X-Git-Url: https://gitweb.ps.run/toc/blobdiff_plain/9f5457a18f551d261e4bd380ea16a52dc5b04cf9..9610ce88f0b753db81014a053bd3c6d79471c90c:/Toc.g4

diff --git a/Toc.g4 b/Toc.g4
index 2170321..a5d5dd8 100644
--- a/Toc.g4
+++ b/Toc.g4
@@ -2,94 +2,81 @@ grammar Toc;
 
 prog: (decl)+ EOF;
 
-decl: varDecl
+decl: varDecl ';'
     | funcDecl
     | structDecl
+    | namespaceDecl
     ;
 
+namespaceDecl: 'namespace' typeName '{' decl* '}';
+
 varDecl:  'var' var;
 var:  varName (':' type) ('=' expr)?;
 varInit:  varName (':' type) ('=' expr);
 
-type: typeName (typeModifier)*;
-typeModifier: '*' | '[' NUMBER? ']';
+type: namespaceSpecifier* typeName genericInstantiation? (typeModifier)*;
+typeModifier: '*' | ('[' (INT_LIT)? ']');
 
+namespaceSpecifier: typeName '::';
 
 funcDecl: 'func' func;
-func: funcName '(' parameter ')' (':' type) body;
+func: funcName genericDecl? '(' parameter ')' (':' type) (body | ';');
 parameter: (var (',' var)*)?;
 
 body: '{' stmt* '}';
 
 
-structDecl: 'struct' structName '{' structMember* '}';
-structMember: structVar | structMethod;
-structVar: var;
+structDecl: 'struct' structName genericDecl? '{' structMember* '}';
+structMember: privateDecl? structVar | structMethod;
+structVar: var ';';
 structMethod: func;
+privateDecl: 'private';
 
+genericDecl: '<' typeName (',' typeName)* '>';
+genericInstantiation: '<' type (',' type)* '>';
 
-stmt: varDecl
+stmt: varDecl ';'
     | ifStmt
     | switchStmt
     | forStmt
     | whileStmt
-    | assignStmt
-    | returnStmt
-    | expr;
+    | assignStmt ';'
+    | returnStmt ';'
+    | expr ';';
 
 ifStmt: 'if' expr body elseIfStmt* elseStmt?;
 elseIfStmt: 'else' 'if' expr body;
 elseStmt: 'else' body;
 
-switchStmt: 'switch' identifierExpr switchBody;
+switchStmt: 'switch' expr switchBody;
 switchBody: '{' switchCase* '}';
 switchCase: 'case' expr body;
 
-forStmt: 'for' (varInit | assignStmt) ',' expr ',' expr body;
+forStmt: 'for' varInit ',' expr ',' expr body;
 
 whileStmt: 'while' expr body;
 
-assignStmt: identifierExpr '=' expr;
+assignStmt: expr '=' expr;
 
 returnStmt: 'return' expr;
 
-expr: funcExpr
-    | litExpr
-    | identifierExpr
-    | parenExpr
-    | accessExpr
-    | opExpr;
-
-/* op */
-nonOpExpr: funcExpr
-         | litExpr
-         | identifierExpr
-         | parenExpr
-         | accessExpr;
-
-/* lit access op */
-nonAccessExpr: funcExpr
-             | identifierExpr
-             | parenExpr;
-
-funcExpr: funcName '(' (expr (',' expr)*)? ')';
-
-opExpr: binaryOp | prefixOp | postfixOp | ternaryOp;
-binaryOp: nonOpExpr binary_op nonOpExpr (binary_op nonOpExpr)*;
-prefixOp: prefix_op nonOpExpr;
-postfixOp: nonOpExpr postfix_op;
-ternaryOp: nonOpExpr '?' expr ':' expr;
-
-identifierExpr: varName;
-
-litExpr: INT_LIT | DECIMAL_LIT | STRING_LIT | BOOL_LIT;
+expr: namespaceSpecifier* funcName genericInstantiation? '(' (expr (',' expr)*)? ')' #funcExpr
+    | expr '.' funcName genericInstantiation? '(' (expr (',' expr)*)? ')'            #methodExpr
+    | literal                          #litExpr
+    | '(' expr ')'                     #parenExpr
+    | expr (dot | arrow) varName       #dotExpr
+    | prefix_op expr                   #prefixOpExpr
+    | expr postfix_op                  #postfixOpExpr
+    | expr binary_op expr              #binaryOpExpr
+    | expr '?' expr ':' expr           #ternaryOpExpr
+    | expr '[' expr ']'                #bracketExpr
+    | namespaceSpecifier* varName      #identifierExpr
+    ;
 
-accessExpr: nonAccessExpr (accessSubExpr)+;
-accessSubExpr: accessMember | accessBrackets;
-accessMember: ('.' | '->') identifierExpr;
-accessBrackets: '[' expr ']';
+dot: '.';
+arrow: '->';
 
-parenExpr: '(' expr ')';
+literal: INT_LIT | DECIMAL_LIT | StringLit | BOOL_LIT;
 
 funcName: NAME;
 varName: NAME;
@@ -109,10 +96,17 @@ binary_op:
 
 INT_LIT: ('+' | '-')? [0-9]+;
 DECIMAL_LIT: ('+' | '-')* [0-9]+ '.' [0-9]+;
-STRING_LIT: '"' [^"]* '"';
 BOOL_LIT: 'true' | 'false';
+StringLit: '"' CharSeq '"';
+
+fragment CharSeq: Char+;
+fragment Char: ~["\\\r\n]
+             | '\\' ['"?abfnrtv\\]
+             | '\\\n'
+             | '\\\r\n'
+             ;
 
 NAME: ([a-z] | [A-Z] | [0-9])+;
 WS: [ \t\r\n]+ -> skip;
 NEWLINE: [\r\n]+;
-NUMBER: [0-9]+;
+COMMENT: '//' .*? '\n' -> skip;