Skip to content

Add support for destructuring in var declarations #96

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 4, 2019
Merged

Add support for destructuring in var declarations #96

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/Language/JavaScript/Parser/Grammar7.y
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -958,14 +958,14 @@ VariableDeclarationListNoIn : VariableDeclarationNoIn
-- VariableDeclaration : See 12.2
-- Identifier Initialiseropt
VariableDeclaration :: { AST.JSExpression }
VariableDeclaration : Identifier SimpleAssign AssignmentExpression { AST.JSVarInitExpression $1 (AST.JSVarInit $2 $3) {- 'JSVarInitExpression1' -} }
| Identifier { AST.JSVarInitExpression $1 AST.JSVarInitNone {- 'JSVarInitExpression2' -} }
VariableDeclaration : PrimaryExpression SimpleAssign AssignmentExpression { AST.JSVarInitExpression $1 (AST.JSVarInit $2 $3) {- 'JSVarInitExpression1' -} }
| Identifier { AST.JSVarInitExpression $1 AST.JSVarInitNone {- 'JSVarInitExpression2' -} }

-- VariableDeclarationNoIn : See 12.2
-- Identifier InitialiserNoInopt
VariableDeclarationNoIn :: { AST.JSExpression }
VariableDeclarationNoIn : Identifier SimpleAssign AssignmentExpression { AST.JSVarInitExpression $1 (AST.JSVarInit $2 $3) {- 'JSVarInitExpressionInit2' -} }
| Identifier { AST.JSVarInitExpression $1 AST.JSVarInitNone {- 'JSVarInitExpression2' -} }
VariableDeclarationNoIn : PrimaryExpression SimpleAssign AssignmentExpression { AST.JSVarInitExpression $1 (AST.JSVarInit $2 $3) {- 'JSVarInitExpressionInit2' -} }
| Identifier { AST.JSVarInitExpression $1 AST.JSVarInitNone {- 'JSVarInitExpression2' -} }

-- EmptyStatement : See 12.3
-- ;
Expand Down
1 change: 1 addition & 0 deletions test/Test/Language/Javascript/Minify.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,6 +225,7 @@ testMinifyStmt = describe "Minify statements:" $ do
minifyStmt " var d = 1, x = 2 ; " `shouldBe` "var d=1,x=2"
minifyStmt " let c = 1 ; " `shouldBe` "let c=1"
minifyStmt " let d = 1, x = 2 ; " `shouldBe` "let d=1,x=2"
minifyStmt " const { a : [ b , c ] } = d; " `shouldBe` "const{a:[b,c]}=d"

it "string concatenation" $
minifyStmt " f (\"ab\"+\"cd\") " `shouldBe` "f('abcd')"
Expand Down
2 changes: 2 additions & 0 deletions test/Test/Language/Javascript/RoundTrip.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,8 @@ testRoundTrip = describe "Roundtrip:" $ do
testRT "switch (x) {default:break;}"
testRT "switch (x) {default:\ncase 1:break;}"
testRT "var x=1;let y=2;"
testRT "var [x, y]=z;"
testRT "let {x: [y]}=z;"

it "module" $ do
testRTModule "import def from 'mod'"
Expand Down
2 changes: 2 additions & 0 deletions test/Test/Language/Javascript/StatementParser.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,8 @@ testStatementParser = describe "Parse statements:" $ do
testStmt "var x=1;" `shouldBe` "Right (JSAstStatement (JSVariable (JSVarInitExpression (JSIdentifier 'x') [JSDecimal '1'])))"
testStmt "const x=1,y=2;" `shouldBe` "Right (JSAstStatement (JSConstant (JSVarInitExpression (JSIdentifier 'x') [JSDecimal '1'],JSVarInitExpression (JSIdentifier 'y') [JSDecimal '2'])))"
testStmt "let x=1,y=2;" `shouldBe` "Right (JSAstStatement (JSLet (JSVarInitExpression (JSIdentifier 'x') [JSDecimal '1'],JSVarInitExpression (JSIdentifier 'y') [JSDecimal '2'])))"
testStmt "var [a,b]=x" `shouldBe` "Right (JSAstStatement (JSVariable (JSVarInitExpression (JSArrayLiteral [JSIdentifier 'a',JSComma,JSIdentifier 'b']) [JSIdentifier 'x'])))"
testStmt "const {a:b}=x" `shouldBe` "Right (JSAstStatement (JSConstant (JSVarInitExpression (JSObjectLiteral [JSPropertyNameandValue (JSIdentifier 'a') [JSIdentifier 'b']]) [JSIdentifier 'x'])))"

it "break" $ do
testStmt "break;" `shouldBe` "Right (JSAstStatement (JSBreak,JSSemicolon))"
Expand Down