forgetest1
/
antlr
forked from jasder/antlr
1
0
Fork 0
Code Issues Pull Requests 1 Releases Wiki Activity

tweak to compile. strange

This commit is contained in:
Terence Parr 2012-11-18 15:04:42 -08:00
parent 133b00aef9
commit ffbdf8a36c
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tool/playground/T.g
View File

@ -1,6 +1,6 @@
grammar T; grammar T;
s : rule ; s : R ;
R : 'x' EOF;
rule : A # X
;

4
tool/src/org/antlr/v4/tool/GrammarTransformPipeline.java
View File

@ -279,7 +279,7 @@ public class GrammarTransformPipeline {
GrammarRootAST combinedAST = combinedGrammar.ast; GrammarRootAST combinedAST = combinedGrammar.ast;
//tool.log("grammar", "before="+combinedAST.toStringTree()); //tool.log("grammar", "before="+combinedAST.toStringTree());
GrammarASTAdaptor adaptor = new GrammarASTAdaptor(combinedAST.token.getInputStream()); GrammarASTAdaptor adaptor = new GrammarASTAdaptor(combinedAST.token.getInputStream());
GrammarAST[] elements = combinedAST.getChildren().toArray(new GrammarAST[0]); GrammarAST[] elements = (GrammarAST[])combinedAST.getChildren().toArray(new GrammarAST[0]);
// MAKE A GRAMMAR ROOT and ID // MAKE A GRAMMAR ROOT and ID
String lexerName = combinedAST.getChild(0).getText()+"Lexer"; String lexerName = combinedAST.getChild(0).getText()+"Lexer";
@ -295,7 +295,7 @@ public class GrammarTransformPipeline {
if ( optionsRoot!=null ) { if ( optionsRoot!=null ) {
GrammarAST lexerOptionsRoot = (GrammarAST)adaptor.dupNode(optionsRoot); GrammarAST lexerOptionsRoot = (GrammarAST)adaptor.dupNode(optionsRoot);
lexerAST.addChild(lexerOptionsRoot); lexerAST.addChild(lexerOptionsRoot);
GrammarAST[] options = optionsRoot.getChildren().toArray(new GrammarAST[0]); GrammarAST[] options = (GrammarAST[])optionsRoot.getChildren().toArray(new GrammarAST[0]);
for (GrammarAST o : options) { for (GrammarAST o : options) {
String optionName = o.getChild(0).getText(); String optionName = o.getChild(0).getText();
if ( Grammar.lexerOptions.contains(optionName) && if ( Grammar.lexerOptions.contains(optionName) &&