summaryrefslogtreecommitdiff
path: root/dev-java/antlr
diff options
context:
space:
mode:
authorroot <root@alpha.trunkmasters.com>2026-06-04 16:24:49 -0500
committerroot <root@alpha.trunkmasters.com>2026-06-04 16:24:49 -0500
commita3ceca1b4c0d9bdb550dc23f06ffbb5a8e033bc7 (patch)
tree0c52bbae1c242fbc296bd650fcd1167685f81492 /dev-java/antlr
parentbfd9c39e4712ebdb442d4ca0673061faed1e70e1 (diff)
downloadbaldeagleos-repo-a3ceca1b4c0d9bdb550dc23f06ffbb5a8e033bc7.tar.gz
baldeagleos-repo-a3ceca1b4c0d9bdb550dc23f06ffbb5a8e033bc7.tar.xz
baldeagleos-repo-a3ceca1b4c0d9bdb550dc23f06ffbb5a8e033bc7.zip
Adding metadata
Diffstat (limited to 'dev-java/antlr')
-rw-r--r--dev-java/antlr/Manifest5
-rw-r--r--dev-java/antlr/antlr-2.7.7-r10.ebuild46
-rw-r--r--dev-java/antlr/antlr-3.2-r2.ebuild102
-rw-r--r--dev-java/antlr/antlr-3.5.3.ebuild56
-rw-r--r--dev-java/antlr/antlr-4.13.2.ebuild51
-rw-r--r--dev-java/antlr/files/3.2-java-8.patch32
-rw-r--r--dev-java/antlr/files/3.2-test-fixes.patch249
-rw-r--r--dev-java/antlr/files/antlr-3.2-java21.patch31
-rw-r--r--dev-java/antlr/metadata.xml11
9 files changed, 0 insertions, 583 deletions
diff --git a/dev-java/antlr/Manifest b/dev-java/antlr/Manifest
deleted file mode 100644
index ecf380d60b84..000000000000
--- a/dev-java/antlr/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST antlr-2.7.7.tar.gz 1816180 BLAKE2B 3a9a51070f8651befeb4d22be344b544e119db34a78522828c2ffc3c481c14b9c7784f0a9997a61f6faedde5b6d1fe12214cfd84fb274f7065f3ffe6a44abf1c SHA512 faa72d2ddcba434ef1233e70c1549e63eba67c00793966322e821cf7f015cccb804448cb92d8fbef0429f59928fad65ec954f8ffbda0acbb8e983de0806d349d
-DIST antlr-3.2.jar 1928009 BLAKE2B 9c56b0142abdb7d0caabebbae12618a665f91001e2f472519549a65b8601b81fcca485898c7420087a7b631351eb26e4b98589d7284960efcc3c65155919fd2a SHA512 25a61404c4b41e48eeaed49d41122f9400092248a10eb776d75ce3513295870eca1acc4b06c74925284a27cc64ca0506e34de39fb91996f09727cc5cc72dd9a6
-DIST antlr-3.2.tar.gz 837320 BLAKE2B 3addcfed45e67a7f8f3841a890be418626d93229dc326fe4670c6b145a457203a26f01723695573692c65bb6c376349a8d8cd852b339b1f6da7b71a52e14bb4f SHA512 8984221cd89253c033a4596dd56cd51b297393a53b4682f5ab401172745d343371bf0d45417fa286ce972add1b4e474f1f3091fa1345158dbfc040702d61607c
-DIST antlr-3.5.3.tar.gz 6752328 BLAKE2B 8ebd098c9475122cddcadd5991b9f882b7fda5868ad979b29c9f4dab97e39cd31e7fc943476c3a854f3e3aee9c1c56384b7fcc893f87548482af5d5d0839fd30 SHA512 c565e1ade7a62bb127df707015afded9a9cea54cbf5488730a327671c57e8718f93f76c4fa28edd856810cb9c7ccbcb27b53a7c8f7e3efc8169e64cfcc535a4c
-DIST antlr-4.13.2.tar.gz 4167326 BLAKE2B 709f3c18329e08a811d7a4e5258fc0183ba6fa6ab62fe83ab694360cf1ce2bb3aa3f30cc62a0339a6ff8b64dd0a766057fd6f751cfc34a4e05051e4d54a57fad SHA512 afd8ecab637a0e70cddf98f63c918eab2b907f87207624e20e80a79f885d6502d4ab734a602b1707969d61944410828b689ec2f8b09c15314fe991024cde1613
diff --git a/dev-java/antlr/antlr-2.7.7-r10.ebuild b/dev-java/antlr/antlr-2.7.7-r10.ebuild
deleted file mode 100644
index c8caf6ed429d..000000000000
--- a/dev-java/antlr/antlr-2.7.7-r10.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc examples source"
-MAVEN_ID="antlr:antlr:2.7.7"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="A parser generator for many languages"
-HOMEPAGE="https://www.antlr2.org/"
-SRC_URI="https://www.antlr2.org/download/${P}.tar.gz"
-S="${WORKDIR}/${P}"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 ~x64-macos ~x64-solaris"
-
-DEPEND=">=virtual/jdk-1.8:*"
-RDEPEND=">=virtual/jre-1.8:*"
-
-JAVA_MAIN_CLASS="antlr.Tool"
-JAVA_SRC_DIR="${S}/${PN}"
-
-DOCS=( CHANGES.txt README.txt )
-
-src_prepare() {
- default #780585
- java-pkg-2_src_prepare
- java-pkg_clean
-
- # Delete build files from examples.
- find examples \( -name Makefile.in -o -name shiplist \) -delete || die
-}
-
-# Avoid configure script.
-src_configure() { :; }
-
-src_install() {
- java-pkg-simple_src_install
-
- use doc && java-pkg_dohtml -r doc/*
- use examples && java-pkg_doexamples examples/java
- use source && java-pkg_dosrc antlr
-}
diff --git a/dev-java/antlr/antlr-3.2-r2.ebuild b/dev-java/antlr/antlr-3.2-r2.ebuild
deleted file mode 100644
index d7d6da91d945..000000000000
--- a/dev-java/antlr/antlr-3.2-r2.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc test"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="A parser generator for many languages"
-HOMEPAGE="https://www.antlr3.org/"
-SRC_URI="https://www.antlr3.org/download/${P}.tar.gz
- https://www.antlr3.org/download/${P}.jar" # Prebuilt version needed.
-S="${WORKDIR}/${P}"
-
-LICENSE="BSD"
-SLOT="3"
-KEYWORDS="amd64 arm64 ppc64 ~x64-macos ~x64-solaris"
-RESTRICT="!test? ( test )"
-
-CP_DEPEND=">=dev-java/antlr-2.7.7-r7:0
- dev-java/stringtemplate:0"
-
-RDEPEND="${CP_DEPEND}
- >=virtual/jre-1.8:*"
-
-DEPEND="${CP_DEPEND}
- >=virtual/jdk-1.8:*
- test? ( dev-java/junit:4 )"
-
-PATCHES=(
- # These fixes have been applied in 3.5.
- "${FILESDIR}/${PV}-test-fixes.patch"
- "${FILESDIR}/${PV}-java-8.patch"
- "${FILESDIR}/antlr-3.2-java21.patch"
-)
-
-JAVA_GENTOO_CLASSPATH_EXTRA="${S}/${PN}-runtime.jar"
-
-src_unpack() {
- unpack ${P}.tar.gz
-}
-
-src_prepare() {
- default
- java-pkg_clean
-
- # Some tests fail under Java 8 in ways that probably aren't limited
- # to the tests. This is bad but upstream is never going to update
- # 3.2 even though other projects still rely on it. If any issues
- # arise, we can only put pressure on those projects to upgrade.
- local vm_version="$(java-config -g PROVIDES_VERSION)"
- if ver_test "${vm_version}" -ge 1.8; then
- rm -v tool/src/test/java/org/antlr/test/Test{DFAConversion,SemanticPredicates,TopologicalSort}.java || die
- fi
-
- # 3.2 has strange hidden files.
- find -type f -name "._*.*" -delete || die
-}
-
-src_compile() {
- cd "${S}/runtime/Java/src/main" || die
- JAVA_JAR_FILENAME="${S}/${PN}-runtime.jar" java-pkg-simple_src_compile
-
- cd "${S}/tool/src/main" || die
-
- local G; for G in antlr codegen antlr.print assign.types buildnfa define; do # from pom.xml
- antlr -o antlr2/org/antlr/grammar/v2/{,${G}.g} || die
- done
-
- # We have applied a patch to fix this version under Java 8. Trouble
- # is that we need to run a prebuilt version before we can build our
- # own and that version doesn't have the fix applied. We work around
- # this by building just the offending class against the prebuilt
- # version and then putting them together in the classpath. That
- # isn't all. Due to a compiler limitation that Chewi doesn't fully
- # understand, this class cannot be compiled by itself without a
- # couple of tweaks that have been applied in the Java 8 patch.
- ejavac -classpath "${DISTDIR}/${P}.jar" java/org/antlr/tool/CompositeGrammar.java
-
- java -classpath "java:${DISTDIR}/${P}.jar" org.antlr.Tool $(find antlr3 -name "*.g") || die
- JAVA_JAR_FILENAME="${S}/${PN}-tool.jar" java-pkg-simple_src_compile
- java-pkg_addres "${S}/${PN}-tool.jar" resources
-}
-
-src_install() {
- java-pkg_dojar ${PN}-{runtime,tool}.jar
- java-pkg_dolauncher ${PN}${SLOT} --main org.antlr.Tool
- use doc && java-pkg_dojavadoc runtime/Java/src/main/target/api
-}
-
-src_test() {
- cd tool/src/test/java || die
- local CP=".:${S}/${PN}-runtime.jar:${S}/${PN}-tool.jar:$(java-pkg_getjars --build-only junit-4,${JAVA_GENTOO_CLASSPATH})"
-
- local TESTS=$(find * -name "Test*.java")
- TESTS="${TESTS//.java}"
- TESTS="${TESTS//\//.}"
-
- ejavac -classpath "${CP}" $(find -name "*.java")
- ejunit4 -classpath "${CP}" ${TESTS}
-}
diff --git a/dev-java/antlr/antlr-3.5.3.ebuild b/dev-java/antlr/antlr-3.5.3.ebuild
deleted file mode 100644
index c61d1440241e..000000000000
--- a/dev-java/antlr/antlr-3.5.3.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit eapi9-ver java-pkg-2
-
-DESCRIPTION="A parser generator for many languages"
-HOMEPAGE="https://www.antlr3.org/"
-# Reuse tarball for DOCS
-SRC_URI="https://github.com/${PN}/${PN}3/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="3.5"
-KEYWORDS="amd64 arm64 ppc64 ~x64-macos ~x64-solaris"
-
-CP_DEPEND="
- ~dev-java/antlr-runtime-${PV}:${SLOT}
- ~dev-java/antlr-tool-${PV}:${SLOT}
-"
-
-DEPEND="
- >=virtual/jdk-1.8:*
- ${CP_DEPEND}
-"
-
-RDEPEND="
- >=virtual/jre-1.8:*
- ${CP_DEPEND}
-"
-
-S="${WORKDIR}/${PN}3-${PV}"
-
-DOCS=( contributors.txt README.txt )
-
-src_compile() {
- :
-}
-
-src_install() {
- java-pkg_regjar "$(java-pkg_getjar "antlr-runtime-${SLOT}" antlr-runtime.jar)"
- java-pkg_regjar "$(java-pkg_getjar "antlr-tool-${SLOT}" antlr-tool.jar)"
-
- java-pkg_dolauncher "${PN}${SLOT}" --main org.antlr.Tool
- einstalldocs # https://bugs.gentoo.org/789582
-}
-
-pkg_postinst() {
- # If upgrading from a version of this slot that installs JARs,
- # display a message about submodule split
- local changed_ver="3.5.2-r2"
- ver_replacing -lt "${changed_ver}" || return
- elog "Since version ${changed_ver}, ${PN}-${SLOT} no longer installs JARs."
- elog "Please find the JARs from files installed by submodule packages"
- elog "antlr-runtime-${SLOT} and antlr-tool-${SLOT}."
-}
diff --git a/dev-java/antlr/antlr-4.13.2.ebuild b/dev-java/antlr/antlr-4.13.2.ebuild
deleted file mode 100644
index 79118c3ebbf1..000000000000
--- a/dev-java/antlr/antlr-4.13.2.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit eapi9-ver java-pkg-2
-
-DESCRIPTION="A parser generator for many languages"
-HOMEPAGE="https://www.antlr.org/"
-# Reuse tarball for DOCS
-SRC_URI="https://github.com/${PN}/${PN}4/archive/${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}4-${PV}"
-
-LICENSE="BSD"
-SLOT="4"
-KEYWORDS="amd64 arm64 ppc64 ~x64-macos ~x64-solaris"
-
-CP_DEPEND="
- ~dev-java/antlr-runtime-${PV}:${SLOT}
- ~dev-java/antlr-tool-${PV}:${SLOT}
-"
-
-DEPEND="
- >=virtual/jdk-1.8:*
- ${CP_DEPEND}
-"
-
-RDEPEND="
- >=virtual/jre-1.8:*
- ${CP_DEPEND}
-"
-
-DOCS=( CHANGES.txt CONTRIBUTING.md README.md doc )
-
-src_install() {
- java-pkg_regjar "$(java-pkg_getjar "antlr-runtime-${SLOT}" antlr-runtime.jar)"
- java-pkg_regjar "$(java-pkg_getjar "antlr-tool-${SLOT}" antlr-tool.jar)"
-
- java-pkg_dolauncher "${PN}${SLOT}" --main org.antlr.v4.Tool
- einstalldocs # https://bugs.gentoo.org/789582
-}
-
-pkg_postinst() {
- # If upgrading from a version of this slot that installs JARs,
- # display a message about submodule split
- local changed_ver="4.9.3"
- ver_replacing -lt "${changed_ver}" || return
- elog "Since version ${changed_ver}, ${PN}-${SLOT} no longer installs JARs."
- elog "Please find the JARs from files installed by submodule packages"
- elog "antlr-runtime-${SLOT} and antlr-tool-${SLOT}."
-}
diff --git a/dev-java/antlr/files/3.2-java-8.patch b/dev-java/antlr/files/3.2-java-8.patch
deleted file mode 100644
index 662abfe1e17f..000000000000
--- a/dev-java/antlr/files/3.2-java-8.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-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);
- }
- }
diff --git a/dev-java/antlr/files/3.2-test-fixes.patch b/dev-java/antlr/files/3.2-test-fixes.patch
deleted file mode 100644
index 28068edb76ba..000000000000
--- a/dev-java/antlr/files/3.2-test-fixes.patch
+++ /dev/null
@@ -1,249 +0,0 @@
---- a/tool/src/test/java/org/antlr/test/BaseTest.java.orig 2010-11-30 01:54:04.000000000 +0000
-+++ b/tool/src/test/java/org/antlr/test/BaseTest.java 2015-09-24 22:25:36.872191194 +0100
-@@ -130,8 +130,8 @@
- try {
- Process process =
- Runtime.getRuntime().exec(args, null, outputDir);
-- StreamVacuum stdout = new StreamVacuum(process.getInputStream());
-- StreamVacuum stderr = new StreamVacuum(process.getErrorStream());
-+ StreamVacuum stdout = new StreamVacuum(process.getInputStream(), tmpdir+"/"+fileName);
-+ StreamVacuum stderr = new StreamVacuum(process.getErrorStream(), tmpdir+"/"+fileName);
- stdout.start();
- stderr.start();
- process.waitFor();
-@@ -406,8 +406,8 @@
- //System.out.println("execParser: "+cmdLine);
- Process process =
- Runtime.getRuntime().exec(args, null, new File(tmpdir));
-- StreamVacuum stdoutVacuum = new StreamVacuum(process.getInputStream());
-- StreamVacuum stderrVacuum = new StreamVacuum(process.getErrorStream());
-+ StreamVacuum stdoutVacuum = new StreamVacuum(process.getInputStream(), tmpdir+"/input");
-+ StreamVacuum stderrVacuum = new StreamVacuum(process.getErrorStream(), tmpdir+"/input");
- stdoutVacuum.start();
- stderrVacuum.start();
- process.waitFor();
-@@ -499,8 +499,10 @@
- StringBuffer buf = new StringBuffer();
- BufferedReader in;
- Thread sucker;
-- public StreamVacuum(InputStream in) {
-+ String inputFile;
-+ public StreamVacuum(InputStream in, String inputFile) {
- this.in = new BufferedReader( new InputStreamReader(in) );
-+ this.inputFile = inputFile;
- }
- public void start() {
- sucker = new Thread(this);
-@@ -510,6 +512,8 @@
- try {
- String line = in.readLine();
- while (line!=null) {
-+ if (line.startsWith(inputFile))
-+ line = line.substring(inputFile.length()+1);
- buf.append(line);
- buf.append('\n');
- line = in.readLine();
---- a/tool/src/test/java/org/antlr/test/TestTopologicalSort.java.orig 2009-09-23 19:36:14.000000000 +0100
-+++ b/tool/src/test/java/org/antlr/test/TestTopologicalSort.java 2010-11-30 01:54:04.000000000 +0000
-@@ -49,7 +49,7 @@
- g.addEdge("F", "H");
- g.addEdge("E", "F");
-
-- String expecting = "[H, F, E, D, A, G, B, C]";
-+ String expecting = "[H, F, E, D, G, A, B, C]";
- List nodes = g.sort();
- String result = nodes.toString();
- assertEquals(expecting, result);
-@@ -91,7 +91,7 @@
- g.addEdge("Def.g", "Java.tokens"); // walkers feed off generated tokens
- g.addEdge("Ref.g", "Java.tokens");
-
-- String expecting = "[MyJava.tokens, Java.g, Java.tokens, Def.g, Ref.g]";
-+ String expecting = "[MyJava.tokens, Java.g, Java.tokens, Ref.g, Def.g]";
- List nodes = g.sort();
- String result = nodes.toString();
- assertEquals(expecting, result);
-@@ -105,7 +105,7 @@
- g.addEdge("Def.g", "JavaLexer.tokens");
- g.addEdge("Ref.g", "JavaLexer.tokens");
-
-- String expecting = "[JavaLexer.g, JavaLexer.tokens, JavaParser.g, Def.g, Ref.g]";
-+ String expecting = "[JavaLexer.g, JavaLexer.tokens, JavaParser.g, Ref.g, Def.g]";
- List nodes = g.sort();
- String result = nodes.toString();
- assertEquals(expecting, result);
---- a/tool/src/test/java/org/antlr/test/TestSemanticPredicates.java.orig 2009-09-23 19:36:12.000000000 +0100
-+++ b/tool/src/test/java/org/antlr/test/TestSemanticPredicates.java 2015-12-05 13:52:05.923411552 +0000
-@@ -731,19 +731,23 @@
- "c : a\n" +
- " | b\n" +
- " ;\n");
-- String expecting =
-- ".s0-X->.s1\n" +
-- ".s1-{((a&&c)||(b&&c))}?->:s2=>1\n" +
-- ".s1-{c}?->:s3=>2\n";
-- int[] unreachableAlts = null;
-- int[] nonDetAlts = null;
-- String ambigInput = null;
-- int[] insufficientPredAlts = null;
-- int[] danglingAlts = null;
-- int numWarnings = 0;
-- checkDecision(g, 3, expecting, unreachableAlts,
-- nonDetAlts, ambigInput, insufficientPredAlts,
-- danglingAlts, numWarnings, false);
-+ try {
-+ String expecting =
-+ ".s0-X->.s1\n" +
-+ ".s1-{((a&&c)||(b&&c))}?->:s2=>1\n" +
-+ ".s1-{c}?->:s3=>2\n";
-+ checkDecision(g, 3, expecting, null,
-+ null, null, null,
-+ null, 0, false);
-+ } catch (org.junit.ComparisonFailure e) {
-+ String expecting =
-+ ".s0-X->.s1\n" +
-+ ".s1-{((b&&c)||(a&&c))}?->:s2=>1\n" +
-+ ".s1-{c}?->:s3=>2\n";
-+ checkDecision(g, 3, expecting, null,
-+ null, null, null,
-+ null, 0, false);
-+ }
- }
-
- @Test
---- a/tool/src/test/java/org/antlr/test/TestAttributes.java.orig 2015-12-05 13:55:55.392843185 +0000
-+++ b/tool/src/test/java/org/antlr/test/TestAttributes.java 2015-12-05 14:04:38.120599871 +0000
-@@ -439,20 +439,15 @@
- ErrorManager.setErrorListener(equeue);
- Grammar g = new Grammar(
- "parser grammar t;\n"+
-- "a : x=b {"+action+"} ;\n" +
-+ "a : x=b {###"+action+"!!!} ;\n" +
- "b : B ;\n");
- Tool antlr = newTool();
- CodeGenerator generator = new CodeGenerator(antlr, g, "Java");
- g.setCodeGenerator(generator);
-- generator.genRecognizer(); // forces load of templates
-- ActionTranslator translator = new ActionTranslator(generator,"a",
-- new antlr.CommonToken(ANTLRParser.ACTION,action),1);
-- String rawTranslation =
-- translator.translate();
-- StringTemplateGroup templates =
-- new StringTemplateGroup(".", AngleBracketTemplateLexer.class);
-- StringTemplate actionST = new StringTemplate(templates, rawTranslation);
-- String found = actionST.toString();
-+ generator.genRecognizer(); // codegen phase sets some vars we need
-+ StringTemplate codeST = generator.getRecognizerST();
-+ String code = codeST.toString();
-+ String found = code.substring(code.indexOf("###")+3,code.indexOf("!!!"));
- assertEquals(expecting, found);
-
- assertEquals("unexpected errors: "+equeue, 0, equeue.errors.size());
-@@ -1771,20 +1766,15 @@
- Grammar g = new Grammar(
- "parser grammar t;\n" +
- "options {output=template;}\n"+
-- "a : {"+action+"}\n" +
-+ "a : {###"+action+"!!!}\n" +
- " ;\n");
- Tool antlr = newTool();
- CodeGenerator generator = new CodeGenerator(antlr, g, "Java");
- g.setCodeGenerator(generator);
-- generator.genRecognizer(); // forces load of templates
-- ActionTranslator translator = new ActionTranslator(generator,"a",
-- new antlr.CommonToken(ANTLRParser.ACTION,action),1);
-- String rawTranslation =
-- translator.translate();
-- StringTemplateGroup templates =
-- new StringTemplateGroup(".", AngleBracketTemplateLexer.class);
-- StringTemplate actionST = new StringTemplate(templates, rawTranslation);
-- String found = actionST.toString();
-+ generator.genRecognizer(); // codegen phase sets some vars we need
-+ StringTemplate codeST = generator.getRecognizerST();
-+ String code = codeST.toString();
-+ String found = code.substring(code.indexOf("###")+3,code.indexOf("!!!"));
- assertEquals(expecting, found);
-
- assertEquals("unexpected errors: "+equeue, 0, equeue.errors.size());
-@@ -1869,35 +1859,21 @@
- ErrorManager.setErrorListener(equeue);
- Grammar g = new Grammar(
- "grammar t;\n"+
-- "a : b {"+action+"}\n" +
-- " | c {"+action2+"}\n" +
-+ "a : b {###"+action+"!!!}\n" +
-+ " | c {^^^"+action2+"&&&}\n" +
- " ;\n" +
- "b : 'a';\n" +
- "c : '0';\n");
- Tool antlr = newTool();
- CodeGenerator generator = new CodeGenerator(antlr, g, "Java");
- g.setCodeGenerator(generator);
-- generator.genRecognizer(); // forces load of templates
-- ActionTranslator translator = new ActionTranslator(generator,"a",
-- new antlr.CommonToken(ANTLRParser.ACTION,action),1);
-- String rawTranslation =
-- translator.translate();
-- StringTemplateGroup templates =
-- new StringTemplateGroup(".", AngleBracketTemplateLexer.class);
-- StringTemplate actionST = new StringTemplate(templates, rawTranslation);
-- String found = actionST.toString();
-+ generator.genRecognizer(); // codegen phase sets some vars we need
-+ StringTemplate codeST = generator.getRecognizerST();
-+ String code = codeST.toString();
-+ String found = code.substring(code.indexOf("###")+3,code.indexOf("!!!"));
- assertEquals(expecting, found);
-
-- assertEquals("unexpected errors: "+equeue, 0, equeue.errors.size());
-- translator = new ActionTranslator(generator,
-- "a",
-- new antlr.CommonToken(ANTLRParser.ACTION,action2),2);
-- rawTranslation =
-- translator.translate();
-- templates =
-- new StringTemplateGroup(".", AngleBracketTemplateLexer.class);
-- actionST = new StringTemplate(templates, rawTranslation);
-- found = actionST.toString();
-+ found = code.substring(code.indexOf("^^^")+3,code.indexOf("&&&"));
-
- assertEquals(expecting2, found);
-
-@@ -3208,7 +3184,7 @@
-
- @Test public void testAssignToTreeNodeAttribute() throws Exception {
- String action = "$tree.scope = localScope;";
-- String expecting = "(()retval.tree).scope = localScope;";
-+ String expecting = "((Object)retval.tree).scope = localScope;";
- ErrorQueue equeue = new ErrorQueue();
- ErrorManager.setErrorListener(equeue);
- Grammar g = new Grammar(
-@@ -3219,24 +3195,17 @@
- " Scope localScope=null;\n" +
- "}\n" +
- "@after {\n" +
-- " $tree.scope = localScope;\n" +
-+ " ###$tree.scope = localScope;!!!\n" +
- "}\n" +
- " : 'a' -> ^('a')\n" +
- ";");
- Tool antlr = newTool();
- CodeGenerator generator = new CodeGenerator(antlr, g, "Java");
- g.setCodeGenerator(generator);
-- generator.genRecognizer(); // forces load of templates
-- ActionTranslator translator = new ActionTranslator(generator,
-- "rule",
-- new antlr.CommonToken(ANTLRParser.ACTION,action),1);
-- String rawTranslation =
-- translator.translate();
-- StringTemplateGroup templates =
-- new StringTemplateGroup(".", AngleBracketTemplateLexer.class);
-- StringTemplate actionST = new StringTemplate(templates, rawTranslation);
-- String found = actionST.toString();
-- assertEquals("unexpected errors: "+equeue, 0, equeue.errors.size());
-+ generator.genRecognizer(); // codegen phase sets some vars we need
-+ StringTemplate codeST = generator.getRecognizerST();
-+ String code = codeST.toString();
-+ String found = code.substring(code.indexOf("###")+3,code.indexOf("!!!"));
- assertEquals(expecting, found);
- }
-
diff --git a/dev-java/antlr/files/antlr-3.2-java21.patch b/dev-java/antlr/files/antlr-3.2-java21.patch
deleted file mode 100644
index 8d885f9a5f11..000000000000
--- a/dev-java/antlr/files/antlr-3.2-java21.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-bug #919684
---- a/tool/src/main/java/org/antlr/codegen/CodeGenerator.java
-+++ b/tool/src/main/java/org/antlr/codegen/CodeGenerator.java
-@@ -36,6 +36,7 @@ import org.antlr.Tool;
- import org.antlr.analysis.*;
- import org.antlr.misc.*;
- import org.antlr.stringtemplate.*;
-+import org.antlr.stringtemplate.StringTemplate;
- import org.antlr.stringtemplate.language.AngleBracketTemplateLexer;
- import org.antlr.tool.*;
-
---- a/tool/src/main/antlr2/org/antlr/grammar/v2/codegen.g
-+++ b/tool/src/main/antlr2/org/antlr/grammar/v2/codegen.g
-@@ -32,6 +32,7 @@ header {
- import org.antlr.misc.*;
- import java.util.*;
- import org.antlr.stringtemplate.*;
-+ import org.antlr.stringtemplate.StringTemplate;
- import antlr.TokenWithIndex;
- import antlr.CommonToken;
- import org.antlr.codegen.*;
---- a/tool/src/main/resources/org/antlr/codegen/templates/Java/ST.stg
-+++ b/tool/src/main/resources/org/antlr/codegen/templates/Java/ST.stg
-@@ -33,6 +33,7 @@ group ST;
- @outputFile.imports() ::= <<
- <@super.imports()>
- import org.antlr.stringtemplate.*;
-+import org.antlr.stringtemplate.StringTemplate;
- import org.antlr.stringtemplate.language.*;
- import java.util.HashMap;
- >>
diff --git a/dev-java/antlr/metadata.xml b/dev-java/antlr/metadata.xml
deleted file mode 100644
index b219362a9f8c..000000000000
--- a/dev-java/antlr/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>java@gentoo.org</email>
- <name>Java</name>
- </maintainer>
- <upstream>
- <remote-id type="github">antlr/antlr4</remote-id>
- </upstream>
-</pkgmetadata>