[C#] Additional changes to be able to compile files.

[git-p4: depot-paths = "//depot/code/examples-v3/": change = 7531]
antlr · Jan 26, 2011 · cff3960 · cff3960
1 parent c28f1c2
commit cff3960
Show file tree

Hide file tree

Showing 32 changed files with 175 additions and 6 deletions.
diff --git a/csharp/ANTLR/ANTLRv3.g b/csharp/ANTLR/ANTLRv3.g
@@ -81,6 +81,7 @@ tokens {
 	int gtype;
 }
 
+public
 grammarDef
     :   DOC_COMMENT?
     	(	'lexer'  {gtype=LEXER_GRAMMAR;}    // pure lexer

diff --git a/csharp/ANTLR/ANTLRv3Tree.g b/csharp/ANTLR/ANTLRv3Tree.g
@@ -36,6 +36,7 @@ options {
 	ASTLabelType = CommonTree;
 }
 
+public
 grammarDef
     :   ^( grammarType ID DOC_COMMENT? optionsSpec? tokensSpec? attrScope* action* rule+ )
     ;

diff --git a/csharp/C/C.g b/csharp/C/C.g
@@ -73,6 +73,7 @@ bool isTypeName(string name)
 }
 }
 
+public
 translation_unit
 scope Symbols; // entire file is a scope
 @init {

diff --git a/csharp/LL-star/SimpleC.g b/csharp/LL-star/SimpleC.g
@@ -5,6 +5,7 @@ options
     language=CSharp2; 
 }
 
+public
 program
     :   declaration+
     ;

diff --git a/csharp/cminus/CMinus.g b/csharp/cminus/CMinus.g
@@ -20,6 +20,7 @@ scope slist {
 @header {
 }
 
+public
 program
 scope {
   IList<StringTemplate> globals;

diff --git a/csharp/cminus/Main.cs b/csharp/cminus/Main.cs
@@ -50,7 +50,7 @@ public static void Main(string[] args)
 					CommonTokenStream tokens = new CommonTokenStream(lexer);
 					CMinusParser parser = new CMinusParser(tokens);
 					parser.TemplateLib = templates;
-					RuleReturnScope r = parser.program();
+                    CMinusParser.program_return r = parser.program();
 					Console.Out.WriteLine(r.Template.ToString());
 				}
 				else

diff --git a/csharp/composite-java/Java.g b/csharp/composite-java/Java.g
@@ -18,6 +18,7 @@ import JavaDecl, JavaAnnotations, JavaExpr, JavaStat, JavaLexerRules;
 // starting point for parsing a java file
 /* The annotations are separated out to make parsing faster, but must be associated with
    a packageDeclaration or a typeDeclaration (and not an empty one). */
+public
 compilationUnit
     :   annotations
         (   packageDeclaration importDeclaration* typeDeclaration*

diff --git a/csharp/composite-java/JavaAnnotations.g b/csharp/composite-java/JavaAnnotations.g
@@ -2,48 +2,59 @@ parser grammar JavaAnnotations;
 
 // ANNOTATIONS
 
+public
 annotations
     :   annotation+
     ;
 
+public
 annotation
     :   '@' annotationName ( '(' ( elementValuePairs | elementValue )? ')' )?
     ;
 
+public
 annotationName
     : Identifier ('.' Identifier)*
     ;
 
+public
 elementValuePairs
     :   elementValuePair (',' elementValuePair)*
     ;
 
+public
 elementValuePair
     :   Identifier '=' elementValue
     ;
 
+public
 elementValue
     :   conditionalExpression
     |   annotation
     |   elementValueArrayInitializer
     ;
 
+public
 elementValueArrayInitializer
     :   '{' (elementValue (',' elementValue)*)? (',')? '}'
     ;
 
+public
 annotationTypeDeclaration
     :   '@' 'interface' Identifier annotationTypeBody
     ;
 
+public
 annotationTypeBody
     :   '{' (annotationTypeElementDeclaration)* '}'
     ;
 
+public
 annotationTypeElementDeclaration
     :   modifiers annotationTypeElementRest
     ;
 
+public
 annotationTypeElementRest
     :   type annotationMethodOrConstantRest ';'
     |   normalClassDeclaration ';'?
@@ -52,19 +63,23 @@ annotationTypeElementRest
     |   annotationTypeDeclaration ';'?
     ;
 
+public
 annotationMethodOrConstantRest
     :   annotationMethodRest
     |   annotationConstantRest
     ;
 
+public
 annotationMethodRest
     :   Identifier '(' ')' defaultValue?
     ;
 
+public
 annotationConstantRest
     :   variableDeclarators
     ;
 
+public
 defaultValue
     :   'default' elementValue
     ;