Gang, I have just made widespread changes in all targets. trivial but widespread. please sync to get them!!! They are:
* ANTLRCore.sti no longer used; removed from all targets. * Adding type, text terminal options (only C# 3 uses them at this point). * Replaced hetero arg with terminalOptions arg in all templates that reference hetero (this is the class name / node type used for TOKEN<NODETYPE> references in grammar). Widespread but trivial changes to all targets. hetero is now terminalOptions.node. Can also get terminalOptions.type and terminalOptions.text from dictionary of options. * Fixed mispelling of license in BSD license headers * left-recursion pattern off until all targets catch up Ter PS Sam: I changed your .class to .node (sorry; ha!) CHANGELIST 7842: //depot/code/antlr/main/tool/CHANGES.txt#48 //depot/code/antlr/main/tool/src/main/antlr2/org/antlr/grammar/v2/codegen.g#5 //depot/code/antlr/main/tool/src/main/java/org/antlr/codegen/CSharp3Target.java#2 //depot/code/antlr/main/tool/src/main/java/org/antlr/codegen/RubyTarget.java#6 //depot/code/antlr/main/tool/src/main/java/org/antlr/tool/Grammar.java#16 //depot/code/antlr/main/tool/src/main/java/org/antlr/tool/serialize.g#2 //depot/code/antlr/main/tool/src/main/resources/org/antlr/codegen/templates/ANTLRCore.sti#4 //depot/code/antlr/main/tool/src/main/resources/org/antlr/codegen/templates/ActionScript/AST.stg#3 //depot/code/antlr/main/tool/src/main/resources/org/antlr/codegen/templates/ActionScript/ASTParser.stg#2 //depot/code/antlr/main/tool/src/main/resources/org/antlr/codegen/templates/ActionScript/ASTTreeParser.stg#2 //depot/code/antlr/main/tool/src/main/resources/org/antlr/codegen/templates/ActionScript/ActionScript.stg#5 //depot/code/antlr/main/tool/src/main/resources/org/antlr/codegen/templates/C/AST.stg#6 //depot/code/antlr/main/tool/src/main/resources/org/antlr/codegen/templates/C/ASTDbg.stg#2 //depot/code/antlr/main/tool/src/main/resources/org/antlr/codegen/templates/C/ASTParser.stg#2 //depot/code/antlr/main/tool/src/main/resources/org/antlr/codegen/templates/C/ASTTreeParser.stg#3 //depot/code/antlr/main/tool/src/main/resources/org/antlr/codegen/templates/C/C.stg#15 //depot/code/antlr/main/tool/src/main/resources/org/antlr/codegen/templates/C/Dbg.stg#3 //depot/code/antlr/main/tool/src/main/resources/org/antlr/codegen/templates/CPP/CPP.stg#4 //depot/code/antlr/main/tool/src/main/resources/org/antlr/codegen/templates/CSharp2/AST.stg#6 //depot/code/antlr/main/tool/src/main/resources/org/antlr/codegen/templates/CSharp2/ASTDbg.stg#6 //depot/code/antlr/main/tool/src/main/resources/org/antlr/codegen/templates/CSharp2/ASTParser.stg#5 //depot/code/antlr/main/tool/src/main/resources/org/antlr/codegen/templates/CSharp2/ASTTreeParser.stg#8 //depot/code/antlr/main/tool/src/main/resources/org/antlr/codegen/templates/CSharp2/CSharp2.stg#24 //depot/code/antlr/main/tool/src/main/resources/org/antlr/codegen/templates/CSharp2/Dbg.stg#7 //depot/code/antlr/main/tool/src/main/resources/org/antlr/codegen/templates/CSharp2/ST.stg#7 //depot/code/antlr/main/tool/src/main/resources/org/antlr/codegen/templates/CSharp3/AST.stg#15 //depot/code/antlr/main/tool/src/main/resources/org/antlr/codegen/templates/CSharp3/ASTDbg.stg#7 //depot/code/antlr/main/tool/src/main/resources/org/antlr/codegen/templates/CSharp3/ASTParser.stg#8 //depot/code/antlr/main/tool/src/main/resources/org/antlr/codegen/templates/CSharp3/ASTTreeParser.stg#12 //depot/code/antlr/main/tool/src/main/resources/org/antlr/codegen/templates/CSharp3/CSharp3.stg#45 //depot/code/antlr/main/tool/src/main/resources/org/antlr/codegen/templates/CSharp3/Dbg.stg#9 //depot/code/antlr/main/tool/src/main/resources/org/antlr/codegen/templates/CSharp3/ST.stg#10 //depot/code/antlr/main/tool/src/main/resources/org/antlr/codegen/templates/Delphi/AST.stg#2 //depot/code/antlr/main/tool/src/main/resources/org/antlr/codegen/templates/Delphi/ASTParser.stg#2 //depot/code/antlr/main/tool/src/main/resources/org/antlr/codegen/templates/Delphi/ASTTreeParser.stg#2 //depot/code/antlr/main/tool/src/main/resources/org/antlr/codegen/templates/Delphi/Delphi.stg#4 //depot/code/antlr/main/tool/src/main/resources/org/antlr/codegen/templates/Java/AST.stg#2 //depot/code/antlr/main/tool/src/main/resources/org/antlr/codegen/templates/Java/ASTDbg.stg#3 //depot/code/antlr/main/tool/src/main/resources/org/antlr/codegen/templates/Java/ASTParser.stg#2 //depot/code/antlr/main/tool/src/main/resources/org/antlr/codegen/templates/Java/ASTTreeParser.stg#2 //depot/code/antlr/main/tool/src/main/resources/org/antlr/codegen/templates/Java/Dbg.stg#4 //depot/code/antlr/main/tool/src/main/resources/org/antlr/codegen/templates/Java/Java.stg#23 //depot/code/antlr/main/tool/src/main/resources/org/antlr/codegen/templates/Java/ST.stg#2 //depot/code/antlr/main/tool/src/main/resources/org/antlr/codegen/templates/JavaScript/AST.stg#3 //depot/code/antlr/main/tool/src/main/resources/org/antlr/codegen/templates/JavaScript/ASTParser.stg#2 //depot/code/antlr/main/tool/src/main/resources/org/antlr/codegen/templates/JavaScript/ASTTreeParser.stg#2 //depot/code/antlr/main/tool/src/main/resources/org/antlr/codegen/templates/JavaScript/JavaScript.stg#5 //depot/code/antlr/main/tool/src/main/resources/org/antlr/codegen/templates/ObjC/AST.stg#11 //depot/code/antlr/main/tool/src/main/resources/org/antlr/codegen/templates/ObjC/ASTDbg.stg#4 //depot/code/antlr/main/tool/src/main/resources/org/antlr/codegen/templates/ObjC/ASTParser.stg#7 //depot/code/antlr/main/tool/src/main/resources/org/antlr/codegen/templates/ObjC/ASTTreeParser.stg#7 //depot/code/antlr/main/tool/src/main/resources/org/antlr/codegen/templates/ObjC/Dbg.stg#7 //depot/code/antlr/main/tool/src/main/resources/org/antlr/codegen/templates/ObjC/ObjC.stg#21 //depot/code/antlr/main/tool/src/main/resources/org/antlr/codegen/templates/ObjC/ST.stg#5 //depot/code/antlr/main/tool/src/main/resources/org/antlr/codegen/templates/Perl5/ASTTreeParser.stg#2 //depot/code/antlr/main/tool/src/main/resources/org/antlr/codegen/templates/Perl5/Perl5.stg#5 //depot/code/antlr/main/tool/src/main/resources/org/antlr/codegen/templates/Python/AST.stg#2 //depot/code/antlr/main/tool/src/main/resources/org/antlr/codegen/templates/Python/ASTDbg.stg#2 //depot/code/antlr/main/tool/src/main/resources/org/antlr/codegen/templates/Python/ASTParser.stg#2 //depot/code/antlr/main/tool/src/main/resources/org/antlr/codegen/templates/Python/ASTTreeParser.stg#2 //depot/code/antlr/main/tool/src/main/resources/org/antlr/codegen/templates/Python/Dbg.stg#2 //depot/code/antlr/main/tool/src/main/resources/org/antlr/codegen/templates/Python/Python.stg#5 //depot/code/antlr/main/tool/src/main/resources/org/antlr/codegen/templates/Python/ST.stg#2 //depot/code/antlr/main/tool/src/main/resources/org/antlr/codegen/templates/Ruby/AST.stg#3 //depot/code/antlr/main/tool/src/main/resources/org/antlr/codegen/templates/Ruby/ASTParser.stg#3 //depot/code/antlr/main/tool/src/main/resources/org/antlr/codegen/templates/Ruby/ASTTreeParser.stg#3 //depot/code/antlr/main/tool/src/main/resources/org/antlr/codegen/templates/Ruby/Dbg.stg#3 //depot/code/antlr/main/tool/src/main/resources/org/antlr/codegen/templates/Ruby/Ruby.stg#7 //depot/code/antlr/main/tool/src/main/resources/org/antlr/codegen/templates/Scala/Scala.stg#4 //depot/code/antlr/main/tool/src/main/resources/org/antlr/tool/templates/messages/formats/antlr.stg#2 //depot/code/antlr/main/tool/src/main/resources/org/antlr/tool/templates/messages/formats/gnu.stg#2 //depot/code/antlr/main/tool/src/main/resources/org/antlr/tool/templates/messages/formats/vs2005.stg#2 //depot/code/antlr/main/tool/src/test/java/org/antlr/test/TestHeteroAST.java#5 _______________________________________________ antlr-dev mailing list antlr-dev@antlr.org http://www.antlr.org/mailman/listinfo/antlr-dev
