ghc-parser 0.1.4.0 → 0.1.6.0

raw patch · 2 files changed

+17/−29 lines, 2 filesdep ~basedep ~ghcPVP: major bump suggested

API removals or changes: PVP suggests a major version bump

Dependency ranges changed: base, ghc

API changes (from Hackage documentation)

Files

• generic-src/Language/Haskell/GHC/Parser.hs +10/−25
• ghc-parser.cabal +7/−4

@@ -17,12 +17,6 @@   parserTypeSignature,   parserModule,   parserExpression,-  partialStatement,-  partialImport,-  partialDeclaration,-  partialTypeSignature,-  partialModule,-  partialExpression,    -- Haskell string preprocessing.   removeComments,@@ -71,27 +65,20 @@   } deriving (Eq, Show, Functor)  -data ParserType = FullParser | PartialParser-data Parser a = Parser ParserType (P a)+data Parser a = Parser (P a)  -- Our parsers.-parserStatement      = Parser FullParser    Parse.fullStatement-parserImport         = Parser FullParser    Parse.fullImport-parserDeclaration    = Parser FullParser    Parse.fullDeclaration-parserExpression     = Parser FullParser    Parse.fullExpression-parserTypeSignature  = Parser FullParser    Parse.fullTypeSignature-parserModule         = Parser FullParser    Parse.fullModule-partialStatement     = Parser PartialParser Parse.partialStatement-partialImport        = Parser PartialParser Parse.partialImport-partialDeclaration   = Parser PartialParser Parse.partialDeclaration-partialExpression    = Parser PartialParser Parse.partialExpression-partialTypeSignature = Parser PartialParser Parse.partialTypeSignature-partialModule        = Parser PartialParser Parse.partialModule+parserStatement      = Parser Parse.fullStatement+parserImport         = Parser Parse.fullImport+parserDeclaration    = Parser Parse.fullDeclaration+parserExpression     = Parser Parse.fullExpression+parserTypeSignature  = Parser Parse.fullTypeSignature+parserModule         = Parser Parse.fullModule  -- | Run a GHC parser on a string. Return success or failure with -- associated information for both. runParser :: DynFlags -> Parser a -> String -> ParseOutput a-runParser flags (Parser parserType parser) str =+runParser flags (Parser parser) str =   -- Create an initial parser state.   let filename = "<interactive>"       location = mkRealSrcLoc (mkFastString filename) 1 1@@ -115,10 +102,8 @@       let parseEnd = realSrcSpanStart $ last_loc parseState           endLine = srcLocLine parseEnd           endCol = srcLocCol parseEnd-          (before, after) = splitAtLoc endLine endCol str in-        case parserType of-          PartialParser -> Partial result (before, after)-          FullParser -> Parsed result+          (before, after) = splitAtLoc endLine endCol str+        in Parsed result      -- Convert the bag of errors into an error string.     printErrorBag bag = joinLines . map show $ bagToList bag

@@ -2,7 +2,7 @@ -- documentation, see http://haskell.org/cabal/users-guide/  name:                ghc-parser-version:             0.1.4.0+version:             0.1.6.0 synopsis:            Haskell source parser from GHC. -- description: homepage:            https://github.com/gibiansky/IHaskell@@ -29,8 +29,8 @@                        Language.Haskell.GHC.HappyParser   -- other-modules:   -- other-extensions:-  build-depends:       base                 >=4.6 && <4.8,-                       ghc                  >=7.6 && <7.10+  build-depends:       base                 >=4.6 && <4.9,+                       ghc                  >=7.6 && <7.11    if   impl(ghc >= 7.6) && impl(ghc < 7.8)     hs-source-dirs:      generic-src src-7.6@@ -38,6 +38,9 @@     if impl(ghc >= 7.8) && impl(ghc < 7.8.3)       hs-source-dirs:    generic-src src-7.8.2     else-      hs-source-dirs:    generic-src src-7.8.3+      if impl(ghc < 7.10)+        hs-source-dirs:    generic-src src-7.8.3+      else+        hs-source-dirs:    generic-src src-7.10    default-language:    Haskell2010