1. 23 Jan, 2015 2 commits
    • Herbert Valerio Riedel's avatar
      Revert "Update Haddock submodule" · febee92c
      Herbert Valerio Riedel authored
      This reverts commit 34d68d8e
      as it breaks the build:
      
        Configuring hsc2hs-0.67...
        Configuring ghc-cabal-0.1...
        Configuring parallel-3.2.0.6...
        Configuring hpc-bin-0.67...
        Configuring haddock-2.16.0...
        ghc-cabal: At least the following dependencies are missing:
        ghc >=7.9 && <7.11
        make[1]: *** [utils/haddock/dist/package-data.mk] Error 1
        make[1]: *** Waiting for unfinished jobs....
          GHC PKG libraries/parallel/dist-install/package-data.mk
        Reading package info from "libraries/parallel/dist-install/inplace-pkg-config" ... done.
        parallel-3.2.0.6: Warning: haddock-interfaces: /srv/builds/commits/rGHC/B3035-34d68d8e/libraries/parallel/dist-install/doc/html/parallel/parallel.haddock doesn't exist or isn't a file
        parallel-3.2.0.6: cannot find any of ["Control/Seq.hi","Control/Seq.p_hi","Control/Seq.dyn_hi"] (ignoring)
        parallel-3.2.0.6: cannot find any of ["Control/Parallel.hi","Control/Parallel.p_hi","Control/Parallel.dyn_hi"] (ignoring)
        parallel-3.2.0.6: cannot find any of ["Control/Parallel/Strategies.hi","Control/Parallel/Strategies.p_hi","Control/Parallel/Strategies.dyn_hi"] (ignoring)
        parallel-3.2.0.6: cannot find any of ["libHSparal_791B1zx5CJ25cUOFECtmw0.a","libHSparal_791B1zx5CJ25cUOFECtmw0.p_a","libHSparal_791B1zx5CJ25cUOFECtmw0-ghc7.11.20150123.so","libHSparal_791B1zx5CJ25cUOFECtmw0-ghc7.11.20150123.dylib","HSparal_791B1zx5CJ25cUOFECtmw0-ghc7.11.20150123.dll"] on library path (ignoring)
        make: *** [all] Error 2
      
      Moreover, utils/haddock is supposed to track the `ghc-head` branch
      (which is what `git submodule update --remote utils/haddock` helps with)
      febee92c
    • Mateusz Kowalczyk's avatar
      Update Haddock submodule · 34d68d8e
      Mateusz Kowalczyk authored
      34d68d8e
  2. 22 Jan, 2015 6 commits
  3. 21 Jan, 2015 3 commits
  4. 20 Jan, 2015 8 commits
  5. 19 Jan, 2015 19 commits
  6. 18 Jan, 2015 1 commit
  7. 16 Jan, 2015 1 commit
    • Alan Zimmerman's avatar
      API Annotations tweaks. · 11881ec6
      Alan Zimmerman authored
      Summary:
      HsTyLit now has SourceText
      
      Update documentation of HsSyn to reflect which annotations are attached to which element.
      
      Ensure that the parser always keeps HsSCC and HsTickPragma values, to
      be ignored in the desugar phase if not needed
      
      Bringing in SourceText for pragmas
      
      Add Location in NPlusKPat
      
      Add Location in FunDep
      
      Make RecCon payload Located
      
      Explicitly add AnnVal to RdrName where it is compound
      
      Add Location in IPBind
      
      Add Location to name in IEThingAbs
      
      Add Maybe (Located id,Bool) to Match to track fun_id,infix
        This includes converting Match into a record and adding a note about why
        the fun_id needs to be replicated in the Match.
      
      Add Location in KindedTyVar
      
      Sort out semi-colons for parsing
      
        - import statements
        - stmts
        - decls
        - decls_cls
        - decls_inst
      
      This updates the haddock submodule.
      
      Test Plan: ./validate
      
      Reviewers: hvr, austin, goldfire, simonpj
      
      Reviewed By: simonpj
      
      Subscribers: thomie, carter
      
      Differential Revision: https://phabricator.haskell.org/D538
      11881ec6