add comments, fix struct/function lookup

[toc] / Toc.g4

diff --git a/Toc.g4 b/Toc.g4
index 336b7b03a0a0e8b15bf5745e0099d529b0a3e3a4..a5d5dd83f7d4d94f7cf98438e5cae71fd05f3b43 100644 (file)
--- a/Toc.g4
+++ b/Toc.g4
@@ -14,13 +14,13 @@ varDecl:  'var' var;
 var:  varName (':' type) ('=' expr)?;\r
 varInit:  varName (':' type) ('=' expr);\r
 \r
 var:  varName (':' type) ('=' expr)?;\r
 varInit:  varName (':' type) ('=' expr);\r
 \r

-type: namespaceSpecifier* typeName (typeModifier)*;\r
+type: namespaceSpecifier* typeName genericInstantiation? (typeModifier)*;\r

 typeModifier: '*' | ('[' (INT_LIT)? ']');\r
 \r
 namespaceSpecifier: typeName '::';\r
 \r
 funcDecl: 'func' func;\r
 typeModifier: '*' | ('[' (INT_LIT)? ']');\r
 \r
 namespaceSpecifier: typeName '::';\r
 \r
 funcDecl: 'func' func;\r

-func: funcName genericDecl? '(' parameter ')' (':' type) body;\r
+func: funcName genericDecl? '(' parameter ')' (':' type) (body | ';');\r

 parameter: (var (',' var)*)?;\r
 \r
 body: '{' stmt* '}';\r
 parameter: (var (',' var)*)?;\r
 \r
 body: '{' stmt* '}';\r


@@ -33,6 +33,7 @@ structMethod: func;
 privateDecl: 'private';\r
 \r
 genericDecl: '<' typeName (',' typeName)* '>';\r
 privateDecl: 'private';\r
 \r
 genericDecl: '<' typeName (',' typeName)* '>';\r

+genericInstantiation: '<' type (',' type)* '>';\r

 \r
 stmt: varDecl ';'\r
     | ifStmt\r
 \r
 stmt: varDecl ';'\r
     | ifStmt\r


@@ -59,20 +60,23 @@ assignStmt: expr '=' expr;
 \r
 returnStmt: 'return' expr;\r
 \r
 \r
 returnStmt: 'return' expr;\r
 \r

-expr: namespaceSpecifier* funcName '(' (expr (',' expr)*)? ')' #funcExpr\r
-    | expr '.' funcName '(' (expr (',' expr)*)? ')'            #methodExpr\r
-    | literal                                                  #litExpr\r
-    | '(' expr ')'                                             #parenExpr\r
-    | expr '.' varName                                         #dotExpr\r
-    | prefix_op expr                                           #prefixOpExpr\r
-    | expr postfix_op                                          #postfixOpExpr\r
-    | expr binary_op expr                                      #binaryOpExpr\r
-    | expr '?' expr ':' expr                                   #ternaryOpExpr\r
-    | expr '[' expr ']'                                        #bracketExpr\r
-    | namespaceSpecifier* varName                              #identifierExpr\r
+expr: namespaceSpecifier* funcName genericInstantiation? '(' (expr (',' expr)*)? ')' #funcExpr\r
+    | expr '.' funcName genericInstantiation? '(' (expr (',' expr)*)? ')'            #methodExpr\r
+    | literal                          #litExpr\r
+    | '(' expr ')'                     #parenExpr\r
+    | expr (dot | arrow) varName       #dotExpr\r
+    | prefix_op expr                   #prefixOpExpr\r
+    | expr postfix_op                  #postfixOpExpr\r
+    | expr binary_op expr              #binaryOpExpr\r
+    | expr '?' expr ':' expr           #ternaryOpExpr\r
+    | expr '[' expr ']'                #bracketExpr\r
+    | namespaceSpecifier* varName      #identifierExpr\r

     ;\r
 \r
     ;\r
 \r

-literal: INT_LIT | DECIMAL_LIT | STRING_LIT | BOOL_LIT;\r
+dot: '.';\r
+arrow: '->';\r
+\r
+literal: INT_LIT | DECIMAL_LIT | StringLit | BOOL_LIT;\r

 \r
 funcName: NAME;\r
 varName: NAME;\r
 \r
 funcName: NAME;\r
 varName: NAME;\r


@@ -92,9 +96,17 @@ binary_op:
 \r
 INT_LIT: ('+' | '-')? [0-9]+;\r
 DECIMAL_LIT: ('+' | '-')* [0-9]+ '.' [0-9]+;\r
 \r
 INT_LIT: ('+' | '-')? [0-9]+;\r
 DECIMAL_LIT: ('+' | '-')* [0-9]+ '.' [0-9]+;\r

-STRING_LIT: '"' [^"]* '"';\r

 BOOL_LIT: 'true' | 'false';\r
 BOOL_LIT: 'true' | 'false';\r

+StringLit: '"' CharSeq '"';\r
+\r
+fragment CharSeq: Char+;\r
+fragment Char: ~["\\\r\n]\r
+             | '\\' ['"?abfnrtv\\]\r
+             | '\\\n'\r
+             | '\\\r\n'\r
+             ;\r

 \r
 NAME: ([a-z] | [A-Z] | [0-9])+;\r
 WS: [ \t\r\n]+ -> skip;\r
 NEWLINE: [\r\n]+;\r
 \r
 NAME: ([a-z] | [A-Z] | [0-9])+;\r
 WS: [ \t\r\n]+ -> skip;\r
 NEWLINE: [\r\n]+;\r

+COMMENT: '//' .*? '\n' -> skip;\r