Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 506678
Collapse All | Expand All

(-)tool/src/main/java/org/antlr/tool/CompositeGrammar.java.orig (-3 / +13 lines)
Lines 31-37 Link Here
31
import org.antlr.analysis.NFAState;
31
import org.antlr.analysis.NFAState;
32
import org.antlr.misc.Utils;
32
import org.antlr.misc.Utils;
33
33
34
import java.util.*;
34
import java.util.ArrayList;
35
import java.util.HashMap;
36
import java.util.HashSet;
37
import java.util.Iterator;
38
import java.util.LinkedHashMap;
39
import java.util.List;
40
import java.util.Map;
41
import java.util.Set;
42
import java.util.Vector;
35
import org.antlr.grammar.v2.AssignTokenTypesWalker;
43
import org.antlr.grammar.v2.AssignTokenTypesWalker;
36
44
37
/** A tree of component (delegate) grammars.
45
/** A tree of component (delegate) grammars.
Lines 219-226 Link Here
219
	public List<Grammar> getIndirectDelegates(Grammar g) {
227
	public List<Grammar> getIndirectDelegates(Grammar g) {
220
		List<Grammar> direct = getDirectDelegates(g);
228
		List<Grammar> direct = getDirectDelegates(g);
221
		List<Grammar> delegates = getDelegates(g);
229
		List<Grammar> delegates = getDelegates(g);
222
		delegates.removeAll(direct);
230
                if ( direct!=null ) {
223
		return delegates;
231
                        delegates.removeAll(direct);
232
                }
233
                return delegates;
224
	}
234
	}
225
235
226
	/** Return list of delegate grammars from root down to g.
236
	/** Return list of delegate grammars from root down to g.

Return to bug 506678