sping 15/08/08 01:55:34 Added: antlr-3.1.3-jdk-8.patch Log: dev-java/antlr: Fix for JDK 8 (bug #506678) (Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 0x401A1600)
Revision Changes Path 1.1 dev-java/antlr/files/antlr-3.1.3-jdk-8.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/antlr/files/antlr-3.1.3-jdk-8.patch?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/antlr/files/antlr-3.1.3-jdk-8.patch?rev=1.1&content-type=text/plain Index: antlr-3.1.3-jdk-8.patch =================================================================== >From 126414cf2731a3fe8a42393d0b41ce0060844b34 Mon Sep 17 00:00:00 2001 From: Sebastian Pipping <[email protected]> Date: Sat, 8 Aug 2015 03:46:00 +0200 Subject: [PATCH] Fix CompositeGrammer.getIndirectDelegates for JDK 8 https://github.com/antlr/antlr3/issues/151 --- tool/src/main/java/org/antlr/tool/CompositeGrammar.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tool/src/main/java/org/antlr/tool/CompositeGrammar.java b/tool/src/main/java/org/antlr/tool/CompositeGrammar.java index bb15723..fc16f01 100644 --- a/tool/src/main/java/org/antlr/tool/CompositeGrammar.java +++ b/tool/src/main/java/org/antlr/tool/CompositeGrammar.java @@ -219,7 +219,9 @@ public class CompositeGrammar { 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; } -- 2.5.0
