aboutsummaryrefslogtreecommitdiff
path: root/tool
diff options
context:
space:
mode:
Diffstat (limited to 'tool')
-rw-r--r--tool/CHANGES.txt8
-rw-r--r--tool/pom.xml8
-rw-r--r--tool/src/BUILD.bazel145
-rwxr-xr-xtool/src/main/resources/org/antlr/codegen/templates/Cpp/Cpp.stg2
-rw-r--r--tool/src/test/java/org/antlr/test/TestAutoAST.java4
-rw-r--r--tool/src/test/java/org/antlr/test/TestCharDFAConversion.java2
-rw-r--r--tool/src/test/java/org/antlr/test/TestDFAConversion.java2
-rw-r--r--tool/src/test/java/org/antlr/test/TestSemanticPredicateEvaluation.java2
-rw-r--r--tool/src/test/java/org/antlr/test/TestSemanticPredicates.java4
9 files changed, 163 insertions, 14 deletions
diff --git a/tool/CHANGES.txt b/tool/CHANGES.txt
index 0770dcb..c8f55da 100644
--- a/tool/CHANGES.txt
+++ b/tool/CHANGES.txt
@@ -1,3 +1,11 @@
+****************************************************************************
+As of ANTLR 3.5.2, March 25 2014, we are no longer updating this file. Instead,
+we are using the github release mechanism. For example, here is
+3.5.2 release notes:
+
+https://github.com/antlr/antlr3/releases/tag/3.5.2
+****************************************************************************
+
ANTLR 3.5 Release
January 4, 2012
diff --git a/tool/pom.xml b/tool/pom.xml
index cc5134d..3098aeb 100644
--- a/tool/pom.xml
+++ b/tool/pom.xml
@@ -16,7 +16,7 @@
<parent>
<groupId>org.antlr</groupId>
<artifactId>antlr-master</artifactId>
- <version>3.5.2</version>
+ <version>3.5.3</version>
</parent>
<dependencies>
@@ -63,14 +63,10 @@
<build>
<plugins>
-
<plugin>
<groupId>org.antlr</groupId>
<artifactId>antlr3-maven-plugin</artifactId>
- <version>3.5</version>
- <configuration>
- <libDirectory>target/generated-sources/antlr/org/antlr/grammar/v3</libDirectory>
- </configuration>
+ <version>3.5.2</version>
<executions>
<execution>
<goals>
diff --git a/tool/src/BUILD.bazel b/tool/src/BUILD.bazel
new file mode 100644
index 0000000..30e9de7
--- /dev/null
+++ b/tool/src/BUILD.bazel
@@ -0,0 +1,145 @@
+"""BUILD.bazel file for ANTLR 3."""
+
+load("@rules_java//java:defs.bzl", "java_binary", "java_library", "java_test")
+
+package(default_visibility = ["//visibility:private"])
+
+java_binary(
+ name = "tool",
+ main_class = "org.antlr.Tool",
+ visibility = ["//:__pkg__"],
+ runtime_deps = [":tool_lib"],
+)
+
+java_library(
+ name = "tool_lib",
+ srcs = glob(["main/java/**/*.java"]) + [
+ "main/java/org/antlr/grammar/v3/ANTLRLexer.java",
+ "main/java/org/antlr/grammar/v3/ANTLRParser.java",
+ "main/java/org/antlr/grammar/v3/ANTLRTreePrinter.java",
+ "main/java/org/antlr/grammar/v3/ANTLRv3Lexer.java",
+ "main/java/org/antlr/grammar/v3/ANTLRv3Parser.java",
+ "main/java/org/antlr/grammar/v3/ANTLRv3Tree.java",
+ "main/java/org/antlr/grammar/v3/ActionAnalysis.java",
+ "main/java/org/antlr/grammar/v3/ActionTranslator.java",
+ "main/java/org/antlr/grammar/v3/AssignTokenTypesWalker.java",
+ "main/java/org/antlr/grammar/v3/CodeGenTreeWalker.java",
+ "main/java/org/antlr/grammar/v3/DefineGrammarItemsWalker.java",
+ "main/java/org/antlr/grammar/v3/LeftRecursiveRuleWalker.java",
+ "main/java/org/antlr/grammar/v3/TreeToNFAConverter.java",
+ ],
+ javacopts = [
+ "-Xep:EqualsHashCode:OFF",
+ ],
+ resource_strip_prefix = "tool/src/main/resources",
+ resources = glob(["main/resources/**/*.stg"]),
+ visibility = ["//visibility:public"],
+ deps = [
+ ":tool_bootstrap",
+ "//:java_runtime",
+ "@stringtemplate4",
+ ],
+)
+
+genrule(
+ name = "tool_bootstrap",
+ srcs = [
+ "main/antlr3/org/antlr/grammar/v3/ANTLR.g",
+ "main/antlr3/org/antlr/grammar/v3/ANTLRTreePrinter.g",
+ "main/antlr3/org/antlr/grammar/v3/ANTLRv3.g",
+ "main/antlr3/org/antlr/grammar/v3/ANTLRv3Tree.g",
+ "main/antlr3/org/antlr/grammar/v3/ActionAnalysis.g",
+ "main/antlr3/org/antlr/grammar/v3/ActionTranslator.g",
+ "main/antlr3/org/antlr/grammar/v3/AssignTokenTypesWalker.g",
+ "main/antlr3/org/antlr/grammar/v3/CodeGenTreeWalker.g",
+ "main/antlr3/org/antlr/grammar/v3/DefineGrammarItemsWalker.g",
+ "main/antlr3/org/antlr/grammar/v3/LeftRecursiveRuleWalker.g",
+ "main/antlr3/org/antlr/grammar/v3/TreeToNFAConverter.g",
+ ],
+ outs = [
+ "main/java/org/antlr/grammar/v3/ANTLRLexer.java",
+ "main/java/org/antlr/grammar/v3/ANTLRParser.java",
+ "main/java/org/antlr/grammar/v3/ANTLRTreePrinter.java",
+ "main/java/org/antlr/grammar/v3/ANTLRv3Lexer.java",
+ "main/java/org/antlr/grammar/v3/ANTLRv3Parser.java",
+ "main/java/org/antlr/grammar/v3/ANTLRv3Tree.java",
+ "main/java/org/antlr/grammar/v3/ActionAnalysis.java",
+ "main/java/org/antlr/grammar/v3/ActionTranslator.java",
+ "main/java/org/antlr/grammar/v3/AssignTokenTypesWalker.java",
+ "main/java/org/antlr/grammar/v3/CodeGenTreeWalker.java",
+ "main/java/org/antlr/grammar/v3/DefineGrammarItemsWalker.java",
+ "main/java/org/antlr/grammar/v3/LeftRecursiveRuleWalker.java",
+ "main/java/org/antlr/grammar/v3/TreeToNFAConverter.java",
+ ],
+ cmd = """
+ $(JAVA) -cp $(location @antlr3_bootstrap//jar) org.antlr.Tool -fo $(RULEDIR)/main/java/org/antlr/grammar/v3 $(location :main/antlr3/org/antlr/grammar/v3/ANTLR.g)
+ $(JAVA) -cp $(location @antlr3_bootstrap//jar) org.antlr.Tool -fo $(RULEDIR)/main/java/org/antlr/grammar/v3 $(location :main/antlr3/org/antlr/grammar/v3/ANTLRTreePrinter.g)
+ $(JAVA) -cp $(location @antlr3_bootstrap//jar) org.antlr.Tool -fo $(RULEDIR)/main/java/org/antlr/grammar/v3 $(location :main/antlr3/org/antlr/grammar/v3/ANTLRv3.g)
+ $(JAVA) -cp $(location @antlr3_bootstrap//jar) org.antlr.Tool -fo $(RULEDIR)/main/java/org/antlr/grammar/v3 $(location :main/antlr3/org/antlr/grammar/v3/ANTLRv3Tree.g)
+ $(JAVA) -cp $(location @antlr3_bootstrap//jar) org.antlr.Tool -fo $(RULEDIR)/main/java/org/antlr/grammar/v3 $(location :main/antlr3/org/antlr/grammar/v3/ActionAnalysis.g)
+ $(JAVA) -cp $(location @antlr3_bootstrap//jar) org.antlr.Tool -fo $(RULEDIR)/main/java/org/antlr/grammar/v3 $(location :main/antlr3/org/antlr/grammar/v3/ActionTranslator.g)
+ $(JAVA) -cp $(location @antlr3_bootstrap//jar) org.antlr.Tool -fo $(RULEDIR)/main/java/org/antlr/grammar/v3 $(location :main/antlr3/org/antlr/grammar/v3/AssignTokenTypesWalker.g)
+ $(JAVA) -cp $(location @antlr3_bootstrap//jar) org.antlr.Tool -fo $(RULEDIR)/main/java/org/antlr/grammar/v3 $(location :main/antlr3/org/antlr/grammar/v3/CodeGenTreeWalker.g)
+ $(JAVA) -cp $(location @antlr3_bootstrap//jar) org.antlr.Tool -fo $(RULEDIR)/main/java/org/antlr/grammar/v3 $(location :main/antlr3/org/antlr/grammar/v3/DefineGrammarItemsWalker.g)
+ $(JAVA) -cp $(location @antlr3_bootstrap//jar) org.antlr.Tool -fo $(RULEDIR)/main/java/org/antlr/grammar/v3 $(location :main/antlr3/org/antlr/grammar/v3/LeftRecursiveRuleWalker.g)
+ $(JAVA) -cp $(location @antlr3_bootstrap//jar) org.antlr.Tool -fo $(RULEDIR)/main/java/org/antlr/grammar/v3 $(location :main/antlr3/org/antlr/grammar/v3/TreeToNFAConverter.g)
+ """,
+ toolchains = ["@bazel_tools//tools/jdk:current_host_java_runtime"],
+ tools = ["@antlr3_bootstrap//jar"],
+)
+
+java_test(
+ name = "tests",
+ srcs = glob(["test/java/**/*.java"]),
+ args = [
+ "org.antlr.test.TestASTConstruction",
+ "org.antlr.test.TestAttributes",
+ "org.antlr.test.TestAutoAST",
+ "org.antlr.test.TestBufferedTreeNodeStream",
+ "org.antlr.test.TestCharDFAConversion",
+ "org.antlr.test.TestCommonTokenStream",
+ "org.antlr.test.TestCompositeGrammars",
+ "org.antlr.test.TestDFAConversion",
+ "org.antlr.test.TestDFAMatching",
+ "org.antlr.test.TestFastQueue",
+ "org.antlr.test.TestHeteroAST",
+ "org.antlr.test.TestInterpretedLexing",
+ "org.antlr.test.TestInterpretedParsing",
+ "org.antlr.test.TestIntervalSet",
+ "org.antlr.test.TestJavaCodeGeneration",
+ "org.antlr.test.TestLeftRecursion",
+ "org.antlr.test.TestLexer",
+ "org.antlr.test.TestMessages",
+ "org.antlr.test.TestNFAConstruction",
+ "org.antlr.test.TestRewriteAST",
+ "org.antlr.test.TestRewriteTemplates",
+ "org.antlr.test.TestSemanticPredicateEvaluation",
+ "org.antlr.test.TestSemanticPredicates",
+ "org.antlr.test.TestSets",
+ "org.antlr.test.TestSymbolDefinitions",
+ "org.antlr.test.TestSyntacticPredicateEvaluation",
+ "org.antlr.test.TestSyntaxErrors",
+ "org.antlr.test.TestTemplates",
+ "org.antlr.test.TestTokenRewriteStream",
+ "org.antlr.test.TestTopologicalSort",
+ "org.antlr.test.TestTreeGrammarRewriteAST",
+ "org.antlr.test.TestTreeIterator",
+ "org.antlr.test.TestTreeNodeStream",
+ "org.antlr.test.TestTreeParsing",
+ "org.antlr.test.TestTrees",
+ "org.antlr.test.TestTreeWizard",
+ ],
+ javacopts = [
+ "-Xep:JUnit4RunWithMissing:OFF",
+ ],
+ main_class = "org.junit.runner.JUnitCore",
+ use_testrunner = False,
+ visibility = ["//:__pkg__"],
+ deps = [
+ ":tool_lib",
+ "//:java_runtime",
+ "@hamcrest_core//jar",
+ "@junit//jar",
+ "@stringtemplate4",
+ ],
+)
diff --git a/tool/src/main/resources/org/antlr/codegen/templates/Cpp/Cpp.stg b/tool/src/main/resources/org/antlr/codegen/templates/Cpp/Cpp.stg
index d94024b..571b0b1 100755
--- a/tool/src/main/resources/org/antlr/codegen/templates/Cpp/Cpp.stg
+++ b/tool/src/main/resources/org/antlr/codegen/templates/Cpp/Cpp.stg
@@ -1007,7 +1007,7 @@ parser( grammar,
bitsets,
ASTLabelType,
superClass="Parser",
- labelType="ImplTraits::CommonTokenType*",
+ labelType="const ImplTraits::CommonTokenType*",
members={<actions.parser.members>}
) ::= <<
<beginNamespace(actions)>
diff --git a/tool/src/test/java/org/antlr/test/TestAutoAST.java b/tool/src/test/java/org/antlr/test/TestAutoAST.java
index 14aeed0..b7295c2 100644
--- a/tool/src/test/java/org/antlr/test/TestAutoAST.java
+++ b/tool/src/test/java/org/antlr/test/TestAutoAST.java
@@ -369,7 +369,7 @@ public class TestAutoAST extends BaseTest {
@Test
public void testSetRootWithLabel() throws Exception {
-
+
String grammar =
"grammar T;\n" +
"options {output=AST;}\n" +
@@ -807,7 +807,7 @@ public class TestAutoAST extends BaseTest {
// S U P P O R T
- public void _test() throws Exception {
+ private void _test() throws Exception {
String grammar =
"grammar T;\n" +
"options {output=AST;}\n" +
diff --git a/tool/src/test/java/org/antlr/test/TestCharDFAConversion.java b/tool/src/test/java/org/antlr/test/TestCharDFAConversion.java
index c1af910..8dd4e06 100644
--- a/tool/src/test/java/org/antlr/test/TestCharDFAConversion.java
+++ b/tool/src/test/java/org/antlr/test/TestCharDFAConversion.java
@@ -499,7 +499,7 @@ public class TestCharDFAConversion extends BaseTest {
// S U P P O R T
- public void _template() throws Exception {
+ private void _template() throws Exception {
Grammar g = new Grammar(
"grammar T;\n"+
"a : A | B;");
diff --git a/tool/src/test/java/org/antlr/test/TestDFAConversion.java b/tool/src/test/java/org/antlr/test/TestDFAConversion.java
index b30bd20..cd06d64 100644
--- a/tool/src/test/java/org/antlr/test/TestDFAConversion.java
+++ b/tool/src/test/java/org/antlr/test/TestDFAConversion.java
@@ -1524,7 +1524,7 @@ As a result, alternative(s) 2 were disabled for that input
// S U P P O R T
- public void _template() throws Exception {
+ private void _template() throws Exception {
Grammar g = new Grammar(
"parser grammar t;\n"+
"a : A | B;");
diff --git a/tool/src/test/java/org/antlr/test/TestSemanticPredicateEvaluation.java b/tool/src/test/java/org/antlr/test/TestSemanticPredicateEvaluation.java
index 6da7f31..dfc9e9c 100644
--- a/tool/src/test/java/org/antlr/test/TestSemanticPredicateEvaluation.java
+++ b/tool/src/test/java/org/antlr/test/TestSemanticPredicateEvaluation.java
@@ -225,7 +225,7 @@ public class TestSemanticPredicateEvaluation extends BaseTest {
// S U P P O R T
- public void _test() throws Exception {
+ private void _test() throws Exception {
String grammar =
"grammar T;\n" +
"options {output=AST;}\n" +
diff --git a/tool/src/test/java/org/antlr/test/TestSemanticPredicates.java b/tool/src/test/java/org/antlr/test/TestSemanticPredicates.java
index 0ad540c..73b9bfe 100644
--- a/tool/src/test/java/org/antlr/test/TestSemanticPredicates.java
+++ b/tool/src/test/java/org/antlr/test/TestSemanticPredicates.java
@@ -185,7 +185,7 @@ public class TestSemanticPredicates extends BaseTest {
".s1-B->:s2=>1\n";
checkDecision(g, 1, expecting, new int[] {2},
new int[] {1,2}, "A B", new int[] {1}, null, 3);
- }
+ }
*/
@Test public void testHoist2() throws Exception {
@@ -768,7 +768,7 @@ public class TestSemanticPredicates extends BaseTest {
// S U P P O R T
- public void _template() throws Exception {
+ private void _template() throws Exception {
Grammar g = new Grammar(
"parser grammar t;\n"+
"a : A | B;");
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-05 01:54:00 +0000