This is an automated email from the ASF dual-hosted git repository. andy pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/jena.git
commit 03fcac2003f0a90880a2a2d5108329d9365ca0dc Author: Andy Seaborne <[email protected]> AuthorDate: Sun May 11 17:11:53 2025 +0100 GH-3182: Generate parser code into a javacc subdirectory --- jena-arq/Grammar/arq.jj | 4 +-- jena-arq/Grammar/grammar | 2 +- jena-arq/Grammar/main.jj | 10 +++---- jena-arq/Grammar/sparql_12.jj | 4 +-- .../org/apache/jena/sparql/lang/ParserARQ.java | 6 ++-- .../apache/jena/sparql/lang/ParserARQUpdate.java | 6 ++-- .../apache/jena/sparql/lang/ParserSPARQL12.java | 6 ++-- .../jena/sparql/lang/ParserSPARQL12Update.java | 6 ++-- .../apache/jena/sparql/lang/arq/ARQParserBase.java | 2 +- .../sparql/lang/arq/{ => javacc}/ARQParser.java | 4 +-- .../lang/arq/{ => javacc}/ARQParserConstants.java | 2 +- .../arq/{ => javacc}/ARQParserTokenManager.java | 2 +- .../lang/arq/{ => javacc}/ParseException.java | 4 +-- .../lang/arq/{ => javacc}/SimpleCharStream.java | 4 +-- .../jena/sparql/lang/arq/{ => javacc}/Token.java | 4 +-- .../{sparql_12 => arq/javacc}/TokenMgrError.java | 4 +-- .../sparql/lang/sparql_12/SPARQLParser12Base.java | 2 +- .../sparql_12/{ => javacc}/JavaCharStream.java | 4 +-- .../sparql_12/{ => javacc}/ParseException.java | 4 +-- .../sparql_12/{ => javacc}/SPARQLParser12.java | 4 +-- .../{ => javacc}/SPARQLParser12Constants.java | 2 +- .../{ => javacc}/SPARQLParser12TokenManager.java | 2 +- .../sparql/lang/sparql_12/{ => javacc}/Token.java | 4 +-- .../{arq => sparql_12/javacc}/TokenMgrError.java | 4 +-- .../org/apache/jena/sparql/path/PathParser.java | 6 ++-- .../org/apache/jena/sparql/util/ExprUtils.java | 2 +- .../apache/jena/arq/querybuilder/Converters.java | 4 +-- .../arq/querybuilder/handlers/SelectHandler.java | 32 +++++++++++----------- .../handlers/SolutionModifierHandler.java | 6 ++-- 29 files changed, 73 insertions(+), 73 deletions(-) diff --git a/jena-arq/Grammar/arq.jj b/jena-arq/Grammar/arq.jj index 4d8c6f17cc..2347808552 100644 --- a/jena-arq/Grammar/arq.jj +++ b/jena-arq/Grammar/arq.jj @@ -23,7 +23,7 @@ options STATIC = false ; } PARSER_BEGIN(ARQParser) -package org.apache.jena.sparql.lang.arq ; +package org.apache.jena.sparql.lang.arq.javacc ; import org.apache.jena.graph.* ; import org.apache.jena.query.* ; import org.apache.jena.sparql.core.Var ; @@ -37,7 +37,7 @@ import org.apache.jena.sparql.modify.request.* ; import org.apache.jena.sparql.core.Quad ; import java.util.List; import java.util.ArrayList; -public class ARQParser extends ARQParserBase +public class ARQParser extends org.apache.jena.sparql.lang.arq.ARQParserBase {} PARSER_END(ARQParser) void QueryUnit(): { } diff --git a/jena-arq/Grammar/grammar b/jena-arq/Grammar/grammar index bb692fcd7e..993a7f028b 100755 --- a/jena-arq/Grammar/grammar +++ b/jena-arq/Grammar/grammar @@ -30,7 +30,7 @@ function grammar ## NAME="$(echo $N | tr '[:lower:]' '[:upper:]')" ## DIR1="$(echo $N | tr '[:upper:]' '[:lower:]')" - DIR="../src/main/java/org/apache/jena/sparql/lang/$PKG" + DIR="../src/main/java/org/apache/jena/sparql/lang/$PKG/javacc" (cd "$DIR" ; rm -f TokenMgrError.java ParseException.java Token.java JavaCharStream.java ) diff --git a/jena-arq/Grammar/main.jj b/jena-arq/Grammar/main.jj index efc2a660f5..3333fec921 100644 --- a/jena-arq/Grammar/main.jj +++ b/jena-arq/Grammar/main.jj @@ -38,15 +38,15 @@ #endif #ifdef SPARQL_12 -#define PACKAGE lang.sparql_12 +#define PACKAGE org.apache.jena.sparql.lang.sparql_12 #define CLASS SPARQLParser12 -#define PARSERBASE SPARQLParser12Base +#define PARSERBASE org.apache.jena.sparql.lang.sparql_12.SPARQLParser12Base #endif #ifdef ARQ -#define PACKAGE lang.arq +#define PACKAGE org.apache.jena.sparql.lang.arq #define CLASS ARQParser -#define PARSERBASE ARQParserBase +#define PARSERBASE org.apache.jena.sparql.lang.arq.ARQParserBase #endif options @@ -88,7 +88,7 @@ PARSER_BEGIN(CLASS) * limitations under the License. */ -package org.apache.jena.sparql.PACKAGE ; +package PACKAGE.javacc ; import org.apache.jena.graph.* ; import org.apache.jena.query.* ; diff --git a/jena-arq/Grammar/sparql_12.jj b/jena-arq/Grammar/sparql_12.jj index 664020f46b..f802ca3188 100644 --- a/jena-arq/Grammar/sparql_12.jj +++ b/jena-arq/Grammar/sparql_12.jj @@ -23,7 +23,7 @@ options STATIC = false ; } PARSER_BEGIN(SPARQLParser12) -package org.apache.jena.sparql.lang.sparql_12 ; +package org.apache.jena.sparql.lang.sparql_12.javacc ; import org.apache.jena.graph.* ; import org.apache.jena.query.* ; import org.apache.jena.sparql.core.Var ; @@ -34,7 +34,7 @@ import org.apache.jena.sparql.expr.aggregate.* ; import org.apache.jena.sparql.expr.aggregate.lib.* ; import org.apache.jena.update.* ; import org.apache.jena.sparql.modify.request.* ; -public class SPARQLParser12 extends SPARQLParser12Base +public class SPARQLParser12 extends org.apache.jena.sparql.lang.sparql_12.SPARQLParser12Base {} PARSER_END(SPARQLParser12) void QueryUnit(): { } diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/lang/ParserARQ.java b/jena-arq/src/main/java/org/apache/jena/sparql/lang/ParserARQ.java index bae0b73e1b..197effbe88 100644 --- a/jena-arq/src/main/java/org/apache/jena/sparql/lang/ParserARQ.java +++ b/jena-arq/src/main/java/org/apache/jena/sparql/lang/ParserARQ.java @@ -27,7 +27,7 @@ import org.apache.jena.query.QueryException; import org.apache.jena.query.QueryParseException; import org.apache.jena.query.Syntax; import org.apache.jena.shared.JenaException; -import org.apache.jena.sparql.lang.arq.ARQParser; +import org.apache.jena.sparql.lang.arq.javacc.ARQParser; import org.apache.jena.sparql.syntax.Element; import org.apache.jena.sparql.syntax.Template; @@ -86,9 +86,9 @@ public class ParserARQ extends SPARQLParser { query.setStrict(true); parser.setQuery(query); action.exec(parser); - } catch (org.apache.jena.sparql.lang.arq.ParseException ex) { + } catch (org.apache.jena.sparql.lang.arq.javacc.ParseException ex) { throw new QueryParseException(ex.getMessage(), ex.currentToken.beginLine, ex.currentToken.beginColumn); - } catch (org.apache.jena.sparql.lang.arq.TokenMgrError tErr) { + } catch (org.apache.jena.sparql.lang.arq.javacc.TokenMgrError tErr) { // Last valid token : not the same as token error message - but this // should not happen int col = parser.token.endColumn; diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/lang/ParserARQUpdate.java b/jena-arq/src/main/java/org/apache/jena/sparql/lang/ParserARQUpdate.java index 7a8baa3a31..1f2a8ac979 100644 --- a/jena-arq/src/main/java/org/apache/jena/sparql/lang/ParserARQUpdate.java +++ b/jena-arq/src/main/java/org/apache/jena/sparql/lang/ParserARQUpdate.java @@ -25,7 +25,7 @@ import org.apache.jena.query.QueryException; import org.apache.jena.query.QueryParseException; import org.apache.jena.shared.JenaException; import org.apache.jena.sparql.core.Prologue; -import org.apache.jena.sparql.lang.arq.ARQParser; +import org.apache.jena.sparql.lang.arq.javacc.ARQParser; import org.apache.jena.sparql.modify.UpdateSink; public class ParserARQUpdate extends UpdateParser { @@ -38,9 +38,9 @@ public class ParserARQUpdate extends UpdateParser { parser = new ARQParser(r); parser.setUpdate(prologue, sink); parser.UpdateUnit(); - } catch (org.apache.jena.sparql.lang.arq.ParseException ex) { + } catch (org.apache.jena.sparql.lang.arq.javacc.ParseException ex) { throw new QueryParseException(ex.getMessage(), ex.currentToken.beginLine, ex.currentToken.beginColumn); - } catch (org.apache.jena.sparql.lang.arq.TokenMgrError tErr) { + } catch (org.apache.jena.sparql.lang.arq.javacc.TokenMgrError tErr) { // Last valid token : not the same as token error message - but this // should not happen int col = parser.token.endColumn; diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/lang/ParserSPARQL12.java b/jena-arq/src/main/java/org/apache/jena/sparql/lang/ParserSPARQL12.java index 6db50ca3a7..1cabd774c4 100644 --- a/jena-arq/src/main/java/org/apache/jena/sparql/lang/ParserSPARQL12.java +++ b/jena-arq/src/main/java/org/apache/jena/sparql/lang/ParserSPARQL12.java @@ -27,7 +27,7 @@ import org.apache.jena.query.QueryException; import org.apache.jena.query.QueryParseException; import org.apache.jena.query.Syntax; import org.apache.jena.shared.JenaException; -import org.apache.jena.sparql.lang.sparql_12.SPARQLParser12; +import org.apache.jena.sparql.lang.sparql_12.javacc.SPARQLParser12; import org.apache.jena.sparql.syntax.Element; import org.apache.jena.sparql.syntax.Template; @@ -72,9 +72,9 @@ public class ParserSPARQL12 extends SPARQLParser query.setStrict(true); parser.setQuery(query); action.exec(parser); - } catch (org.apache.jena.sparql.lang.sparql_12.ParseException ex) { + } catch (org.apache.jena.sparql.lang.sparql_12.javacc.ParseException ex) { throw new QueryParseException(ex.getMessage(), ex.currentToken.beginLine, ex.currentToken.beginColumn); - } catch (org.apache.jena.sparql.lang.sparql_12.TokenMgrError tErr) { + } catch (org.apache.jena.sparql.lang.sparql_12.javacc.TokenMgrError tErr) { // Last valid token : not the same as token error message - but this // should not happen int col = parser.token.endColumn; diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/lang/ParserSPARQL12Update.java b/jena-arq/src/main/java/org/apache/jena/sparql/lang/ParserSPARQL12Update.java index 40313c8b8b..249f266613 100644 --- a/jena-arq/src/main/java/org/apache/jena/sparql/lang/ParserSPARQL12Update.java +++ b/jena-arq/src/main/java/org/apache/jena/sparql/lang/ParserSPARQL12Update.java @@ -25,7 +25,7 @@ import org.apache.jena.query.QueryException; import org.apache.jena.query.QueryParseException; import org.apache.jena.shared.JenaException; import org.apache.jena.sparql.core.Prologue; -import org.apache.jena.sparql.lang.sparql_12.SPARQLParser12; +import org.apache.jena.sparql.lang.sparql_12.javacc.SPARQLParser12; import org.apache.jena.sparql.modify.UpdateSink; import org.apache.jena.update.UpdateException; @@ -40,9 +40,9 @@ public class ParserSPARQL12Update extends UpdateParser parser = new SPARQLParser12(r); parser.setUpdate(prologue, sink); parser.UpdateUnit(); - } catch (org.apache.jena.sparql.lang.sparql_12.ParseException ex) { + } catch (org.apache.jena.sparql.lang.sparql_12.javacc.ParseException ex) { throw new QueryParseException(ex.getMessage(), ex.currentToken.beginLine, ex.currentToken.beginColumn); - } catch (org.apache.jena.sparql.lang.sparql_12.TokenMgrError tErr) { + } catch (org.apache.jena.sparql.lang.sparql_12.javacc.TokenMgrError tErr) { // Last valid token : not the same as token error message - but this // should not happen int col = parser.token.endColumn; diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/lang/arq/ARQParserBase.java b/jena-arq/src/main/java/org/apache/jena/sparql/lang/arq/ARQParserBase.java index a33a37ffe2..e3d0bcf29e 100644 --- a/jena-arq/src/main/java/org/apache/jena/sparql/lang/arq/ARQParserBase.java +++ b/jena-arq/src/main/java/org/apache/jena/sparql/lang/arq/ARQParserBase.java @@ -39,7 +39,7 @@ import org.apache.jena.sparql.syntax.ElementNamedGraph; import org.apache.jena.sparql.syntax.ElementPathBlock; import org.apache.jena.sparql.syntax.Template; -class ARQParserBase extends SPARQLParserBase +public class ARQParserBase extends SPARQLParserBase { // JSON JSONHandler handler = new JSONHandlerBase() ; diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/lang/arq/ARQParser.java b/jena-arq/src/main/java/org/apache/jena/sparql/lang/arq/javacc/ARQParser.java similarity index 99% rename from jena-arq/src/main/java/org/apache/jena/sparql/lang/arq/ARQParser.java rename to jena-arq/src/main/java/org/apache/jena/sparql/lang/arq/javacc/ARQParser.java index 82c90bfae5..7029e47e00 100644 --- a/jena-arq/src/main/java/org/apache/jena/sparql/lang/arq/ARQParser.java +++ b/jena-arq/src/main/java/org/apache/jena/sparql/lang/arq/javacc/ARQParser.java @@ -1,6 +1,6 @@ /* ARQParser.java */ /* Generated By:JavaCC: Do not edit this line. ARQParser.java */ -package org.apache.jena.sparql.lang.arq ; +package org.apache.jena.sparql.lang.arq.javacc ; import org.apache.jena.graph.* ; import org.apache.jena.query.* ; import org.apache.jena.sparql.core.Var ; @@ -16,7 +16,7 @@ import java.util.List; import java.util.ArrayList; @SuppressWarnings("all") -public class ARQParser extends ARQParserBase implements ARQParserConstants { +public class ARQParser extends org.apache.jena.sparql.lang.arq.ARQParserBase implements ARQParserConstants { final public void QueryUnit() throws ParseException { ByteOrderMark(); diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/lang/arq/ARQParserConstants.java b/jena-arq/src/main/java/org/apache/jena/sparql/lang/arq/javacc/ARQParserConstants.java similarity index 99% rename from jena-arq/src/main/java/org/apache/jena/sparql/lang/arq/ARQParserConstants.java rename to jena-arq/src/main/java/org/apache/jena/sparql/lang/arq/javacc/ARQParserConstants.java index ff5460bb16..6766a1491e 100644 --- a/jena-arq/src/main/java/org/apache/jena/sparql/lang/arq/ARQParserConstants.java +++ b/jena-arq/src/main/java/org/apache/jena/sparql/lang/arq/javacc/ARQParserConstants.java @@ -1,5 +1,5 @@ /* Generated By:JavaCC: Do not edit this line. ARQParserConstants.java */ -package org.apache.jena.sparql.lang.arq ; +package org.apache.jena.sparql.lang.arq.javacc ; /** diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/lang/arq/ARQParserTokenManager.java b/jena-arq/src/main/java/org/apache/jena/sparql/lang/arq/javacc/ARQParserTokenManager.java similarity index 99% rename from jena-arq/src/main/java/org/apache/jena/sparql/lang/arq/ARQParserTokenManager.java rename to jena-arq/src/main/java/org/apache/jena/sparql/lang/arq/javacc/ARQParserTokenManager.java index 00f1bfb679..5604610206 100644 --- a/jena-arq/src/main/java/org/apache/jena/sparql/lang/arq/ARQParserTokenManager.java +++ b/jena-arq/src/main/java/org/apache/jena/sparql/lang/arq/javacc/ARQParserTokenManager.java @@ -1,6 +1,6 @@ /* ARQParserTokenManager.java */ /* Generated By:JavaCC: Do not edit this line. ARQParserTokenManager.java */ -package org.apache.jena.sparql.lang.arq ; +package org.apache.jena.sparql.lang.arq.javacc ; import org.apache.jena.graph.* ; import org.apache.jena.query.* ; import org.apache.jena.sparql.core.Var ; diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/lang/arq/ParseException.java b/jena-arq/src/main/java/org/apache/jena/sparql/lang/arq/javacc/ParseException.java similarity index 98% rename from jena-arq/src/main/java/org/apache/jena/sparql/lang/arq/ParseException.java rename to jena-arq/src/main/java/org/apache/jena/sparql/lang/arq/javacc/ParseException.java index cb1919325b..e372cbd4e1 100644 --- a/jena-arq/src/main/java/org/apache/jena/sparql/lang/arq/ParseException.java +++ b/jena-arq/src/main/java/org/apache/jena/sparql/lang/arq/javacc/ParseException.java @@ -1,6 +1,6 @@ /* Generated By:JavaCC: Do not edit this line. ParseException.java Version 7.0 */ /* JavaCCOptions:KEEP_LINE_COLUMN=true */ -package org.apache.jena.sparql.lang.arq ; +package org.apache.jena.sparql.lang.arq.javacc ; /** * This exception is thrown when parse errors are encountered. @@ -192,4 +192,4 @@ public class ParseException extends Exception { } } -/* JavaCC - OriginalChecksum=7f03520468cc43d4f83f09bbb6a97299 (do not edit this line) */ +/* JavaCC - OriginalChecksum=481959af21dccd5944e1500dbb9a4cfd (do not edit this line) */ diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/lang/arq/SimpleCharStream.java b/jena-arq/src/main/java/org/apache/jena/sparql/lang/arq/javacc/SimpleCharStream.java similarity index 99% rename from jena-arq/src/main/java/org/apache/jena/sparql/lang/arq/SimpleCharStream.java rename to jena-arq/src/main/java/org/apache/jena/sparql/lang/arq/javacc/SimpleCharStream.java index d6ffb88916..d8ffd1ddba 100644 --- a/jena-arq/src/main/java/org/apache/jena/sparql/lang/arq/SimpleCharStream.java +++ b/jena-arq/src/main/java/org/apache/jena/sparql/lang/arq/javacc/SimpleCharStream.java @@ -1,6 +1,6 @@ /* Generated By:JavaCC: Do not edit this line. SimpleCharStream.java Version 7.0 */ /* JavaCCOptions:STATIC=false,SUPPORT_CLASS_VISIBILITY_PUBLIC=true */ -package org.apache.jena.sparql.lang.arq ; +package org.apache.jena.sparql.lang.arq.javacc ; /** * An implementation of interface CharStream, where the stream is assumed to @@ -469,4 +469,4 @@ public class SimpleCharStream boolean getTrackLineColumn() { return trackLineColumn; } void setTrackLineColumn(boolean tlc) { trackLineColumn = tlc; } } -/* JavaCC - OriginalChecksum=5f495744c87e77321fd570f94f38cd5d (do not edit this line) */ +/* JavaCC - OriginalChecksum=998e7d6690753a66d2ca7608e53c1761 (do not edit this line) */ diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/lang/arq/Token.java b/jena-arq/src/main/java/org/apache/jena/sparql/lang/arq/javacc/Token.java similarity index 97% rename from jena-arq/src/main/java/org/apache/jena/sparql/lang/arq/Token.java rename to jena-arq/src/main/java/org/apache/jena/sparql/lang/arq/javacc/Token.java index b4da352e69..32e2e7abe6 100644 --- a/jena-arq/src/main/java/org/apache/jena/sparql/lang/arq/Token.java +++ b/jena-arq/src/main/java/org/apache/jena/sparql/lang/arq/javacc/Token.java @@ -1,6 +1,6 @@ /* Generated By:JavaCC: Do not edit this line. Token.java Version 7.0 */ /* JavaCCOptions:TOKEN_EXTENDS=,KEEP_LINE_COLUMN=true,SUPPORT_CLASS_VISIBILITY_PUBLIC=true */ -package org.apache.jena.sparql.lang.arq ; +package org.apache.jena.sparql.lang.arq.javacc ; /** * Describes the input token stream. @@ -129,4 +129,4 @@ public class Token implements java.io.Serializable { } } -/* JavaCC - OriginalChecksum=0ea2e0bf17ab3b36b824cbe5bb2a103c (do not edit this line) */ +/* JavaCC - OriginalChecksum=be6ea7686a7ad6d4ba6dcbcd7f228d68 (do not edit this line) */ diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_12/TokenMgrError.java b/jena-arq/src/main/java/org/apache/jena/sparql/lang/arq/javacc/TokenMgrError.java similarity index 97% rename from jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_12/TokenMgrError.java rename to jena-arq/src/main/java/org/apache/jena/sparql/lang/arq/javacc/TokenMgrError.java index d21b400f9f..239864b985 100644 --- a/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_12/TokenMgrError.java +++ b/jena-arq/src/main/java/org/apache/jena/sparql/lang/arq/javacc/TokenMgrError.java @@ -1,6 +1,6 @@ /* Generated By:JavaCC: Do not edit this line. TokenMgrError.java Version 7.0 */ /* JavaCCOptions: */ -package org.apache.jena.sparql.lang.sparql_12 ; +package org.apache.jena.sparql.lang.arq.javacc ; /** Token Manager Error. */ @@ -146,4 +146,4 @@ public class TokenMgrError extends Error this(LexicalErr(EOFSeen, lexState, errorLine, errorColumn, errorAfter, curChar), reason); } } -/* JavaCC - OriginalChecksum=e285a05be4fd62e0dd22c9ebd879d30e (do not edit this line) */ +/* JavaCC - OriginalChecksum=3ce6496d28ffe3225a80cc695081abdc (do not edit this line) */ diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_12/SPARQLParser12Base.java b/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_12/SPARQLParser12Base.java index 8c56b8bdea..906f5e0d62 100644 --- a/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_12/SPARQLParser12Base.java +++ b/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_12/SPARQLParser12Base.java @@ -19,4 +19,4 @@ package org.apache.jena.sparql.lang.sparql_12; import org.apache.jena.sparql.lang.SPARQLParserBase ; -class SPARQLParser12Base extends SPARQLParserBase implements SPARQLParser12Constants {} +public class SPARQLParser12Base extends SPARQLParserBase {} diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_12/JavaCharStream.java b/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_12/javacc/JavaCharStream.java similarity index 99% rename from jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_12/JavaCharStream.java rename to jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_12/javacc/JavaCharStream.java index 58fe7de595..e706e9ce83 100644 --- a/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_12/JavaCharStream.java +++ b/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_12/javacc/JavaCharStream.java @@ -1,6 +1,6 @@ /* Generated By:JavaCC: Do not edit this line. JavaCharStream.java Version 7.0 */ /* JavaCCOptions:STATIC=false,SUPPORT_CLASS_VISIBILITY_PUBLIC=true */ -package org.apache.jena.sparql.lang.sparql_12 ; +package org.apache.jena.sparql.lang.sparql_12.javacc ; /** * An implementation of interface CharStream, where the stream is assumed to @@ -690,4 +690,4 @@ class JavaCharStream void setTrackLineColumn(boolean tlc) { trackLineColumn = tlc; } } -/* JavaCC - OriginalChecksum=2602e8c5f9fa8bab1639c90110c00487 (do not edit this line) */ +/* JavaCC - OriginalChecksum=431471b0c34e8a862d93c540c01c5564 (do not edit this line) */ diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_12/ParseException.java b/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_12/javacc/ParseException.java similarity index 98% rename from jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_12/ParseException.java rename to jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_12/javacc/ParseException.java index 39572964aa..d9016ff579 100644 --- a/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_12/ParseException.java +++ b/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_12/javacc/ParseException.java @@ -1,6 +1,6 @@ /* Generated By:JavaCC: Do not edit this line. ParseException.java Version 7.0 */ /* JavaCCOptions:KEEP_LINE_COLUMN=true */ -package org.apache.jena.sparql.lang.sparql_12 ; +package org.apache.jena.sparql.lang.sparql_12.javacc ; /** * This exception is thrown when parse errors are encountered. @@ -192,4 +192,4 @@ public class ParseException extends Exception { } } -/* JavaCC - OriginalChecksum=d99fe3a89f42aa20bf0fd3a874682224 (do not edit this line) */ +/* JavaCC - OriginalChecksum=3ad271b7a12861cbc7e039bfd2a9aff6 (do not edit this line) */ diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_12/SPARQLParser12.java b/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_12/javacc/SPARQLParser12.java similarity index 99% rename from jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_12/SPARQLParser12.java rename to jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_12/javacc/SPARQLParser12.java index 56bff8e37c..0cfc0f540e 100644 --- a/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_12/SPARQLParser12.java +++ b/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_12/javacc/SPARQLParser12.java @@ -1,6 +1,6 @@ /* SPARQLParser12.java */ /* Generated By:JavaCC: Do not edit this line. SPARQLParser12.java */ -package org.apache.jena.sparql.lang.sparql_12 ; +package org.apache.jena.sparql.lang.sparql_12.javacc ; import org.apache.jena.graph.* ; import org.apache.jena.query.* ; import org.apache.jena.sparql.core.Var ; @@ -13,7 +13,7 @@ import org.apache.jena.update.* ; import org.apache.jena.sparql.modify.request.* ; @SuppressWarnings("all") -public class SPARQLParser12 extends SPARQLParser12Base implements SPARQLParser12Constants { +public class SPARQLParser12 extends org.apache.jena.sparql.lang.sparql_12.SPARQLParser12Base implements SPARQLParser12Constants { final public void QueryUnit() throws ParseException { startQuery() ; diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_12/SPARQLParser12Constants.java b/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_12/javacc/SPARQLParser12Constants.java similarity index 99% rename from jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_12/SPARQLParser12Constants.java rename to jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_12/javacc/SPARQLParser12Constants.java index e9b86b8136..fe163eecf2 100644 --- a/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_12/SPARQLParser12Constants.java +++ b/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_12/javacc/SPARQLParser12Constants.java @@ -1,5 +1,5 @@ /* Generated By:JavaCC: Do not edit this line. SPARQLParser12Constants.java */ -package org.apache.jena.sparql.lang.sparql_12 ; +package org.apache.jena.sparql.lang.sparql_12.javacc ; /** diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_12/SPARQLParser12TokenManager.java b/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_12/javacc/SPARQLParser12TokenManager.java similarity index 99% rename from jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_12/SPARQLParser12TokenManager.java rename to jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_12/javacc/SPARQLParser12TokenManager.java index a34f95832b..a3db6a4dee 100644 --- a/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_12/SPARQLParser12TokenManager.java +++ b/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_12/javacc/SPARQLParser12TokenManager.java @@ -1,6 +1,6 @@ /* SPARQLParser12TokenManager.java */ /* Generated By:JavaCC: Do not edit this line. SPARQLParser12TokenManager.java */ -package org.apache.jena.sparql.lang.sparql_12 ; +package org.apache.jena.sparql.lang.sparql_12.javacc ; import org.apache.jena.graph.* ; import org.apache.jena.query.* ; import org.apache.jena.sparql.core.Var ; diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_12/Token.java b/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_12/javacc/Token.java similarity index 97% rename from jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_12/Token.java rename to jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_12/javacc/Token.java index 9d65d44be1..a64db9b3e2 100644 --- a/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_12/Token.java +++ b/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_12/javacc/Token.java @@ -1,6 +1,6 @@ /* Generated By:JavaCC: Do not edit this line. Token.java Version 7.0 */ /* JavaCCOptions:TOKEN_EXTENDS=,KEEP_LINE_COLUMN=true,SUPPORT_CLASS_VISIBILITY_PUBLIC=true */ -package org.apache.jena.sparql.lang.sparql_12 ; +package org.apache.jena.sparql.lang.sparql_12.javacc ; /** * Describes the input token stream. @@ -129,4 +129,4 @@ public class Token implements java.io.Serializable { } } -/* JavaCC - OriginalChecksum=3098884c494a753c2a2d8dc68d94be4f (do not edit this line) */ +/* JavaCC - OriginalChecksum=716c697b14d703fafca7130103b3421e (do not edit this line) */ diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/lang/arq/TokenMgrError.java b/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_12/javacc/TokenMgrError.java similarity index 97% rename from jena-arq/src/main/java/org/apache/jena/sparql/lang/arq/TokenMgrError.java rename to jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_12/javacc/TokenMgrError.java index 7260bb1d48..415595f10c 100644 --- a/jena-arq/src/main/java/org/apache/jena/sparql/lang/arq/TokenMgrError.java +++ b/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_12/javacc/TokenMgrError.java @@ -1,6 +1,6 @@ /* Generated By:JavaCC: Do not edit this line. TokenMgrError.java Version 7.0 */ /* JavaCCOptions: */ -package org.apache.jena.sparql.lang.arq ; +package org.apache.jena.sparql.lang.sparql_12.javacc ; /** Token Manager Error. */ @@ -146,4 +146,4 @@ public class TokenMgrError extends Error this(LexicalErr(EOFSeen, lexState, errorLine, errorColumn, errorAfter, curChar), reason); } } -/* JavaCC - OriginalChecksum=26900e63a554da1bde0d1d6ebd69f6c3 (do not edit this line) */ +/* JavaCC - OriginalChecksum=8101d56944cc76b1e7511c5b99ed1ea8 (do not edit this line) */ diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/path/PathParser.java b/jena-arq/src/main/java/org/apache/jena/sparql/path/PathParser.java index d087c69df5..7a74241129 100644 --- a/jena-arq/src/main/java/org/apache/jena/sparql/path/PathParser.java +++ b/jena-arq/src/main/java/org/apache/jena/sparql/path/PathParser.java @@ -28,7 +28,7 @@ import org.apache.jena.query.QueryParseException ; import org.apache.jena.shared.JenaException ; import org.apache.jena.shared.PrefixMapping ; import org.apache.jena.sparql.core.Prologue ; -import org.apache.jena.sparql.lang.arq.ARQParser ; +import org.apache.jena.sparql.lang.arq.javacc.ARQParser; public class PathParser { @@ -45,13 +45,13 @@ public class PathParser query.setStrict(true) ; parser.setQuery(query) ; return parser.PathUnit() ; - } catch (org.apache.jena.sparql.lang.arq.ParseException ex) + } catch (org.apache.jena.sparql.lang.arq.javacc.ParseException ex) { throw new QueryParseException(ex.getMessage(), ex.currentToken.beginLine, ex.currentToken.beginColumn ) ; } - catch (org.apache.jena.sparql.lang.arq.TokenMgrError tErr) + catch (org.apache.jena.sparql.lang.arq.javacc.TokenMgrError tErr) { // Last valid token : not the same as token error message - but this should not happen int col = parser.token.endColumn ; diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/util/ExprUtils.java b/jena-arq/src/main/java/org/apache/jena/sparql/util/ExprUtils.java index dd746b3e91..e5556bb59e 100644 --- a/jena-arq/src/main/java/org/apache/jena/sparql/util/ExprUtils.java +++ b/jena-arq/src/main/java/org/apache/jena/sparql/util/ExprUtils.java @@ -35,7 +35,7 @@ import org.apache.jena.sparql.engine.binding.Binding ; import org.apache.jena.sparql.engine.binding.BindingRoot ; import org.apache.jena.sparql.expr.* ; import org.apache.jena.sparql.function.FunctionEnv ; -import org.apache.jena.sparql.lang.arq.* ; +import org.apache.jena.sparql.lang.arq.javacc.*; import org.apache.jena.sparql.serializer.FmtExprSPARQL ; import org.apache.jena.sparql.serializer.SerializationContext ; import org.apache.jena.sparql.sse.SSE ; diff --git a/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/Converters.java b/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/Converters.java index 2a01badafb..2e089f51f6 100644 --- a/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/Converters.java +++ b/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/Converters.java @@ -39,8 +39,8 @@ import org.apache.jena.sparql.ARQInternalErrorException; import org.apache.jena.sparql.core.TriplePath; import org.apache.jena.sparql.core.Var; import org.apache.jena.sparql.expr.ExprVar; -import org.apache.jena.sparql.lang.arq.ARQParser; -import org.apache.jena.sparql.lang.arq.ParseException; +import org.apache.jena.sparql.lang.arq.javacc.ARQParser; +import org.apache.jena.sparql.lang.arq.javacc.ParseException; import org.apache.jena.sparql.path.P_Link; import org.apache.jena.sparql.path.Path; import org.apache.jena.sparql.path.PathParser; diff --git a/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/handlers/SelectHandler.java b/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/handlers/SelectHandler.java index 509b8cb528..2da0aba683 100644 --- a/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/handlers/SelectHandler.java +++ b/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/handlers/SelectHandler.java @@ -6,9 +6,9 @@ * 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. @@ -27,9 +27,9 @@ import org.apache.jena.query.QueryParseException; import org.apache.jena.sparql.core.Var; import org.apache.jena.sparql.core.VarExprList; import org.apache.jena.sparql.expr.Expr; -import org.apache.jena.sparql.lang.arq.ARQParser; -import org.apache.jena.sparql.lang.arq.ParseException; -import org.apache.jena.sparql.lang.arq.TokenMgrError; +import org.apache.jena.sparql.lang.arq.javacc.ARQParser; +import org.apache.jena.sparql.lang.arq.javacc.ParseException; +import org.apache.jena.sparql.lang.arq.javacc.TokenMgrError; /** * A Select clause handler. @@ -43,7 +43,7 @@ public class SelectHandler implements Handler { /** * Constructor. - * + * * @param aggHandler The aggregate handler that wraps the query we want to * handle. */ @@ -57,7 +57,7 @@ public class SelectHandler implements Handler { /** * Set the distinct flag. Set or unset the distinct flag. Will set the reduced * flag if it was previously set. - * + * * @param state the state to set the distinct flag to. */ public void setDistinct(boolean state) { @@ -70,7 +70,7 @@ public class SelectHandler implements Handler { /** * Set the reduced flag. Set or unset the reduced flag. Will set the reduced * flag if it was previously set. - * + * * @param state the state to set the reduced flag to. */ public void setReduced(boolean state) { @@ -83,7 +83,7 @@ public class SelectHandler implements Handler { /** * Add a variable to the select. If the variable is <code>null</code> the * variables are set to star. - * + * * @param var The variable to add. */ public void addVar(Var var) { @@ -98,7 +98,7 @@ public class SelectHandler implements Handler { /** * Add an Expression as variable to the select. If the variable is the variables * are set to star. - * + * * @param expression The expression as a string. * @param var The variable to add. */ @@ -108,9 +108,9 @@ public class SelectHandler implements Handler { /** * Parse an expression string into an expression. - * + * * This must be able to be parsed as though it were written "SELECT "+s - * + * * @param s the select string to parse. * @return the expression * @throws QueryParseException on error @@ -139,7 +139,7 @@ public class SelectHandler implements Handler { /** * Add an Expression as variable to the select. - * + * * @param expr The expression to add. * @param var The variable to add. */ @@ -157,7 +157,7 @@ public class SelectHandler implements Handler { /** * Get the list of variables from the query. - * + * * @return The list of variables in the query. */ public List<Var> getVars() { @@ -166,7 +166,7 @@ public class SelectHandler implements Handler { /** * Return the projected var expression list. - * + * * @return The projected var expression list. */ public VarExprList getProject() { @@ -175,7 +175,7 @@ public class SelectHandler implements Handler { /** * Add all the variables from the select handler variable. - * + * * @param selectHandler The select handler to copy the variables from. */ public void addAll(SelectHandler selectHandler) { diff --git a/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/handlers/SolutionModifierHandler.java b/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/handlers/SolutionModifierHandler.java index a37e35d476..617d9a583c 100644 --- a/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/handlers/SolutionModifierHandler.java +++ b/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/handlers/SolutionModifierHandler.java @@ -33,9 +33,9 @@ import org.apache.jena.sparql.core.VarExprList; import org.apache.jena.sparql.expr.Expr; import org.apache.jena.sparql.expr.ExprList; import org.apache.jena.sparql.expr.ExprVar; -import org.apache.jena.sparql.lang.arq.ARQParser; -import org.apache.jena.sparql.lang.arq.ParseException; -import org.apache.jena.sparql.lang.arq.TokenMgrError; +import org.apache.jena.sparql.lang.arq.javacc.ARQParser; +import org.apache.jena.sparql.lang.arq.javacc.ParseException; +import org.apache.jena.sparql.lang.arq.javacc.TokenMgrError; /** * The Solution Modifier handler.
