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

The -package command line option shouldn't suppress the @header{} block in a grammar

This commit is contained in:
Sam Harwell 2012-09-22 21:45:07 -05:00
parent 62e005c841
commit 8e3b85d868
1 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
tool/resources/org/antlr/v4/tool/templates/codegen/Java/Java.stg
View File

@ -16,9 +16,8 @@ ParserFile(file, parser, namedActions) ::= <<
// $ANTLR ANTLRVersion> <file.fileName> generatedTimestamp>
<if(file.genPackage)>
package <file.genPackage>;
<else>
<namedActions.header>
<endif>
<namedActions.header>
import org.antlr.v4.runtime.atn.*;
import org.antlr.v4.runtime.dfa.DFA;
import org.antlr.v4.runtime.*;
@ -34,9 +33,8 @@ import java.util.ArrayList;
ListenerFile(file, header) ::= <<
<if(file.genPackage)>
package <file.genPackage>;
<else>
<header>
<endif>
<header>
import org.antlr.v4.runtime.tree.*;
import org.antlr.v4.runtime.Token;
@ -50,9 +48,8 @@ void exit<lname; format="cap">(<file.parserName>.<lname; format="cap">Context ct
BaseListenerFile(file, header) ::= <<
<if(file.genPackage)>
package <file.genPackage>;
<else>
<header>
<endif>
<header>
import org.antlr.v4.runtime.ParserRuleContext;
import org.antlr.v4.runtime.Token;
@ -74,9 +71,8 @@ public class <file.grammarName>BaseListener implements <file.grammarName>Listene
VisitorFile(file, header) ::= <<
<if(file.genPackage)>
package <file.genPackage>;
<else>
<header>
<endif>
<header>
import org.antlr.v4.runtime.tree.*;
import org.antlr.v4.runtime.Token;
@ -89,9 +85,8 @@ T visit<lname; format="cap">(<file.parserName>.<lname; format="cap">Context ctx)
BaseVisitorFile(file, header) ::= <<
<if(file.genPackage)>
package <file.genPackage>;
<else>
<header>
<endif>
<header>
import org.antlr.v4.runtime.tree.*;
import org.antlr.v4.runtime.Token;
import org.antlr.v4.runtime.ParserRuleContext;
@ -698,9 +693,8 @@ LexerFile(lexerFile, lexer, namedActions) ::= <<
// $ANTLR ANTLRVersion> <lexerFile.fileName> generatedTimestamp>
<if(lexerFile.genPackage)>
package <lexerFile.genPackage>;
<else>
<namedActions.header>
<endif>
<namedActions.header>
import org.antlr.v4.runtime.Lexer;
import org.antlr.v4.runtime.CharStream;
import org.antlr.v4.runtime.Token;