toc now uses internal representation instead of ast

[toc] / Toc.g4

diff --git a/Toc.g4 b/Toc.g4
index 95c9a0dd95a4f35f1fdf9456a7c483b3fbb0712e..7b9ff972ef37d1974169ccdc45cc5d96c401bf3d 100644 (file)
--- a/Toc.g4
+++ b/Toc.g4
@@ -15,9 +15,7 @@ type: typeName;
 \r
 funcDecl: 'func' func;\r
 func: funcName '(' parameter ')' (':' type) body;\r
-parameter: (firstParameter (additionalParameter)*)?;\r
-firstParameter: var;\r
-additionalParameter: ',' var;\r
+parameter: (var (',' var)*)?;\r
 \r
 body: '{' stmt* '}';\r
 \r
@@ -61,10 +59,18 @@ nonOpExpr: funcCall
          | parenExpr;\r
 \r
 nonSubscriptExpr: funcCall\r
+                | literal\r
                 | identifier\r
                 | memberAccess\r
                 | parenExpr;\r
 \r
+nonAccessExpr: funcCall\r
+             | literal\r
+             | identifier\r
+             | subscript\r
+             | parenExpr\r
+             | operatorExpr;\r
+\r
 funcCall: funcName '(' (expr (',' expr)*)? ')';\r
 \r
 operatorExpr: binaryOperator;\r