diff --git a/grammar/src/expressions.grm b/grammar/src/expressions.grm index a82cd991db2..9f4151f48ee 100644 --- a/grammar/src/expressions.grm +++ b/grammar/src/expressions.grm @@ -73,7 +73,7 @@ prefixUnaryExpression ; postfixUnaryExpression - : memberAccess postfixUnaryOperation* + : atomicExpression postfixUnaryOperation* ; // !!! When you add here, remember to update the FIRST set in the parser @@ -177,15 +177,6 @@ memberAccessOperation : "." : "?." : "#" ; -functionCall - : functionExpression typeArguments valueArguments? functionLiteral? - : functionExpression valueArguments functionLiteral? - ; - -functionExpression - : expression - ; - typeArguments : "<" type{","} ">" ; @@ -194,11 +185,6 @@ valueArguments : "(" (SimpleName "=")? ("out" | "ref")? expression{","} ")" ; -infixFunctionCall - : expression SimpleName typeArguments - : expression SimpleName expression - ; - jump : "throw" expression : "return" expression? @@ -231,16 +217,6 @@ constructorInvocation : userType valueArguments? ; -memberAccess - : functionCall - : fieldOrPropertyAccess - : functionLiteral // no parameters allowed - ; - -fieldOrPropertyAccess - : (FieldName | SimpleName) arrayAccess? - ; - arrayAccess : "[" expression{","} "]" ;