the scope (parser or lexer) in @parser::header was dropped, so keep t…

…rack of it and only include @Header in Listener and Visitor code

Signed-off-by: Eric Vergnaud <eric.vergnaud@wanadoo.fr>

tool/src/org/antlr/v4/codegen/model/ListenerFile.java

@@ -46,7 +46,7 @@ public ListenerFile(OutputModelFactory factory, String fileName) {
 		Grammar g = factory.getGrammar();
 		parserName = g.getRecognizerName();
 		grammarName = g.name;
-		namedActions = buildNamedActions(factory.getGrammar());
+		namedActions = buildNamedActions(factory.getGrammar(), ast -> ast.getScope() == null);
 		for (Rule r : g.rules.values()) {
 			Map<String, List<Pair<Integer,AltAST>>> labels = r.getAltLabels();
 			if ( labels!=null ) {

tool/src/org/antlr/v4/codegen/model/OutputFile.java

@@ -13,6 +13,7 @@
 
 import java.util.HashMap;
 import java.util.Map;
+import java.util.function.Predicate;
 
 public abstract class OutputFile extends OutputModelObject {
 	public final String fileName;
@@ -32,10 +33,15 @@ public OutputFile(OutputModelFactory factory, String fileName) {
     }
 
 	public Map<String, Action> buildNamedActions(Grammar g) {
+		return buildNamedActions(g, null);
+	}
+
+	public Map<String, Action> buildNamedActions(Grammar g, Predicate<ActionAST> filter) {
 		Map<String, Action> namedActions = new HashMap<String, Action>();
 		for (String name : g.namedActions.keySet()) {
 			ActionAST ast = g.namedActions.get(name);
-			namedActions.put(name, new Action(factory, ast));
+			if(filter==null || filter.test(ast))
+				namedActions.put(name, new Action(factory, ast));
 		}
 		return namedActions;
 	}

tool/src/org/antlr/v4/codegen/model/VisitorFile.java

@@ -58,7 +58,8 @@ public VisitorFile(OutputModelFactory factory, String fileName) {
 			}
 		}
 		ActionAST ast = g.namedActions.get("header");
-		if ( ast!=null ) header = new Action(factory, ast);
+		if ( ast!=null && ast.getScope()==null)
+			header = new Action(factory, ast);
 		genPackage = g.tool.genPackage;
 		accessLevel = g.getOptionString("accessLevel");
 		exportMacro = g.getOptionString("exportMacro");

tool/src/org/antlr/v4/semantics/SymbolCollector.java

@@ -63,6 +63,7 @@ public SymbolCollector(Grammar g) {
 
 	@Override
 	public void globalNamedAction(GrammarAST scope, GrammarAST ID, ActionAST action) {
+		action.setScope(scope);
 		namedActions.add((GrammarAST)ID.getParent());
 		action.resolver = g;
 	}

tool/src/org/antlr/v4/tool/ast/ActionAST.java

@@ -13,7 +13,8 @@
 
 public class ActionAST extends GrammarASTWithOptions implements RuleElementAST {
     // Alt, rule, grammar space
-    public AttributeResolver resolver;
+	GrammarAST scope = null;
+	public AttributeResolver resolver;
 	public List<Token> chunks; // useful for ANTLR IDE developers
 
 	public ActionAST(ActionAST node) {
@@ -31,4 +32,14 @@ public ActionAST(ActionAST node) {
 
 	@Override
 	public Object visit(GrammarASTVisitor v) { return v.visit(this); }
+
+	public void setScope(GrammarAST scope) {
+		this.scope = scope;
+	}
+
+	public GrammarAST getScope() {
+		return scope;
+	}
+
+
 }