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