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

diff --git a/Toc.g4 b/Toc.g4
index 2170321..0f2f613 100644
--- a/Toc.g4
+++ b/Toc.g4
@@ -2,40 +2,45 @@ 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? ']';
+typeModifier: '*' | ('[' (INT_LIT)? ']');
 
 
 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 elseIfStmt* elseStmt?;
 elseIfStmt: 'else' 'if' expr body;
@@ -115,4 +120,3 @@ BOOL_LIT: 'true' | 'false';
 NAME: ([a-z] | [A-Z] | [0-9])+;
 WS: [ \t\r\n]+ -> skip;
 NEWLINE: [\r\n]+;
-NUMBER: [0-9]+;