New Upstream Snapshot - javacc4
Ready changes
Summary
Merged new upstream version: 7.0.12+git20220912.1.3c912ac+ds (was: 7.0.12).
Resulting package
Built on 2022-12-18T09:54 (took 6m20s)
The resulting binary packages can be installed (if you have the apt repository enabled) by running one of:
apt install -t fresh-snapshots javacc-docapt install -t fresh-snapshots javacc
Diff
diff --git a/.gitattributes b/.gitattributes
deleted file mode 100644
index da2af18..0000000
--- a/.gitattributes
+++ /dev/null
@@ -1,20 +0,0 @@
-# Auto detect text files and perform LF normalization
-* text=auto
-
-*.java text
-*.jj text
-*.jjt text
-*.html text
-*.css text
-*.js text
-*.sql text
-*.q text
-
-# Note: executable is a non-standard attribute, and it is used by the release plugin
-*.sh text eol=lf executable
-*.cgi text eol=lf executable
-
-*.bat text eol=crlf
-*.cmd text eol=crlf
-
-/contributors merge=union
diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml
deleted file mode 100644
index 9fa0bd3..0000000
--- a/.github/workflows/master.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-name: Java CI
-
-on: [push]
-
-jobs:
- build:
-
- runs-on: ubuntu-latest
-
- steps:
- - uses: actions/checkout@v2
- - name: Set up JDK 1.8
- uses: actions/setup-java@v1
- with:
- java-version: 1.8
- - name: Build with Maven
- run: mvn -B package --file pom.xml
diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index e6b9176..0000000
--- a/.gitignore
+++ /dev/null
@@ -1,51 +0,0 @@
-.gradle
-.groovy
-.classpath
-.project
-.checkstyle
-.settings
-.idea
-*.iml
-/target/
-/build/
-/buildSrc/build/
-/buildSrc/subprojects/*/build/
-/examples/build/
-/examples/*/build/
-/test/build/
-/out/
-/buildSrc/out/
-/buildSrc/subprojects/*/out/
-/examples/out/
-/examples/*/out/
-/test/out/
-/bin/
-/buildSrc/bin/
-/buildSrc/subprojects/*/bin/
-/examples/bin/
-/examples/*/bin/
-/test/bin/
-build-eclipse
-!subprojects/plugin/src/test/resources/compiledJavaccFile/target
-
-.svn/
-
-/classes/
-.settings/
-/src/main/generated-sources/
-test.tmp/
-tmp/
-.gradle/
-TEST-*
-**/out-dir/
-*.*~
-*.asc
-examples/JJTreeExamples/cpp/eg*/
-**/gen/
-
-javacc-*.tar.gz
-javacc-*.zip
-dist/
-ant.log
-mvn.log
-cobertura.ser
diff --git a/debian/changelog b/debian/changelog
index 64844c4..f275df2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+javacc (7.0.12+git20220912.1.3c912ac+ds-1) UNRELEASED; urgency=low
+
+ * New upstream snapshot.
+
+ -- Debian Janitor <janitor@jelmer.uk> Sun, 18 Dec 2022 09:50:32 -0000
+
javacc (7.0.12-1) unstable; urgency=medium
* New upstream release
diff --git a/docs/_config.yml b/docs/_config.yml
index 3f382b4..bb77f0c 100644
--- a/docs/_config.yml
+++ b/docs/_config.yml
@@ -9,10 +9,10 @@ title: JavaCC
description: The most popular parser generator for use with Java applications.
# Latest release
-version: 7.0.11
+version: 7.0.10
# Site URLs
github:
contributors_url: https://github.com/javacc/javacc/graphs/contributors
- zip_url: https://github.com/javacc/javacc/archive/javacc-7.0.11.zip
- tar_url: https://github.com/javacc/javacc/archive/javacc-7.0.11.tar.gz
+ zip_url: https://github.com/javacc/javacc/archive/javacc-7.0.10.zip
+ tar_url: https://github.com/javacc/javacc/archive/javacc-7.0.10.tar.gz
diff --git a/docs/documentation/grammar.md b/docs/documentation/grammar.md
index 5e99120..8844a79 100644
--- a/docs/documentation/grammar.md
+++ b/docs/documentation/grammar.md
@@ -66,7 +66,7 @@ javacc_input ::= javacc_options
"PARSER_BEGIN" "(" <IDENTIFIER> ")"
java_compilation_unit
"PARSER_END" "(" <IDENTIFIER> ")"
- ( production )+
+ ( production )*
<EOF>
```
diff --git a/docs/downloads.md b/docs/downloads.md
index 9b3af83..6a5df43 100644
--- a/docs/downloads.md
+++ b/docs/downloads.md
@@ -4,15 +4,13 @@
### <a name="stable"></a>All stable releases
-N.B. LOOKAHEAD functionality is broken from version 7.0.5. It will be fixed in version 7.0.10 and upper. In the interim, if you require LOOKAHEAD functionality, please use version 7.0.4.
+N.B. LOOKAHEAD functionality is broken from version 7.0.5. It will be fixed in version 7.0.10. In the interim, if you require LOOKAHEAD functionality, please use version 7.0.4.
-JavaCC 7.0.12 is our latest stable release.
+JavaCC 7.0.10 is our latest stable release.
All JavaCC releases are available via [GitHub](https://github.com/javacc/javacc/releases) and [Maven](https://mvnrepository.com/artifact/net.java.dev.javacc/javacc) including checksums and cryptographic signatures.
#### 7.0.x
-* JavaCC 7.0.12 - 2022-07-06 ([Source (zip)](https://github.com/javacc/javacc/archive/javacc-7.0.12.zip), [Source (tar.gz)](https://github.com/javacc/javacc/archive/javacc-7.0.12.tar.gz), [Binaries](https://repo1.maven.org/maven2/net/java/dev/javacc/javacc/7.0.12/javacc-7.0.12.jar), [Javadocs](https://repo1.maven.org/maven2/net/java/dev/javacc/javacc/7.0.12/javacc-7.0.12-javadoc.jar), [Release Notes](release-notes.md#javacc-7.0.12))
-* JavaCC 7.0.11 - 2020-11-22 ([Source (zip)](https://github.com/javacc/javacc/archive/javacc-7.0.11.zip), [Source (tar.gz)](https://github.com/javacc/javacc/archive/javacc-7.0.11.tar.gz), [Binaries](https://repo1.maven.org/maven2/net/java/dev/javacc/javacc/7.0.11/javacc-7.0.11.jar), [Javadocs](https://repo1.maven.org/maven2/net/java/dev/javacc/javacc/7.0.11/javacc-7.0.11-javadoc.jar), [Release Notes](release-notes.md#javacc-7.0.11))
* JavaCC 7.0.10 - 2020-11-22 ([Source (zip)](https://github.com/javacc/javacc/archive/javacc-7.0.10.zip), [Source (tar.gz)](https://github.com/javacc/javacc/archive/javacc-7.0.10.tar.gz), [Binaries](https://repo1.maven.org/maven2/net/java/dev/javacc/javacc/7.0.10/javacc-7.0.10.jar), [Javadocs](https://repo1.maven.org/maven2/net/java/dev/javacc/javacc/7.0.10/javacc-7.0.10-javadoc.jar), [Release Notes](release-notes.md#javacc-7.0.10))
* JavaCC 7.0.9 - 2020-06-22 ([Source (zip)](https://github.com/javacc/javacc/archive/javacc-7.0.9.zip), [Source (tar.gz)](https://github.com/javacc/javacc/archive/javacc-7.0.9.tar.gz), [Binaries](https://repo1.maven.org/maven2/net/java/dev/javacc/javacc/7.0.9/javacc-7.0.9.jar), [Javadocs](https://repo1.maven.org/maven2/net/java/dev/javacc/javacc/7.0.9/javacc-7.0.9-javadoc.jar), [Release Notes](release-notes.md#javacc-7.0.9))
* JavaCC 7.0.8 - 2020-06-22 ([Source (zip)](https://github.com/javacc/javacc/archive/javacc-7.0.8.zip), [Source (tar.gz)](https://github.com/javacc/javacc/archive/javacc-7.0.8.tar.gz), [Binaries](https://repo1.maven.org/maven2/net/java/dev/javacc/javacc/7.0.8/javacc-7.0.8.jar), [Javadocs](https://repo1.maven.org/maven2/net/java/dev/javacc/javacc/7.0.8/javacc-7.0.8-javadoc.jar), [Release Notes](release-notes.md#javacc-7.0.8))
@@ -36,9 +34,9 @@ All JavaCC releases are available via [GitHub](https://github.com/javacc/javacc/
To install JavaCC, navigate to the download directory and type:
```
-$ unzip javacc-7.0.12.zip
+$ unzip javacc-7.0.10.zip
or
-$ tar xvf javacc-7.0.12.tar.gz
+$ tar xvf javacc-7.0.10.tar.gz
```
Once you have completed installation add the `bin/` directory in the JavaCC installation to your `PATH`. The JavaCC, JJTree, and JJDoc invocation scripts/executables reside in this directory.
diff --git a/docs/index.md b/docs/index.md
index bad69b4..d2bced4 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -74,7 +74,7 @@ This example recognizes matching braces followed by zero or more line terminator
Examples of legal strings in this grammar are:
-`{}`, `{{{{{}}}}}` // ... etc
+`{}`, `{{{{{}}}}}` // ... etc
Examples of illegal strings are:
@@ -152,9 +152,9 @@ This guide will walk you through locally building the project, running an existi
### <a name="download"></a>Download & Installation
-JavaCC 7.0.12 is our latest stable release.
+JavaCC 7.0.10 is our latest stable release.
-* JavaCC 7.0.12 - ([Source (zip)](https://github.com/javacc/javacc/archive/javacc-7.0.12.zip), [Source (tar.gz)](https://github.com/javacc/javacc/archive/javacc-7.0.12.tar.gz), [Binaries](https://repo1.maven.org/maven2/net/java/dev/javacc/javacc/7.0.12/javacc-7.0.12.jar), [Javadocs](https://repo1.maven.org/maven2/net/java/dev/javacc/javacc/7.0.12/javacc-7.0.12-javadoc.jar), [Release Notes](release-notes.md#javacc-7.0.12))
+* JavaCC 7.0.10 - ([Source (zip)](https://github.com/javacc/javacc/archive/javacc-7.0.10.zip), [Source (tar.gz)](https://github.com/javacc/javacc/archive/javacc-7.0.10.tar.gz), [Binaries](https://repo1.maven.org/maven2/net/java/dev/javacc/javacc/7.0.10/javacc-7.0.10.jar), [Javadocs](https://repo1.maven.org/maven2/net/java/dev/javacc/javacc/7.0.10/javacc-7.0.10-javadoc.jar), [Release Notes](release-notes.md#javacc-7.0.10))
All JavaCC releases are available via [GitHub](https://github.com/javacc/javacc/releases) and [Maven](https://mvnrepository.com/artifact/net.java.dev.javacc/javacc) including checksums and cryptographic signatures.
@@ -168,16 +168,16 @@ The GitHub 8.0 branch contains the next generation of JavaCC that splits the fr
To install JavaCC, navigate to the download directory and type:
```
-$ unzip javacc-7.0.12.zip
+$ unzip javacc-7.0.10.zip
or
-$ tar xvf javacc-7.0.12.tar.gz
+$ tar xvf javacc-7.0.10.tar.gz
```
-Then place the binary `javacc-7.0.12.jar` in a new `target/` folder, and rename to `javacc.jar`.
+Then place the binary `javacc-7.0.10.jar` in a new `target/` folder, and rename to `javacc.jar`.
Once you have completed installation add the `scripts/` directory in the JavaCC installation to your `PATH`. The JavaCC, JJTree, and JJDoc invocation scripts/executables reside in this directory.
-On UNIX based systems, the scripts may not be executable immediately. This can be solved by using the command from the `javacc-7.0.12/` directory:
+On UNIX based systems, the scripts may not be executable immediately. This can be solved by using the command from the `javacc-7.0.10/` directory:
```
chmod +x scripts/javacc
@@ -288,7 +288,7 @@ User | Use Case
[Apache Calcite](https://calcite.apache.org/) | Parsing SQL statements | [Parser.jj](https://github.com/apache/calcite/blob/master/core/src/main/codegen/templates/Parser.jj)
[Apache Camel](https://camel.apache.org/) | Parsing stored SQL templates | [sspt.jj](https://github.com/apache/camel/blob/master/components/camel-sql/src/main/java/org/apache/camel/component/sql/stored/template/grammar/sspt.jj)
[Apache Jena](https://jena.apache.org/) | Parsing queries written in SPARQL, ARQ, SSE, Turtle and JSON | [sparql_10](https://github.com/apache/jena/blob/master/jena-arq/Grammar/Final/sparql_10-final.jj), [sparql_11](https://github.com/apache/jena/blob/master/jena-arq/Grammar/Final/sparql_11-final.jj), [arq.jj](https://github.com/apache/jena/blob/master/jena-arq/Grammar/arq.jj), [sse.jj](https://github.com/apache/jena/blob/master/jena-arq/Grammar/sse/sse.jj), [turtle.jj](https://github.com/apache/jena/blob/master/jena-arq/Grammar/turtle.jj), [json.jj](https://github.com/apache/jena/blob/master/jena-arq/Grammar/JSON/json.jj)
-[Apache Lucene](https://lucene.apache.org/) | Parsing search queries | [QueryParser.jj](https://github.com/apache/lucene/tree/main/lucene/queryparser/src/java/org/apache/lucene/queryparser/classic/QueryParser.jj)
+[Apache Lucene](https://lucene.apache.org/) | Parsing search queries | [QueryParser.jj](https://github.com/apache/lucene-solr/blob/master/lucene/queryparser/src/java/org/apache/lucene/queryparser/classic/QueryParser.jj)
[Apache Tomcat](https://tomcat.apache.org/) | Parsing Expression Language (EL) and JSON | [ELParser.jjt](https://github.com/apache/tomcat/blob/master/java/org/apache/el/parser/ELParser.jjt), [JSONParser.jj](https://github.com/apache/tomcat/blob/master/java/org/apache/tomcat/util/json/JSONParser.jj)
[Apache Zookeeper](https://zookeeper.apache.org/) | Optimising serialisation/deserialisation of Hadoop I/O records | [rcc.jj](https://github.com/apache/zookeeper/blob/master/zookeeper-jute/src/main/java/org/apache/jute/compiler/generated/rcc.jj)
[Java Parser](https://javaparser.org/) | Parsing Java language files | [java.jj](https://github.com/javaparser/javaparser/blob/master/javaparser-core/src/main/javacc/java.jj)
diff --git a/docs/release-notes.md b/docs/release-notes.md
index 54e268f..97ad33e 100644
--- a/docs/release-notes.md
+++ b/docs/release-notes.md
@@ -31,7 +31,6 @@ It also includes the change history for JJTree, JJDoc and the C++ versions of Ja
#### 7.0.x
-* [7.0.12](#javacc-7.0.12)
* [7.0.11](#javacc-7.0.11)
* [7.0.10](#javacc-7.0.10)
* [7.0.9](#javacc-7.0.9)
@@ -95,32 +94,6 @@ It also includes the change history for JJTree, JJDoc and the C++ versions of Ja
<br>
-### MODIFICATIONS IN VERSION <a name="javacc-7.0.12"></a>7.0.12
----
- <br>
-* \#230 : Remove unused char from TokenMgrError.template in LexicalEr
-* \#228 : Remove redundant cast in TokenMgrError template
-* \#224 : Production part in javacc_input cannot be omitted
-* \#223 : Fix annotations for JavaCharStream
-* \#222 : Generate max. one deprecated annotation per method
-* \#219 : Fix mismatched javadoc
-* \#213 : Fix legacy links to Apache Lucene's grammar file
-* \#212 : Test for allocation expression #189
-* \#211 : Bad defaultVisit() method generated
-* \#210 : Another change for marked for removal
-* \#209 : Improve lexical error message
-* \#208 : Relocated misplaced annotations
-* \#207 : Changed methods marked for removal
-* \#206 : Build xml improvements
-* \#205 : Small fixes on warnings
-* \#203 : Missing change for doc for token_manager_decls (issue #190)
-* \#202 : Fix doc for token_manager_decls (issue #190)
-* \#200 : Update index.md and _config.yml
-
-* \#199 : Fix QueryParser.jj url in READMD
-
-<br>
-
### MODIFICATIONS IN VERSION <a name="javacc-7.0.11"></a>7.0.11
---
<br>
diff --git a/pom.xml b/pom.xml
index 7dbf6b3..386ae03 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
<groupId>net.java.dev.javacc</groupId>
<artifactId>javacc</artifactId>
<name>JavaCC</name>
- <version>7.0.12</version>
+ <version>7.0.11-SNAPSHOT</version>
<description>JavaCC is a parser/scanner generator for java. </description>
<url>https://github.com/javacc/javacc</url>
@@ -21,7 +21,7 @@
<url>https://github.com/javacc/javacc</url>
<connection>scm:git:https://github.com/javacc/javacc.git</connection>
<developerConnection>scm:git:ssh://git@github.com/javacc/javacc.git</developerConnection>
- <tag>javacc-7.0.12</tag>
+ <tag>HEAD</tag>
</scm>
<mailingLists>
<mailingList>
@@ -310,7 +310,7 @@
<arg line="examples/GUIParsing/ParserVersion/CalcInput.jj" />
</java>
<javac fork="true" srcdir="test.tmp/GUIParsing/ParserVersion" />
- <!--
+ <!--
<echo />
<copy todir="test.tmp/GUIParsing/TokenMgrVersion">
<fileset dir="examples/GUIParsing/TokenMgrVersion">
@@ -318,7 +318,7 @@
</fileset>
</copy>
<java failonerror="true" fork="true" classname="javacc" classpath="target/classes">
- <arg line="-OUTPUT_DIRECTORY=test.tmp/GUIParsing/TokenMgrVersion" />
+ <arg line="-OUTPUT_DIRECTORY=test.tmp/GUIParsing/TokenMgrVersion" />
<arg line="examples/GUIParsing/TokenMgrVersion/CalcInput.jj" />
</java>
<javac fork="true" srcdir="test.tmp/GUIParsing/TokenMgrVersion" />
@@ -554,21 +554,6 @@
<arg line="examples/Obfuscator/MapFile.jj" />
</java>
<javac fork="true" srcdir="test.tmp/Obfuscator" />
-
- <echo />
- <java failonerror="true" fork="true" classname="javacc" classpath="target/classes">
- <arg line="-OUTPUT_DIRECTORY=test.tmp/gwtTemplate" />
- <arg line="test/gwtTemplate/Parser.jj" />
- </java>
- <javac fork="true" srcdir="test.tmp/gwtTemplate" />
-
- <echo />
- <java failonerror="true" fork="true" classname="javacc" classpath="target/classes">
- <arg line="-OUTPUT_DIRECTORY=test.tmp/gwtUnicodeTemplate" />
- <arg line="test/gwtUnicodeTemplate/Parser.jj" />
- </java>
- <javac fork="true" srcdir="test.tmp/gwtUnicodeTemplate" />
-
<!-- TODO, test cases for SimpleExamples -->
<echo />
<copy todir="test.tmp/Transformer">
@@ -662,7 +647,7 @@
</execution>
</executions>
</plugin>
- <!--
+ <!--
<plugin>
<artifactId>maven-jarsigner-plugin</artifactId>
<executions>
diff --git a/src/main/resources/templates/TokenMgrError.template b/src/main/resources/templates/TokenMgrError.template
index e5dd31f..38117e3 100644
--- a/src/main/resources/templates/TokenMgrError.template
+++ b/src/main/resources/templates/TokenMgrError.template
@@ -1,4 +1,5 @@
/** Token Manager Error. */
+${GENERATE_ANNOTATIONS?@SuppressWarnings("all") :}
${SUPPORT_CLASS_VISIBILITY_PUBLIC?public :}class ${LEGACY_EXCEPTION_HANDLING?TokenMgrError:TokenMgrException} extends ${LEGACY_EXCEPTION_HANDLING?Error:RuntimeException}
{
@@ -102,7 +103,7 @@ ${SUPPORT_CLASS_VISIBILITY_PUBLIC?public :}class ${LEGACY_EXCEPTION_HANDLING?Tok
return("Lexical error at line " + //
errorLine + ", column " + //
errorColumn + ". Encountered: " + //
- (EOFSeen ? "<EOF>" : ("'" + addEscapes(String.valueOf(curChar)) + "' (" + curChar + "),")) + //
+ (EOFSeen ? "<EOF>" : ("'" + addEscapes(String.valueOf((char) curChar)) + "' (" + curChar + "),")) + //
(errorAfter == null || errorAfter.length() == 0 ? "" : " after prefix \"" + addEscapes(errorAfter) + "\"")) + //
(lexState == 0 ? "" : " (in lexical state " + lexState + ")");
}
diff --git a/src/main/resources/templates/gwt/JavaCharStream.template b/src/main/resources/templates/gwt/JavaCharStream.template
index ffbcdca..4433134 100644
--- a/src/main/resources/templates/gwt/JavaCharStream.template
+++ b/src/main/resources/templates/gwt/JavaCharStream.template
@@ -2,7 +2,7 @@
* An implementation of interface CharStream, where the stream is assumed to
* contain only ASCII characters (with java-like unicode escape processing).
*/
-
+
#if SUPPORT_CLASS_VISIBILITY_PUBLIC
public
@@ -380,13 +380,14 @@ class JavaCharStream
}
}
+#if GENERATE_ANNOTATIONS
+ @Deprecated
+#fi
/**
* @deprecated
* @see #getEndColumn
*/
-#if GENERATE_ANNOTATIONS
@Deprecated
-#fi
${PREFIX}public int getColumn() {
#if KEEP_LINE_COLUMN
return bufcolumn[bufpos];
@@ -395,13 +396,14 @@ class JavaCharStream
#fi
}
+#if GENERATE_ANNOTATIONS
+ @Deprecated
+#fi
/**
* @deprecated
* @see #getEndLine
*/
-#if GENERATE_ANNOTATIONS
@Deprecated
-#fi
${PREFIX}public int getLine() {
#if KEEP_LINE_COLUMN
return bufline[bufpos];
diff --git a/src/main/resources/templates/gwt/Provider.template b/src/main/resources/templates/gwt/Provider.template
index 678b935..f91f52d 100644
--- a/src/main/resources/templates/gwt/Provider.template
+++ b/src/main/resources/templates/gwt/Provider.template
@@ -5,8 +5,8 @@ public interface Provider {
/**
* Reads characters into an array
* @param buffer Destination buffer
- * @param offset Offset at which to start storing characters
- * @param len The maximum possible number of characters to read
+ * @param offset Offset at which to start storing characters
+ * @param length The maximum possible number of characters to read
* @return The number of characters read, or -1 if all read
* @exception IOException
*/
@@ -19,4 +19,4 @@ public interface Provider {
*/
public void close() throws IOException;
-}
+}
\ No newline at end of file
diff --git a/src/main/resources/templates/gwt/SimpleCharStream.template b/src/main/resources/templates/gwt/SimpleCharStream.template
index a1de1e3..9c88437 100644
--- a/src/main/resources/templates/gwt/SimpleCharStream.template
+++ b/src/main/resources/templates/gwt/SimpleCharStream.template
@@ -215,13 +215,14 @@ ${SUPPORT_CLASS_VISIBILITY_PUBLIC?public :}class SimpleCharStream
return c;
}
+#if GENERATE_ANNOTATIONS
+ @Deprecated
+#fi
/**
* @deprecated
* @see #getEndColumn
*/
-#if GENERATE_ANNOTATIONS
@Deprecated
-#fi
${PREFIX}public int getColumn() {
#if KEEP_LINE_COLUMN
return bufcolumn[bufpos];
@@ -230,13 +231,14 @@ ${SUPPORT_CLASS_VISIBILITY_PUBLIC?public :}class SimpleCharStream
#fi
}
+#if GENERATE_ANNOTATIONS
+ @Deprecated
+#fi
/**
* @deprecated
* @see #getEndLine
*/
-#if GENERATE_ANNOTATIONS
@Deprecated
-#fi
${PREFIX}public int getLine() {
#if KEEP_LINE_COLUMN
return bufline[bufpos];
diff --git a/src/main/resources/version.properties b/src/main/resources/version.properties
index e9125c7..2686610 100644
--- a/src/main/resources/version.properties
+++ b/src/main/resources/version.properties
@@ -1,3 +1,3 @@
version.major=7
version.minor=0
-version.patch=12
+version.patch=11
diff --git a/test/gwtTemplate/Parser.jj b/test/gwtTemplate/Parser.jj
deleted file mode 100644
index e784b4f..0000000
--- a/test/gwtTemplate/Parser.jj
+++ /dev/null
@@ -1,76 +0,0 @@
-/* Copyright (c) 2006, Sun Microsystems, Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * * Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * * Neither the name of the Sun Microsystems, Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-
-options {
- LOOKAHEAD = 1;
- CHOICE_AMBIGUITY_CHECK = 2;
- OTHER_AMBIGUITY_CHECK = 1;
- STATIC = true;
- DEBUG_PARSER = false;
- DEBUG_LOOKAHEAD = false;
- DEBUG_TOKEN_MANAGER = false;
- ERROR_REPORTING = true;
- JAVA_UNICODE_ESCAPE = false;
- UNICODE_INPUT = false;
- IGNORE_CASE = false;
- USER_TOKEN_MANAGER = false;
- USER_CHAR_STREAM = false;
- BUILD_PARSER = true;
- BUILD_TOKEN_MANAGER = true;
- SANITY_CHECK = true;
- FORCE_LA_CHECK = false;
- JAVA_TEMPLATE_TYPE = "modern";
-}
-
-PARSER_BEGIN(Parser)
-
-import java.io.IOException;
-
-/** Simple brace matcher. */
-public class Parser {
-
- /** Main entry point. */
- public static void main(String args[]) throws ParseException, IOException {
- Parser parser = new Parser(new StreamProvider(System.in));
- parser.Input();
- }
-
-}
-
-PARSER_END(Parser)
-
-/** Root production. */
-void Input() :
-{}
-{
-
- "A" {
- System.out.println("hello");
- } <EOF>
-}
diff --git a/test/gwtUnicodeTemplate/Parser.jj b/test/gwtUnicodeTemplate/Parser.jj
deleted file mode 100644
index 4847e08..0000000
--- a/test/gwtUnicodeTemplate/Parser.jj
+++ /dev/null
@@ -1,76 +0,0 @@
-/* Copyright (c) 2006, Sun Microsystems, Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * * Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * * Neither the name of the Sun Microsystems, Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-
-options {
- LOOKAHEAD = 1;
- CHOICE_AMBIGUITY_CHECK = 2;
- OTHER_AMBIGUITY_CHECK = 1;
- STATIC = true;
- DEBUG_PARSER = false;
- DEBUG_LOOKAHEAD = false;
- DEBUG_TOKEN_MANAGER = false;
- ERROR_REPORTING = true;
- JAVA_UNICODE_ESCAPE = true;
- UNICODE_INPUT = false;
- IGNORE_CASE = false;
- USER_TOKEN_MANAGER = false;
- USER_CHAR_STREAM = false;
- BUILD_PARSER = true;
- BUILD_TOKEN_MANAGER = true;
- SANITY_CHECK = true;
- FORCE_LA_CHECK = false;
- JAVA_TEMPLATE_TYPE = "modern";
-}
-
-PARSER_BEGIN(Parser)
-
-import java.io.IOException;
-
-/** Simple brace matcher. */
-public class Parser {
-
- /** Main entry point. */
- public static void main(String args[]) throws ParseException, IOException {
- Parser parser = new Parser(new StreamProvider(System.in));
- parser.Input();
- }
-
-}
-
-PARSER_END(Parser)
-
-/** Root production. */
-void Input() :
-{}
-{
-
- "A" {
- System.out.println("hello");
- } <EOF>
-}
diff --git a/test/java7features/Parser.jj b/test/java7features/Parser.jj
index 748bc52..8beadf9 100644
--- a/test/java7features/Parser.jj
+++ b/test/java7features/Parser.jj
@@ -52,10 +52,6 @@ PARSER_BEGIN(Parser)
/** Simple brace matcher. */
public class Parser {
- // to test issue #189
- private java.util.List<String> list1 = new java.util.ArrayList<String>();
- private java.util.List<String> list2 = new java.util.ArrayList<>();
-
/** Main entry point. */
public static void main(String args[]) throws ParseException {
Parser parser = new Parser(System.in);
diff --git a/test/javaFileGeneration/expected/no-keep-line/TokenMgrError.java b/test/javaFileGeneration/expected/no-keep-line/TokenMgrError.java
index fb99ce6..619baaf 100644
--- a/test/javaFileGeneration/expected/no-keep-line/TokenMgrError.java
+++ b/test/javaFileGeneration/expected/no-keep-line/TokenMgrError.java
@@ -104,7 +104,7 @@ public class TokenMgrError extends Error
return("Lexical error at line " +
errorLine + ", column " +
errorColumn + ". Encountered: " +
- (EOFSeen ? "<EOF> " : ("\"" + addEscapes(String.valueOf(curChar)) + "\"") + " (" + curChar + "), ") +
+ (EOFSeen ? "<EOF> " : ("\"" + addEscapes(String.valueOf((char) curChar)) + "\"") + " (" + curChar + "), ") +
"after : \"" + addEscapes(errorAfter) + "\"");
}
diff --git a/test/javaFileGeneration/expected/non-static/TokenMgrError.java b/test/javaFileGeneration/expected/non-static/TokenMgrError.java
index fb99ce6..619baaf 100644
--- a/test/javaFileGeneration/expected/non-static/TokenMgrError.java
+++ b/test/javaFileGeneration/expected/non-static/TokenMgrError.java
@@ -104,7 +104,7 @@ public class TokenMgrError extends Error
return("Lexical error at line " +
errorLine + ", column " +
errorColumn + ". Encountered: " +
- (EOFSeen ? "<EOF> " : ("\"" + addEscapes(String.valueOf(curChar)) + "\"") + " (" + curChar + "), ") +
+ (EOFSeen ? "<EOF> " : ("\"" + addEscapes(String.valueOf((char) curChar)) + "\"") + " (" + curChar + "), ") +
"after : \"" + addEscapes(errorAfter) + "\"");
}
diff --git a/test/javaFileGeneration/expected/not-public/TokenMgrError.java b/test/javaFileGeneration/expected/not-public/TokenMgrError.java
index 2e8fac1..6909b87 100644
--- a/test/javaFileGeneration/expected/not-public/TokenMgrError.java
+++ b/test/javaFileGeneration/expected/not-public/TokenMgrError.java
@@ -104,7 +104,7 @@ class TokenMgrError extends Error
return("Lexical error at line " +
errorLine + ", column " +
errorColumn + ". Encountered: " +
- (EOFSeen ? "<EOF> " : ("\"" + addEscapes(String.valueOf(curChar)) + "\"") + " (" + curChar + "), ") +
+ (EOFSeen ? "<EOF> " : ("\"" + addEscapes(String.valueOf((char) curChar)) + "\"") + " (" + curChar + "), ") +
"after : \"" + addEscapes(errorAfter) + "\"");
}
diff --git a/test/javaFileGeneration/expected/static/TokenMgrError.java b/test/javaFileGeneration/expected/static/TokenMgrError.java
index fb99ce6..619baaf 100644
--- a/test/javaFileGeneration/expected/static/TokenMgrError.java
+++ b/test/javaFileGeneration/expected/static/TokenMgrError.java
@@ -104,7 +104,7 @@ public class TokenMgrError extends Error
return("Lexical error at line " +
errorLine + ", column " +
errorColumn + ". Encountered: " +
- (EOFSeen ? "<EOF> " : ("\"" + addEscapes(String.valueOf(curChar)) + "\"") + " (" + curChar + "), ") +
+ (EOFSeen ? "<EOF> " : ("\"" + addEscapes(String.valueOf((char) curChar)) + "\"") + " (" + curChar + "), ") +
"after : \"" + addEscapes(errorAfter) + "\"");
}