language-ecmascript 0.17.2.0 → 0.19.1.0
raw patch · 5 files changed
Files
- CHANGELOG +9/−0
- language-ecmascript.cabal +23/−14
- src/Language/ECMAScript3/Lexer.hs +15/−15
- src/Language/ECMAScript3/Parser.hs +2/−1
- src/Language/ECMAScript3/PrettyPrint.hs +2/−2
CHANGELOG view
@@ -1,5 +1,14 @@ Version change log. +=0.19.0.1=+Version bumps and a build fix for GHC 8.8 (GitHub issue #85).++=0.19=+Pull request #84: Moved the Arbitrary instance and the testing-feat dependency to the test-suite. Removed tabs from the lexer.++=0.18=+Pull request #83: Updated dependencies, migrated to ansi-wl-pprint.+ =0.17.2.0= Issue #82: Tighter lexing of identifiers using Unicode character classes (thanks @berdario).
language-ecmascript.cabal view
@@ -1,8 +1,8 @@ Name: language-ecmascript-Version: 0.17.2.0-Cabal-Version: >= 1.10+Version: 0.19.1.0+Cabal-Version: >= 1.12 Copyright: (c) 2007-2012 Brown University, (c) 2008-2010 Claudiu Saftoiu,- (c) 2012-2015 Stevens Institute of Technology, (c) 2016 Eyal Lotem, (c) 2016-2017 Andrey Chudnov+ (c) 2012-2015 Stevens Institute of Technology, (c) 2016 Eyal Lotem, (c) 2016-2020 Andrey Chudnov License: BSD3 License-file: LICENSE Author: Andrey Chudnov, Arjun Guha, Spiridon Aristides Eliopoulos,@@ -11,7 +11,7 @@ Homepage: http://github.com/jswebtools/language-ecmascript Bug-reports: http://github.com/jswebtools/language-ecmascript/issues Stability: experimental-Tested-with: GHC==7.4.2, GHC==7.6.3, GHC==7.8.4, GHC==7.10.3, GHC==8.0.2+Tested-with: GHC==8.8.1 Extra-Source-Files: test/parse-pretty/*.js, test/diff/left/*.js, test/diff/right/*.js, test/diff/expects/*.diff, CHANGELOG Category: Language Build-Type: Simple@@ -29,23 +29,22 @@ Source-repository this type: git location: git://github.com/jswebtools/language-ecmascript.git- tag: 0.17.2.0+ tag: 0.19.0.1 Library Hs-Source-Dirs: src Build-Depends:- base >= 4 && < 5,+ base >= 4 && < 4.15, mtl >= 1 && < 3, parsec > 3 && < 3.2.0,- wl-pprint >= 1.2 && < 2,+ ansi-wl-pprint >= 0.6 && < 1, containers == 0.*, uniplate >= 1.6 && <1.7, data-default-class >= 0.0.1 && < 0.2, QuickCheck >= 2.5 && < 3, template-haskell >= 2.7 && < 3,- Diff == 0.3.*,- testing-feat >= 0.4.0.2 && < 0.5,+ Diff == 0.4.*, charset >= 0.3 ghc-options: -fwarn-incomplete-patterns@@ -56,7 +55,6 @@ Language.ECMAScript3.PrettyPrint Language.ECMAScript3.Syntax Language.ECMAScript3.Syntax.Annotations- Language.ECMAScript3.Syntax.Arbitrary Language.ECMAScript3.Syntax.CodeGen Language.ECMAScript3.Syntax.QuasiQuote Language.ECMAScript3.Analysis.Environment@@ -70,30 +68,41 @@ Default-Language: Haskell2010 Test-Suite test- Hs-Source-Dirs: test+ Hs-Source-Dirs: src test Type: exitcode-stdio-1.0 Main-Is: TestMain.hs Other-Modules:+ Language.ECMAScript3.Lexer+ Language.ECMAScript3.Parser+ Language.ECMAScript3.Parser.State+ Language.ECMAScript3.Parser.Type+ Language.ECMAScript3.PrettyPrint+ Language.ECMAScript3.SourceDiff+ Language.ECMAScript3.Syntax+ Language.ECMAScript3.Syntax.Annotations+ Language.ECMAScript3.Syntax.Arbitrary Test.Diff Test.Unit Test.Pretty Test.Arbitrary Build-Depends:- base >= 4 && < 5,+ base >= 4 && < 4.14, mtl >= 1 && < 3, parsec >= 3 && < 3.2.0,- wl-pprint >= 1.2 && < 2,+ ansi-wl-pprint >= 0.6 && < 1,+ charset >= 0.3, containers == 0.*, directory >= 1.2 && < 1.4, filepath >= 1.3 && < 1.5, HUnit >= 1.2 && < 1.7, QuickCheck >= 2.5 && < 3, data-default-class >= 0.0.1 && < 0.2,+ testing-feat >= 0.4.0.2 && < 1.2, test-framework >= 0.8 && < 0.9, test-framework-hunit >= 0.3.0 && < 0.4, test-framework-quickcheck2 >= 0.3.0.1 && < 0.4, uniplate >= 1.6 && <1.7,- Diff == 0.3.*,+ Diff == 0.4.*, language-ecmascript Default-Extensions: DeriveDataTypeable, ScopedTypeVariables, DeriveFunctor, DeriveFoldable, DeriveTraversable, FlexibleContexts Default-Language: Haskell2010
src/Language/ECMAScript3/Lexer.hs view
@@ -80,45 +80,45 @@ -- everything but commaSep and semiSep identifier :: Stream s Identity Char => Parser s String-identifier = T.identifier lex+identifier = T.identifier lex reserved :: Stream s Identity Char => String -> Parser s ()-reserved = T.reserved lex+reserved = T.reserved lex operator :: Stream s Identity Char => Parser s String-operator = T.operator lex+operator = T.operator lex reservedOp :: Stream s Identity Char => String -> Parser s ()-reservedOp = T.reservedOp lex +reservedOp = T.reservedOp lex charLiteral :: Stream s Identity Char => Parser s Char-charLiteral = T.charLiteral lex +charLiteral = T.charLiteral lex stringLiteral :: Stream s Identity Char => Parser s String stringLiteral = T.stringLiteral lex -- natural :: Stream s Identity Char => Parser s Integer--- natural = T.natural lex +-- natural = T.natural lex -- integer :: Stream s Identity Char => Parser s Integer--- integer = T.integer lex +-- integer = T.integer lex -- float :: Stream s Identity Char => Parser s Double -- float = T.float lex -- naturalOrFloat :: Stream s Identity Char => Parser s (Either Integer Double) -- naturalOrFloat = T.naturalOrFloat lex -- decimal :: Stream s Identity Char => Parser s Integer--- decimal = T.decimal lex +-- decimal = T.decimal lex -- hexadecimal :: Stream s Identity Char => Parser s Integer--- hexadecimal = T.hexadecimal lex +-- hexadecimal = T.hexadecimal lex -- octal :: Stream s Identity Char => Parser s Integer -- octal = T.octal lex symbol :: Stream s Identity Char => String -> Parser s String symbol = T.symbol lex whiteSpace :: Stream s Identity Char => Parser s ()-whiteSpace = T.whiteSpace lex +whiteSpace = T.whiteSpace lex parens :: Stream s Identity Char => Parser s a -> Parser s a-parens = T.parens lex+parens = T.parens lex braces :: Stream s Identity Char => Parser s a -> Parser s a-braces = T.braces lex+braces = T.braces lex squares :: Stream s Identity Char => Parser s a -> Parser s a-squares = T.squares lex +squares = T.squares lex semi :: Stream s Identity Char => Parser s String-semi = T.semi lex+semi = T.semi lex comma :: Stream s Identity Char => Parser s String-comma = T.comma lex+comma = T.comma lex colon :: Stream s Identity Char => Parser s String colon = T.colon lex dot :: Stream s Identity Char => Parser s String
src/Language/ECMAScript3/Parser.hs view
@@ -42,6 +42,7 @@ import Data.Maybe (isJust, isNothing, fromMaybe) import Control.Monad.Error.Class import Control.Applicative ((<$>), (<*>))+import Control.Exception (throwIO) {-# DEPRECATED ParsedStatement, ParsedExpression, StatementParser, ExpressionParser@@ -794,7 +795,7 @@ parseJavaScriptFromFile filename = do chars <- liftIO $ readFile filename case parse parseScript filename chars of- Left err -> fail (show err)+ Left err -> liftIO $ throwIO $ userError $ show err Right (Script _ stmts) -> return stmts -- | Parse a JavaScript program from a string
src/Language/ECMAScript3/PrettyPrint.hs view
@@ -10,8 +10,8 @@ ,unsafeInExprStmt ) where -import qualified Text.PrettyPrint.Leijen as Pretty-import Text.PrettyPrint.Leijen hiding (Pretty, parens)+import qualified Text.PrettyPrint.ANSI.Leijen as Pretty+import Text.PrettyPrint.ANSI.Leijen hiding (Pretty, parens) import Language.ECMAScript3.Syntax import Prelude hiding (maybe, id) import qualified Prelude