add namespace, private struct member grammar, change bracket style

[toc] / Toc.g4

diff --git a/Toc.g4 b/Toc.g4
index 631e2c3d2123e69fa2c124969b43d1c8e48ee9a4..0f2f613a130d3a778edf03683e31c0ad1736cad4 100644 (file)
--- a/Toc.g4
+++ b/Toc.g4
@@ -2,45 +2,53 @@ grammar Toc;
 \r
 prog: (decl)+ EOF;\r
 \r
-decl: varDecl\r
+decl: varDecl ';'\r
     | funcDecl\r
     | structDecl\r
+    | namespaceDecl\r
     ;\r
 \r
+namespaceDecl: 'namespace' typeName '{' decl* '}';\r
+\r
 varDecl:  'var' var;\r
 var:  varName (':' type) ('=' expr)?;\r
 varInit:  varName (':' type) ('=' expr);\r
 \r
 type: typeName (typeModifier)*;\r
-typeModifier: '*' | '[' NUMBER? ']';\r
+typeModifier: '*' | ('[' (INT_LIT)? ']');\r
 \r
 \r
 funcDecl: 'func' func;\r
-func: funcName '(' parameter ')' (':' type) body;\r
+func: funcName genericDecl? '(' parameter ')' (':' type) body;\r
 parameter: (var (',' var)*)?;\r
 \r
 body: '{' stmt* '}';\r
 \r
 \r
-structDecl: 'struct' structName '{' structMember* '}';\r
-structMember: structVar | structMethod;\r
-structVar: var;\r
+structDecl: 'struct' structName genericDecl? '{' structMember* '}';\r
+structMember: privateDecl? structVar | structMethod;\r
+structVar: var ';';\r
 structMethod: func;\r
+privateDecl: 'private';\r
 \r
+genericDecl: '<' typeName (',' typeName)* '>';\r
 \r
-stmt: varDecl\r
+stmt: varDecl ';'\r
     | ifStmt\r
     | switchStmt\r
     | forStmt\r
     | whileStmt\r
-    | assignStmt\r
-    | returnStmt\r
-    | expr;\r
+    | assignStmt ';'\r
+    | returnStmt ';'\r
+    | expr ';';\r
 \r
-ifStmt: 'if' expr body ('else' 'if' expr body)* ('else' body)?;\r
+ifStmt: 'if' expr body elseIfStmt* elseStmt?;\r
+elseIfStmt: 'else' 'if' expr body;\r
+elseStmt: 'else' body;\r
 \r
 switchStmt: 'switch' identifierExpr switchBody;\r
-switchBody: '{' ('case' expr body)* '}';\r
+switchBody: '{' switchCase* '}';\r
+switchCase: 'case' expr body;\r
 \r
 forStmt: 'for' (varInit | assignStmt) ',' expr ',' expr body;\r
 \r
@@ -72,16 +80,19 @@ nonAccessExpr: funcExpr
 funcExpr: funcName '(' (expr (',' expr)*)? ')';\r
 \r
 opExpr: binaryOp | prefixOp | postfixOp | ternaryOp;\r
-binaryOp: nonOpExpr BINARY_OP nonOpExpr (BINARY_OP nonOpExpr)*;\r
-prefixOp: PREFIX_OP nonOpExpr;\r
-postfixOp: nonOpExpr POSTFIX_OP;\r
+binaryOp: nonOpExpr binary_op nonOpExpr (binary_op nonOpExpr)*;\r
+prefixOp: prefix_op nonOpExpr;\r
+postfixOp: nonOpExpr postfix_op;\r
 ternaryOp: nonOpExpr '?' expr ':' expr;\r
 \r
 identifierExpr: varName;\r
 \r
 litExpr: INT_LIT | DECIMAL_LIT | STRING_LIT | BOOL_LIT;\r
 \r
-accessExpr: nonAccessExpr ((('.' | '->') identifierExpr) | ('[' expr ']'))+;\r
+accessExpr: nonAccessExpr (accessSubExpr)+;\r
+accessSubExpr: accessMember | accessBrackets;\r
+accessMember: ('.' | '->') identifierExpr;\r
+accessBrackets: '[' expr ']';\r
 \r
 parenExpr: '(' expr ')';\r
 \r
@@ -91,12 +102,12 @@ typeName: NAME;
 structName: NAME;\r
 \r
 \r
-POSTFIX_OP:\r
+postfix_op:\r
     '++' | '--';\r
-PREFIX_OP:\r
-    [+!~&*-] | POSTFIX_OP;\r
-BINARY_OP:\r
-    [+*/%&<|^>-] |\r
+prefix_op:\r
+    '+' | '-' | '!' | '~' | '&' | '*' | postfix_op;\r
+binary_op:\r
+    '+' | '-' | '*' | '/' | '%' | '&' | '<' | '|' | '^' | '>' |\r
     '==' | '!=' | '<=' | '>=' | '<'  | '>' |\r
     '<<' | '>>' | '||' | '&&' | '&=' | '|=' | '^=' |\r
     '<<=' | '>>=' | '+=' | '-=' | '*=' | '/=' | '%=';\r
@@ -109,4 +120,3 @@ BOOL_LIT: 'true' | 'false';
 NAME: ([a-z] | [A-Z] | [0-9])+;\r
 WS: [ \t\r\n]+ -> skip;\r
 NEWLINE: [\r\n]+;\r
-NUMBER: [0-9]+;\r