You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by an...@apache.org on 2015/04/25 16:29:32 UTC
jena git commit: Ensure the (unused) javacc/json parser builds
Repository: jena
Updated Branches:
refs/heads/jena3 dbee568bd -> acaa308fe
Ensure the (unused) javacc/json parser builds
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/acaa308f
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/acaa308f
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/acaa308f
Branch: refs/heads/jena3
Commit: acaa308fe583bd020ce7e08384dd1cac5f097c70
Parents: dbee568
Author: Andy Seaborne <an...@apache.org>
Authored: Sat Apr 25 15:29:25 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Sat Apr 25 15:29:25 2015 +0100
----------------------------------------------------------------------
jena-arq/Grammar/JSON/json | 11 +++----
jena-arq/Grammar/JSON/json.jj | 2 +-
.../org/apache/jena/atlas/iterator/Filter.java | 1 +
.../io/parserjavacc/javacc/JSON_Parser.java | 2 +-
.../io/parserjavacc/javacc/JavaCharStream.java | 2 +-
.../io/parserjavacc/javacc/ParseException.java | 30 +++++++++-----------
.../json/io/parserjavacc/javacc/Token.java | 2 +-
.../io/parserjavacc/javacc/TokenMgrError.java | 4 +--
8 files changed, 26 insertions(+), 28 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/acaa308f/jena-arq/Grammar/JSON/json
----------------------------------------------------------------------
diff --git a/jena-arq/Grammar/JSON/json b/jena-arq/Grammar/JSON/json
index ac77ed0..8f00775 100755
--- a/jena-arq/Grammar/JSON/json
+++ b/jena-arq/Grammar/JSON/json
@@ -19,7 +19,7 @@
GRAMMAR="${GRAMMAR:-"json.jj"}"
ROOT="../.."
-PKG=org/openjena/atlas/json/io/parserjavacc/javacc
+PKG=org/apache/jena/atlas/json/io/parserjavacc/javacc
# --------------------------------------------------------
@@ -84,10 +84,11 @@ function grammar
-e 's/public String getMessage/@Override public String getMessage/' < $F > F
mv F $F
-## echo "---- Fixing Java warnings in ${CLASS} ..."
-## F="$DIR/${CLASS}.java"
-## cat $F > F
-## mv F $F
+ echo "---- Fixing Java warnings in ${CLASS} ..."
+ F="$DIR/${CLASS}.java"
+ sed -e 's/public class /\n@SuppressWarnings("all")\npublic class /' < $F > F
+ mv F $F
+
echo "---- Done"
}
http://git-wip-us.apache.org/repos/asf/jena/blob/acaa308f/jena-arq/Grammar/JSON/json.jj
----------------------------------------------------------------------
diff --git a/jena-arq/Grammar/JSON/json.jj b/jena-arq/Grammar/JSON/json.jj
index 2e9a341..5e236d6 100644
--- a/jena-arq/Grammar/JSON/json.jj
+++ b/jena-arq/Grammar/JSON/json.jj
@@ -2,7 +2,7 @@
// (Run through cpp -P -C first)
#endif
-#define PACKAGE org.openjena.atlas.json.io.parserjavacc.javacc
+#define PACKAGE org.apache.jena.atlas.json.io.parserjavacc.javacc
#define CLASS JSON_Parser
#define PARSERBASE JSON_ParserBase
http://git-wip-us.apache.org/repos/asf/jena/blob/acaa308f/jena-arq/src/main/java/org/apache/jena/atlas/iterator/Filter.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/atlas/iterator/Filter.java b/jena-arq/src/main/java/org/apache/jena/atlas/iterator/Filter.java
index c3926af..5d427c5 100644
--- a/jena-arq/src/main/java/org/apache/jena/atlas/iterator/Filter.java
+++ b/jena-arq/src/main/java/org/apache/jena/atlas/iterator/Filter.java
@@ -18,4 +18,5 @@
package org.apache.jena.atlas.iterator;
+@FunctionalInterface
public interface Filter <T> { boolean accept(T item) ; }
http://git-wip-us.apache.org/repos/asf/jena/blob/acaa308f/jena-arq/src/main/java/org/apache/jena/atlas/json/io/parserjavacc/javacc/JSON_Parser.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/atlas/json/io/parserjavacc/javacc/JSON_Parser.java b/jena-arq/src/main/java/org/apache/jena/atlas/json/io/parserjavacc/javacc/JSON_Parser.java
index 94485ed..b20ae62 100644
--- a/jena-arq/src/main/java/org/apache/jena/atlas/json/io/parserjavacc/javacc/JSON_Parser.java
+++ b/jena-arq/src/main/java/org/apache/jena/atlas/json/io/parserjavacc/javacc/JSON_Parser.java
@@ -17,7 +17,7 @@
* limitations under the License.
*/
package org.apache.jena.atlas.json.io.parserjavacc.javacc ;
-//This is javacc generated code
+
@SuppressWarnings("all")
public class JSON_Parser extends JSON_ParserBase implements JSON_ParserConstants {
http://git-wip-us.apache.org/repos/asf/jena/blob/acaa308f/jena-arq/src/main/java/org/apache/jena/atlas/json/io/parserjavacc/javacc/JavaCharStream.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/atlas/json/io/parserjavacc/javacc/JavaCharStream.java b/jena-arq/src/main/java/org/apache/jena/atlas/json/io/parserjavacc/javacc/JavaCharStream.java
index 2c7dfe7..fab21a0 100644
--- a/jena-arq/src/main/java/org/apache/jena/atlas/json/io/parserjavacc/javacc/JavaCharStream.java
+++ b/jena-arq/src/main/java/org/apache/jena/atlas/json/io/parserjavacc/javacc/JavaCharStream.java
@@ -631,4 +631,4 @@ class JavaCharStream
}
}
-/* JavaCC - OriginalChecksum=a710e6974f4d01033f48ada97dfeacc0 (do not edit this line) */
+/* JavaCC - OriginalChecksum=196c0cb0362108148ef203f6aeebbb2e (do not edit this line) */
http://git-wip-us.apache.org/repos/asf/jena/blob/acaa308f/jena-arq/src/main/java/org/apache/jena/atlas/json/io/parserjavacc/javacc/ParseException.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/atlas/json/io/parserjavacc/javacc/ParseException.java b/jena-arq/src/main/java/org/apache/jena/atlas/json/io/parserjavacc/javacc/ParseException.java
index 6ca8ff4..60f1b18 100644
--- a/jena-arq/src/main/java/org/apache/jena/atlas/json/io/parserjavacc/javacc/ParseException.java
+++ b/jena-arq/src/main/java/org/apache/jena/atlas/json/io/parserjavacc/javacc/ParseException.java
@@ -106,24 +106,20 @@ public class ParseException extends Exception {
int[][] expectedTokenSequences,
String[] tokenImage) {
String eol = System.getProperty("line.separator", "\n");
- StringBuilder expected = new StringBuilder();
+ StringBuffer expected = new StringBuffer();
int maxSize = 0;
- for ( int[] expectedTokenSequence : expectedTokenSequences )
- {
- if ( maxSize < expectedTokenSequence.length )
- {
- maxSize = expectedTokenSequence.length;
- }
- for ( int anExpectedTokenSequence : expectedTokenSequence )
- {
- expected.append( tokenImage[anExpectedTokenSequence] ).append( ' ' );
- }
- if ( expectedTokenSequence[expectedTokenSequence.length - 1] != 0 )
- {
- expected.append( "..." );
- }
- expected.append( eol ).append( " " );
+ for (int i = 0; i < expectedTokenSequences.length; i++) {
+ if (maxSize < expectedTokenSequences[i].length) {
+ maxSize = expectedTokenSequences[i].length;
}
+ for (int j = 0; j < expectedTokenSequences[i].length; j++) {
+ expected.append(tokenImage[expectedTokenSequences[i][j]]).append(' ');
+ }
+ if (expectedTokenSequences[i][expectedTokenSequences[i].length - 1] != 0) {
+ expected.append("...");
+ }
+ expected.append(eol).append(" ");
+ }
String retval = "Encountered \"";
Token tok = currentToken.next;
for (int i = 0; i < maxSize; i++) {
@@ -205,4 +201,4 @@ public class ParseException extends Exception {
}
}
-/* JavaCC - OriginalChecksum=d49aad1253f63d642305ff3b73d37570 (do not edit this line) */
+/* JavaCC - OriginalChecksum=463606632617d479003093b9f56b1b21 (do not edit this line) */
http://git-wip-us.apache.org/repos/asf/jena/blob/acaa308f/jena-arq/src/main/java/org/apache/jena/atlas/json/io/parserjavacc/javacc/Token.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/atlas/json/io/parserjavacc/javacc/Token.java b/jena-arq/src/main/java/org/apache/jena/atlas/json/io/parserjavacc/javacc/Token.java
index 9ccc77f..36dfd15 100644
--- a/jena-arq/src/main/java/org/apache/jena/atlas/json/io/parserjavacc/javacc/Token.java
+++ b/jena-arq/src/main/java/org/apache/jena/atlas/json/io/parserjavacc/javacc/Token.java
@@ -145,4 +145,4 @@ public class Token implements java.io.Serializable {
}
}
-/* JavaCC - OriginalChecksum=6ca5d02a354e0af4378cdc0566848097 (do not edit this line) */
+/* JavaCC - OriginalChecksum=3971e11e3f5d3a7a42a9e5b4073175bb (do not edit this line) */
http://git-wip-us.apache.org/repos/asf/jena/blob/acaa308f/jena-arq/src/main/java/org/apache/jena/atlas/json/io/parserjavacc/javacc/TokenMgrError.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/atlas/json/io/parserjavacc/javacc/TokenMgrError.java b/jena-arq/src/main/java/org/apache/jena/atlas/json/io/parserjavacc/javacc/TokenMgrError.java
index f7300dd..0284630 100644
--- a/jena-arq/src/main/java/org/apache/jena/atlas/json/io/parserjavacc/javacc/TokenMgrError.java
+++ b/jena-arq/src/main/java/org/apache/jena/atlas/json/io/parserjavacc/javacc/TokenMgrError.java
@@ -65,7 +65,7 @@ public class TokenMgrError extends Error
* equivalents in the given string
*/
protected static final String addEscapes(String str) {
- StringBuilder retval = new StringBuilder();
+ StringBuffer retval = new StringBuffer();
char ch;
for (int i = 0; i < str.length(); i++) {
switch (str.charAt(i))
@@ -161,4 +161,4 @@ public class TokenMgrError extends Error
this(LexicalError(EOFSeen, lexState, errorLine, errorColumn, errorAfter, curChar), reason);
}
}
-/* JavaCC - OriginalChecksum=7ad60310b6e6e85dbdd863d8920855a8 (do not edit this line) */
+/* JavaCC - OriginalChecksum=294422f12cf9922f9c5434a538289880 (do not edit this line) */