hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2026-01-09 04:30:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

JavaScript: Refactor parsing of parenthesised expressions.

Browse Source
This commit is contained in:
Max Schaefer
2019-01-29 15:52:29 +00:00
parent 92c8501e67
commit bb93cef20a
1 changed files with 21 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
javascript/extractor/src/com/semmle/jcorn/Parser.java
View File

@@ -1691,27 +1691,34 @@ public class Parser {
first = false;
else
this.expect(TokenType.comma);
if (allowTrailingComma && this.afterTrailingComma(TokenType.parenR, true)) {
parenExprs.lastIsComma = true;
if (!parseParenthesisedExpression(refDestructuringErrors, allowTrailingComma, parenExprs, first))
break;
} else if (this.type == TokenType.ellipsis) {
parenExprs.spreadStart = this.start;
parenExprs.exprList.add(this.parseParenItem(this.parseRest(false), -1, null));
if (this.type == TokenType.comma)
this.raise(this.startLoc, "Comma is not permitted after the rest element");
break;
} else {
if (this.type == TokenType.parenL && parenExprs.innerParenStart == 0) {
parenExprs.innerParenStart = this.start;
}
parenExprs.exprList.add(this.parseMaybeAssign(false, refDestructuringErrors, this::parseParenItem));
}
}
parenExprs.endLoc = this.startLoc;
this.expect(TokenType.parenR);
return parenExprs;
}
protected boolean parseParenthesisedExpression(DestructuringErrors refDestructuringErrors,
boolean allowTrailingComma, ParenthesisedExpressions parenExprs, boolean first) {
if (allowTrailingComma && this.afterTrailingComma(TokenType.parenR, true)) {
parenExprs.lastIsComma = true;
return false;
} else if (this.type == TokenType.ellipsis) {
parenExprs.spreadStart = this.start;
parenExprs.exprList.add(this.parseParenItem(this.parseRest(false), -1, null));
if (this.type == TokenType.comma)
this.raise(this.startLoc, "Comma is not permitted after the rest element");
return false;
} else {
if (this.type == TokenType.parenL && parenExprs.innerParenStart == 0) {
parenExprs.innerParenStart = this.start;
}
parenExprs.exprList.add(this.parseMaybeAssign(false, refDestructuringErrors, this::parseParenItem));
}
return true;
}
protected Expression parseParenItem(Expression left, int startPos, Position startLoc) {
return left;
}