wip: parse spread operator.

Author: diasbruno

src/Language/JavaScript/Parser/AST.hs

@@ -108,6 +108,7 @@ data JSExpression
     | JSObjectLiteral !JSAnnot !JSObjectPropertyList !JSAnnot -- ^lbrace contents rbrace
     | JSUnaryExpression !JSUnaryOp !JSExpression
     | JSVarInitExpression !JSExpression !JSVarInitializer -- ^identifier, initializer
+    | JSSpreadExpression !JSAnnot !JSExpression
     deriving (Data, Eq, Show, Typeable)
 
 data JSBinOp
@@ -311,6 +312,7 @@ instance ShowStripped JSExpression where
     ss (JSStringLiteral _ s) = "JSStringLiteral " ++ s
     ss (JSUnaryExpression op x) = "JSUnaryExpression (" ++ ss op ++ "," ++ ss x ++ ")"
     ss (JSVarInitExpression x1 x2) = "JSVarInitExpression (" ++ ss x1 ++ ") " ++ ss x2
+    ss (JSSpreadExpression _ x1) = "JSSpreadExpression (" ++ ss x1 ++ ")"
 
 instance ShowStripped JSTryCatch where
     ss (JSCatch _ _lb x1 _rb x3) = "JSCatch (" ++ ss x1 ++ "," ++ ss x3 ++ ")"

src/Language/JavaScript/Parser/Grammar7.y

@@ -71,6 +71,7 @@ import qualified Language.JavaScript.Parser.AST as AST
      '%'    { ModToken {} }
      '!'    { NotToken {} }
      '~'    { BitwiseNotToken {} }
+     '...'  { SpreadToken {} }
      '.'    { DotToken {} }
      '['    { LeftBracketToken {} }
      ']'    { RightBracketToken {} }
@@ -181,6 +182,9 @@ Colon : ':' { mkJSAnnot $1 }
 Semi :: { AST.JSAnnot }
 Semi : ';' { mkJSAnnot $1 }
 
+Spread :: { AST.JSAnnot }
+Spread : '...' { mkJSAnnot $1 }
+
 Dot :: { AST.JSAnnot }
 Dot : '.' { mkJSAnnot $1 }
 
@@ -416,6 +420,7 @@ PrimaryExpression : 'this'                   { AST.JSLiteral (mkJSAnnot $1) "thi
                   | Literal                  { $1 {- 'PrimaryExpression2' -} }
                   | ArrayLiteral             { $1 {- 'PrimaryExpression3' -} }
                   | ObjectLiteral            { $1 {- 'PrimaryExpression4' -} }
+                  | SpreadExpression         { $1 }
                   | LParen Expression RParen { AST.JSExpressionParen $1 $2 $3 }
 
 -- Identifier ::                                                            See 7.6
@@ -468,6 +473,8 @@ IdentifierName : Identifier {$1}
              | 'future'     { AST.JSIdentifier (mkJSAnnot $1) (tokenLiteral $1) }
 
 
+SpreadExpression :: { AST.JSExpression }
+SpreadExpression : Spread Expression  { AST.JSSpreadExpression $1 $2 {- 'SpreadExpression' -} }
 
 -- ArrayLiteral :                                                        See 11.1.4
 --        [ Elisionopt ]

src/Language/JavaScript/Parser/Lexer.x

@@ -320,6 +320,7 @@ tokens :-
     "%"     { adapt (symbolToken  ModToken) }
     "!"     { adapt (symbolToken  NotToken) }
     "~"     { adapt (symbolToken  BitwiseNotToken) }
+    "..."   { adapt (symbolToken  SpreadToken) }
     "."     { adapt (symbolToken  DotToken) }
     "["     { adapt (symbolToken  LeftBracketToken) }
     "]"     { adapt (symbolToken  RightBracketToken) }

src/Language/JavaScript/Parser/Token.hs

@@ -141,6 +141,7 @@ data Token
     | ModToken { tokenSpan :: !TokenPosn, tokenComment :: ![CommentAnnotation]  }
     | NotToken { tokenSpan :: !TokenPosn, tokenComment :: ![CommentAnnotation]  }
     | BitwiseNotToken { tokenSpan :: !TokenPosn, tokenComment :: ![CommentAnnotation]  }
+    | SpreadToken { tokenSpan :: !TokenPosn, tokenComment :: ![CommentAnnotation]  }
     | DotToken { tokenSpan :: !TokenPosn, tokenComment :: ![CommentAnnotation]  }
     | LeftBracketToken { tokenSpan :: !TokenPosn, tokenComment :: ![CommentAnnotation]  }
     | RightBracketToken { tokenSpan :: !TokenPosn, tokenComment :: ![CommentAnnotation]  }

test/Test/Language/Javascript/ExpressionParser.hs

@@ -69,6 +69,8 @@ testExpressionParser = describe "Parse expressions:" $ do
         testExpr "!y"       `shouldBe` "Right (JSAstExpression (JSUnaryExpression ('!',JSIdentifier 'y')))"
         testExpr "y++"      `shouldBe` "Right (JSAstExpression (JSExpressionPostfix ('++',JSIdentifier 'y')))"
         testExpr "y--"      `shouldBe` "Right (JSAstExpression (JSExpressionPostfix ('--',JSIdentifier 'y')))"
+        testExpr "...y"     `shouldBe` "Right (JSAstExpression (JSSpreadExpression (JSIdentifier 'y')))"
+
 
     it "new expression" $ do
         testExpr "new x()"  `shouldBe` "Right (JSAstExpression (JSMemberNew (JSIdentifier 'x',JSArguments ())))"

test/Test/Language/Javascript/Lexer.hs

@@ -49,6 +49,9 @@ testLexer = describe "Lexer:" $ do
         testLex "'\"'"      `shouldBe` "[StringToken '\"']"
         testLex "\"\\'\""      `shouldBe` "[StringToken \"\\'\"]"
 
+    it "spread token" $ do
+        testLex "...a" `shouldBe` "[SpreadToken,IdentifierToken 'a']"
+
     it "assignment" $ do
         testLex "x=1"       `shouldBe` "[IdentifierToken 'x',SimpleAssignToken,DecimalToken 1]"
         testLex "x=1\ny=2"  `shouldBe` "[IdentifierToken 'x',SimpleAssignToken,DecimalToken 1,WsToken,IdentifierToken 'y',SimpleAssignToken,DecimalToken 2]"