fix(ts): fix function error issues

phodal · Nov 17, 2022 · 4640f34 · 4640f34
1 parent b86d867
commit 4640f34
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/chapi-ast-typescript/src/main/antlr/TypeScriptParser.g4 b/chapi-ast-typescript/src/main/antlr/TypeScriptParser.g4
@@ -905,7 +905,6 @@ singleExpression
     | singleExpression ('.' | '?''.') identifierName                         # PropertyAccessExpression
     |  New (Dot Target| singleExpression )                                   # NewExpression
     // find arguments first, then found the call expression
-//    | singleExpression typeArguments? arguments                              # ArgumentsExpression
     | '(' expressionSequence ')'                                             # ParenthesizedExpression
 
   // TODO:
@@ -914,17 +913,22 @@ singleExpression
 
     | This                                                                   # ThisExpression
     | Super                                                                  # SuperExpression
-    | identifierName                                                         # IdentifierExpression
+    | typeArguments? identifierName                                          # IdentifierExpression
     | literal                                                                # LiteralExpression
     | arrayLiteral                                                           # ArrayLiteralExpression
     | objectLiteral                                                          # ObjectLiteralExpression
     | templateStringLiteral                                                  # TemplateStringExpression
+    | singleExpression As asExpression                                       # CastAsExpression
 
+    // TODO: careful use those
+    | singleExpression typeArguments? arguments                              # ArgumentsExpression
     | htmlElements                                                           # HtmlElementExpression
     ;
 
 
-
+asExpression
+    : singleExpression
+    ;
 
 functionExpression
     : Function '*'? Identifier? '(' formalParameterList? ')' typeAnnotation? '{' functionBody '}'