Skip to content
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

contributor signature #1212

Closed
wants to merge 2 commits into from
+6 −1
Closed

contributor signature #1212

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cbda03a
avoid null entries for ambigous tree list
WolfgangFahl Apr 8, 2016
836a32d
adds Wolfgang Fahl as contributor
WolfgangFahl Jun 16, 2016
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
1 change: 1 addition & 0 deletions contributors.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,3 +92,4 @@ YYYY/MM/DD, github id, Full name, email
2016/03/27, beardlybread, Bradley Steinbacher, bradley.j.steinbacher@gmail.com
2016/03/29, msteiger, Martin Steiger, antlr@martin-steiger.de
2016/03/28, gagern, Martin von Gagern, gagern@ma.tum.de
2016/06/16, WolfgangFahl, Wolfgang Fahl, info@bitplan.com
6 changes: 5 additions & 1 deletion tool/src/org/antlr/v4/tool/GrammarParserInterpreter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -320,7 +320,11 @@ public static List<ParserRuleContext> getAllPossibleParseTrees(Grammar g,
if ( Trees.isAncestorOf(parser.getOverrideDecisionRoot(), ambigSubTree) ) {
ambigSubTree = (GrammarInterpreterRuleContext)parser.getOverrideDecisionRoot();
}
trees.add(ambigSubTree);
if (ambigSubTree!=null) {
trees.add(ambigSubTree);
} else {
// TODO: should we do something about this?
}
alt = alts.nextSetBit(alt + 1);
}

Expand Down