mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-01-11 03:57:28 -08:00
0029d15a96
I initially wanted to add 3.3 but despite it being less disruptive than 3.4, I found compatibility issues with the revdeps. We will hopefully never need 3.3. This is a total rewrite from the previous version, which uses the new simplified antlr-2 ebuild and adds a very large test suite that is passing with a little patching. Package-Manager: portage-2.2.26
33 lines
1.3 KiB
Diff
33 lines
1.3 KiB
Diff
diff -Naur antlr-3.3.orig/tool/src/main/java/org/antlr/tool/CompositeGrammar.java antlr-3.3/tool/src/main/java/org/antlr/tool/CompositeGrammar.java
|
|
--- antlr-3.3.orig/tool/src/main/java/org/antlr/tool/CompositeGrammar.java 2010-11-30 01:54:04.000000000 +0000
|
|
+++ antlr-3.3/tool/src/main/java/org/antlr/tool/CompositeGrammar.java 2015-10-03 14:28:50.063497181 +0100
|
|
@@ -219,7 +219,9 @@
|
|
public List<Grammar> getIndirectDelegates(Grammar g) {
|
|
List<Grammar> direct = getDirectDelegates(g);
|
|
List<Grammar> delegates = getDelegates(g);
|
|
- delegates.removeAll(direct);
|
|
+ if (direct != null) {
|
|
+ delegates.removeAll(direct);
|
|
+ }
|
|
return delegates;
|
|
}
|
|
|
|
@@ -389,7 +391,7 @@
|
|
Set<String> localRuleDefs = new HashSet<String>();
|
|
Set<String> overrides = new HashSet<String>();
|
|
// compute set of non-overridden rules for this delegate
|
|
- for (Rule r : p.grammar.getRules()) {
|
|
+ for (Rule r : (Collection<Rule>) p.grammar.getRules()) {
|
|
if ( !ruleDefs.contains(r.name) ) {
|
|
localRuleDefs.add(r.name);
|
|
}
|
|
@@ -409,7 +411,7 @@
|
|
|
|
// pass larger set of defined rules to delegates
|
|
if ( p.children!=null ) {
|
|
- for (CompositeGrammarTree delegate : p.children) {
|
|
+ for (CompositeGrammarTree delegate : (List<CompositeGrammarTree>) p.children) {
|
|
_minimizeRuleSet(ruleDefs, delegate);
|
|
}
|
|
}
|