pre change

[toc] / Toc.g4

diff --git a/Toc.g4 b/Toc.g4
index 21703211d5db185d7b0f7c0bb1e5b7275e88b25f..336b7b03a0a0e8b15bf5745e0099d529b0a3e3a4 100644 (file)
--- a/Toc.g4
+++ b/Toc.g4
@@ -2,94 +2,77 @@ 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
+type: namespaceSpecifier* typeName (typeModifier)*;\r
+typeModifier: '*' | ('[' (INT_LIT)? ']');\r
 \r
+namespaceSpecifier: typeName '::';\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 elseIfStmt* elseStmt?;\r
 elseIfStmt: 'else' 'if' expr body;\r
 elseStmt: 'else' body;\r
 \r
-switchStmt: 'switch' identifierExpr switchBody;\r
+switchStmt: 'switch' expr switchBody;\r
 switchBody: '{' switchCase* '}';\r
 switchCase: 'case' expr body;\r
 \r
-forStmt: 'for' (varInit | assignStmt) ',' expr ',' expr body;\r
+forStmt: 'for' varInit ',' expr ',' expr body;\r
 \r
 whileStmt: 'while' expr body;\r
 \r
-assignStmt: identifierExpr '=' expr;\r
+assignStmt: expr '=' expr;\r
 \r
 returnStmt: 'return' expr;\r
 \r
-expr: funcExpr\r
-    | litExpr\r
-    | identifierExpr\r
-    | parenExpr\r
-    | accessExpr\r
-    | opExpr;\r
-\r
-/* op */\r
-nonOpExpr: funcExpr\r
-         | litExpr\r
-         | identifierExpr\r
-         | parenExpr\r
-         | accessExpr;\r
-\r
-/* lit access op */\r
-nonAccessExpr: funcExpr\r
-             | identifierExpr\r
-             | parenExpr;\r
-\r
-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
-ternaryOp: nonOpExpr '?' expr ':' expr;\r
-\r
-identifierExpr: varName;\r
-\r
-litExpr: INT_LIT | DECIMAL_LIT | STRING_LIT | BOOL_LIT;\r
-\r
-accessExpr: nonAccessExpr (accessSubExpr)+;\r
-accessSubExpr: accessMember | accessBrackets;\r
-accessMember: ('.' | '->') identifierExpr;\r
-accessBrackets: '[' expr ']';\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
+    ;\r
 \r
-parenExpr: '(' expr ')';\r
+literal: INT_LIT | DECIMAL_LIT | STRING_LIT | BOOL_LIT;\r
 \r
 funcName: NAME;\r
 varName: NAME;\r
@@ -115,4 +98,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