X-Git-Url: https://gitweb.ps.run/toc/blobdiff_plain/5f9668526491332f62c05ad831dbf6d5fdc2b6d0..dbc4a22d3c8c4189459f0361cb9da06415ec2dc9:/Toc.g4

diff --git a/Toc.g4 b/Toc.g4
index 631e2c3..336b7b0 100644
--- a/Toc.g4
+++ b/Toc.g4
@@ -2,88 +2,77 @@ 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 (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)* '>';
 
-stmt: varDecl
+stmt: varDecl ';'
     | ifStmt
     | switchStmt
     | forStmt
     | whileStmt
-    | assignStmt
-    | returnStmt
-    | expr;
+    | assignStmt ';'
+    | returnStmt ';'
+    | expr ';';
 
-ifStmt: 'if' expr body ('else' 'if' expr body)* ('else' body)?;
+ifStmt: 'if' expr body elseIfStmt* elseStmt?;
+elseIfStmt: 'else' 'if' expr body;
+elseStmt: 'else' body;
 
-switchStmt: 'switch' identifierExpr switchBody;
-switchBody: '{' ('case' expr body)* '}';
+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;
-
-accessExpr: nonAccessExpr ((('.' | '->') identifierExpr) | ('[' expr ']'))+;
+expr: namespaceSpecifier* funcName '(' (expr (',' expr)*)? ')' #funcExpr
+    | expr '.' funcName '(' (expr (',' expr)*)? ')'            #methodExpr
+    | literal                                                  #litExpr
+    | '(' expr ')'                                             #parenExpr
+    | expr '.' 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
+    ;
 
-parenExpr: '(' expr ')';
+literal: INT_LIT | DECIMAL_LIT | STRING_LIT | BOOL_LIT;
 
 funcName: NAME;
 varName: NAME;
@@ -91,12 +80,12 @@ typeName: NAME;
 structName: NAME;
 
 
-POSTFIX_OP:
+postfix_op:
     '++' | '--';
-PREFIX_OP:
-    [+!~&*-] | POSTFIX_OP;
-BINARY_OP:
-    [+*/%&<|^>-] |
+prefix_op:
+    '+' | '-' | '!' | '~' | '&' | '*' | postfix_op;
+binary_op:
+    '+' | '-' | '*' | '/' | '%' | '&' | '<' | '|' | '^' | '>' |
     '==' | '!=' | '<=' | '>=' | '<'  | '>' |
     '<<' | '>>' | '||' | '&&' | '&=' | '|=' | '^=' |
     '<<=' | '>>=' | '+=' | '-=' | '*=' | '/=' | '%=';
@@ -109,4 +98,3 @@ BOOL_LIT: 'true' | 'false';
 NAME: ([a-z] | [A-Z] | [0-9])+;
 WS: [ \t\r\n]+ -> skip;
 NEWLINE: [\r\n]+;
-NUMBER: [0-9]+;