JavaScript: Accept let expressions with an object literal as their body.

Max Schaefer · Max Schaefer · commit dbbb961b4888 · 2019-02-24T20:45:41.000Z
diff --git a/javascript/extractor/src/com/semmle/jcorn/CustomParser.java b/javascript/extractor/src/com/semmle/jcorn/CustomParser.java
@@ -196,8 +196,12 @@ protected Node parseLetExpression(Position startLoc, boolean maybeStatement) {
 		this.expect(TokenType.parenR);
 
 		if (this.type == TokenType.braceL) {
-			if (!maybeStatement)
-				this.unexpected();
+			if (!maybeStatement) {
+				// must be the start of an object literal
+				Expression body = this.parseObj(false, null);
+				return this.finishNode(new LetExpression(new SourceLocation(startLoc), decl.getDeclarations(), body));
+			}
+
 			BlockStatement body = this.parseBlock(false);
 			return this.finishNode(new LetStatement(new SourceLocation(startLoc), decl.getDeclarations(), body));
 		} else if (maybeStatement) {
diff --git a/javascript/extractor/tests/mozilla/input/letExpr.js b/javascript/extractor/tests/mozilla/input/letExpr.js
@@ -2,4 +2,6 @@ var x = 42, y = 19;
 
 console.log(let (x = 23, y = 19) x + y);
 
-console.log(x - y);
+console.log(x - y);
+
+JSON.stringify(let (x = 23, y = 19) { x: x, y: y});
diff --git a/javascript/extractor/tests/mozilla/output/trap/letExpr.js.trap b/javascript/extractor/tests/mozilla/output/trap/letExpr.js.trap
