add namespace, private struct member grammar, change bracket style

[toc] / gen / TocParser.h

diff --git a/gen/TocParser.h b/gen/TocParser.h
index 2482c29aaed7f42b1667669c34f934a4f9476660..51d1e89fc45b98a8249a4868e4889e3da974ade7 100644 (file)
--- a/gen/TocParser.h
+++ b/gen/TocParser.h
@@ -20,25 +20,25 @@ public:
     T__32 = 33, T__33 = 34, T__34 = 35, T__35 = 36, T__36 = 37, T__37 = 38, \r
     T__38 = 39, T__39 = 40, T__40 = 41, T__41 = 42, T__42 = 43, T__43 = 44, \r
     T__44 = 45, T__45 = 46, T__46 = 47, T__47 = 48, T__48 = 49, T__49 = 50, \r
     T__32 = 33, T__33 = 34, T__34 = 35, T__35 = 36, T__36 = 37, T__37 = 38, \r
     T__38 = 39, T__39 = 40, T__40 = 41, T__41 = 42, T__42 = 43, T__43 = 44, \r
     T__44 = 45, T__45 = 46, T__46 = 47, T__47 = 48, T__48 = 49, T__49 = 50, \r

-    T__50 = 51, T__51 = 52, T__52 = 53, T__53 = 54, T__54 = 55, INT_LIT = 56, \r
-    DECIMAL_LIT = 57, STRING_LIT = 58, BOOL_LIT = 59, NAME = 60, WS = 61, \r
-    NEWLINE = 62\r
+    T__50 = 51, T__51 = 52, T__52 = 53, T__53 = 54, T__54 = 55, T__55 = 56, \r
+    T__56 = 57, INT_LIT = 58, DECIMAL_LIT = 59, STRING_LIT = 60, BOOL_LIT = 61, \r
+    NAME = 62, WS = 63, NEWLINE = 64\r

   };\r
 \r
   enum {\r
   };\r
 \r
   enum {\r

-    RuleProg = 0, RuleDecl = 1, RuleVarDecl = 2, RuleVar = 3, RuleVarInit = 4, \r
-    RuleType = 5, RuleTypeModifier = 6, RuleFuncDecl = 7, RuleFunc = 8, \r
-    RuleParameter = 9, RuleBody = 10, RuleStructDecl = 11, RuleStructMember = 12, \r
-    RuleStructVar = 13, RuleStructMethod = 14, RuleGenericDecl = 15, RuleStmt = 16, \r
-    RuleIfStmt = 17, RuleElseIfStmt = 18, RuleElseStmt = 19, RuleSwitchStmt = 20, \r
-    RuleSwitchBody = 21, RuleSwitchCase = 22, RuleForStmt = 23, RuleWhileStmt = 24, \r
-    RuleAssignStmt = 25, RuleReturnStmt = 26, RuleExpr = 27, RuleNonOpExpr = 28, \r
-    RuleNonAccessExpr = 29, RuleFuncExpr = 30, RuleOpExpr = 31, RuleBinaryOp = 32, \r
-    RulePrefixOp = 33, RulePostfixOp = 34, RuleTernaryOp = 35, RuleIdentifierExpr = 36, \r
-    RuleLitExpr = 37, RuleAccessExpr = 38, RuleAccessSubExpr = 39, RuleAccessMember = 40, \r
-    RuleAccessBrackets = 41, RuleParenExpr = 42, RuleFuncName = 43, RuleVarName = 44, \r
-    RuleTypeName = 45, RuleStructName = 46, RulePostfix_op = 47, RulePrefix_op = 48, \r
-    RuleBinary_op = 49\r
+    RuleProg = 0, RuleDecl = 1, RuleNamespaceDecl = 2, RuleVarDecl = 3, \r
+    RuleVar = 4, RuleVarInit = 5, RuleType = 6, RuleTypeModifier = 7, RuleFuncDecl = 8, \r
+    RuleFunc = 9, RuleParameter = 10, RuleBody = 11, RuleStructDecl = 12, \r
+    RuleStructMember = 13, RuleStructVar = 14, RuleStructMethod = 15, RulePrivateDecl = 16, \r
+    RuleGenericDecl = 17, RuleStmt = 18, RuleIfStmt = 19, RuleElseIfStmt = 20, \r
+    RuleElseStmt = 21, RuleSwitchStmt = 22, RuleSwitchBody = 23, RuleSwitchCase = 24, \r
+    RuleForStmt = 25, RuleWhileStmt = 26, RuleAssignStmt = 27, RuleReturnStmt = 28, \r
+    RuleExpr = 29, RuleNonOpExpr = 30, RuleNonAccessExpr = 31, RuleFuncExpr = 32, \r
+    RuleOpExpr = 33, RuleBinaryOp = 34, RulePrefixOp = 35, RulePostfixOp = 36, \r
+    RuleTernaryOp = 37, RuleIdentifierExpr = 38, RuleLitExpr = 39, RuleAccessExpr = 40, \r
+    RuleAccessSubExpr = 41, RuleAccessMember = 42, RuleAccessBrackets = 43, \r
+    RuleParenExpr = 44, RuleFuncName = 45, RuleVarName = 46, RuleTypeName = 47, \r
+    RuleStructName = 48, RulePostfix_op = 49, RulePrefix_op = 50, RuleBinary_op = 51\r

   };\r
 \r
   explicit TocParser(antlr4::TokenStream *input);\r
   };\r
 \r
   explicit TocParser(antlr4::TokenStream *input);\r


@@ -53,6 +53,7 @@ public:
 \r
   class ProgContext;\r
   class DeclContext;\r
 \r
   class ProgContext;\r
   class DeclContext;\r

+  class NamespaceDeclContext;\r

   class VarDeclContext;\r
   class VarContext;\r
   class VarInitContext;\r
   class VarDeclContext;\r
   class VarContext;\r
   class VarInitContext;\r


@@ -66,6 +67,7 @@ public:
   class StructMemberContext;\r
   class StructVarContext;\r
   class StructMethodContext;\r
   class StructMemberContext;\r
   class StructVarContext;\r
   class StructMethodContext;\r

+  class PrivateDeclContext;\r

   class GenericDeclContext;\r
   class StmtContext;\r
   class IfStmtContext;\r
   class GenericDeclContext;\r
   class StmtContext;\r
   class IfStmtContext;\r


@@ -122,12 +124,26 @@ public:
     VarDeclContext *varDecl();\r
     FuncDeclContext *funcDecl();\r
     StructDeclContext *structDecl();\r
     VarDeclContext *varDecl();\r
     FuncDeclContext *funcDecl();\r
     StructDeclContext *structDecl();\r

+    NamespaceDeclContext *namespaceDecl();\r

 \r
    \r
   };\r
 \r
   DeclContext* decl();\r
 \r
 \r
    \r
   };\r
 \r
   DeclContext* decl();\r
 \r

+  class  NamespaceDeclContext : public antlr4::ParserRuleContext {\r
+  public:\r
+    NamespaceDeclContext(antlr4::ParserRuleContext *parent, size_t invokingState);\r
+    virtual size_t getRuleIndex() const override;\r
+    TypeNameContext *typeName();\r
+    std::vector<DeclContext *> decl();\r
+    DeclContext* decl(size_t i);\r
+\r
+   \r
+  };\r
+\r
+  NamespaceDeclContext* namespaceDecl();\r
+\r

   class  VarDeclContext : public antlr4::ParserRuleContext {\r
   public:\r
     VarDeclContext(antlr4::ParserRuleContext *parent, size_t invokingState);\r
   class  VarDeclContext : public antlr4::ParserRuleContext {\r
   public:\r
     VarDeclContext(antlr4::ParserRuleContext *parent, size_t invokingState);\r


@@ -258,6 +274,7 @@ public:
     StructMemberContext(antlr4::ParserRuleContext *parent, size_t invokingState);\r
     virtual size_t getRuleIndex() const override;\r
     StructVarContext *structVar();\r
     StructMemberContext(antlr4::ParserRuleContext *parent, size_t invokingState);\r
     virtual size_t getRuleIndex() const override;\r
     StructVarContext *structVar();\r

+    PrivateDeclContext *privateDecl();\r

     StructMethodContext *structMethod();\r
 \r
    \r
     StructMethodContext *structMethod();\r
 \r
    \r


@@ -287,6 +304,16 @@ public:
 \r
   StructMethodContext* structMethod();\r
 \r
 \r
   StructMethodContext* structMethod();\r
 \r

+  class  PrivateDeclContext : public antlr4::ParserRuleContext {\r
+  public:\r
+    PrivateDeclContext(antlr4::ParserRuleContext *parent, size_t invokingState);\r
+    virtual size_t getRuleIndex() const override;\r
+\r
+   \r
+  };\r
+\r
+  PrivateDeclContext* privateDecl();\r
+\r

   class  GenericDeclContext : public antlr4::ParserRuleContext {\r
   public:\r
     GenericDeclContext(antlr4::ParserRuleContext *parent, size_t invokingState);\r
   class  GenericDeclContext : public antlr4::ParserRuleContext {\r
   public:\r
     GenericDeclContext(antlr4::ParserRuleContext *parent, size_t invokingState);\r