Microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2025-11-18 17:21:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move grammar checking: binaryExpression

Browse Source
This commit is contained in:
Yui T
2014-12-11 14:09:49 -08:00
parent a485fbbf5a
commit 0d99f1afd5
2 changed files with 24 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/compiler/checker.ts
+20
View File
@@ -6710,6 +6710,19 @@ module ts {
}
function checkBinaryExpression(node: BinaryExpression, contextualMapper?: TypeMapper) {
// Grammar checking
if (!checkGrammarModifiers(node)) {
if (node.parserContextFlags & ParserContextFlags.StrictMode) {
if (isLeftHandSideExpression(node.left) && isAssignmentOperator(node.operator)) {
if (isEvalOrArgumentsIdentifier(node.left)) {
// ECMA 262 (Annex C) The identifier eval or arguments may not appear as the LeftHandSideExpression of an
// Assignment operator(11.13) or of a PostfixExpression(11.3)
reportGrammarErrorOfInvalidUseInStrictMode(<Identifier>node.left);
}
}
}
}
var operator = node.operator;
if (operator === SyntaxKind.EqualsToken && (node.left.kind === SyntaxKind.ObjectLiteralExpression || node.left.kind === SyntaxKind.ArrayLiteralExpression)) {
return checkDestructuringAssignment(node.left, checkExpression(node.right, contextualMapper), contextualMapper);
@@ -9950,6 +9963,13 @@ module ts {
}
}
function reportGrammarErrorOfInvalidUseInStrictMode(node: Identifier): boolean {
// declarationNameToString cannot be used here since it uses a backreference to 'parent' that is not yet set
var sourceText = getSourceFileOfNode(node).text;
var name = sourceText.substring(skipTrivia(sourceText, node.pos), node.end);
return grammarErrorOnNode(node, Diagnostics.Invalid_use_of_0_in_strict_mode, name);
}
initializeTypeChecker();
return checker;
src/compiler/parser.ts
+4 -4
View File
@@ -178,7 +178,7 @@ module ts {
return node.kind === SyntaxKind.ExpressionStatement && (<ExpressionStatement>node).expression.kind === SyntaxKind.StringLiteral;
}
function isEvalOrArgumentsIdentifier(node: Node): boolean {
export function isEvalOrArgumentsIdentifier(node: Node): boolean {
return node.kind === SyntaxKind.Identifier &&
(<Identifier>node).text &&
((<Identifier>node).text === "eval" || (<Identifier>node).text === "arguments");
@@ -4533,7 +4533,7 @@ module ts {
}
}
function isLeftHandSideExpression(expr: Expression): boolean {
export function isLeftHandSideExpression(expr: Expression): boolean {
if (expr) {
switch (expr.kind) {
case SyntaxKind.PropertyAccessExpression:
@@ -4563,7 +4563,7 @@ module ts {
return false;
}
function isAssignmentOperator(token: SyntaxKind): boolean {
export function isAssignmentOperator(token: SyntaxKind): boolean {
return token >= SyntaxKind.FirstAssignment && token <= SyntaxKind.LastAssignment;
}
@@ -4634,7 +4634,7 @@ module ts {
//return checkCallOrNewExpression(<NewExpression>node);
case SyntaxKind.EnumDeclaration: return checkEnumDeclaration(<EnumDeclaration>node);
case SyntaxKind.BinaryExpression: return checkBinaryExpression(<BinaryExpression>node);
//case SyntaxKind.BinaryExpression: return checkBinaryExpression(<BinaryExpression>node);
case SyntaxKind.BindingElement: return checkBindingElement(<BindingElement>node);
case SyntaxKind.CatchClause: return checkCatchClause(<CatchClause>node);
case SyntaxKind.ClassDeclaration: return checkClassDeclaration(<ClassDeclaration>node);