Merge remote-tracking branch 'mb/antlr4-support' into languages.antlr
diff --git a/ide/libs.antlr4.runtime/external/antlr4-runtime-4.7.2-license.txt b/ide/libs.antlr4.runtime/external/antlr4-runtime-4.7.2-license.txt
index 4dbaf42..8a2f197 100644
--- a/ide/libs.antlr4.runtime/external/antlr4-runtime-4.7.2-license.txt
+++ b/ide/libs.antlr4.runtime/external/antlr4-runtime-4.7.2-license.txt
@@ -4,6 +4,7 @@
License: BSD-antlr-runtime4
Origin: Antlr
URL: https://www.antlr.org
+Files: antlr4-runtime-4.7.2.jar, antlr4-4.7.2.jar, ST4-4.1.jar
Use of Antlr version 4.7.2 is governed by the terms of the license below:
diff --git a/ide/libs.antlr4.runtime/external/binaries-list b/ide/libs.antlr4.runtime/external/binaries-list
index 1c223a2..1714789 100644
--- a/ide/libs.antlr4.runtime/external/binaries-list
+++ b/ide/libs.antlr4.runtime/external/binaries-list
@@ -16,5 +16,4 @@
# under the License.
E27D8AB4F984F9D186F54DA984A6AB1CCCAC755E org.antlr:antlr4-runtime:4.7.2
93058C41A6CBB7F5CA63EDAC837F42C002DBC556 org.antlr:antlr4:4.7.2
-CD9CD41361C155F3AF0F653009DCECB08D8B4AFD org.antlr:antlr-runtime:3.5.2
467D508BE07A542AD0A68FFCAED2D561C5FB2E0C org.antlr:ST4:4.1
diff --git a/ide/libs.antlr4.runtime/src/org/netbeans/libs/antlr4/runtime/Bundle.properties b/ide/libs.antlr4.runtime/src/org/netbeans/libs/antlr4/runtime/Bundle.properties
index 4d55bba..5c0cc8b 100644
--- a/ide/libs.antlr4.runtime/src/org/netbeans/libs/antlr4/runtime/Bundle.properties
+++ b/ide/libs.antlr4.runtime/src/org/netbeans/libs/antlr4/runtime/Bundle.properties
@@ -16,7 +16,7 @@
# under the License.
-OpenIDE-Module-Name=Antlr 4.5 Runtime
+OpenIDE-Module-Name=Antlr 4 Runtime
OpenIDE-Module-Short-Description=Antlr Runtime Libraries
OpenIDE-Module-Long-Description=Contains Antlr 4.7.2 runtime libraries
OpenIDE-Module-Display-Category=Libraries
diff --git a/java/languages.antlr/build.xml b/java/languages.antlr/build.xml
index 914e8b7..935bec4 100644
--- a/java/languages.antlr/build.xml
+++ b/java/languages.antlr/build.xml
@@ -27,6 +27,36 @@
<import file="../../nbbuild/templates/projectized.xml"/>
<target name="download-antlr-grammar" depends="init">
+ <property name="antlr.additionalheader">
+
+@header{
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+// DO NOT EDIT THIS FILE MANUALLY!
+// SEE build.xml FOR INSTRUCTIONS
+
+package org.antlr.parser.antlr4;
+
+}
+
+</property>
<property name="antlr.outdir" location="${src.dir}/org/antlr/parser/antlr4"/>
<mkdir dir="${antlr.outdir}"/>
@@ -35,20 +65,28 @@
<get src="https://raw.githubusercontent.com/antlr/grammars-v4/${antlr4.grammar.version}/antlr/antlr4/LexBasic.g4" dest="${antlr.outdir}"/>
<get src="https://raw.githubusercontent.com/antlr/grammars-v4/${antlr4.grammar.version}/antlr/antlr4/Java/LexerAdaptor.java" dest="${antlr.outdir}"/>
<replace file="${antlr.outdir}/LexerAdaptor.java" token="//package" value="package"/>
+ <replaceregexp match="(parser|lexer) grammar ([^;]+);([\n\r]*)"
+ replace="\1 grammar \2;${antlr.additionalheader}"
+ flags="g"
+ >
+ <fileset dir="${antlr.outdir}" includes="ANTLRv4Parser.g4 LexBasic.g4" />
+ </replaceregexp>
</target>
<target name="generate-antlr-parser" description="Regenerate the ANTLRv4 parser" depends="init">
<property name="antlr.outdir" location="${src.dir}/org/antlr/parser/antlr4"/>
<path id="antlr4.tool">
<fileset dir="../../ide/libs.antlr4.runtime/external" includes="*.jar"/>
+ <fileset dir="../../ide/libs.antlr3.runtime/external" includes="antlr-runtime-*.jar"/>
</path>
- <java classname="org.antlr.v4.Tool" classpathref="antlr4.tool">
- <arg value="-o"/><arg value="${antlr.outdir}"/>
- <!--arg value="-package"/><arg value="org.antlr.parser.antlr4"/-->
- <!--arg value="-visitor"/-->
- <arg value="${antlr.outdir}/ANTLRv4Lexer.g4"/>
- <arg value="${antlr.outdir}/ANTLRv4Parser.g4"/>
+ <java classname="org.antlr.v4.Tool" classpathref="antlr4.tool" fork="true" dir="${antlr.outdir}">
+ <arg value="-o"/>
+ <arg value="${antlr.outdir}"/>
+ <arg value="-package"/>
+ <arg value="org.antlr.parser.antlr4"/>
+ <arg value="ANTLRv4Lexer.g4"/>
+ <arg value="ANTLRv4Parser.g4"/>
</java>
<delete dir="${antlr.outdir}" includes="*.tokens"/>
diff --git a/java/languages.antlr/src/org/antlr/parser/antlr4/ANTLRv4Lexer.java b/java/languages.antlr/src/org/antlr/parser/antlr4/ANTLRv4Lexer.java
index e0b6e0e..e91592a 100644
--- a/java/languages.antlr/src/org/antlr/parser/antlr4/ANTLRv4Lexer.java
+++ b/java/languages.antlr/src/org/antlr/parser/antlr4/ANTLRv4Lexer.java
@@ -1,4 +1,5 @@
-// Generated from /home/lkishalmi/NetBeansProjects/netbeans/java/languages.antlr/src/org/antlr/parser/antlr4/ANTLRv4Lexer.g4 by ANTLR 4.7.2
+// Generated from ANTLRv4Lexer.g4 by ANTLR 4.7.2
+package org.antlr.parser.antlr4;
/*
* Licensed to the Apache Software Foundation (ASF) under one
diff --git a/java/languages.antlr/src/org/antlr/parser/antlr4/ANTLRv4Parser.java b/java/languages.antlr/src/org/antlr/parser/antlr4/ANTLRv4Parser.java
index 7df66de..7edf184 100644
--- a/java/languages.antlr/src/org/antlr/parser/antlr4/ANTLRv4Parser.java
+++ b/java/languages.antlr/src/org/antlr/parser/antlr4/ANTLRv4Parser.java
@@ -1,4 +1,5 @@
-// Generated from /home/lkishalmi/NetBeansProjects/netbeans/java/languages.antlr/src/org/antlr/parser/antlr4/ANTLRv4Parser.g4 by ANTLR 4.7.2
+// Generated from ANTLRv4Parser.g4 by ANTLR 4.7.2
+package org.antlr.parser.antlr4;
/*
* Licensed to the Apache Software Foundation (ASF) under one
diff --git a/java/languages.antlr/src/org/antlr/parser/antlr4/ANTLRv4ParserBaseListener.java b/java/languages.antlr/src/org/antlr/parser/antlr4/ANTLRv4ParserBaseListener.java
index a13ce6a..2030201 100644
--- a/java/languages.antlr/src/org/antlr/parser/antlr4/ANTLRv4ParserBaseListener.java
+++ b/java/languages.antlr/src/org/antlr/parser/antlr4/ANTLRv4ParserBaseListener.java
@@ -1,4 +1,5 @@
-// Generated from /home/lkishalmi/NetBeansProjects/netbeans/java/languages.antlr/src/org/antlr/parser/antlr4/ANTLRv4Parser.g4 by ANTLR 4.7.2
+// Generated from ANTLRv4Parser.g4 by ANTLR 4.7.2
+package org.antlr.parser.antlr4;
/*
* Licensed to the Apache Software Foundation (ASF) under one
diff --git a/java/languages.antlr/src/org/antlr/parser/antlr4/ANTLRv4ParserListener.java b/java/languages.antlr/src/org/antlr/parser/antlr4/ANTLRv4ParserListener.java
index 0366015..4748de3 100644
--- a/java/languages.antlr/src/org/antlr/parser/antlr4/ANTLRv4ParserListener.java
+++ b/java/languages.antlr/src/org/antlr/parser/antlr4/ANTLRv4ParserListener.java
@@ -1,4 +1,5 @@
-// Generated from /home/lkishalmi/NetBeansProjects/netbeans/java/languages.antlr/src/org/antlr/parser/antlr4/ANTLRv4Parser.g4 by ANTLR 4.7.2
+// Generated from ANTLRv4Parser.g4 by ANTLR 4.7.2
+package org.antlr.parser.antlr4;
/*
* Licensed to the Apache Software Foundation (ASF) under one
diff --git a/java/languages.antlr/src/org/antlr/parser/antlr4/LexBasic.g4 b/java/languages.antlr/src/org/antlr/parser/antlr4/LexBasic.g4
index 9384ad1..800f224 100644
--- a/java/languages.antlr/src/org/antlr/parser/antlr4/LexBasic.g4
+++ b/java/languages.antlr/src/org/antlr/parser/antlr4/LexBasic.g4
@@ -61,6 +61,7 @@
package org.antlr.parser.antlr4;
}
+
// ======================================================
// Lexer fragments
//
