Skip to content

Eric file objs update #4034

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
parrt merged 1 commit into from
Dec 20, 2022
Merged

Eric file objs update #4034

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 4 additions & 6 deletions tool/src/org/antlr/v4/codegen/model/ListenerFile.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,7 @@
import org.antlr.v4.tool.ast.ActionAST;
import org.antlr.v4.tool.ast.AltAST;

import java.util.LinkedHashMap;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.*;

/** A model object representing a parse tree listener file.
* These are the rules specific events triggered by a parse tree visitor.
Expand Down Expand Up @@ -61,7 +57,9 @@ public ListenerFile(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");
Expand Down
8 changes: 2 additions & 6 deletions tool/src/org/antlr/v4/codegen/model/VisitorFile.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,7 @@
import org.antlr.v4.tool.ast.ActionAST;
import org.antlr.v4.tool.ast.AltAST;

import java.util.LinkedHashMap;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.*;

public class VisitorFile extends OutputFile {
public String genPackage; // from -package cmd-line
Expand All @@ -41,7 +37,7 @@ public class VisitorFile extends OutputFile {
public VisitorFile(OutputModelFactory factory, String fileName) {
super(factory, fileName);
Grammar g = factory.getGrammar();
namedActions = buildNamedActions(g);
namedActions = buildNamedActions(g, ast -> ast.getScope()==null);
parserName = g.getRecognizerName();
grammarName = g.name;
for (Rule r : g.rules.values()) {
Expand Down