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 876d812901ffd97274d7a6c5d47527f549b4c480 Author: Andy Seaborne <[email protected]> AuthorDate: Wed Dec 10 15:50:08 2025 +0000 GH-3634: Rename riot.extra riot.turtlejcc. Move lang parser classes to oaj.riot.lang. --- jena-arq/Grammar/Turtle/turtle.jj | 4 +- .../org/apache/jena/cdt/CDTLiteralParserBase.java | 2 +- .../apache/jena/cdt/parser/CDTLiteralParser.java | 4 +- .../cdt/parser/CDTLiteralParserTokenManager.java | 3 +- .../org/apache/jena/riot/RDFParserRegistry.java | 2 +- .../jena/riot/lang/{extra => }/LangParserBase.java | 2 +- .../jena/riot/lang/{extra => }/LangParserLib.java | 2 +- .../riot/lang/{extra => turtlejcc}/TurtleJCC.java | 2 +- .../TurtleJavaccReaderRIOT.java | 8 ++-- .../javacc/ParseException.java | 2 +- .../javacc/SimpleCharStream.java | 2 +- .../lang/{extra => turtlejcc}/javacc/Token.java | 2 +- .../{extra => turtlejcc}/javacc/TokenMgrError.java | 2 +- .../{extra => turtlejcc}/javacc/TurtleJavacc.java | 6 +-- .../javacc/TurtleJavaccConstants.java | 2 +- .../javacc/TurtleJavaccTokenManager.java | 6 +-- .../apache/jena/sparql/lang/QueryParserBase.java | 2 +- .../jena/sparql/lang/sparql_10/Legacy10.java | 4 +- .../jena/sparql/lang/sparql_11/Legacy11.java | 3 +- .../sparql/sse/lang/parser/SSE_ParserCore.java | 3 +- .../lang/parser/SSE_ParserCoreTokenManager.java | 3 +- .../org/apache/jena/rdf12/TestRDF12LangSyntax.java | 2 +- .../jena/rdf12/parse/TestTurtleStarParse.java | 2 +- .../org/apache/jena/riot/Scripts_AltTurtle.java | 2 +- jena-cmds/src/test/java/arq/rdftests.java | 2 +- .../shacl/compact/reader/ShaclCompactParser.java | 2 +- .../reader/parser/ShaclCompactParserJJ.java | 4 +- .../parser/ShaclCompactParserJJTokenManager.java | 4 +- .../org/apache/jena/shex/parser/ParserShExC.java | 4 +- .../apache/jena/shex/parser/javacc/ShExJavacc.java | 46 +++++++++++----------- 30 files changed, 69 insertions(+), 65 deletions(-) diff --git a/jena-arq/Grammar/Turtle/turtle.jj b/jena-arq/Grammar/Turtle/turtle.jj index f931a6ff61..70a2985820 100644 --- a/jena-arq/Grammar/Turtle/turtle.jj +++ b/jena-arq/Grammar/Turtle/turtle.jj @@ -55,8 +55,8 @@ PARSER_BEGIN(TurtleJavacc) package org.apache.jena.riot.lang.extra.javacc; import org.apache.jena.graph.*; -import org.apache.jena.riot.lang.extra.* ; -import static org.apache.jena.riot.lang.extra.LangParserLib.*; +import org.apache.jena.riot.lang.* ; +import static org.apache.jena.riot.lang.LangParserLib.*; public class TurtleJavacc extends LangParserBase {} diff --git a/jena-arq/src/main/java/org/apache/jena/cdt/CDTLiteralParserBase.java b/jena-arq/src/main/java/org/apache/jena/cdt/CDTLiteralParserBase.java index 816078e550..47e3d2db1e 100644 --- a/jena-arq/src/main/java/org/apache/jena/cdt/CDTLiteralParserBase.java +++ b/jena-arq/src/main/java/org/apache/jena/cdt/CDTLiteralParserBase.java @@ -19,7 +19,7 @@ package org.apache.jena.cdt; import org.apache.jena.graph.Node; -import org.apache.jena.riot.lang.extra.LangParserBase; +import org.apache.jena.riot.lang.LangParserBase; public class CDTLiteralParserBase extends LangParserBase { diff --git a/jena-arq/src/main/java/org/apache/jena/cdt/parser/CDTLiteralParser.java b/jena-arq/src/main/java/org/apache/jena/cdt/parser/CDTLiteralParser.java index e72d78fa05..23a4e0b0b4 100644 --- a/jena-arq/src/main/java/org/apache/jena/cdt/parser/CDTLiteralParser.java +++ b/jena-arq/src/main/java/org/apache/jena/cdt/parser/CDTLiteralParser.java @@ -20,6 +20,8 @@ package org.apache.jena.cdt.parser; +import static org.apache.jena.riot.lang.LangParserLib.*; + import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -28,8 +30,6 @@ import java.util.Map; import org.apache.jena.cdt.*; import org.apache.jena.graph.Node; -import static org.apache.jena.riot.lang.extra.LangParserLib.*; - public class CDTLiteralParser extends CDTLiteralParserBase implements CDTLiteralParserConstants { // --- Entry point for cdt:List literals diff --git a/jena-arq/src/main/java/org/apache/jena/cdt/parser/CDTLiteralParserTokenManager.java b/jena-arq/src/main/java/org/apache/jena/cdt/parser/CDTLiteralParserTokenManager.java index 7541676cee..2461f330e1 100644 --- a/jena-arq/src/main/java/org/apache/jena/cdt/parser/CDTLiteralParserTokenManager.java +++ b/jena-arq/src/main/java/org/apache/jena/cdt/parser/CDTLiteralParserTokenManager.java @@ -19,13 +19,14 @@ */ package org.apache.jena.cdt.parser; +import static org.apache.jena.riot.lang.LangParserLib.*; + import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; import org.apache.jena.cdt.*; import org.apache.jena.graph.Node; -import static org.apache.jena.riot.lang.extra.LangParserLib.*; /** Token Manager. */ @SuppressWarnings ("unused") diff --git a/jena-arq/src/main/java/org/apache/jena/riot/RDFParserRegistry.java b/jena-arq/src/main/java/org/apache/jena/riot/RDFParserRegistry.java index ea8087f197..fde7640226 100644 --- a/jena-arq/src/main/java/org/apache/jena/riot/RDFParserRegistry.java +++ b/jena-arq/src/main/java/org/apache/jena/riot/RDFParserRegistry.java @@ -23,9 +23,9 @@ import static org.apache.jena.riot.Lang.*; import java.util.*; import org.apache.jena.riot.lang.*; -import org.apache.jena.riot.lang.extra.TurtleJCC; import org.apache.jena.riot.lang.rdfxml.RRX; import org.apache.jena.riot.lang.rdfxml.rrx.ReaderRDFXML_SAX; +import org.apache.jena.riot.lang.turtlejcc.TurtleJCC; /** The registry of languages and parsers. * To register a new parser: diff --git a/jena-arq/src/main/java/org/apache/jena/riot/lang/extra/LangParserBase.java b/jena-arq/src/main/java/org/apache/jena/riot/lang/LangParserBase.java similarity index 99% rename from jena-arq/src/main/java/org/apache/jena/riot/lang/extra/LangParserBase.java rename to jena-arq/src/main/java/org/apache/jena/riot/lang/LangParserBase.java index d1ad3b1127..4d08edab19 100644 --- a/jena-arq/src/main/java/org/apache/jena/riot/lang/extra/LangParserBase.java +++ b/jena-arq/src/main/java/org/apache/jena/riot/lang/LangParserBase.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.jena.riot.lang.extra; +package org.apache.jena.riot.lang; import org.apache.jena.atlas.AtlasException; import org.apache.jena.atlas.lib.EscapeStr; diff --git a/jena-arq/src/main/java/org/apache/jena/riot/lang/extra/LangParserLib.java b/jena-arq/src/main/java/org/apache/jena/riot/lang/LangParserLib.java similarity index 99% rename from jena-arq/src/main/java/org/apache/jena/riot/lang/extra/LangParserLib.java rename to jena-arq/src/main/java/org/apache/jena/riot/lang/LangParserLib.java index 509d453cc3..7d40cf9568 100644 --- a/jena-arq/src/main/java/org/apache/jena/riot/lang/extra/LangParserLib.java +++ b/jena-arq/src/main/java/org/apache/jena/riot/lang/LangParserLib.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.jena.riot.lang.extra; +package org.apache.jena.riot.lang; import org.apache.jena.atlas.AtlasException; import org.apache.jena.atlas.lib.EscapeStr; diff --git a/jena-arq/src/main/java/org/apache/jena/riot/lang/extra/TurtleJCC.java b/jena-arq/src/main/java/org/apache/jena/riot/lang/turtlejcc/TurtleJCC.java similarity index 97% rename from jena-arq/src/main/java/org/apache/jena/riot/lang/extra/TurtleJCC.java rename to jena-arq/src/main/java/org/apache/jena/riot/lang/turtlejcc/TurtleJCC.java index 3e6fcdacab..93aeaf6d0d 100644 --- a/jena-arq/src/main/java/org/apache/jena/riot/lang/extra/TurtleJCC.java +++ b/jena-arq/src/main/java/org/apache/jena/riot/lang/turtlejcc/TurtleJCC.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.jena.riot.lang.extra; +package org.apache.jena.riot.lang.turtlejcc; import org.apache.jena.riot.*; import org.apache.jena.riot.lang.LangTurtle; diff --git a/jena-arq/src/main/java/org/apache/jena/riot/lang/extra/TurtleJavaccReaderRIOT.java b/jena-arq/src/main/java/org/apache/jena/riot/lang/turtlejcc/TurtleJavaccReaderRIOT.java similarity index 93% rename from jena-arq/src/main/java/org/apache/jena/riot/lang/extra/TurtleJavaccReaderRIOT.java rename to jena-arq/src/main/java/org/apache/jena/riot/lang/turtlejcc/TurtleJavaccReaderRIOT.java index c213423716..6965d9fdce 100644 --- a/jena-arq/src/main/java/org/apache/jena/riot/lang/extra/TurtleJavaccReaderRIOT.java +++ b/jena-arq/src/main/java/org/apache/jena/riot/lang/turtlejcc/TurtleJavaccReaderRIOT.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.jena.riot.lang.extra; +package org.apache.jena.riot.lang.turtlejcc; import java.io.InputStream; import java.io.Reader; @@ -26,9 +26,9 @@ import org.apache.jena.atlas.web.ContentType; import org.apache.jena.riot.ReaderRIOT; import org.apache.jena.riot.RiotParseException; import org.apache.jena.riot.lang.LangTurtle; -import org.apache.jena.riot.lang.extra.javacc.ParseException; -import org.apache.jena.riot.lang.extra.javacc.TokenMgrError; -import org.apache.jena.riot.lang.extra.javacc.TurtleJavacc; +import org.apache.jena.riot.lang.turtlejcc.javacc.ParseException; +import org.apache.jena.riot.lang.turtlejcc.javacc.TokenMgrError; +import org.apache.jena.riot.lang.turtlejcc.javacc.TurtleJavacc; import org.apache.jena.riot.system.ParserProfile; import org.apache.jena.riot.system.StreamRDF; import org.apache.jena.sparql.util.Context; diff --git a/jena-arq/src/main/java/org/apache/jena/riot/lang/extra/javacc/ParseException.java b/jena-arq/src/main/java/org/apache/jena/riot/lang/turtlejcc/javacc/ParseException.java similarity index 99% rename from jena-arq/src/main/java/org/apache/jena/riot/lang/extra/javacc/ParseException.java rename to jena-arq/src/main/java/org/apache/jena/riot/lang/turtlejcc/javacc/ParseException.java index 6b8406870b..7837b35726 100644 --- a/jena-arq/src/main/java/org/apache/jena/riot/lang/extra/javacc/ParseException.java +++ b/jena-arq/src/main/java/org/apache/jena/riot/lang/turtlejcc/javacc/ParseException.java @@ -18,7 +18,7 @@ * limitations under the License. */ -package org.apache.jena.riot.lang.extra.javacc; +package org.apache.jena.riot.lang.turtlejcc.javacc; /** * This exception is thrown when parse errors are encountered. diff --git a/jena-arq/src/main/java/org/apache/jena/riot/lang/extra/javacc/SimpleCharStream.java b/jena-arq/src/main/java/org/apache/jena/riot/lang/turtlejcc/javacc/SimpleCharStream.java similarity index 99% rename from jena-arq/src/main/java/org/apache/jena/riot/lang/extra/javacc/SimpleCharStream.java rename to jena-arq/src/main/java/org/apache/jena/riot/lang/turtlejcc/javacc/SimpleCharStream.java index cffa705730..b0453cc3b0 100644 --- a/jena-arq/src/main/java/org/apache/jena/riot/lang/extra/javacc/SimpleCharStream.java +++ b/jena-arq/src/main/java/org/apache/jena/riot/lang/turtlejcc/javacc/SimpleCharStream.java @@ -18,7 +18,7 @@ * limitations under the License. */ -package org.apache.jena.riot.lang.extra.javacc; +package org.apache.jena.riot.lang.turtlejcc.javacc; /** * An implementation of interface CharStream, where the stream is assumed to diff --git a/jena-arq/src/main/java/org/apache/jena/riot/lang/extra/javacc/Token.java b/jena-arq/src/main/java/org/apache/jena/riot/lang/turtlejcc/javacc/Token.java similarity index 98% rename from jena-arq/src/main/java/org/apache/jena/riot/lang/extra/javacc/Token.java rename to jena-arq/src/main/java/org/apache/jena/riot/lang/turtlejcc/javacc/Token.java index 4275e25c6d..1e1826dee9 100644 --- a/jena-arq/src/main/java/org/apache/jena/riot/lang/extra/javacc/Token.java +++ b/jena-arq/src/main/java/org/apache/jena/riot/lang/turtlejcc/javacc/Token.java @@ -18,7 +18,7 @@ * limitations under the License. */ -package org.apache.jena.riot.lang.extra.javacc; +package org.apache.jena.riot.lang.turtlejcc.javacc; /** * Describes the input token stream. diff --git a/jena-arq/src/main/java/org/apache/jena/riot/lang/extra/javacc/TokenMgrError.java b/jena-arq/src/main/java/org/apache/jena/riot/lang/turtlejcc/javacc/TokenMgrError.java similarity index 99% rename from jena-arq/src/main/java/org/apache/jena/riot/lang/extra/javacc/TokenMgrError.java rename to jena-arq/src/main/java/org/apache/jena/riot/lang/turtlejcc/javacc/TokenMgrError.java index 5a343315b2..55446626e8 100644 --- a/jena-arq/src/main/java/org/apache/jena/riot/lang/extra/javacc/TokenMgrError.java +++ b/jena-arq/src/main/java/org/apache/jena/riot/lang/turtlejcc/javacc/TokenMgrError.java @@ -18,7 +18,7 @@ * limitations under the License. */ -package org.apache.jena.riot.lang.extra.javacc; +package org.apache.jena.riot.lang.turtlejcc.javacc; /** Token Manager Error. */ diff --git a/jena-arq/src/main/java/org/apache/jena/riot/lang/extra/javacc/TurtleJavacc.java b/jena-arq/src/main/java/org/apache/jena/riot/lang/turtlejcc/javacc/TurtleJavacc.java similarity index 99% rename from jena-arq/src/main/java/org/apache/jena/riot/lang/extra/javacc/TurtleJavacc.java rename to jena-arq/src/main/java/org/apache/jena/riot/lang/turtlejcc/javacc/TurtleJavacc.java index bb070d787d..c45b3b9888 100644 --- a/jena-arq/src/main/java/org/apache/jena/riot/lang/extra/javacc/TurtleJavacc.java +++ b/jena-arq/src/main/java/org/apache/jena/riot/lang/turtlejcc/javacc/TurtleJavacc.java @@ -18,11 +18,11 @@ * limitations under the License. */ -package org.apache.jena.riot.lang.extra.javacc; +package org.apache.jena.riot.lang.turtlejcc.javacc; import org.apache.jena.graph.*; -import org.apache.jena.riot.lang.extra.* ; -import static org.apache.jena.riot.lang.extra.LangParserLib.*; +import org.apache.jena.riot.lang.* ; +import static org.apache.jena.riot.lang.LangParserLib.*; public class TurtleJavacc extends LangParserBase implements TurtleJavaccConstants { diff --git a/jena-arq/src/main/java/org/apache/jena/riot/lang/extra/javacc/TurtleJavaccConstants.java b/jena-arq/src/main/java/org/apache/jena/riot/lang/turtlejcc/javacc/TurtleJavaccConstants.java similarity index 99% rename from jena-arq/src/main/java/org/apache/jena/riot/lang/extra/javacc/TurtleJavaccConstants.java rename to jena-arq/src/main/java/org/apache/jena/riot/lang/turtlejcc/javacc/TurtleJavaccConstants.java index cae13afc6a..5427ee3965 100644 --- a/jena-arq/src/main/java/org/apache/jena/riot/lang/extra/javacc/TurtleJavaccConstants.java +++ b/jena-arq/src/main/java/org/apache/jena/riot/lang/turtlejcc/javacc/TurtleJavaccConstants.java @@ -17,7 +17,7 @@ * limitations under the License. */ -package org.apache.jena.riot.lang.extra.javacc; +package org.apache.jena.riot.lang.turtlejcc.javacc; /** diff --git a/jena-arq/src/main/java/org/apache/jena/riot/lang/extra/javacc/TurtleJavaccTokenManager.java b/jena-arq/src/main/java/org/apache/jena/riot/lang/turtlejcc/javacc/TurtleJavaccTokenManager.java similarity index 99% rename from jena-arq/src/main/java/org/apache/jena/riot/lang/extra/javacc/TurtleJavaccTokenManager.java rename to jena-arq/src/main/java/org/apache/jena/riot/lang/turtlejcc/javacc/TurtleJavaccTokenManager.java index 7705c1f4a6..d708810930 100644 --- a/jena-arq/src/main/java/org/apache/jena/riot/lang/extra/javacc/TurtleJavaccTokenManager.java +++ b/jena-arq/src/main/java/org/apache/jena/riot/lang/turtlejcc/javacc/TurtleJavaccTokenManager.java @@ -18,10 +18,10 @@ * limitations under the License. */ -package org.apache.jena.riot.lang.extra.javacc; +package org.apache.jena.riot.lang.turtlejcc.javacc; import org.apache.jena.graph.*; -import org.apache.jena.riot.lang.extra.* ; -import static org.apache.jena.riot.lang.extra.LangParserLib.*; +import org.apache.jena.riot.lang.* ; +import static org.apache.jena.riot.lang.LangParserLib.*; /** Token Manager. */ @SuppressWarnings ("unused") diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/lang/QueryParserBase.java b/jena-arq/src/main/java/org/apache/jena/sparql/lang/QueryParserBase.java index c2c007ae14..cd08d8f0d9 100644 --- a/jena-arq/src/main/java/org/apache/jena/sparql/lang/QueryParserBase.java +++ b/jena-arq/src/main/java/org/apache/jena/sparql/lang/QueryParserBase.java @@ -37,7 +37,7 @@ import org.apache.jena.irix.IRIx; import org.apache.jena.irix.RelativeIRIException; import org.apache.jena.query.ARQ; import org.apache.jena.query.QueryParseException; -import org.apache.jena.riot.lang.extra.LangParserLib; +import org.apache.jena.riot.lang.LangParserLib; import org.apache.jena.riot.system.Checker; import org.apache.jena.riot.system.ErrorHandler; import org.apache.jena.riot.system.ErrorHandlerFactory; diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_10/Legacy10.java b/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_10/Legacy10.java index ad5485414b..ee5dd126f6 100644 --- a/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_10/Legacy10.java +++ b/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_10/Legacy10.java @@ -38,7 +38,6 @@ import org.apache.jena.irix.RelativeIRIException; import org.apache.jena.query.ARQ; import org.apache.jena.query.Query; import org.apache.jena.query.QueryParseException; -import org.apache.jena.riot.lang.extra.LangParserLib; import org.apache.jena.riot.system.Checker; import org.apache.jena.riot.system.ErrorHandler; import org.apache.jena.riot.system.ErrorHandlerFactory; @@ -63,7 +62,6 @@ import org.apache.jena.vocabulary.RDF; import org.slf4j.Logger; import org.slf4j.LoggerFactory; - /** Copies of classes so that the SPARQL 1.0 parser is isolated from later SPARQL parser development. */ class Legacy10 { /** Base class parsers, mainly SPARQL related */ @@ -357,7 +355,7 @@ class Legacy10 { /** remove the first n characters from the string */ protected static String stripChars(String s, int n) { - return LangParserLib.stripChars(s, n); + return s.substring(n, s.length()) ; } protected Var createVariable(String s, int line, int column) { diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_11/Legacy11.java b/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_11/Legacy11.java index b6692635e3..d4227a55a8 100644 --- a/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_11/Legacy11.java +++ b/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_11/Legacy11.java @@ -38,7 +38,6 @@ import org.apache.jena.irix.RelativeIRIException; import org.apache.jena.query.ARQ; import org.apache.jena.query.Query; import org.apache.jena.query.QueryParseException; -import org.apache.jena.riot.lang.extra.LangParserLib; import org.apache.jena.riot.system.Checker; import org.apache.jena.riot.system.ErrorHandler; import org.apache.jena.riot.system.ErrorHandlerFactory; @@ -357,7 +356,7 @@ class Legacy11 { /** remove the first n characters from the string */ protected static String stripChars(String s, int n) { - return LangParserLib.stripChars(s, n); + return s.substring(n, s.length()) ; } protected Var createVariable(String s, int line, int column) { diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/sse/lang/parser/SSE_ParserCore.java b/jena-arq/src/main/java/org/apache/jena/sparql/sse/lang/parser/SSE_ParserCore.java index d6347a5fb1..2d9da86bbe 100644 --- a/jena-arq/src/main/java/org/apache/jena/sparql/sse/lang/parser/SSE_ParserCore.java +++ b/jena-arq/src/main/java/org/apache/jena/sparql/sse/lang/parser/SSE_ParserCore.java @@ -20,8 +20,9 @@ package org.apache.jena.sparql.sse.lang.parser ; +import static org.apache.jena.riot.lang.LangParserLib.*; + import org.apache.jena.sparql.sse.lang.ParserSSEBase ; -import static org.apache.jena.riot.lang.extra.LangParserLib.*; public class SSE_ParserCore extends ParserSSEBase implements SSE_ParserCoreConstants { diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/sse/lang/parser/SSE_ParserCoreTokenManager.java b/jena-arq/src/main/java/org/apache/jena/sparql/sse/lang/parser/SSE_ParserCoreTokenManager.java index 7a1742dbfb..7617b32f58 100644 --- a/jena-arq/src/main/java/org/apache/jena/sparql/sse/lang/parser/SSE_ParserCoreTokenManager.java +++ b/jena-arq/src/main/java/org/apache/jena/sparql/sse/lang/parser/SSE_ParserCoreTokenManager.java @@ -19,8 +19,9 @@ */ package org.apache.jena.sparql.sse.lang.parser ; +import static org.apache.jena.riot.lang.LangParserLib.*; + import org.apache.jena.sparql.sse.lang.ParserSSEBase ; -import static org.apache.jena.riot.lang.extra.LangParserLib.*; /** Token Manager. */ @SuppressWarnings ("unused") diff --git a/jena-arq/src/test/java/org/apache/jena/rdf12/TestRDF12LangSyntax.java b/jena-arq/src/test/java/org/apache/jena/rdf12/TestRDF12LangSyntax.java index 0df67dc8dd..c63c94e3ab 100644 --- a/jena-arq/src/test/java/org/apache/jena/rdf12/TestRDF12LangSyntax.java +++ b/jena-arq/src/test/java/org/apache/jena/rdf12/TestRDF12LangSyntax.java @@ -32,7 +32,7 @@ import org.junit.jupiter.params.provider.MethodSource; import org.apache.jena.graph.Graph; import org.apache.jena.graph.GraphMemFactory; import org.apache.jena.riot.*; -import org.apache.jena.riot.lang.extra.TurtleJCC; +import org.apache.jena.riot.lang.turtlejcc.TurtleJCC; import org.apache.jena.riot.system.*; import org.apache.jena.shared.JenaException; import org.apache.jena.sparql.core.DatasetGraph; diff --git a/jena-arq/src/test/java/org/apache/jena/rdf12/parse/TestTurtleStarParse.java b/jena-arq/src/test/java/org/apache/jena/rdf12/parse/TestTurtleStarParse.java index b68ad5c7eb..e4fa20f2a9 100644 --- a/jena-arq/src/test/java/org/apache/jena/rdf12/parse/TestTurtleStarParse.java +++ b/jena-arq/src/test/java/org/apache/jena/rdf12/parse/TestTurtleStarParse.java @@ -25,7 +25,7 @@ import org.junit.jupiter.api.Test; import org.apache.jena.riot.Lang; import org.apache.jena.riot.RDFParser; import org.apache.jena.riot.RiotException; -import org.apache.jena.riot.lang.extra.TurtleJCC; +import org.apache.jena.riot.lang.turtlejcc.TurtleJCC; import org.apache.jena.riot.system.ErrorHandler; import org.apache.jena.riot.system.ErrorHandlerFactory; import org.apache.jena.riot.system.StreamRDF; diff --git a/jena-arq/src/test/java/org/apache/jena/riot/Scripts_AltTurtle.java b/jena-arq/src/test/java/org/apache/jena/riot/Scripts_AltTurtle.java index eca9d7d00e..701a875d92 100644 --- a/jena-arq/src/test/java/org/apache/jena/riot/Scripts_AltTurtle.java +++ b/jena-arq/src/test/java/org/apache/jena/riot/Scripts_AltTurtle.java @@ -27,7 +27,7 @@ import org.junit.jupiter.api.TestFactory; import org.apache.jena.arq.TestConsts; import org.apache.jena.arq.junit.Scripts; -import org.apache.jena.riot.lang.extra.TurtleJCC; +import org.apache.jena.riot.lang.turtlejcc.TurtleJCC; import org.apache.jena.sys.JenaSystem; /** Execute turtle test with alt parser. */ diff --git a/jena-cmds/src/test/java/arq/rdftests.java b/jena-cmds/src/test/java/arq/rdftests.java index 7f99e4e5cf..406c556e09 100644 --- a/jena-cmds/src/test/java/arq/rdftests.java +++ b/jena-cmds/src/test/java/arq/rdftests.java @@ -53,7 +53,7 @@ import org.apache.jena.riot.Lang; import org.apache.jena.riot.RDFDataMgr; import org.apache.jena.riot.RIOT; import org.apache.jena.riot.SysRIOT; -import org.apache.jena.riot.lang.extra.TurtleJCC; +import org.apache.jena.riot.lang.turtlejcc.TurtleJCC; import org.apache.jena.sparql.expr.E_Function; import org.apache.jena.sparql.expr.NodeValue; import org.apache.jena.sparql.util.NodeFactoryExtra; diff --git a/jena-shacl/src/main/java/org/apache/jena/shacl/compact/reader/ShaclCompactParser.java b/jena-shacl/src/main/java/org/apache/jena/shacl/compact/reader/ShaclCompactParser.java index b4ba181dd6..2c82799a9e 100644 --- a/jena-shacl/src/main/java/org/apache/jena/shacl/compact/reader/ShaclCompactParser.java +++ b/jena-shacl/src/main/java/org/apache/jena/shacl/compact/reader/ShaclCompactParser.java @@ -23,7 +23,7 @@ import org.apache.jena.datatypes.xsd.XSDDatatype; import org.apache.jena.graph.Node; import org.apache.jena.graph.NodeFactory; import org.apache.jena.graph.Triple; -import org.apache.jena.riot.lang.extra.LangParserBase; +import org.apache.jena.riot.lang.LangParserBase; import org.apache.jena.riot.system.PrefixMap; import org.apache.jena.riot.system.StreamRDF; import org.apache.jena.riot.tokens.TokenizerText; diff --git a/jena-shacl/src/main/java/org/apache/jena/shacl/compact/reader/parser/ShaclCompactParserJJ.java b/jena-shacl/src/main/java/org/apache/jena/shacl/compact/reader/parser/ShaclCompactParserJJ.java index 336c1c817d..3a2f61a29f 100644 --- a/jena-shacl/src/main/java/org/apache/jena/shacl/compact/reader/parser/ShaclCompactParserJJ.java +++ b/jena-shacl/src/main/java/org/apache/jena/shacl/compact/reader/parser/ShaclCompactParserJJ.java @@ -21,11 +21,13 @@ package org.apache.jena.shacl.compact.reader.parser; import java.util.List; + +import static org.apache.jena.riot.lang.LangParserLib.*; + import java.util.ArrayList; import org.apache.jena.graph.*; import org.apache.jena.sparql.path.*; import org.apache.jena.shacl.compact.reader.*; -import static org.apache.jena.riot.lang.extra.LangParserLib.*; public class ShaclCompactParserJJ extends ShaclCompactParser implements ShaclCompactParserJJConstants { diff --git a/jena-shacl/src/main/java/org/apache/jena/shacl/compact/reader/parser/ShaclCompactParserJJTokenManager.java b/jena-shacl/src/main/java/org/apache/jena/shacl/compact/reader/parser/ShaclCompactParserJJTokenManager.java index 08d441f305..71f4567c5a 100644 --- a/jena-shacl/src/main/java/org/apache/jena/shacl/compact/reader/parser/ShaclCompactParserJJTokenManager.java +++ b/jena-shacl/src/main/java/org/apache/jena/shacl/compact/reader/parser/ShaclCompactParserJJTokenManager.java @@ -20,11 +20,13 @@ package org.apache.jena.shacl.compact.reader.parser; import java.util.List; + +import static org.apache.jena.riot.lang.LangParserLib.*; + import java.util.ArrayList; import org.apache.jena.graph.*; import org.apache.jena.sparql.path.*; import org.apache.jena.shacl.compact.reader.*; -import static org.apache.jena.riot.lang.extra.LangParserLib.*; /** Token Manager. */ @SuppressWarnings ("unused") diff --git a/jena-shex/src/main/java/org/apache/jena/shex/parser/ParserShExC.java b/jena-shex/src/main/java/org/apache/jena/shex/parser/ParserShExC.java index 706122f240..25558c6454 100644 --- a/jena-shex/src/main/java/org/apache/jena/shex/parser/ParserShExC.java +++ b/jena-shex/src/main/java/org/apache/jena/shex/parser/ParserShExC.java @@ -35,8 +35,8 @@ import org.apache.jena.graph.NodeFactory; import org.apache.jena.graph.Triple; import org.apache.jena.irix.IRIs; import org.apache.jena.riot.RiotException; -import org.apache.jena.riot.lang.extra.LangParserBase; -import org.apache.jena.riot.lang.extra.LangParserLib; +import org.apache.jena.riot.lang.LangParserBase; +import org.apache.jena.riot.lang.LangParserLib; import org.apache.jena.shex.ShapeMap; import org.apache.jena.shex.ShexRecord; import org.apache.jena.shex.ShexSchema; diff --git a/jena-shex/src/main/java/org/apache/jena/shex/parser/javacc/ShExJavacc.java b/jena-shex/src/main/java/org/apache/jena/shex/parser/javacc/ShExJavacc.java index 72ffeda66d..7fac1949aa 100644 --- a/jena-shex/src/main/java/org/apache/jena/shex/parser/javacc/ShExJavacc.java +++ b/jena-shex/src/main/java/org/apache/jena/shex/parser/javacc/ShExJavacc.java @@ -24,7 +24,7 @@ import static org.apache.jena.shex.sys.SysShex.*; import org.apache.jena.shex.parser.*; import org.apache.jena.shex.expressions.*; import org.apache.jena.graph.*; -import static org.apache.jena.riot.lang.extra.LangParserLib.*; +import static org.apache.jena.riot.lang.LangParserLib.*; import java.util.*; public class ShExJavacc extends ParserShExC implements ShExJavaccConstants { @@ -115,7 +115,7 @@ finishShexDoc(); } // ---- - final public + final public void directive() throws ParseException { switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) { case BASE:{ @@ -157,7 +157,7 @@ imports(iri, token.beginLine, token.beginColumn) ; } // ---- - final public + final public void notStartAction() throws ParseException { switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) { case START:{ @@ -227,7 +227,7 @@ semActs(semAct, token.beginLine, token.beginColumn); } // ---- - final public + final public void shapeExprDecl() throws ParseException {Node n; startShapeExprDecl(); n = shapeExprLabel(); @@ -781,7 +781,7 @@ constraintDatatype(str, token.beginLine, token.beginColumn); } // Check precedence - final public + final public void nonLitInlineNodeConstraint() throws ParseException {int idx; idx = startNonLiteralNodeConstraint(token.beginLine, token.beginColumn); nonLitNodeConstraint(); @@ -1160,7 +1160,7 @@ extras.add(p); // { // oneOfTripleExpr() // } -// +// // void oneOfTripleExpr() : {} // { // (LOOKAHEAD(2) @@ -1168,12 +1168,12 @@ extras.add(p); // | multiElementOneOf() // ) // } -// +// // void multiElementOneOf() : {} // { // groupTripleExpr() (<VBAR> groupTripleExpr())+ // } -// +// // void groupTripleExpr() : {} // { // ( LOOKAHEAD(2) @@ -1181,12 +1181,12 @@ extras.add(p); // | multiElementGroup() // ) // } -// +// // void singleElementGroup() : {} // { // unaryTripleExpr() (<SEMI_COLON>)? // } -// +// // void multiElementGroup() : {} // { // unaryTripleExpr() @@ -1253,7 +1253,7 @@ finishTripleExpressionClause(idx, null); // } // ---- - final public + final public void unaryTripleExpr() throws ParseException {Node n = null; startUnaryTripleExpr(); switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) { @@ -1464,7 +1464,7 @@ finishValueSet(); // { // iriRange() | literalRange() | languageRange() | (LOOKAHEAD(2) exclusion())+ // } -// +// // void exclusion() : {} // { // <MINUS> @@ -1472,7 +1472,7 @@ finishValueSet(); // iri() | literal() | <LANGTAG> // ) (<TILDE>)? // } - final public + final public void valueSetValue() throws ParseException { startValueSetValue(); switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) { @@ -1583,12 +1583,12 @@ finishValueExclusion(iriStr, lang, lit, isStem); // { // iri() (<TILDE> ( iriExclusion())*)? // } -// +// // void iriExclusion() : {} // { // <MINUS> iri() (<TILDE>)? // } - final public + final public void iriRange() throws ParseException {String iriStr; boolean seenTilde = false; boolean haveSet = false; startIriRange(); iriStr = iri(); @@ -1637,12 +1637,12 @@ if ( ! haveSet ) { valueSetIriRange(iriStr, false); } // { // literal() (<TILDE> ( literalExclusion() )* )? // } -// +// // void literalExclusion() : {} // { // <MINUS> literal() (<TILDE>)? // } - final public + final public void literalRange() throws ParseException {Node lit; boolean seenTilde = false; boolean haveSet = false; startLiteralRange(); lit = literal(); @@ -1695,7 +1695,7 @@ if ( ! haveSet ) { valueSetLiteralRange(lit, false); } // <AT> <TILDE> ( languageExclusion() )* // ) // } -// +// // void languageExclusion() : {} // { // <MINUS> <LANGTAG> (<TILDE>)? @@ -1950,7 +1950,7 @@ semActs.add(semAct); } // ------------------------- Terms - final public + final public Node booleanLiteral() throws ParseException { switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) { case TRUE:{ @@ -2154,7 +2154,7 @@ lex = stripQuotes3(t.image) ; } // ---- Shape Map - final public + final public void UnitShapeMap() throws ParseException { switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) { case BOM:{ @@ -2282,7 +2282,7 @@ association(n, t, label); // | t = triplePattern() { shapeAssociation(t); } // ) // } - final public + final public Node subjectTerm() throws ParseException {String s; switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) { case IRIref: @@ -2787,7 +2787,7 @@ o = focusNode; throw generateParseException(); } - + static private final class LookaheadSuccess extends java.lang.Error { @Override public Throwable fillInStackTrace() { @@ -2974,7 +2974,7 @@ o = focusNode; p = p.next; } - p.gen = jj_gen + xla - jj_la; + p.gen = jj_gen + xla - jj_la; p.first = token; p.arg = xla; }
