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

refactor grammar transform pipeline 

[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9454]
This commit is contained in:
parrt 2011-11-25 11:55:13 -08:00
parent 5dfc4aed1d
commit 3b543098aa
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tool/src/org/antlr/v4/Tool.java
View File

@ -256,7 +256,6 @@ public class Tool {
public void process(Grammar g, boolean gencode) {
g.loadImportedGrammars();
GrammarTransformPipeline.integrateImportedGrammars(g);
GrammarTransformPipeline transform = new GrammarTransformPipeline(g, this);
transform.process();
@ -266,7 +265,7 @@ public class Tool {
if ( g.ast!=null && g.ast.grammarType== ANTLRParser.COMBINED &&
!g.ast.hasErrors )
{
lexerAST = GrammarTransformPipeline.extractImplicitLexer(g); // alters g.ast
lexerAST = transform.extractImplicitLexer(g); // alters g.ast
if ( lexerAST!=null ) {
lexerg = new LexerGrammar(this, lexerAST);
lexerg.fileName = g.fileName;

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

@ -55,11 +55,12 @@ public class GrammarTransformPipeline {
if ( ast==null ) return;
tool.log("grammar", "before: "+ast.toStringTree());
integrateImportedGrammars(g);
if ( ast.grammarType==ANTLRParser.PARSER || ast.grammarType==ANTLRParser.COMBINED ) {
translateLeftRecursiveRules(ast);
}
reduceBlocksToSets(ast);
tool.log("grammar", "after: "+ast.toStringTree());
}
@ -146,6 +147,7 @@ public class GrammarTransformPipeline {
return null;
}
/** Utility visitor that sets grammar ptr in each node */
public static void setGrammarPtr(final Grammar g, GrammarAST tree) {
// ensure each node has pointer to surrounding grammar
TreeVisitor v = new TreeVisitor(new GrammarASTAdaptor());
@ -169,7 +171,7 @@ public class GrammarTransformPipeline {
The goal is a complete combined grammar so we can ignore subordinate
grammars.
*/
public static void integrateImportedGrammars(Grammar rootGrammar) {
public void integrateImportedGrammars(Grammar rootGrammar) {
List<Grammar> imports = rootGrammar.getAllImportedGrammars();
if ( imports==null ) return;
@ -305,7 +307,7 @@ public class GrammarTransformPipeline {
* in combined AST. Anything cut out is dup'd before
* adding to lexer to avoid "who's ur daddy" issues
*/
public static GrammarRootAST extractImplicitLexer(Grammar combinedGrammar) {
public GrammarRootAST extractImplicitLexer(Grammar combinedGrammar) {
GrammarRootAST combinedAST = combinedGrammar.ast;
//tool.log("grammar", "before="+combinedAST.toStringTree());
GrammarASTAdaptor adaptor = new GrammarASTAdaptor(combinedAST.token.getInputStream());