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 2025/12/13 12:01:12 UTC

(jena) branch main updated (775204d811 -> 458332fbf5)

This is an automated email from the ASF dual-hosted git repository.

andy pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/jena.git


    from 775204d811 GH-3634: Partial separation of TurtleJCC from RIOT
     new 20c55627fc Switch license to ASF contributed form
     new 458332fbf5 GH-3636: Regularize the code layout for javacc parsers. Add SPDX identifier.

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 jena-arq/Grammar/CDTs/cdt-literals                 |    8 +-
 jena-arq/Grammar/CDTs/cdt_literals.jj              |    9 +-
 jena-arq/Grammar/JSON/json                         |    8 +-
 jena-arq/Grammar/JSON/json.jj                      |   36 +-
 jena-arq/Grammar/Turtle/turtle                     |    2 +
 jena-arq/Grammar/Turtle/turtle.jj                  |    4 +
 jena-arq/Grammar/arq.jj                            |  354 +++-
 jena-arq/Grammar/grammar                           |   12 +-
 jena-arq/Grammar/header.jj                         |    2 +
 jena-arq/Grammar/main.jj                           |    4 +
 jena-arq/Grammar/sparql_12.jj                      |  315 +++-
 jena-arq/Grammar/sse/grammar-sse                   |   27 +-
 jena-arq/Grammar/sse/sse.jj                        |    8 +-
 .../json/io/parserjavacc/javacc/JSON_Parser.java   |   15 +-
 .../parserjavacc/javacc/JSON_ParserConstants.java  |    5 +-
 .../javacc/JSON_ParserTokenManager.java            |    5 +-
 .../io/parserjavacc/javacc/JavaCharStream.java     |   86 +-
 .../io/parserjavacc/javacc/ParseException.java     |    7 +-
 .../atlas/json/io/parserjavacc/javacc/Token.java   |    7 +-
 .../json/io/parserjavacc/javacc/TokenMgrError.java |   10 +-
 .../org/apache/jena/cdt/ParserForCDTLiterals.java  |    6 +-
 .../cdt/{parser => javacc}/CDTLiteralParser.java   |    7 +-
 .../CDTLiteralParserConstants.java                 |    4 +-
 .../CDTLiteralParserTokenManager.java              |    7 +-
 .../apache/jena/cdt/javacc}/JavaCharStream.java    |    6 +-
 .../lang/parser => cdt/javacc}/ParseException.java |    6 +-
 .../java/org/apache/jena/cdt/javacc}/Token.java    |    6 +-
 .../jena/cdt/{parser => javacc}/TokenMgrError.java |    6 +-
 .../riot/lang/turtlejcc/javacc/ParseException.java |    4 +-
 .../lang/turtlejcc/javacc/SimpleCharStream.java    |    4 +-
 .../jena/riot/lang/turtlejcc/javacc/Token.java     |    4 +-
 .../riot/lang/turtlejcc/javacc/TokenMgrError.java  |    4 +-
 .../riot/lang/turtlejcc/javacc/TurtleJavacc.java   |    2 +
 .../turtlejcc/javacc/TurtleJavaccConstants.java    |    2 +
 .../turtlejcc/javacc/TurtleJavaccTokenManager.java |    2 +
 .../jena/sparql/lang/arq/javacc/ARQParser.java     | 1811 +++++++++++---------
 .../sparql/lang/arq/javacc/ARQParserConstants.java |   19 +
 .../lang/arq/javacc/ARQParserTokenManager.java     |   19 +
 .../sparql/lang/arq/javacc/ParseException.java     |   21 +-
 .../sparql/lang/arq/javacc/SimpleCharStream.java   |   21 +-
 .../apache/jena/sparql/lang/arq/javacc/Token.java  |   21 +-
 .../jena/sparql/lang/arq/javacc/TokenMgrError.java |   21 +-
 .../jena/sparql/lang/sparql_10/ParserSPARQL10.java |    5 +-
 .../sparql/lang/sparql_10/SPARQLParser10Base.java  |    2 +-
 .../sparql_10/{ => javacc}/JavaCharStream.java     |    2 +-
 .../sparql_10/{ => javacc}/ParseException.java     |    2 +-
 .../sparql_10/{ => javacc}/SPARQLParser10.java     |    3 +-
 .../{ => javacc}/SPARQLParser10Constants.java      |    2 +-
 .../{ => javacc}/SPARQLParser10TokenManager.java   |    2 +-
 .../sparql/lang/sparql_10/{ => javacc}/Token.java  |    2 +-
 .../lang/sparql_10/{ => javacc}/TokenMgrError.java |    2 +-
 .../jena/sparql/lang/sparql_11/ParserSPARQL11.java |    5 +-
 .../lang/sparql_11/ParserSPARQL11Update.java       |    5 +-
 .../sparql/lang/sparql_11/SPARQLParser11Base.java  |    2 +-
 .../sparql_11/{ => javacc}/JavaCharStream.java     |    2 +-
 .../sparql_11/{ => javacc}/ParseException.java     |    2 +-
 .../sparql_11/{ => javacc}/SPARQLParser11.java     |    3 +-
 .../{ => javacc}/SPARQLParser11Constants.java      |    2 +-
 .../{ => javacc}/SPARQLParser11TokenManager.java   |    2 +-
 .../sparql/lang/sparql_11/{ => javacc}/Token.java  |    2 +-
 .../lang/sparql_11/{ => javacc}/TokenMgrError.java |    2 +-
 .../lang/sparql_12/javacc/JavaCharStream.java      |   21 +-
 .../lang/sparql_12/javacc/ParseException.java      |   21 +-
 .../lang/sparql_12/javacc/SPARQLParser12.java      |  155 +-
 .../sparql_12/javacc/SPARQLParser12Constants.java  |   19 +
 .../javacc/SPARQLParser12TokenManager.java         |   19 +
 .../jena/sparql/lang/sparql_12/javacc/Token.java   |   21 +-
 .../lang/sparql_12/javacc/TokenMgrError.java       |   21 +-
 .../apache/jena/sparql/sse/lang/SSE_Parser.java    |    6 +-
 .../sse/lang/javacc}/ParseException.java           |    6 +-
 .../lang/{parser => javacc}/SSE_ParserCore.java    |    7 +-
 .../SSE_ParserCoreConstants.java                   |    4 +-
 .../SSE_ParserCoreTokenManager.java                |    7 +-
 .../lang/{parser => javacc}/SimpleCharStream.java  |    2 +-
 .../parser => sparql/sse/lang/javacc}/Token.java   |    6 +-
 .../sse/lang/{parser => javacc}/TokenMgrError.java |    6 +-
 .../ttl_test/test/turtle/TestTurtleInternal.java   |    2 +-
 .../apache/jena/ttl_test/turtle/ParserTurtle.java  |    6 +-
 .../ttl_test/turtle/javacc}/JavaCharStream.java    |   85 +-
 .../turtle/{parser => javacc}/ParseException.java  |    6 +-
 .../apache/jena/ttl_test/turtle/javacc}/Token.java |    6 +-
 .../turtle/{parser => javacc}/TokenMgrError.java   |    6 +-
 .../turtle/{parser => javacc}/TurtleParser.java    |  184 +-
 .../{parser => javacc}/TurtleParserConstants.java  |    4 +-
 .../TurtleParserTokenManager.java                  |   49 +-
 jena-core/testing/ttl_test/README                  |    2 +-
 jena-core/testing/ttl_test/turtle-test-parser      |    5 +-
 jena-core/testing/ttl_test/turtle-test.jj          |   14 +-
 jena-langtag/pom.xml                               |   12 +-
 jena-shacl/shaclc/shaclc-parser                    |    6 +-
 jena-shacl/shaclc/shaclc.jj                        |    8 +-
 .../apache/jena/shacl/compact/ShaclcParser.java    |    6 +-
 .../compact/reader/javacc}/ParseException.java     |    6 +-
 .../{parser => javacc}/ShaclCompactParserJJ.java   |    8 +-
 .../ShaclCompactParserJJConstants.java             |    4 +-
 .../ShaclCompactParserJJTokenManager.java          |    8 +-
 .../{parser => javacc}/SimpleCharStream.java       |    6 +-
 .../jena/shacl/compact/reader/javacc}/Token.java   |    6 +-
 .../compact/reader/javacc}/TokenMgrError.java      |    6 +-
 .../compact/reader/parser/ParseException.java      |  213 ---
 .../jena/shacl/compact/reader/parser/Token.java    |  150 --
 .../shacl/compact/reader/parser/TokenMgrError.java |  167 --
 jena-shex/shexc/shex-parser                        |    6 +-
 jena-shex/shexc/shex.jj                            |    6 +-
 .../jena/shex/parser/javacc/ParseException.java    |    4 +-
 .../apache/jena/shex/parser/javacc/ShExJavacc.java |  168 +-
 .../shex/parser/javacc/ShExJavaccConstants.java    |    2 +
 .../shex/parser/javacc/ShExJavaccTokenManager.java |   87 +-
 .../jena/shex/parser/javacc/SimpleCharStream.java  |    4 +-
 .../org/apache/jena/shex/parser/javacc/Token.java  |    4 +-
 .../jena/shex/parser/javacc/TokenMgrError.java     |    4 +-
 111 files changed, 2636 insertions(+), 1921 deletions(-)
 rename jena-arq/src/main/java/org/apache/jena/cdt/{parser => javacc}/CDTLiteralParser.java (99%)
 rename jena-arq/src/main/java/org/apache/jena/cdt/{parser => javacc}/CDTLiteralParserConstants.java (97%)
 rename jena-arq/src/main/java/org/apache/jena/cdt/{parser => javacc}/CDTLiteralParserTokenManager.java (99%)
 rename {jena-core/src/test/java/org/apache/jena/ttl_test/turtle/parser => jena-arq/src/main/java/org/apache/jena/cdt/javacc}/JavaCharStream.java (99%)
 copy jena-arq/src/main/java/org/apache/jena/{sparql/sse/lang/parser => cdt/javacc}/ParseException.java (98%)
 copy {jena-core/src/test/java/org/apache/jena/ttl_test/turtle/parser => jena-arq/src/main/java/org/apache/jena/cdt/javacc}/Token.java (97%)
 copy jena-arq/src/main/java/org/apache/jena/cdt/{parser => javacc}/TokenMgrError.java (97%)
 rename jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_10/{ => javacc}/JavaCharStream.java (99%)
 rename jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_10/{ => javacc}/ParseException.java (99%)
 rename jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_10/{ => javacc}/SPARQLParser10.java (99%)
 rename jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_10/{ => javacc}/SPARQLParser10Constants.java (99%)
 rename jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_10/{ => javacc}/SPARQLParser10TokenManager.java (99%)
 rename jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_10/{ => javacc}/Token.java (98%)
 rename jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_10/{ => javacc}/TokenMgrError.java (98%)
 rename jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_11/{ => javacc}/JavaCharStream.java (99%)
 rename jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_11/{ => javacc}/ParseException.java (99%)
 rename jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_11/{ => javacc}/SPARQLParser11.java (99%)
 rename jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_11/{ => javacc}/SPARQLParser11Constants.java (99%)
 rename jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_11/{ => javacc}/SPARQLParser11TokenManager.java (99%)
 rename jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_11/{ => javacc}/Token.java (98%)
 rename jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_11/{ => javacc}/TokenMgrError.java (98%)
 rename jena-arq/src/main/java/org/apache/jena/{cdt/parser => sparql/sse/lang/javacc}/ParseException.java (97%)
 rename jena-arq/src/main/java/org/apache/jena/sparql/sse/lang/{parser => javacc}/SSE_ParserCore.java (99%)
 rename jena-arq/src/main/java/org/apache/jena/sparql/sse/lang/{parser => javacc}/SSE_ParserCoreConstants.java (98%)
 rename jena-arq/src/main/java/org/apache/jena/sparql/sse/lang/{parser => javacc}/SSE_ParserCoreTokenManager.java (99%)
 rename jena-arq/src/main/java/org/apache/jena/sparql/sse/lang/{parser => javacc}/SimpleCharStream.java (99%)
 rename jena-arq/src/main/java/org/apache/jena/{cdt/parser => sparql/sse/lang/javacc}/Token.java (96%)
 rename jena-arq/src/main/java/org/apache/jena/sparql/sse/lang/{parser => javacc}/TokenMgrError.java (97%)
 rename {jena-arq/src/main/java/org/apache/jena/cdt/parser => jena-core/src/test/java/org/apache/jena/ttl_test/turtle/javacc}/JavaCharStream.java (96%)
 rename jena-core/src/test/java/org/apache/jena/ttl_test/turtle/{parser => javacc}/ParseException.java (97%)
 rename {jena-arq/src/main/java/org/apache/jena/sparql/sse/lang/parser => jena-core/src/test/java/org/apache/jena/ttl_test/turtle/javacc}/Token.java (96%)
 rename jena-core/src/test/java/org/apache/jena/ttl_test/turtle/{parser => javacc}/TokenMgrError.java (97%)
 rename jena-core/src/test/java/org/apache/jena/ttl_test/turtle/{parser => javacc}/TurtleParser.java (86%)
 rename jena-core/src/test/java/org/apache/jena/ttl_test/turtle/{parser => javacc}/TurtleParserConstants.java (98%)
 rename jena-core/src/test/java/org/apache/jena/ttl_test/turtle/{parser => javacc}/TurtleParserTokenManager.java (98%)
 rename {jena-arq/src/main/java/org/apache/jena/sparql/sse/lang/parser => jena-shacl/src/main/java/org/apache/jena/shacl/compact/reader/javacc}/ParseException.java (97%)
 rename jena-shacl/src/main/java/org/apache/jena/shacl/compact/reader/{parser => javacc}/ShaclCompactParserJJ.java (99%)
 rename jena-shacl/src/main/java/org/apache/jena/shacl/compact/reader/{parser => javacc}/ShaclCompactParserJJConstants.java (98%)
 rename jena-shacl/src/main/java/org/apache/jena/shacl/compact/reader/{parser => javacc}/ShaclCompactParserJJTokenManager.java (99%)
 rename jena-shacl/src/main/java/org/apache/jena/shacl/compact/reader/{parser => javacc}/SimpleCharStream.java (98%)
 rename {jena-core/src/test/java/org/apache/jena/ttl_test/turtle/parser => jena-shacl/src/main/java/org/apache/jena/shacl/compact/reader/javacc}/Token.java (96%)
 rename {jena-arq/src/main/java/org/apache/jena/cdt/parser => jena-shacl/src/main/java/org/apache/jena/shacl/compact/reader/javacc}/TokenMgrError.java (97%)
 delete mode 100644 jena-shacl/src/main/java/org/apache/jena/shacl/compact/reader/parser/ParseException.java
 delete mode 100644 jena-shacl/src/main/java/org/apache/jena/shacl/compact/reader/parser/Token.java
 delete mode 100644 jena-shacl/src/main/java/org/apache/jena/shacl/compact/reader/parser/TokenMgrError.java


(jena) 02/02: GH-3636: Regularize the code layout for javacc parsers. Add SPDX identifier.

Posted by an...@apache.org.
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 458332fbf539bdb46340935330c8eb078ad745a1
Author: Andy Seaborne <an...@apache.org>
AuthorDate: Thu Dec 11 17:00:41 2025 +0000

    GH-3636: Regularize the code layout for javacc parsers. Add SPDX identifier.
---
 jena-arq/Grammar/CDTs/cdt-literals                 |    8 +-
 jena-arq/Grammar/CDTs/cdt_literals.jj              |    9 +-
 jena-arq/Grammar/JSON/json                         |    8 +-
 jena-arq/Grammar/JSON/json.jj                      |   36 +-
 jena-arq/Grammar/Turtle/turtle                     |    2 +
 jena-arq/Grammar/Turtle/turtle.jj                  |    4 +
 jena-arq/Grammar/arq.jj                            |  354 +++-
 jena-arq/Grammar/grammar                           |   12 +-
 jena-arq/Grammar/header.jj                         |    2 +
 jena-arq/Grammar/main.jj                           |    4 +
 jena-arq/Grammar/sparql_12.jj                      |  315 +++-
 jena-arq/Grammar/sse/grammar-sse                   |   27 +-
 jena-arq/Grammar/sse/sse.jj                        |    8 +-
 .../json/io/parserjavacc/javacc/JSON_Parser.java   |   15 +-
 .../parserjavacc/javacc/JSON_ParserConstants.java  |    5 +-
 .../javacc/JSON_ParserTokenManager.java            |    5 +-
 .../io/parserjavacc/javacc/JavaCharStream.java     |   86 +-
 .../io/parserjavacc/javacc/ParseException.java     |    7 +-
 .../atlas/json/io/parserjavacc/javacc/Token.java   |    7 +-
 .../json/io/parserjavacc/javacc/TokenMgrError.java |   10 +-
 .../org/apache/jena/cdt/ParserForCDTLiterals.java  |    6 +-
 .../cdt/{parser => javacc}/CDTLiteralParser.java   |    7 +-
 .../CDTLiteralParserConstants.java                 |    4 +-
 .../CDTLiteralParserTokenManager.java              |    7 +-
 .../apache/jena/cdt/javacc}/JavaCharStream.java    |    6 +-
 .../apache/jena/cdt/javacc}/ParseException.java    |    6 +-
 .../sse/lang/parser => cdt/javacc}/Token.java      |    6 +-
 .../lang/parser => cdt/javacc}/TokenMgrError.java  |    6 +-
 .../riot/lang/turtlejcc/javacc/ParseException.java |    4 +-
 .../lang/turtlejcc/javacc/SimpleCharStream.java    |    4 +-
 .../jena/riot/lang/turtlejcc/javacc/Token.java     |    4 +-
 .../riot/lang/turtlejcc/javacc/TokenMgrError.java  |    4 +-
 .../riot/lang/turtlejcc/javacc/TurtleJavacc.java   |    2 +
 .../turtlejcc/javacc/TurtleJavaccConstants.java    |    2 +
 .../turtlejcc/javacc/TurtleJavaccTokenManager.java |    2 +
 .../jena/sparql/lang/arq/javacc/ARQParser.java     | 1811 +++++++++++---------
 .../sparql/lang/arq/javacc/ARQParserConstants.java |   19 +
 .../lang/arq/javacc/ARQParserTokenManager.java     |   19 +
 .../sparql/lang/arq/javacc/ParseException.java     |   21 +-
 .../sparql/lang/arq/javacc/SimpleCharStream.java   |   21 +-
 .../apache/jena/sparql/lang/arq/javacc/Token.java  |   21 +-
 .../jena/sparql/lang/arq/javacc/TokenMgrError.java |   21 +-
 .../jena/sparql/lang/sparql_10/ParserSPARQL10.java |    5 +-
 .../sparql/lang/sparql_10/SPARQLParser10Base.java  |    2 +-
 .../sparql_10/{ => javacc}/JavaCharStream.java     |    2 +-
 .../sparql_10/{ => javacc}/ParseException.java     |    2 +-
 .../sparql_10/{ => javacc}/SPARQLParser10.java     |    3 +-
 .../{ => javacc}/SPARQLParser10Constants.java      |    2 +-
 .../{ => javacc}/SPARQLParser10TokenManager.java   |    2 +-
 .../sparql/lang/sparql_10/{ => javacc}/Token.java  |    2 +-
 .../lang/sparql_10/{ => javacc}/TokenMgrError.java |    2 +-
 .../jena/sparql/lang/sparql_11/ParserSPARQL11.java |    5 +-
 .../lang/sparql_11/ParserSPARQL11Update.java       |    5 +-
 .../sparql/lang/sparql_11/SPARQLParser11Base.java  |    2 +-
 .../sparql_11/{ => javacc}/JavaCharStream.java     |    2 +-
 .../sparql_11/{ => javacc}/ParseException.java     |    2 +-
 .../sparql_11/{ => javacc}/SPARQLParser11.java     |    3 +-
 .../{ => javacc}/SPARQLParser11Constants.java      |    2 +-
 .../{ => javacc}/SPARQLParser11TokenManager.java   |    2 +-
 .../sparql/lang/sparql_11/{ => javacc}/Token.java  |    2 +-
 .../lang/sparql_11/{ => javacc}/TokenMgrError.java |    2 +-
 .../lang/sparql_12/javacc/JavaCharStream.java      |   21 +-
 .../lang/sparql_12/javacc/ParseException.java      |   21 +-
 .../lang/sparql_12/javacc/SPARQLParser12.java      |  155 +-
 .../sparql_12/javacc/SPARQLParser12Constants.java  |   19 +
 .../javacc/SPARQLParser12TokenManager.java         |   19 +
 .../jena/sparql/lang/sparql_12/javacc/Token.java   |   21 +-
 .../lang/sparql_12/javacc/TokenMgrError.java       |   21 +-
 .../apache/jena/sparql/sse/lang/SSE_Parser.java    |    6 +-
 .../sse/lang/javacc}/ParseException.java           |    6 +-
 .../lang/{parser => javacc}/SSE_ParserCore.java    |    7 +-
 .../SSE_ParserCoreConstants.java                   |    4 +-
 .../SSE_ParserCoreTokenManager.java                |    7 +-
 .../lang/{parser => javacc}/SimpleCharStream.java  |    2 +-
 .../parser => sparql/sse/lang/javacc}/Token.java   |    6 +-
 .../sparql/sse/lang/javacc}/TokenMgrError.java     |    6 +-
 .../ttl_test/test/turtle/TestTurtleInternal.java   |    2 +-
 .../apache/jena/ttl_test/turtle/ParserTurtle.java  |    6 +-
 .../ttl_test/turtle/javacc}/JavaCharStream.java    |   85 +-
 .../ttl_test/turtle/javacc}/ParseException.java    |    6 +-
 .../ttl_test/turtle/{parser => javacc}/Token.java  |    6 +-
 .../ttl_test/turtle/javacc}/TokenMgrError.java     |    6 +-
 .../turtle/{parser => javacc}/TurtleParser.java    |  184 +-
 .../{parser => javacc}/TurtleParserConstants.java  |    4 +-
 .../TurtleParserTokenManager.java                  |   49 +-
 jena-core/testing/ttl_test/README                  |    2 +-
 jena-core/testing/ttl_test/turtle-test-parser      |    5 +-
 jena-core/testing/ttl_test/turtle-test.jj          |   14 +-
 jena-shacl/shaclc/shaclc-parser                    |    6 +-
 jena-shacl/shaclc/shaclc.jj                        |    8 +-
 .../apache/jena/shacl/compact/ShaclcParser.java    |    6 +-
 .../compact/reader/javacc}/ParseException.java     |    6 +-
 .../{parser => javacc}/ShaclCompactParserJJ.java   |    8 +-
 .../ShaclCompactParserJJConstants.java             |    4 +-
 .../ShaclCompactParserJJTokenManager.java          |    8 +-
 .../{parser => javacc}/SimpleCharStream.java       |    6 +-
 .../jena/shacl/compact/reader/javacc}/Token.java   |    6 +-
 .../compact/reader}/javacc/TokenMgrError.java      |    6 +-
 .../compact/reader/parser/ParseException.java      |  213 ---
 .../jena/shacl/compact/reader/parser/Token.java    |  150 --
 .../shacl/compact/reader/parser/TokenMgrError.java |  167 --
 jena-shex/shexc/shex-parser                        |    6 +-
 jena-shex/shexc/shex.jj                            |    6 +-
 .../jena/shex/parser/javacc/ParseException.java    |    4 +-
 .../apache/jena/shex/parser/javacc/ShExJavacc.java |  168 +-
 .../shex/parser/javacc/ShExJavaccConstants.java    |    2 +
 .../shex/parser/javacc/ShExJavaccTokenManager.java |   87 +-
 .../jena/shex/parser/javacc/SimpleCharStream.java  |    4 +-
 .../org/apache/jena/shex/parser/javacc/Token.java  |    4 +-
 .../jena/shex/parser/javacc/TokenMgrError.java     |    4 +-
 110 files changed, 2630 insertions(+), 1915 deletions(-)

diff --git a/jena-arq/Grammar/CDTs/cdt-literals b/jena-arq/Grammar/CDTs/cdt-literals
index 466b3342e6..43a06f9b1c 100755
--- a/jena-arq/Grammar/CDTs/cdt-literals
+++ b/jena-arq/Grammar/CDTs/cdt-literals
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/bash
 ## Licensed to the Apache Software Foundation (ASF) under one
 ## or more contributor license agreements.  See the NOTICE file
 ## distributed with this work for additional information
@@ -14,10 +14,10 @@
 ## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 ## See the License for the specific language governing permissions and
 ## limitations under the License.
+##
+## SPDX-License-Identifier: Apache-2.0
 
-# Parser builder
-
-DIR="../../src/main/java/org/apache/jena/cdt/parser"
+DIR="../../src/main/java/org/apache/jena/cdt/javacc"
 FILE=cdt_literals.jj
 CLASS=CDTLiteralParser
 
diff --git a/jena-arq/Grammar/CDTs/cdt_literals.jj b/jena-arq/Grammar/CDTs/cdt_literals.jj
index d2e098b906..e25e99aa18 100644
--- a/jena-arq/Grammar/CDTs/cdt_literals.jj
+++ b/jena-arq/Grammar/CDTs/cdt_literals.jj
@@ -14,6 +14,8 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 options
@@ -46,9 +48,11 @@ PARSER_BEGIN(CDTLiteralParser)
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
  */
 
-package org.apache.jena.cdt.parser;
+package org.apache.jena.cdt.javacc;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -57,8 +61,7 @@ import java.util.Map;
 
 import org.apache.jena.cdt.*;
 import org.apache.jena.graph.Node;
-
-import static org.apache.jena.riot.lang.extra.LangParserLib.*;
+import static org.apache.jena.riot.lang.LangParserLib.*;
 
 public class CDTLiteralParser extends CDTLiteralParserBase
 {
diff --git a/jena-arq/Grammar/JSON/json b/jena-arq/Grammar/JSON/json
index e109bf225a..aeda71c832 100755
--- a/jena-arq/Grammar/JSON/json
+++ b/jena-arq/Grammar/JSON/json
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/bash
 ## Licensed to the Apache Software Foundation (ASF) under one
 ## or more contributor license agreements.  See the NOTICE file
 ## distributed with this work for additional information
@@ -14,6 +14,8 @@
 ## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 ## See the License for the specific language governing permissions and
 ## limitations under the License.
+##
+## SPDX-License-Identifier: Apache-2.0
 
 # Parser builder
 
@@ -85,9 +87,7 @@ for G in "$@"
   do
   case "$G" in
   json)
-    cpp -P -C "$GRAMMAR" > parser.jj
-    grammar parser.jj $PKG JSON_Parser
-    [ "$RC" = 0 ] && rm -f parser.jj
+    grammar $GRAMMAR $PKG JSON_Parser
     ;;
   *)    echo "**** Unknown grammar: $G" 1>&2
     ;;
diff --git a/jena-arq/Grammar/JSON/json.jj b/jena-arq/Grammar/JSON/json.jj
index 5e236d6d05..3d9d488151 100644
--- a/jena-arq/Grammar/JSON/json.jj
+++ b/jena-arq/Grammar/JSON/json.jj
@@ -1,10 +1,22 @@
-#if 0
-// (Run through cpp -P -C first)
-#endif
-
-#define PACKAGE     org.apache.jena.atlas.json.io.parserjavacc.javacc
-#define CLASS       JSON_Parser
-#define PARSERBASE  JSON_ParserBase
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
 
 options
 {
@@ -17,7 +29,7 @@ options
 }
 
 
-PARSER_BEGIN(CLASS)
+PARSER_BEGIN(JSON_Parser)
 /**
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -34,14 +46,16 @@ PARSER_BEGIN(CLASS)
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
  */
 
-package PACKAGE ;
+package org.apache.jena.atlas.json.io.parserjavacc.javacc;
 
-public class CLASS extends PARSERBASE
+public class JSON_Parser extends JSON_ParserBase
 {
 }
-PARSER_END(CLASS)
+PARSER_END(JSON_Parser)
 
 
 SKIP : { <" " | "\t" | "\n" | "\r" | "\f"> }
diff --git a/jena-arq/Grammar/Turtle/turtle b/jena-arq/Grammar/Turtle/turtle
index 78bae9060e..de5165c18b 100755
--- a/jena-arq/Grammar/Turtle/turtle
+++ b/jena-arq/Grammar/Turtle/turtle
@@ -14,6 +14,8 @@
 ## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 ## See the License for the specific language governing permissions and
 ## limitations under the License.
+##
+## SPDX-License-Identifier: Apache-2.0
 
 DIR="../../src/main/java/org/apache/jena/riot/lang/turtlejcc/javacc"
 FILE="turtle.jj"
diff --git a/jena-arq/Grammar/Turtle/turtle.jj b/jena-arq/Grammar/Turtle/turtle.jj
index 8126b8a876..e1f228c3d5 100644
--- a/jena-arq/Grammar/Turtle/turtle.jj
+++ b/jena-arq/Grammar/Turtle/turtle.jj
@@ -14,6 +14,8 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 // Turtle RDF 1.1 Gramamr.
@@ -50,6 +52,8 @@ PARSER_BEGIN(TurtleJavacc)
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 package org.apache.jena.riot.lang.turtlejcc.javacc;
diff --git a/jena-arq/Grammar/arq.jj b/jena-arq/Grammar/arq.jj
index f53137d127..0529efc2af 100644
--- a/jena-arq/Grammar/arq.jj
+++ b/jena-arq/Grammar/arq.jj
@@ -14,15 +14,94 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
  */
 
+/* Copyright (C) 1991-2025 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, see
+   <https://www.gnu.org/licenses/>.  */
+/* This header is separate from features.h so that the compiler can
+   include it implicitly at the start of every compilation.  It must
+   not itself include <features.h> or any other header that includes
+   <features.h> because the implicit include comes before any feature
+   test macros that may be defined in a source file before it first
+   explicitly includes a system header.  GCC knows the name of this
+   header in order to preinclude it.  */
+/* glibc's intent is to support the IEC 559 math functionality, real
+   and complex.  If the GCC (4.9 and later) predefined macros
+   specifying compiler intent are available, use them to determine
+   whether the overall intent is to support these features; otherwise,
+   presume an older compiler has intent to support these features and
+   define these macros by default.  */
+/* wchar_t uses Unicode 10.0.0.  Version 10.0 of the Unicode Standard is
+   synchronized with ISO/IEC 10646:2017, fifth edition, plus
+   the following additions from Amendment 1 to the fifth edition:
+   - 56 emoji characters
+   - 285 hentaigana
+   - 3 additional Zanabazar Square characters */
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+// ARQ/SPARQL 1.1 Grammar - native syntax for the query engine
 options
 {
+    // \ u processed after parsing in strings and IRIs, nowhere else.
     JAVA_UNICODE_ESCAPE = false ;
     UNICODE_INPUT = true ;
   STATIC = false ;
+//  DEBUG_PARSER          = true ;
+//  DEBUG_TOKEN_MANAGER   = true ;
 }
 PARSER_BEGIN(ARQParser)
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
 package org.apache.jena.sparql.lang.arq.javacc ;
 import org.apache.jena.graph.* ;
 import org.apache.jena.query.* ;
@@ -40,6 +119,13 @@ import java.util.ArrayList;
 public class ARQParser extends org.apache.jena.sparql.lang.arq.ARQParserBase
 {}
 PARSER_END(ARQParser)
+// // Common top for single entry point.
+// void Top(): {}
+// {
+//     ( Query() | Update() )
+//     <EOF>
+// }
+// Query only entry point
 void QueryUnit(): { }
 {
   ByteOrderMark()
@@ -98,6 +184,7 @@ String VersionSpecifier() : { Token t ; String version ; }
       return version;
     }
 }
+// ---- Query type clauses
 void SelectQuery() : { }
 {
   SelectClause()
@@ -124,6 +211,7 @@ void SelectClause() : { Var v ; Expr expr ; Node n ; }
     (
       v = Var() { getQuery().addResultVar(v) ; }
     |
+      // Expressions without ()
       ( LOOKAHEAD(2)
         expr = BuiltInCall() { getQuery().addResultVar((Var)null, expr) ; }
       | expr = FunctionCall() { getQuery().addResultVar((Var)null, expr) ; }
@@ -132,6 +220,7 @@ void SelectClause() : { Var v ; Expr expr ; Node n ; }
       | n = BooleanLiteral() { getQuery().addResultVar((Var)null, NodeValue.makeNode(n)) ; }
       )
     |
+        // Expressions with ()
       (
         { v = null ; }
         <LPAREN>
@@ -147,27 +236,32 @@ void SelectClause() : { Var v ; Expr expr ; Node n ; }
   )
   { setAllowAggregatesInExpressions(false) ; }
 }
+// Allows quads
 void ConstructQuery() : { Template t ;
                           QuadAcc acc = new QuadAcc() ; }
 {
  <CONSTRUCT>
    { getQuery().setQueryConstructType() ; }
  (
+    // Full form.
     t = ConstructTemplate()
       { getQuery().setConstructTemplate(t) ; }
     ( DatasetClause() )*
     WhereClause()
     SolutionModifier()
  |
+    // Abbreviated CONSTRUCT WHERE {}
     ( DatasetClause() )*
     <WHERE>
+    // Should have been "ConstructTemplate()"
     <LBRACE>
-    ConstructQuads(acc)
+    ConstructQuads(acc) // Quads
     <RBRACE>
     SolutionModifier()
     {
       t = new Template(acc) ;
       getQuery().setConstructTemplate(t) ;
+      // Create a query in the same shape as the query created by writing out in full.
    ElementGroup elg = createQueryPattern(t);
       getQuery().setQueryPattern(elg) ;
     }
@@ -212,6 +306,7 @@ void JsonClause() : {}
 void JsonObjectMember() : { Node o ; String s ; Token t; }
 {
   s = String()
+  // PNAME_NS would eval true before COLON (default namescape) so we make sure we got what we were expecting
   t = <PNAME_NS> {
     if ( ! t.image.equals(":") )
       throwParseException("Prefix name expression not legal at this point : "+t.image, t.beginLine, t.beginColumn) ;
@@ -223,6 +318,7 @@ void JsonObjectMember() : { Node o ; String s ; Token t; }
   | o = BooleanLiteral() { getQuery().addJsonMapping(s, o) ; }
   )
 }
+// ----
 void DatasetClause() : {}
 {
   <FROM>
@@ -232,6 +328,7 @@ void DefaultGraphClause() : { String iri ; }
 {
   iri = SourceSelector()
   {
+    // This checks for duplicates
     getQuery().addGraphURI(iri) ;
   }
 }
@@ -240,6 +337,7 @@ void NamedGraphClause() : { String iri ; }
   <NAMED>
   iri = SourceSelector()
   {
+    // This checks for duplicates
     getQuery().addNamedGraphURI(iri) ;
   }
 }
@@ -301,14 +399,14 @@ void OrderCondition() :
 {
   { direction = Query.ORDER_DEFAULT ; }
   (
-    (
+    ( // These are for clarity in the HTML
       ( <ASC> { direction = Query.ORDER_ASCENDING ; }
       | <DESC> { direction = Query.ORDER_DESCENDING ; } )
       expr = BrackettedExpression()
     )
   |
     ( expr = Constraint()
-    | v = Var()
+    | v = Var() //{ expr = asExpr(v) ; } 
     )
   )
   { if ( v == null )
@@ -321,14 +419,14 @@ SortCondition OrderConditionForAggregationFunction() :
 {
   { direction = Query.ORDER_DEFAULT ; }
   (
-    (
+    ( // These are for clarity in the HTML
       ( <ASC> { direction = Query.ORDER_ASCENDING ; }
       | <DESC> { direction = Query.ORDER_DESCENDING ; } )
       expr = BrackettedExpression()
     )
   |
     ( expr = Constraint()
-    | v = Var()
+    | v = Var() //{ expr = asExpr(v) ; } 
     )
   )
   { if ( v == null )
@@ -338,6 +436,9 @@ SortCondition OrderConditionForAggregationFunction() :
 }
 void LimitOffsetClauses() : { }
 {
+  // SPARQL does not care about the order here.
+  // SQL (where implemented) does (it's LIMIT then OFFSET generally)
+  // But that is counter intuitive as it's applied the other way round
   (
     LimitClause() (OffsetClause())?
   |
@@ -365,10 +466,12 @@ void ValuesClause() : { Token t ; }
 }
 void Update() : { }
 {
+  // Rewrite for no recursion - grammar is not LL(1)
   Prologue()
   (
     Update1()
     (
+      // This syntactic lookahead is necessitated by the optional trailing semicolon and prologue
       LOOKAHEAD( <SEMICOLON> Prologue() ( <LOAD> | <CLEAR> | <DROP> | <ADD> |
                    <MOVE> | <COPY> | <CREATE> | <WITH> | <DELETE> | <INSERT> |
                    <USING> | <INSERT_DATA> | <DELETE_DATA> | <DELETE_WHERE> ) )
@@ -404,6 +507,7 @@ void Update1() : { Update up = null ; }
 }
 Update Load() : { String url ; Node dest = null ; boolean silent = false ; }
 {
+    //    <LOAD> ( iri() )+
     <LOAD> (<SILENT> { silent = true ; })? url = iri()
     (<INTO> dest = GraphRef() )?
     { return new UpdateLoad(url, dest, silent) ; }
@@ -438,6 +542,13 @@ Update Copy() : { Target src ; Target dest ; boolean silent = false ; }
   <COPY> (<SILENT> { silent=true ; } )? src = GraphOrDefault() <TO> dest = GraphOrDefault()
   { return new UpdateCopy(src, dest, silent) ; }
 }
+// #ifdef ARQ
+// void Meta() : { QuadDataAccSink qd = new QuadDataAccSink() ; }
+// {
+//    <META> 
+//    QuadData(qd)
+// }
+// #endif
 void InsertData() : { QuadDataAccSink qd = createInsertDataSink() ; Token t ; }
 {
   t = <INSERT_DATA>
@@ -478,6 +589,7 @@ Update Modify() : { Element el ; String iri = null ;
   | InsertClause(up)
   )
   (UsingClause(up))*
+  // WHERE is mandatory here.
   <WHERE>
   { startWherePattern() ; }
   el = GroupGraphPattern() { up.setElement(el) ; }
@@ -540,6 +652,7 @@ void QuadPattern(QuadAcc acc) : { }
     Quads(acc)
     <RBRACE>
 }
+//Ground data : As QuadPattern but don't allow variables.
 void QuadData(QuadDataAccSink acc) : { }
 {
     <LBRACE>
@@ -565,13 +678,15 @@ void QuadsNotTriples(QuadAccSink acc) : {Node gn ; Node prev = acc.getGraph() ;
     <RBRACE>
     { setAccGraph(acc, prev) ; }
 }
+// See "/* TriG template :: ..... */" below.
+// If not TriG like, check this is not "QuadPattern" 
 void ConstructQuads(QuadAcc acc) : {}
 {
-    ( TriplesTemplate(acc))?
+    (/* TriG template: LOOKAHEAD(2) */TriplesTemplate(acc))?
     (
        ConstructQuadsNotTriples(acc)
        (<DOT>)?
-       ( TriplesTemplate(acc))?
+       (/* TriG template: LOOKAHEAD(2) */TriplesTemplate(acc))?
     )*
 }
 void ConstructQuadsNotTriples(QuadAccSink acc) :
@@ -580,7 +695,7 @@ void ConstructQuadsNotTriples(QuadAccSink acc) :
      }
 {
     (
-      <GRAPH>
+      <GRAPH> /* TriG template :: (<GRAPH>)?*/
       gn = VarOrBlankNodeOrIri()
     )?
     { setAccGraph(acc, gn) ; }
@@ -590,11 +705,13 @@ void ConstructQuadsNotTriples(QuadAccSink acc) :
     { setAccGraph(acc, prev) ; }
 }
 void TriplesTemplate(TripleCollector acc) : { }
-{
+{ // same as ConstructTriples
+    // Rewrite for no recursion - grammar is not LL(1)
     TriplesSameSubject(acc)
     (LOOKAHEAD(2) (<DOT>) TriplesSameSubject(acc))*
     (<DOT>)?
 }
+// ---- General Graph Pattern 
 Element GroupGraphPattern() : { Element el = null ; Token t ; }
 {
   t = <LBRACE>
@@ -615,6 +732,9 @@ Element GroupGraphPatternSub() : { Element el = null ; }
 {
       { ElementGroup elg = new ElementGroup() ; }
       { startGroup(elg) ; }
+  // Ensure two BGP's can't be next to each other
+  // Done by seeing if there is a non-BGP and recursing
+  // if there is an intermediate
   (
     { startTriplesBlock() ; }
     el = TriplesBlock(null)
@@ -647,15 +767,16 @@ Element TriplesBlock(ElementPathBlock acc) : { }
 Node ReifiedTripleBlock(TripleCollector acc) : { Node reifId ; }
 {
   reifId = ReifiedTriple(acc)
-  PropertyList(reifId, acc)
+  PropertyList(reifId, acc) // Maybe empty
   { return reifId ; }
 }
 Node ReifiedTripleBlockPath(TripleCollector acc) : { Node reifId ; }
 {
   reifId = ReifiedTriple(acc)
-  PropertyListPath(reifId, acc)
+  PropertyListPath(reifId, acc) // Maybe empty
   { return reifId ; }
 }
+// -----
 Element GraphPatternNotTriples() : { Element el = null ; }
 {
  (
@@ -691,6 +812,7 @@ Element GraphPatternNotTriples() : { Element el = null ; }
  )
  { return el ; }
 }
+// ---- Definitions of each pattern element
 Element OptionalGraphPattern() : { Element el ; }
 { <OPTIONAL> el = GroupGraphPattern()
     { return new ElementOptional(el) ; }
@@ -798,12 +920,36 @@ Node DataBlockValue() : { Node n ; String iri ; }
 | <UNDEF> { return null ; }
 | n = TripleTermData() { return n ; }
 }
+// ---- Reifier, various cases.
+// May return null.
 Node Reifier() : { Token tok = null ; Node reifId = null ; }
 {
     tok = <TILDE>
     (reifId = VarOrReifierId() )?
     { return reifId; }
 }
+// // No variables.
+// Node ReifierData() : { Token tok = null ; Node reifId = null ; }
+// {
+//     tok = <TILDE>
+//     (reifId = ReifierId() )?
+//     { return reifId; }
+// }
+// 
+// Node ReifierId() : { Node n = null ; String iri ; } 
+// {
+//   // No variable
+//   ( iri = iri()           { return createNode(iri) ; }
+//   | n = BlankNode()       { return n ; }
+//   )
+// }
+// 
+// Node VarOrReifierId() : { Node n = null; }
+// {
+//    ( n = Var()        { return n; }
+//    | n = ReifierId()  { return n; }
+//    )
+// }
 Node VarOrReifierId() : { Node n = null; String iri = null; }
 {
    ( n = Var() { return n; }
@@ -850,6 +996,16 @@ Element MinusGraphPattern() : { Element el ; }
     el = GroupGraphPattern()
     { return new ElementMinus(el) ; }
 }
+// Element UnionGraphPattern() : { Element el ; }
+// {
+//     <UNION>
+//     el = GroupGraphPattern()
+//     { return new ElementUnion(el) ; }
+// }
+// SPARQL 1.0: {pattern} UNION {pattern} UNION {pattern} ... :: 
+// SPARQL 1.1 may introduce: { pattern UNION pattern UNION ... }
+// G (union G)* can be a single group pattern
+// or a group pattern as part of an union.
 Element GroupOrUnionGraphPattern() :
     { Element el = null ; ElementUnion el2 = null ; }
 {
@@ -885,6 +1041,7 @@ Expr FunctionCall() : { String fname ; Args a ; }
   a = ArgList()
   {
      if ( AggregateRegistry.isRegistered(fname) ) {
+         // aggregates
          if ( ! getAllowAggregatesInExpressions() )
             throwParseException("Aggregate expression not legal at this point : "+fname, token.beginLine, token.beginColumn) ;
          Aggregator agg = AggregatorFactory.createCustom(fname, a) ;
@@ -926,6 +1083,7 @@ ExprList ExpressionList() : { Expr expr = null ; ExprList exprList = new ExprLis
   )
   { return exprList ; }
 }
+// -------- Construct patterns
 Template ConstructTemplate() : { QuadAcc acc = new QuadAcc() ;
                                  Template t = new Template (acc);}
 {
@@ -937,16 +1095,20 @@ Template ConstructTemplate() : { QuadAcc acc = new QuadAcc() ;
       return t ; }
 }
 void ConstructTriples(TripleCollector acc) : { }
-{
+{ // Same as TriplesTemplate, but retain for 1.0 legacy
+    // Rewrite for no recursion - grammar is not LL(1)
     TriplesSameSubject(acc)
     (LOOKAHEAD(2) (<DOT>) TriplesSameSubject(acc))*
     (<DOT>)?
 }
+// -------- Triple lists with property and object lists
+// -------- Without paths: entry: TriplesSameSubject
 void TriplesSameSubject(TripleCollector acc) : { Node s ; }
 {
   s = VarOrTerm()
   PropertyListNotEmpty(s, acc)
 |
+  // Any of the triple generating syntax elements
   { ElementPathBlock tempAcc = new ElementPathBlock() ; }
   s = TriplesNode(tempAcc)
   PropertyList(s, tempAcc)
@@ -956,7 +1118,7 @@ void TriplesSameSubject(TripleCollector acc) : { Node s ; }
 }
 void PropertyList(Node s, TripleCollector acc) : { }
 {
-  ( PropertyListNotEmpty(s, acc) ) ?
+  ( /* TriG template: LOOKAHEAD(2) */ PropertyListNotEmpty(s, acc) ) ?
 }
 void PropertyListNotEmpty(Node s, TripleCollector acc) :
     { Node p = null ; }
@@ -964,7 +1126,7 @@ void PropertyListNotEmpty(Node s, TripleCollector acc) :
     p = Verb()
     ObjectList(s, p, acc)
   ( <SEMICOLON>
-    (
+    ( /* TriG template: LOOKAHEAD(2) */
        p = Verb()
       ObjectList(s, p, acc)
     )?
@@ -972,6 +1134,8 @@ void PropertyListNotEmpty(Node s, TripleCollector acc) :
 }
 Node Verb() : { Node p ;}
 {
+// Blank nodes as predicates
+//   ( p = VarOrBlankNodeOrIri() | <KW_A> { p = nRDFtype ; } )
   ( p = VarOrIri() | <KW_A> { p = nRDFtype ; } )
   { return p ; }
 }
@@ -987,11 +1151,14 @@ void Object(Node s, Node p, TripleCollector acc): { Node o ; }
   { insert(tempAcc, mark, s, p, o) ; insert(acc, tempAcc) ; }
   Annotation(acc, s, p, o)
 }
+// -------- BGPs with paths.
+// -------- Entry point: TriplesSameSubjectPath
 void TriplesSameSubjectPath(TripleCollector acc) : { Node s ; }
 {
   s = VarOrTerm()
   PropertyListPathNotEmpty(s, acc)
 |
+  // Any of the triple generating syntax elements
   { ElementPathBlock tempAcc = new ElementPathBlock() ; }
   s = TriplesNodePath(tempAcc)
   PropertyListPath(s, tempAcc)
@@ -1026,6 +1193,8 @@ Path VerbPath() : {Node p ; Path path ; }
 }
 Node VerbSimple() : { Node p ; }
 {
+  // "a" now allowed in paths.
+  //( p = Var() | <KW_A> { p = nRDFtype ; } )
   p = Var()
   { return p ; }
 }
@@ -1041,6 +1210,8 @@ void ObjectPath(Node s, Node p, Path path, TripleCollector acc): { Node o ; }
   { insert(tempAcc, mark, s, p, path, o) ; insert(acc, tempAcc) ; }
   AnnotationPath(acc, s, p, path, o)
 }
+// End paths stuff.
+// -------- Paths
 Path PathUnit() : { Path p ; }
 {
   ByteOrderMark()
@@ -1048,6 +1219,7 @@ Path PathUnit() : { Path p ; }
   <EOF>
   { return p ; }
 }
+// Weakest outermost
 Path Path() : { Path p ; }
 {
   p = PathAlternative() { return p ; }
@@ -1066,17 +1238,20 @@ Path PathSequence() : { Path p1 , p2 ; }
     p1 = PathEltOrInverse()
     ( <SLASH> p2 = PathEltOrInverse()
       { p1 = PathFactory.pathSeq(p1, p2) ; }
+    // :p^:q -- Not in SPARQL 1.1
     | <CARAT> p2 = PathElt()
       { p1 = PathFactory.pathSeq(p1, new P_Inverse(p2)) ; }
     )*
    { return p1; }
 }
+// Path unit element, no inverse
 Path PathElt() : { String str ; Node n ; Path p ; }
 {
    p = PathPrimary()
    ( p = PathMod(p) )?
    { return p ; }
 }
+// Path unit element, including inverse.
 Path PathEltOrInverse() : { String str ; Node n ; Path p ; }
 {
    ( p = PathElt()
@@ -1092,23 +1267,25 @@ Path PathMod(Path p) : { long i1 ; long i2 ; }
    | <STAR> { return PathFactory.pathZeroOrMore1(p) ; }
    | <PLUS> { return PathFactory.pathOneOrMore1(p) ; }
    | <LBRACE>
+         //{*}
        ( <STAR> <RBRACE> { return PathFactory.pathZeroOrMoreN(p) ; }
+         // {+}
        | <PLUS> <RBRACE> { return PathFactory.pathOneOrMoreN(p) ; }
-       |
+       | // {N} {N,M} {N,}
           i1 = Integer()
           ( <COMMA>
-            (
+            ( // case {N,}
               <RBRACE>
               { return PathFactory.pathMod(p, i1, PathFactory.UNSET) ; }
-            |
-              i2 = Integer() <RBRACE>
+            | // case {N,M}
+              i2 = Integer() <RBRACE> // case {N,M}
               { return PathFactory.pathMod(p, i1, i2) ; }
             )
           |
-            <RBRACE>
+            <RBRACE> // {N}
                      { return PathFactory.pathFixedLength(p, i1) ; }
           )
-       |
+       | // {,N}
          <COMMA>
          i2 = Integer()
          <RBRACE>
@@ -1165,12 +1342,16 @@ P_Path0 PathOneInPropertySet() : { String str ; Node n ; }
 {
   ( str = iri() { n = createNode(str) ; return new P_Link(n) ; }
   | <KW_A> { return new P_Link(nRDFtype) ; }
+  // This is the !(^:property) form.
   | <CARAT>
     ( str = iri() { n = createNode(str) ; return new P_ReverseLink(n) ; }
     | <KW_A> { return new P_ReverseLink(nRDFtype) ; }
     )
   )
 }
+// -------- Triple expansions
+// Anything that can stand in a node slot and which is
+// a number of triples
 Node TriplesNode(TripleCollector acc) : { Node n ; }
 {
    n = Collection(acc) { return n ; }
@@ -1199,6 +1380,7 @@ Node BlankNodePropertyListPath(TripleCollector acc) : { Token t ; }
   <RBRACKET>
     { return n ; }
 }
+// ------- RDF collections
 Node Collection(TripleCollector acc) :
     { Node listHead = nRDFnil ; Node lastCell = null ; int mark ; Node n ; Token t ; }
 {
@@ -1218,6 +1400,7 @@ Node Collection(TripleCollector acc) :
       lastCell = cell ;
     }
   ) +
+  // Not * here - "()" is handled separately.
   <RPAREN>
    { if ( lastCell != null )
        insert(acc, lastCell, nRDFrest, nRDFnil) ;
@@ -1242,11 +1425,14 @@ Node CollectionPath(TripleCollector acc) :
       lastCell = cell ;
     }
   ) +
+  // Not * here - "()" is handled separately.
   <RPAREN>
    { if ( lastCell != null )
        insert(acc, lastCell, nRDFrest, nRDFnil) ;
      return listHead ; }
 }
+// ---- RDF-star Annotation Syntax
+// Allow paths. Query graph patterns.
 void AnnotationPath(TripleCollector acc, Node s, Node p, Path path, Node o) : { Node reifId = null ; }
 {
   (
@@ -1270,11 +1456,14 @@ void AnnotationBlockPath(TripleCollector acc, Node reifId) : { }
       PropertyListPathNotEmpty(reifId, acc)
    <R_ANN>
 }
+// ---- RDF-star Annotation Syntax
+// No paths. Construct templates.
 void Annotation(TripleCollector acc, Node s, Node p, Node o) : { Node reifId = null ; }
 {
   (
     { p = preConditionReifier(s, p,null, o, token.beginLine, token.beginColumn); }
     reifId = Reifier()
+    // @@ Rewrite java?
     { reifId = insertTripleReifier(acc, reifId, s, p, o, token.beginLine, token.beginColumn) ; }
     { setReifierId(reifId); }
   |
@@ -1288,10 +1477,14 @@ void Annotation(TripleCollector acc, Node s, Node p, Node o) : { Node reifId = n
 }
 void AnnotationBlock(TripleCollector acc, Node reifId) : { }
 {
+   // Roll back into Annotation?
    <L_ANN>
       PropertyListNotEmpty(reifId, acc)
    <R_ANN>
 }
+// -------- Nodes in a graph pattern or template
+// Object position RDF term, element of a list
+// No paths in TriplesNode
 Node GraphNode(TripleCollector acc) : { Node n ; }
 {
    n = VarOrTerm() { return n ; }
@@ -1300,6 +1493,7 @@ Node GraphNode(TripleCollector acc) : { Node n ; }
  |
    n = ReifiedTriple(acc) { return n ; }
 }
+// Object position RDF term. NEW-SYNTAX Rename?
 Node GraphNodePath(TripleCollector acc) : { Node n ; }
 {
   n = VarOrTerm() { return n ; }
@@ -1316,6 +1510,7 @@ Node VarOrTerm() : { Node n = null ; String iri ; }
   | n = NumericLiteral()
   | n = BooleanLiteral()
   | n = BlankNode()
+  //  <LPAREN> <RPAREN>     { return nRDFnil ; }
   | <NIL> { return nRDFnil ; }
   | n = TripleTerm() { return n; }
   )
@@ -1341,6 +1536,8 @@ Node ReifiedTripleSubject(TripleCollector acc) : { Node s; String iri; }
   | s = BooleanLiteral()
   | s = BlankNode()
   | s = ReifiedTriple(acc)
+  //  <LPAREN> <RPAREN>     { s = RDFnil ; }
+  //| <NIL>  { s = nRDFnil ; }
   | s = TripleTerm()
   )
   { return s; }
@@ -1354,6 +1551,8 @@ Node ReifiedTripleObject(TripleCollector acc) : { Node o; String iri; }
   | o = BooleanLiteral()
   | o = BlankNode()
   | o = ReifiedTriple(acc)
+  //  <LPAREN> <RPAREN>     { o = nRDFnil ; }
+  //| <NIL>  { o = nRDFnil ; }
   | o = TripleTerm()
   )
   { return o; }
@@ -1361,6 +1560,7 @@ Node ReifiedTripleObject(TripleCollector acc) : { Node o; String iri; }
 Node TripleTerm() : { Node n = null ; Token openToken ; String iri ; Node s , p , o ; }
 {
     openToken = <L_TRIPLE>
+    // @@ Alt name. ttSubject()?
     s = TripleTermSubject()
     p = Verb()
     o = TripleTermObject()
@@ -1376,6 +1576,8 @@ Node TripleTermSubject() : { Node n; String iri; }
   | n = NumericLiteral()
   | n = BooleanLiteral()
   | n = BlankNode()
+  //  <LPAREN> <RPAREN>     { return nRDFnil ; }
+  //| <NIL>  { return nRDFnil ; }
   | n = TripleTerm() { return n; }
   )
   { return n; }
@@ -1388,6 +1590,8 @@ Node TripleTermObject() : { Node n; String iri; }
   | n = NumericLiteral()
   | n = BooleanLiteral()
   | n = BlankNode()
+  //  <LPAREN> <RPAREN>     { return nRDFnil ; }
+  //| <NIL>  { return nRDFnil ; }
   | n = TripleTerm() { return n; }
   )
   { return n; }
@@ -1395,6 +1599,7 @@ Node TripleTermObject() : { Node n; String iri; }
 Node TripleTermData() : { Node n = null ; Token openToken ; String iri ; Node s , p , o ; }
 {
     openToken = <L_TRIPLE>
+    // @@ Alt name? ttDataValueTerm
     s = TripleTermDataSubject()
     ( iri = iri() { p = createNode(iri) ; } | <KW_A> { p = nRDFtype ; } )
     o = TripleTermDataObject()
@@ -1422,11 +1627,23 @@ Node TripleTermDataObject() : { Node n = null; String iri; }
  )
  { return n; }
 }
+// // VarOrTerm except no var, no bnodes
+// // @@ Rename?
+// Node DataValueTerm() : {  Node n = null ; String iri ; Node s , p , o ; }
+// {
+//   iri = iri()            { return createNode(iri) ; }
+// | n = RDFLiteral()       { return n ; }
+// | n = NumericLiteral()   { return n ; }
+// | n = BooleanLiteral()   { return n ; }
+// | n = TripleTermData()   { return n; }
+// }
+// e.g. Property (if no bNodes) + DESCRIBE
 Node VarOrIri() : {Node n = null ; String iri ; }
 {
   ( n = Var() | iri = iri() { n = createNode(iri) ; } )
   { return n ; }
 }
+// e.g. INSERT DATA { GRAPH ... }
 Node VarOrBlankNodeOrIri() : {Node n = null ; String iri ; }
 {
   ( n = Var() | n = BlankNode() | iri = iri() { n = createNode(iri) ; } )
@@ -1437,6 +1654,7 @@ Var Var() : { Token t ;}
     ( t = <VAR1> | t = <VAR2> )
     { return createVariable(t.image, t.beginLine, t.beginColumn) ; }
 }
+// -------- Constraint syntax
 Expr Expression() : { Expr expr ; }
 {
   expr = ConditionalOrExpression()
@@ -1554,13 +1772,31 @@ Expr PrimaryExpression() : { Expr expr ; Node n ; }
   ( expr = BrackettedExpression() { return expr ; }
   | expr = BuiltInCall() { return expr ; }
   | expr = iriOrFunction() { return expr ; }
+// NOT  | n = ExprVarOrTerm()    { return asExpr(n) ; }
+// Because of iriOrFunction
+// Can't use iri() here
   | n = RDFLiteral() { return asExpr(n) ; }
   | n = NumericLiteral() { return asExpr(n) ; }
   | n = BooleanLiteral() { return asExpr(n) ; }
   | n = Var() { return asExpr(n) ; }
   | n = ExprTripleTerm() { return asExpr(n) ; }
+// and not SPARQL 12
+// needs checking.
+// Use this for ?var(args)
+//  |  expr = VarOrFunction()  { return expr ; }
   )
 }
+// Node ExprVarOrTerm() : { Node n; String s;}
+// {
+//   ( s = iri() { n = createNode(s); }
+//   | n = RDFLiteral()
+//   | n = NumericLiteral()
+//   | n = BooleanLiteral()
+//   | n = Var()
+//   | n = ExprTripleTerm()
+//   )
+//   { return n; }
+// }
 Node ExprTripleTerm() : { Token t ; Node s,p,o,n; }
 {
   t = <L_TRIPLE>
@@ -1616,6 +1852,9 @@ Expr BuiltInCall() : { Expr expr ;
     { return new E_Datatype(expr) ; }
   | <BOUND> <LPAREN> gn = Var() <RPAREN>
     { return new E_Bound(new ExprVar(gn)) ; }
+    // ARQ extension
+    // IRI(expr rel:String or IRI)
+    // IRI(expr base:IRI, expr rel:String or IRI)
   | <IRI> <LPAREN> expr1 = Expression() (<COMMA> expr2 = Expression())? <RPAREN>
     { return makeFunction_IRI(expr1, expr2) ; }
   | <URI> <LPAREN> expr1 = Expression() (<COMMA> expr2 = Expression())? <RPAREN>
@@ -1659,6 +1898,7 @@ Expr BuiltInCall() : { Expr expr ;
   | <TIMEZONE> <LPAREN> expr1 = Expression() <RPAREN> { return new E_DateTimeTimezone(expr1) ; }
   | <TZ> <LPAREN> expr1 = Expression() <RPAREN> { return new E_DateTimeTZ(expr1) ; }
   | <ADJUST>
+    // One or two arguments
     <LPAREN> expr1 = Expression() (<COMMA> expr2 = Expression())? <RPAREN>
     { return new E_AdjustToTimezone(expr1, expr2) ; }
   | <NOW> <NIL> { return new E_Now() ; }
@@ -1669,11 +1909,17 @@ Expr BuiltInCall() : { Expr expr ;
   | <SHA256> <LPAREN> expr1 = Expression() <RPAREN> { return new E_SHA256(expr1) ; }
   | <SHA384> <LPAREN> expr1 = Expression() <RPAREN> { return new E_SHA384(expr1) ; }
   | <SHA512> <LPAREN> expr1 = Expression() <RPAREN> { return new E_SHA512(expr1) ; }
+  // VERSION()
   | <VERSION> <NIL> { return new E_Version(); }
+  // Effective boolean value
   | <EBV> <LPAREN> expr = Expression() <RPAREN> { return new E_EBV(expr); }
   | <COALESCE> a = ExpressionList()
     { return new E_Coalesce(a) ; }
+  // Maybe also allow ?func(?a1,?a2,...)
+//  | <CALL> a = ExpressionList()
+//    { return new E_Call(a) ; }
   | <CALL>
+    // at least one argument (the function to call).
       { a = new ExprList() ; }
     <LPAREN>
       expr = Expression() { a.add(expr) ; }
@@ -1710,7 +1956,7 @@ Expr BuiltInCall() : { Expr expr ;
     { return new E_HasLang(expr) ; }
   | <HAS_LANGDIR> <LPAREN> expr = Expression() <RPAREN>
     { return new E_HasLangDir(expr) ; }
-  |
+  | // Regular expression matcher
     expr = RegexExpression() { return expr ; }
   | expr = ExistsFunc() { return expr ; }
   | expr = NotExistsFunc() { return expr ; }
@@ -1781,6 +2027,8 @@ Expr Aggregate() : { Aggregator agg = null ; String sep = null ;
                      ExprList ordered = new ExprList() ;
                      Token t ; }
 {
+  // Count is special because of COUNT(*)
+  // GROUP_CONCAT is special because of separator=
   { startAggregate(); }
   ( t = <COUNT> <LPAREN>
     ( <DISTINCT> { distinct = true ; } )?
@@ -1807,6 +2055,7 @@ Expr Aggregate() : { Aggregator agg = null ; String sep = null ;
     <LPAREN>
     (t = <DISTINCT> { distinct = true ; })?
     expr = Expression()
+       // JavcaCC 5.0 - rewriting as LL(1) didn't work - code generated was wrong
     (LOOKAHEAD(2)
        ( <SEMICOLON> <SEPARATOR> <EQ> sep=String()
            (<SEMICOLON> <ORDER><BY> expr2 = Expression() { ordered.add(expr2) ; })?
@@ -1848,6 +2097,7 @@ Expr Aggregate() : { Aggregator agg = null ; String sep = null ;
     )?
     <RPAREN>
     { agg = AggregatorFactory.createFold(distinct, expr, expr2, scs) ; }
+    /* Explicit syntax (aggregate even if not registered) */
   | t = <AGG>
     { String iri ; }
     iri = iri()
@@ -1857,6 +2107,7 @@ Expr Aggregate() : { Aggregator agg = null ; String sep = null ;
   )
   {
     if ( ! getAllowAggregatesInExpressions() )
+        // Do late so we have the token for line/column
         throwParseException("Aggregate expression not legal at this point", t.beginLine, t.beginColumn) ;
     if ( getAggregateDepth() > 1 )
         throwParseException("Nested aggregate in expression not legal", t.beginLine, t.beginColumn) ;
@@ -1865,6 +2116,9 @@ Expr Aggregate() : { Aggregator agg = null ; String sep = null ;
     finishAggregate();
     return exprAgg ; }
 }
+// See also FunctionCall.
+// The case of "q:name()" or "q:agg()" or just "q:name"
+// by expanding out FunctionCall()
 Expr iriOrFunction() : { String iri ; Args a = null ; }
 {
   iri = iri()
@@ -1872,6 +2126,7 @@ Expr iriOrFunction() : { String iri ; Args a = null ; }
   { if ( a == null )
        return asExpr(createNode(iri)) ;
     if ( AggregateRegistry.isRegistered(iri) ) {
+         // aggregates
          if ( ! getAllowAggregatesInExpressions() )
             throwParseException("Aggregate expression not legal at this point : "+iri, token.beginLine, token.beginColumn) ;
          Aggregator agg = AggregatorFactory.createCustom(iri, a) ;
@@ -1884,6 +2139,7 @@ Expr iriOrFunction() : { String iri ; Args a = null ; }
 Node RDFLiteral() : { Token t ; String lex = null ; String uri = null ; }
 {
   lex = String()
+  // Optional lang tag and datatype.
   (
     t = <LANG_DIR>
     { return createLiteralLang(lex, t.image, token.beginLine, token.beginColumn); }
@@ -1958,6 +2214,7 @@ Node BlankNode() : { Token t = null ; }
   t = <BLANK_NODE_LABEL>
     { return createBNode(t.image, t.beginLine, t.beginColumn) ; }
 |
+//  <LBRACKET> <RBRACKET> { return createBNode(t.beginLine, t.beginColumn) ; }
   t = <ANON> { return createBNode(t.beginLine, t.beginColumn) ; }
 }
 String IRIREF() : { Token t ; }
@@ -1965,18 +2222,24 @@ String IRIREF() : { Token t ; }
   t = <IRIref>
   { return resolveQuotedIRI(t.image, t.beginLine, t.beginColumn) ; }
 }
+// ------------------------------------------
+// Tokens
+// Comments and whitespace
 SKIP : { " " | "\t" | "\n" | "\r" | "\f" }
 SPECIAL_TOKEN :
 { <SINGLE_LINE_COMMENT: "#" (~["\n","\r"])* ("\n"|"\r"|"\r\n")? > }
 TOKEN: {
   <#WS: " " | "\t" | "\n" | "\r" | "\f">
 |
+  // Whitespace or comment.
   <#WSC: <WS> | <SINGLE_LINE_COMMENT> >
 |
   <BOM: "\uFEFF">
 }
+// Main tokens */
 TOKEN:
 {
+   // Includes # for relative URIs
    <IRIref: "<"
                 ( ~[ ">","<", "\"", "{", "}", "^", "\\", "|", "`", "\u0000"-"\u0020"]
                 | <UCHAR>
@@ -1991,12 +2254,18 @@ TOKEN:
 | <#A2Z: ["a"-"z","A"-"Z"]>
 | <#A2ZN: ["a"-"z","A"-"Z","0"-"9"]>
 }
+// -------------------------------------------------
+// Keyworks : includes operators that are words and should be
+// before general things like IDENTIFIER which swallow almost
+// anything
 TOKEN : { <KW_A: "a" > }
 TOKEN [IGNORE_CASE] :
 {
+// Prologue
    < BASE: "base" >
 | < PREFIX: "prefix" >
 | < VERSION: "version" >
+// Result forms
 | < SELECT: "select" >
 | < DISTINCT: "distinct" >
 | < REDUCED: "reduced" >
@@ -2012,8 +2281,10 @@ TOKEN [IGNORE_CASE] :
 | < UNDEF: "undef" >
 | < ASC: "asc" >
 | < DESC: "desc" >
+// Dataset
 | < NAMED: "named" >
 | < FROM: "from" >
+// Graph pattern operators 
 | < WHERE: "where" >
 | < AND: "and" >
 | < GRAPH: "graph" >
@@ -2056,6 +2327,7 @@ TOKEN [IGNORE_CASE] :
 | < SAMPLE: "sample" >
 | < GROUP_CONCAT: "group_concat" >
 | < FILTER: "filter" >
+// Expression operators
 | < BOUND: "bound" >
 | < COALESCE: "coalesce" >
 | < IN: "in" >
@@ -2126,6 +2398,7 @@ TOKEN [IGNORE_CASE] :
 | < TRUE: "true" >
 | < FALSE: "false" >
 }
+// SPARQL/Update parts.
 TOKEN [IGNORE_CASE] :
 {
   < DATA: "data" >
@@ -2146,16 +2419,22 @@ TOKEN [IGNORE_CASE] :
 | < INTO: "into" >
 | < TO: "to" >
 | < DFT: "default" >
+//| < NAMED:        "named" >
 | < ALL: "all" >
 | < WITH: "with" >
 | < USING: "using" >
+//| < BEGIN:       "begin" >
+//| < COMMIT:      "commit" >
+//| < ABORT:       "abort" >
 }
+// -------------------------------------------------
 TOKEN :
 {
   < #DIGITS: (["0"-"9"])+>
 | < INTEGER: <DIGITS> >
+//| < DECIMAL: ( <DIGITS> "." (<DIGITS>)* | "." <DIGITS> ) >
 | < DECIMAL: (<DIGITS>)? "." <DIGITS> >
-| < DOUBLE:
+| < DOUBLE: // Required exponent.
       (
         ( (["0"-"9"])+ ("." (["0"-"9"])* )? )
         | ( "." (["0"-"9"])+ )
@@ -2175,8 +2454,10 @@ TOKEN :
 | < #UCHAR4: "\\" "u" <HEX> <HEX> <HEX> <HEX> >
 | < #UCHAR8: "\\" "U" <HEX> <HEX> <HEX> <HEX> <HEX> <HEX> <HEX> <HEX> >
 | < STRING_LITERAL1:
+      // Single quoted string
       "'" ( (~["'","\\","\n","\r"]) | <ECHAR> | <UCHAR> )* "'" >
 | < STRING_LITERAL2:
+    // Double quoted string
       "\"" ( (~["\"","\\","\n","\r"]) | <ECHAR> | <UCHAR> )* "\"" >
 | < STRING_LITERAL_LONG1:
      <QUOTE_3S>
@@ -2191,6 +2472,10 @@ TOKEN :
 {
   < LPAREN: "(" >
 | < RPAREN: ")" >
+// All the stuff for NUL is needed just to make a 
+// single list "() ." as a triple pattern illegal.
+// It leads to a lot of extra work.
+// Similarly [].
 | <NIL: <LPAREN> (<WSC>)* <RPAREN> >
 | < LBRACE: "{" >
 | < RBRACE: "}" >
@@ -2204,8 +2489,8 @@ TOKEN :
 | < NE: "!=" >
 | < GT: ">" >
 | < LT: "<" >
-| < LE: "<=" >
-| < GE: ">=" >
+| < LE: "<=" > // Maybe: | "=>" >
+| < GE: ">=" > // Maybe: | "=<" >
 | < L_TRIPLE: "<<(" >
 | < R_TRIPLE: ")>>" >
 | < LT2: "<<" >
@@ -2221,33 +2506,43 @@ TOKEN :
 | < MINUS: "-" >
 | < STAR: "*" >
 | < SLASH: "/" >
+//| < REM: "%" >
 | < DATATYPE: "^^">
 | < AT: "@">
 | < ASSIGN: ":=">
+// Path related
 | < VBAR: "|" >
 | < CARAT: "^" >
 | < QMARK: "?" >
 }
+// See XML chars.txt for notes
 TOKEN:
 {
   <#SURROGATE_PAIR: ["\uD800"-"\uDBFF"] ["\uDC00"-"\uDFFF"] >
 |
+  // XML 1.1 NCNameStartChar without "_"
   <#PN_CHARS_BASE:
           ["A"-"Z"] | ["a"-"z"] |
           ["\u00C0"-"\u00D6"] | ["\u00D8"-"\u00F6"] | ["\u00F8"-"\u02FF"] |
           ["\u0370"-"\u037D"] | ["\u037F"-"\u1FFF"] |
           ["\u200C"-"\u200D"] | ["\u2070"-"\u218F"] | ["\u2C00"-"\u2FEF"] |
           ["\u3001"-"\uD7FF"] | ["\uF900"-"\uFFFD"]
+          // [#x10000-#xEFFFF]
+          // Put in surrogate pairs because by the time javacc sees codepoints,
+          // they are in UTF-16.
           | <SURROGATE_PAIR>
           >
 |
+  // With underscore
   <#PN_CHARS_U: <PN_CHARS_BASE> | "_" >
 |
   <#PN_CHARS: (<PN_CHARS_U> | "-" | ["0"-"9"] | "\u00B7" |
               ["\u0300"-"\u036F"] | ["\u203F"-"\u2040"] ) >
 |
+  // No leading "_", no trailing ".", can have dot inside prefix name.
   <#PN_PREFIX: <PN_CHARS_BASE> ((<PN_CHARS>|".")* <PN_CHARS>)? >
 |
+  // Local part.
   <#PN_LOCAL: (<PN_CHARS_U> | ":" | ["0"-"9"] | <PLX> )
               ( (<PN_CHARS> | "." |":" | <PLX> )*
                 (<PN_CHARS> | ":" | <PLX>) )? >
@@ -2256,6 +2551,7 @@ TOKEN:
              ( <PN_CHARS_U> | ["0"-"9"] | "\u00B7" |
                ["\u0300"-"\u036F"] | ["\u203F"-"\u2040"] )* >
 |
+  // Align with QueryParseBase unescapePName.
   < #PN_LOCAL_ESC: "\\"
           ( "_" |
             "~" | "." | "-" | "!" | "$" | "&" | "'" |
@@ -2268,7 +2564,17 @@ TOKEN:
 |
   < #PERCENT: "%" <HEX> <HEX> >
 }
+// Catch-all tokens.  Must be last.  
+// Any non-whitespace.  Causes a parser exception, rather than a
+// token manager error (which hides the line numbers).
 TOKEN:
 {
   <#UNKNOWN: (~[" ","\t","\n","\r","\f" ])+ >
 }
+/*
+# Local Variables:
+# tab-width: 4
+# indent-tabs-mode: nil
+# comment-default-style: "//"
+# End:
+*/
diff --git a/jena-arq/Grammar/grammar b/jena-arq/Grammar/grammar
index f05f4bef6e..ffb5fc956c 100755
--- a/jena-arq/Grammar/grammar
+++ b/jena-arq/Grammar/grammar
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/bash
 ## Licensed to the Apache Software Foundation (ASF) under one
 ## or more contributor license agreements.  See the NOTICE file
 ## distributed with this work for additional information
@@ -14,8 +14,8 @@
 ## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 ## See the License for the specific language governing permissions and
 ## limitations under the License.
-
-# Parser builder
+##
+## SPDX-License-Identifier: Apache-2.0
 
 GRAMMAR="${GRAMMAR:-main.jj}"
 
@@ -116,17 +116,19 @@ do
 ##           ##grammar sparql_11.jj sparql_11 SPARQLParser11
 	  echo "SPARQL 1.1 - not rebuilt"
 	  ;;
+
+      ## header.jj puts back the license header that cpp removed.
       
       sparql12|sparql_12.jj)
 	  cp header.jj sparql_12.jj
           # The parser that is exactly the working group grammar.
-          cat "$GRAMMAR" | cpp -P -DSPARQL -DSPARQL_12 >> sparql_12.jj
+          cat "$GRAMMAR" | cpp -P -C -DSPARQL -DSPARQL_12 >> sparql_12.jj
           grammar sparql_12.jj sparql_12 SPARQLParser12
           ;;
 
       arq|arq.jj)
 	  cp header.jj arq.jj
-          cat "$GRAMMAR" | cpp -P -DARQ - >> arq.jj
+          cat "$GRAMMAR" | cpp -P -C -DARQ - >> arq.jj
           grammar arq.jj arq ARQParser
           ;;
 
diff --git a/jena-arq/Grammar/header.jj b/jena-arq/Grammar/header.jj
index e5cdfe96e7..9eebab0e5c 100644
--- a/jena-arq/Grammar/header.jj
+++ b/jena-arq/Grammar/header.jj
@@ -14,5 +14,7 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
  */
 
diff --git a/jena-arq/Grammar/main.jj b/jena-arq/Grammar/main.jj
index 87206a44d5..7c89ebbbfa 100644
--- a/jena-arq/Grammar/main.jj
+++ b/jena-arq/Grammar/main.jj
@@ -14,6 +14,8 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 // ARQ/SPARQL 1.1 Grammar - native syntax for the query engine
@@ -86,6 +88,8 @@ PARSER_BEGIN(CLASS)
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 package PACKAGE.javacc ;
diff --git a/jena-arq/Grammar/sparql_12.jj b/jena-arq/Grammar/sparql_12.jj
index cdc0cb60e1..ca01c61fbc 100644
--- a/jena-arq/Grammar/sparql_12.jj
+++ b/jena-arq/Grammar/sparql_12.jj
@@ -14,15 +14,96 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
  */
 
+/* Copyright (C) 1991-2025 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, see
+   <https://www.gnu.org/licenses/>.  */
+/* This header is separate from features.h so that the compiler can
+   include it implicitly at the start of every compilation.  It must
+   not itself include <features.h> or any other header that includes
+   <features.h> because the implicit include comes before any feature
+   test macros that may be defined in a source file before it first
+   explicitly includes a system header.  GCC knows the name of this
+   header in order to preinclude it.  */
+/* glibc's intent is to support the IEC 559 math functionality, real
+   and complex.  If the GCC (4.9 and later) predefined macros
+   specifying compiler intent are available, use them to determine
+   whether the overall intent is to support these features; otherwise,
+   presume an older compiler has intent to support these features and
+   define these macros by default.  */
+/* wchar_t uses Unicode 10.0.0.  Version 10.0 of the Unicode Standard is
+   synchronized with ISO/IEC 10646:2017, fifth edition, plus
+   the following additions from Amendment 1 to the fifth edition:
+   - 56 emoji characters
+   - 285 hentaigana
+   - 3 additional Zanabazar Square characters */
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+// ARQ/SPARQL 1.1 Grammar - native syntax for the query engine
 options
 {
+    // Standards with \ u everywhere, \U in strings and IRIs only.
+    // \ u processed in the input stream
+    // SPARQL 1.0 and 1.1
     JAVA_UNICODE_ESCAPE = true ;
     UNICODE_INPUT = false ;
   STATIC = false ;
+//  DEBUG_PARSER          = true ;
+//  DEBUG_TOKEN_MANAGER   = true ;
 }
 PARSER_BEGIN(SPARQLParser12)
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
 package org.apache.jena.sparql.lang.sparql_12.javacc ;
 import org.apache.jena.graph.* ;
 import org.apache.jena.query.* ;
@@ -37,6 +118,13 @@ import org.apache.jena.sparql.modify.request.* ;
 public class SPARQLParser12 extends org.apache.jena.sparql.lang.sparql_12.SPARQLParser12Base
 {}
 PARSER_END(SPARQLParser12)
+// // Common top for single entry point.
+// void Top(): {}
+// {
+//     ( Query() | Update() )
+//     <EOF>
+// }
+// Query only entry point
 void QueryUnit(): { }
 {
   { startQuery() ; }
@@ -88,6 +176,7 @@ String VersionSpecifier() : { Token t ; String version ; }
       return version;
     }
 }
+// ---- Query type clauses
 void SelectQuery() : { }
 {
   SelectClause()
@@ -114,6 +203,7 @@ void SelectClause() : { Var v ; Expr expr ; Node n ; }
     (
       v = Var() { getQuery().addResultVar(v) ; }
     |
+        // Expressions with ()
       (
         { v = null ; }
         <LPAREN>
@@ -135,21 +225,25 @@ void ConstructQuery() : { Template t ;
  <CONSTRUCT>
    { getQuery().setQueryConstructType() ; }
  (
+    // Full form.
     t = ConstructTemplate()
       { getQuery().setConstructTemplate(t) ; }
     ( DatasetClause() )*
     WhereClause()
     SolutionModifier()
  |
+    // Abbreviated CONSTRUCT WHERE {}
     ( DatasetClause() )*
     <WHERE>
+    // Should have been "ConstructTemplate()"
     <LBRACE>
-    (TriplesTemplate(acc))?
+    (TriplesTemplate(acc))? // triples
     <RBRACE>
     SolutionModifier()
     {
       t = new Template(acc.getBGP()) ;
       getQuery().setConstructTemplate(t) ;
+      // Create a query in the same shape as the query created by writing out in full.
       ElementPathBlock epb = new ElementPathBlock(acc.getBGP()) ;
       ElementGroup elg = new ElementGroup() ;
       elg.addElement(epb) ;
@@ -179,6 +273,7 @@ void AskQuery() : {}
   WhereClause()
   SolutionModifier()
 }
+// ----
 void DatasetClause() : {}
 {
   <FROM>
@@ -188,6 +283,7 @@ void DefaultGraphClause() : { String iri ; }
 {
   iri = SourceSelector()
   {
+    // This checks for duplicates
     getQuery().addGraphURI(iri) ;
   }
 }
@@ -196,6 +292,7 @@ void NamedGraphClause() : { String iri ; }
   <NAMED>
   iri = SourceSelector()
   {
+    // This checks for duplicates
     getQuery().addNamedGraphURI(iri) ;
   }
 }
@@ -257,14 +354,14 @@ void OrderCondition() :
 {
   { direction = Query.ORDER_DEFAULT ; }
   (
-    (
+    ( // These are for clarity in the HTML
       ( <ASC> { direction = Query.ORDER_ASCENDING ; }
       | <DESC> { direction = Query.ORDER_DESCENDING ; } )
       expr = BrackettedExpression()
     )
   |
     ( expr = Constraint()
-    | v = Var()
+    | v = Var() //{ expr = asExpr(v) ; } 
     )
   )
   { if ( v == null )
@@ -274,6 +371,9 @@ void OrderCondition() :
 }
 void LimitOffsetClauses() : { }
 {
+  // SPARQL does not care about the order here.
+  // SQL (where implemented) does (it's LIMIT then OFFSET generally)
+  // But that is counter intuitive as it's applied the other way round
   (
     LimitClause() (OffsetClause())?
   |
@@ -299,8 +399,10 @@ void ValuesClause() : { Token t ; }
     { finishValuesClause(t.beginLine, t.beginColumn) ; }
   )?
 }
+// Strict SPARQL 1.1 : mandatory separator, optional terminator.
 void Update() : { }
 {
+   // SPARQL - recursion - does not scale for large number of updates in a single request
    Prologue()
    (Update1() ( <SEMICOLON> Update() )? )?
 }
@@ -326,6 +428,7 @@ void Update1() : { Update up = null ; }
 }
 Update Load() : { String url ; Node dest = null ; boolean silent = false ; }
 {
+    //    <LOAD> ( iri() )+
     <LOAD> (<SILENT> { silent = true ; })? url = iri()
     (<INTO> dest = GraphRef() )?
     { return new UpdateLoad(url, dest, silent) ; }
@@ -360,6 +463,13 @@ Update Copy() : { Target src ; Target dest ; boolean silent = false ; }
   <COPY> (<SILENT> { silent=true ; } )? src = GraphOrDefault() <TO> dest = GraphOrDefault()
   { return new UpdateCopy(src, dest, silent) ; }
 }
+// #ifdef ARQ
+// void Meta() : { QuadDataAccSink qd = new QuadDataAccSink() ; }
+// {
+//    <META> 
+//    QuadData(qd)
+// }
+// #endif
 void InsertData() : { QuadDataAccSink qd = createInsertDataSink() ; Token t ; }
 {
   t = <INSERT_DATA>
@@ -400,6 +510,7 @@ Update Modify() : { Element el ; String iri = null ;
   | InsertClause(up)
   )
   (UsingClause(up))*
+  // WHERE is mandatory here.
   <WHERE>
   { startWherePattern() ; }
   el = GroupGraphPattern() { up.setElement(el) ; }
@@ -462,6 +573,7 @@ void QuadPattern(QuadAcc acc) : { }
     Quads(acc)
     <RBRACE>
 }
+//Ground data : As QuadPattern but don't allow variables.
 void QuadData(QuadDataAccSink acc) : { }
 {
     <LBRACE>
@@ -488,10 +600,12 @@ void QuadsNotTriples(QuadAccSink acc) : {Node gn ; Node prev = acc.getGraph() ;
     { setAccGraph(acc, prev) ; }
 }
 void TriplesTemplate(TripleCollector acc) : { }
-{
+{ // same as ConstructTriples
+    // Version for the spec.
     TriplesSameSubject(acc)
     (<DOT> (TriplesTemplate(acc))?)?
 }
+// ---- General Graph Pattern 
 Element GroupGraphPattern() : { Element el = null ; Token t ; }
 {
   t = <LBRACE>
@@ -512,6 +626,9 @@ Element GroupGraphPatternSub() : { Element el = null ; }
 {
       { ElementGroup elg = new ElementGroup() ; }
       { startGroup(elg) ; }
+  // Ensure two BGP's can't be next to each other
+  // Done by seeing if there is a non-BGP and recursing
+  // if there is an intermediate
   (
     { startTriplesBlock() ; }
     el = TriplesBlock(null)
@@ -544,15 +661,16 @@ Element TriplesBlock(ElementPathBlock acc) : { }
 Node ReifiedTripleBlock(TripleCollector acc) : { Node reifId ; }
 {
   reifId = ReifiedTriple(acc)
-  PropertyList(reifId, acc)
+  PropertyList(reifId, acc) // Maybe empty
   { return reifId ; }
 }
 Node ReifiedTripleBlockPath(TripleCollector acc) : { Node reifId ; }
 {
   reifId = ReifiedTriple(acc)
-  PropertyListPath(reifId, acc)
+  PropertyListPath(reifId, acc) // Maybe empty
   { return reifId ; }
 }
+// -----
 Element GraphPatternNotTriples() : { Element el = null ; }
 {
  (
@@ -574,6 +692,7 @@ Element GraphPatternNotTriples() : { Element el = null ; }
  )
  { return el ; }
 }
+// ---- Definitions of each pattern element
 Element OptionalGraphPattern() : { Element el ; }
 { <OPTIONAL> el = GroupGraphPattern()
     { return new ElementOptional(el) ; }
@@ -669,12 +788,36 @@ Node DataBlockValue() : { Node n ; String iri ; }
 | <UNDEF> { return null ; }
 | n = TripleTermData() { return n ; }
 }
+// ---- Reifier, various cases.
+// May return null.
 Node Reifier() : { Token tok = null ; Node reifId = null ; }
 {
     tok = <TILDE>
     (reifId = VarOrReifierId() )?
     { return reifId; }
 }
+// // No variables.
+// Node ReifierData() : { Token tok = null ; Node reifId = null ; }
+// {
+//     tok = <TILDE>
+//     (reifId = ReifierId() )?
+//     { return reifId; }
+// }
+// 
+// Node ReifierId() : { Node n = null ; String iri ; } 
+// {
+//   // No variable
+//   ( iri = iri()           { return createNode(iri) ; }
+//   | n = BlankNode()       { return n ; }
+//   )
+// }
+// 
+// Node VarOrReifierId() : { Node n = null; }
+// {
+//    ( n = Var()        { return n; }
+//    | n = ReifierId()  { return n; }
+//    )
+// }
 Node VarOrReifierId() : { Node n = null; String iri = null; }
 {
    ( n = Var() { return n; }
@@ -688,6 +831,16 @@ Element MinusGraphPattern() : { Element el ; }
     el = GroupGraphPattern()
     { return new ElementMinus(el) ; }
 }
+// Element UnionGraphPattern() : { Element el ; }
+// {
+//     <UNION>
+//     el = GroupGraphPattern()
+//     { return new ElementUnion(el) ; }
+// }
+// SPARQL 1.0: {pattern} UNION {pattern} UNION {pattern} ... :: 
+// SPARQL 1.1 may introduce: { pattern UNION pattern UNION ... }
+// G (union G)* can be a single group pattern
+// or a group pattern as part of an union.
 Element GroupOrUnionGraphPattern() :
     { Element el = null ; ElementUnion el2 = null ; }
 {
@@ -723,6 +876,7 @@ Expr FunctionCall() : { String fname ; Args a ; }
   a = ArgList()
   {
      if ( AggregateRegistry.isRegistered(fname) ) {
+         // aggregates
          if ( ! getAllowAggregatesInExpressions() )
             throwParseException("Aggregate expression not legal at this point : "+fname, token.beginLine, token.beginColumn) ;
          Aggregator agg = AggregatorFactory.createCustom(fname, a) ;
@@ -764,6 +918,7 @@ ExprList ExpressionList() : { Expr expr = null ; ExprList exprList = new ExprLis
   )
   { return exprList ; }
 }
+// -------- Construct patterns
 Template ConstructTemplate() : { TripleCollectorBGP acc = new TripleCollectorBGP();
                                  Template t = new Template(acc.getBGP()) ; }
 {
@@ -775,15 +930,19 @@ Template ConstructTemplate() : { TripleCollectorBGP acc = new TripleCollectorBGP
       return t ; }
 }
 void ConstructTriples(TripleCollector acc) : { }
-{
+{ // Same as TriplesTemplate, but retain for 1.0 legacy
+// SPARQL - recursion - does not scale for SPARQL/Update
     TriplesSameSubject(acc)
     (<DOT> (ConstructTriples(acc))? )?
 }
+// -------- Triple lists with property and object lists
+// -------- Without paths: entry: TriplesSameSubject
 void TriplesSameSubject(TripleCollector acc) : { Node s ; }
 {
   s = VarOrTerm()
   PropertyListNotEmpty(s, acc)
 |
+  // Any of the triple generating syntax elements
   { ElementPathBlock tempAcc = new ElementPathBlock() ; }
   s = TriplesNode(tempAcc)
   PropertyList(s, tempAcc)
@@ -793,7 +952,7 @@ void TriplesSameSubject(TripleCollector acc) : { Node s ; }
 }
 void PropertyList(Node s, TripleCollector acc) : { }
 {
-  ( PropertyListNotEmpty(s, acc) ) ?
+  ( /* TriG template: LOOKAHEAD(2) */ PropertyListNotEmpty(s, acc) ) ?
 }
 void PropertyListNotEmpty(Node s, TripleCollector acc) :
     { Node p = null ; }
@@ -801,7 +960,7 @@ void PropertyListNotEmpty(Node s, TripleCollector acc) :
     p = Verb()
     ObjectList(s, p, acc)
   ( <SEMICOLON>
-    (
+    ( /* TriG template: LOOKAHEAD(2) */
        p = Verb()
       ObjectList(s, p, acc)
     )?
@@ -809,6 +968,8 @@ void PropertyListNotEmpty(Node s, TripleCollector acc) :
 }
 Node Verb() : { Node p ;}
 {
+// Blank nodes as predicates
+//   ( p = VarOrBlankNodeOrIri() | <KW_A> { p = nRDFtype ; } )
   ( p = VarOrIri() | <KW_A> { p = nRDFtype ; } )
   { return p ; }
 }
@@ -824,11 +985,14 @@ void Object(Node s, Node p, TripleCollector acc): { Node o ; }
   { insert(tempAcc, mark, s, p, o) ; insert(acc, tempAcc) ; }
   Annotation(acc, s, p, o)
 }
+// -------- BGPs with paths.
+// -------- Entry point: TriplesSameSubjectPath
 void TriplesSameSubjectPath(TripleCollector acc) : { Node s ; }
 {
   s = VarOrTerm()
   PropertyListPathNotEmpty(s, acc)
 |
+  // Any of the triple generating syntax elements
   { ElementPathBlock tempAcc = new ElementPathBlock() ; }
   s = TriplesNodePath(tempAcc)
   PropertyListPath(s, tempAcc)
@@ -863,6 +1027,8 @@ Path VerbPath() : {Node p ; Path path ; }
 }
 Node VerbSimple() : { Node p ; }
 {
+  // "a" now allowed in paths.
+  //( p = Var() | <KW_A> { p = nRDFtype ; } )
   p = Var()
   { return p ; }
 }
@@ -878,6 +1044,9 @@ void ObjectPath(Node s, Node p, Path path, TripleCollector acc): { Node o ; }
   { insert(tempAcc, mark, s, p, path, o) ; insert(acc, tempAcc) ; }
   AnnotationPath(acc, s, p, path, o)
 }
+// End paths stuff.
+// -------- Paths
+// Weakest outermost
 Path Path() : { Path p ; }
 {
   p = PathAlternative() { return p ; }
@@ -899,12 +1068,14 @@ Path PathSequence() : { Path p1 , p2 ; }
     )*
    { return p1; }
 }
+// Path unit element, no inverse
 Path PathElt() : { String str ; Node n ; Path p ; }
 {
    p = PathPrimary()
    ( p = PathMod(p) )?
    { return p ; }
 }
+// Path unit element, including inverse.
 Path PathEltOrInverse() : { String str ; Node n ; Path p ; }
 {
    ( p = PathElt()
@@ -950,12 +1121,16 @@ P_Path0 PathOneInPropertySet() : { String str ; Node n ; }
 {
   ( str = iri() { n = createNode(str) ; return new P_Link(n) ; }
   | <KW_A> { return new P_Link(nRDFtype) ; }
+  // This is the !(^:property) form.
   | <CARAT>
     ( str = iri() { n = createNode(str) ; return new P_ReverseLink(n) ; }
     | <KW_A> { return new P_ReverseLink(nRDFtype) ; }
     )
   )
 }
+// -------- Triple expansions
+// Anything that can stand in a node slot and which is
+// a number of triples
 Node TriplesNode(TripleCollector acc) : { Node n ; }
 {
    n = Collection(acc) { return n ; }
@@ -984,6 +1159,7 @@ Node BlankNodePropertyListPath(TripleCollector acc) : { Token t ; }
   <RBRACKET>
     { return n ; }
 }
+// ------- RDF collections
 Node Collection(TripleCollector acc) :
     { Node listHead = nRDFnil ; Node lastCell = null ; int mark ; Node n ; Token t ; }
 {
@@ -1003,6 +1179,7 @@ Node Collection(TripleCollector acc) :
       lastCell = cell ;
     }
   ) +
+  // Not * here - "()" is handled separately.
   <RPAREN>
    { if ( lastCell != null )
        insert(acc, lastCell, nRDFrest, nRDFnil) ;
@@ -1027,11 +1204,14 @@ Node CollectionPath(TripleCollector acc) :
       lastCell = cell ;
     }
   ) +
+  // Not * here - "()" is handled separately.
   <RPAREN>
    { if ( lastCell != null )
        insert(acc, lastCell, nRDFrest, nRDFnil) ;
      return listHead ; }
 }
+// ---- RDF-star Annotation Syntax
+// Allow paths. Query graph patterns.
 void AnnotationPath(TripleCollector acc, Node s, Node p, Path path, Node o) : { Node reifId = null ; }
 {
   (
@@ -1055,11 +1235,14 @@ void AnnotationBlockPath(TripleCollector acc, Node reifId) : { }
       PropertyListPathNotEmpty(reifId, acc)
    <R_ANN>
 }
+// ---- RDF-star Annotation Syntax
+// No paths. Construct templates.
 void Annotation(TripleCollector acc, Node s, Node p, Node o) : { Node reifId = null ; }
 {
   (
     { p = preConditionReifier(s, p,null, o, token.beginLine, token.beginColumn); }
     reifId = Reifier()
+    // @@ Rewrite java?
     { reifId = insertTripleReifier(acc, reifId, s, p, o, token.beginLine, token.beginColumn) ; }
     { setReifierId(reifId); }
   |
@@ -1073,10 +1256,14 @@ void Annotation(TripleCollector acc, Node s, Node p, Node o) : { Node reifId = n
 }
 void AnnotationBlock(TripleCollector acc, Node reifId) : { }
 {
+   // Roll back into Annotation?
    <L_ANN>
       PropertyListNotEmpty(reifId, acc)
    <R_ANN>
 }
+// -------- Nodes in a graph pattern or template
+// Object position RDF term, element of a list
+// No paths in TriplesNode
 Node GraphNode(TripleCollector acc) : { Node n ; }
 {
    n = VarOrTerm() { return n ; }
@@ -1085,6 +1272,7 @@ Node GraphNode(TripleCollector acc) : { Node n ; }
  |
    n = ReifiedTriple(acc) { return n ; }
 }
+// Object position RDF term. NEW-SYNTAX Rename?
 Node GraphNodePath(TripleCollector acc) : { Node n ; }
 {
   n = VarOrTerm() { return n ; }
@@ -1101,6 +1289,7 @@ Node VarOrTerm() : { Node n = null ; String iri ; }
   | n = NumericLiteral()
   | n = BooleanLiteral()
   | n = BlankNode()
+  //  <LPAREN> <RPAREN>     { return nRDFnil ; }
   | <NIL> { return nRDFnil ; }
   | n = TripleTerm() { return n; }
   )
@@ -1126,6 +1315,8 @@ Node ReifiedTripleSubject(TripleCollector acc) : { Node s; String iri; }
   | s = BooleanLiteral()
   | s = BlankNode()
   | s = ReifiedTriple(acc)
+  //  <LPAREN> <RPAREN>     { s = RDFnil ; }
+  //| <NIL>  { s = nRDFnil ; }
   | s = TripleTerm()
   )
   { return s; }
@@ -1139,6 +1330,8 @@ Node ReifiedTripleObject(TripleCollector acc) : { Node o; String iri; }
   | o = BooleanLiteral()
   | o = BlankNode()
   | o = ReifiedTriple(acc)
+  //  <LPAREN> <RPAREN>     { o = nRDFnil ; }
+  //| <NIL>  { o = nRDFnil ; }
   | o = TripleTerm()
   )
   { return o; }
@@ -1146,6 +1339,7 @@ Node ReifiedTripleObject(TripleCollector acc) : { Node o; String iri; }
 Node TripleTerm() : { Node n = null ; Token openToken ; String iri ; Node s , p , o ; }
 {
     openToken = <L_TRIPLE>
+    // @@ Alt name. ttSubject()?
     s = TripleTermSubject()
     p = Verb()
     o = TripleTermObject()
@@ -1161,6 +1355,8 @@ Node TripleTermSubject() : { Node n; String iri; }
   | n = NumericLiteral()
   | n = BooleanLiteral()
   | n = BlankNode()
+  //  <LPAREN> <RPAREN>     { return nRDFnil ; }
+  //| <NIL>  { return nRDFnil ; }
   | n = TripleTerm() { return n; }
   )
   { return n; }
@@ -1173,6 +1369,8 @@ Node TripleTermObject() : { Node n; String iri; }
   | n = NumericLiteral()
   | n = BooleanLiteral()
   | n = BlankNode()
+  //  <LPAREN> <RPAREN>     { return nRDFnil ; }
+  //| <NIL>  { return nRDFnil ; }
   | n = TripleTerm() { return n; }
   )
   { return n; }
@@ -1180,6 +1378,7 @@ Node TripleTermObject() : { Node n; String iri; }
 Node TripleTermData() : { Node n = null ; Token openToken ; String iri ; Node s , p , o ; }
 {
     openToken = <L_TRIPLE>
+    // @@ Alt name? ttDataValueTerm
     s = TripleTermDataSubject()
     ( iri = iri() { p = createNode(iri) ; } | <KW_A> { p = nRDFtype ; } )
     o = TripleTermDataObject()
@@ -1207,16 +1406,29 @@ Node TripleTermDataObject() : { Node n = null; String iri; }
  )
  { return n; }
 }
+// // VarOrTerm except no var, no bnodes
+// // @@ Rename?
+// Node DataValueTerm() : {  Node n = null ; String iri ; Node s , p , o ; }
+// {
+//   iri = iri()            { return createNode(iri) ; }
+// | n = RDFLiteral()       { return n ; }
+// | n = NumericLiteral()   { return n ; }
+// | n = BooleanLiteral()   { return n ; }
+// | n = TripleTermData()   { return n; }
+// }
+// e.g. Property (if no bNodes) + DESCRIBE
 Node VarOrIri() : {Node n = null ; String iri ; }
 {
   ( n = Var() | iri = iri() { n = createNode(iri) ; } )
   { return n ; }
 }
+// e.g. INSERT DATA { GRAPH ... }
 Var Var() : { Token t ;}
 {
     ( t = <VAR1> | t = <VAR2> )
     { return createVariable(t.image, t.beginLine, t.beginColumn) ; }
 }
+// -------- Constraint syntax
 Expr Expression() : { Expr expr ; }
 {
   expr = ConditionalOrExpression()
@@ -1330,13 +1542,31 @@ Expr PrimaryExpression() : { Expr expr ; Node n ; }
   ( expr = BrackettedExpression() { return expr ; }
   | expr = BuiltInCall() { return expr ; }
   | expr = iriOrFunction() { return expr ; }
+// NOT  | n = ExprVarOrTerm()    { return asExpr(n) ; }
+// Because of iriOrFunction
+// Can't use iri() here
   | n = RDFLiteral() { return asExpr(n) ; }
   | n = NumericLiteral() { return asExpr(n) ; }
   | n = BooleanLiteral() { return asExpr(n) ; }
   | n = Var() { return asExpr(n) ; }
   | n = ExprTripleTerm() { return asExpr(n) ; }
+// and not SPARQL 12
+// needs checking.
+// Use this for ?var(args)
+//  |  expr = VarOrFunction()  { return expr ; }
   )
 }
+// Node ExprVarOrTerm() : { Node n; String s;}
+// {
+//   ( s = iri() { n = createNode(s); }
+//   | n = RDFLiteral()
+//   | n = NumericLiteral()
+//   | n = BooleanLiteral()
+//   | n = Var()
+//   | n = ExprTripleTerm()
+//   )
+//   { return n; }
+// }
 Node ExprTripleTerm() : { Token t ; Node s,p,o,n; }
 {
   t = <L_TRIPLE>
@@ -1392,6 +1622,7 @@ Expr BuiltInCall() : { Expr expr ;
     { return new E_Datatype(expr) ; }
   | <BOUND> <LPAREN> gn = Var() <RPAREN>
     { return new E_Bound(new ExprVar(gn)) ; }
+    // Single argument only for in SPARQL 1.1
   | <IRI> <LPAREN> expr = Expression() <RPAREN>
     { return makeFunction_IRI(expr) ; }
   | <URI> <LPAREN> expr = Expression() <RPAREN>
@@ -1470,7 +1701,7 @@ Expr BuiltInCall() : { Expr expr ;
     { return new E_HasLang(expr) ; }
   | <HAS_LANGDIR> <LPAREN> expr = Expression() <RPAREN>
     { return new E_HasLangDir(expr) ; }
-  |
+  | // Regular expression matcher
     expr = RegexExpression() { return expr ; }
   | expr = ExistsFunc() { return expr ; }
   | expr = NotExistsFunc() { return expr ; }
@@ -1541,6 +1772,8 @@ Expr Aggregate() : { Aggregator agg = null ; String sep = null ;
                      ExprList ordered = new ExprList() ;
                      Token t ; }
 {
+  // Count is special because of COUNT(*)
+  // GROUP_CONCAT is special because of separator=
   { startAggregate(); }
   ( t = <COUNT> <LPAREN>
     ( <DISTINCT> { distinct = true ; } )?
@@ -1563,12 +1796,14 @@ Expr Aggregate() : { Aggregator agg = null ; String sep = null ;
     <LPAREN>
     (t = <DISTINCT> { distinct = true ; })?
     expr = Expression()
+    // Single arg version
     (<SEMICOLON> <SEPARATOR> <EQ> sep=String())?
     <RPAREN>
     { agg = AggregatorFactory.createGroupConcat(distinct, expr, sep, ordered) ; }
   )
   {
     if ( ! getAllowAggregatesInExpressions() )
+        // Do late so we have the token for line/column
         throwParseException("Aggregate expression not legal at this point", t.beginLine, t.beginColumn) ;
     if ( getAggregateDepth() > 1 )
         throwParseException("Nested aggregate in expression not legal", t.beginLine, t.beginColumn) ;
@@ -1577,6 +1812,9 @@ Expr Aggregate() : { Aggregator agg = null ; String sep = null ;
     finishAggregate();
     return exprAgg ; }
 }
+// See also FunctionCall.
+// The case of "q:name()" or "q:agg()" or just "q:name"
+// by expanding out FunctionCall()
 Expr iriOrFunction() : { String iri ; Args a = null ; }
 {
   iri = iri()
@@ -1584,6 +1822,7 @@ Expr iriOrFunction() : { String iri ; Args a = null ; }
   { if ( a == null )
        return asExpr(createNode(iri)) ;
     if ( AggregateRegistry.isRegistered(iri) ) {
+         // aggregates
          if ( ! getAllowAggregatesInExpressions() )
             throwParseException("Aggregate expression not legal at this point : "+iri, token.beginLine, token.beginColumn) ;
          Aggregator agg = AggregatorFactory.createCustom(iri, a) ;
@@ -1596,6 +1835,7 @@ Expr iriOrFunction() : { String iri ; Args a = null ; }
 Node RDFLiteral() : { Token t ; String lex = null ; String uri = null ; }
 {
   lex = String()
+  // Optional lang tag and datatype.
   (
     t = <LANG_DIR>
     { return createLiteralLang(lex, t.image, token.beginLine, token.beginColumn); }
@@ -1670,6 +1910,7 @@ Node BlankNode() : { Token t = null ; }
   t = <BLANK_NODE_LABEL>
     { return createBNode(t.image, t.beginLine, t.beginColumn) ; }
 |
+//  <LBRACKET> <RBRACKET> { return createBNode(t.beginLine, t.beginColumn) ; }
   t = <ANON> { return createBNode(t.beginLine, t.beginColumn) ; }
 }
 String IRIREF() : { Token t ; }
@@ -1677,16 +1918,22 @@ String IRIREF() : { Token t ; }
   t = <IRIref>
   { return resolveQuotedIRI(t.image, t.beginLine, t.beginColumn) ; }
 }
+// ------------------------------------------
+// Tokens
+// Comments and whitespace
 SKIP : { " " | "\t" | "\n" | "\r" | "\f" }
 SPECIAL_TOKEN :
 { <SINGLE_LINE_COMMENT: "#" (~["\n","\r"])* ("\n"|"\r"|"\r\n")? > }
 TOKEN: {
   <#WS: " " | "\t" | "\n" | "\r" | "\f">
 |
+  // Whitespace or comment.
   <#WSC: <WS> | <SINGLE_LINE_COMMENT> >
 }
+// Main tokens */
 TOKEN:
 {
+   // Includes # for relative URIs
    <IRIref: "<"
                 ( ~[ ">","<", "\"", "{", "}", "^", "\\", "|", "`", "\u0000"-"\u0020"]
                 | <UCHAR>
@@ -1701,12 +1948,18 @@ TOKEN:
 | <#A2Z: ["a"-"z","A"-"Z"]>
 | <#A2ZN: ["a"-"z","A"-"Z","0"-"9"]>
 }
+// -------------------------------------------------
+// Keyworks : includes operators that are words and should be
+// before general things like IDENTIFIER which swallow almost
+// anything
 TOKEN : { <KW_A: "a" > }
 TOKEN [IGNORE_CASE] :
 {
+// Prologue
    < BASE: "base" >
 | < PREFIX: "prefix" >
 | < VERSION: "version" >
+// Result forms
 | < SELECT: "select" >
 | < DISTINCT: "distinct" >
 | < REDUCED: "reduced" >
@@ -1721,8 +1974,10 @@ TOKEN [IGNORE_CASE] :
 | < UNDEF: "undef" >
 | < ASC: "asc" >
 | < DESC: "desc" >
+// Dataset
 | < NAMED: "named" >
 | < FROM: "from" >
+// Graph pattern operators 
 | < WHERE: "where" >
 | < AND: "and" >
 | < GRAPH: "graph" >
@@ -1751,6 +2006,7 @@ TOKEN [IGNORE_CASE] :
 | < SAMPLE: "sample" >
 | < GROUP_CONCAT: "group_concat" >
 | < FILTER: "filter" >
+// Expression operators
 | < BOUND: "bound" >
 | < COALESCE: "coalesce" >
 | < IN: "in" >
@@ -1813,6 +2069,7 @@ TOKEN [IGNORE_CASE] :
 | < TRUE: "true" >
 | < FALSE: "false" >
 }
+// SPARQL/Update parts.
 TOKEN [IGNORE_CASE] :
 {
   < DATA: "data" >
@@ -1833,16 +2090,22 @@ TOKEN [IGNORE_CASE] :
 | < INTO: "into" >
 | < TO: "to" >
 | < DFT: "default" >
+//| < NAMED:        "named" >
 | < ALL: "all" >
 | < WITH: "with" >
 | < USING: "using" >
+//| < BEGIN:       "begin" >
+//| < COMMIT:      "commit" >
+//| < ABORT:       "abort" >
 }
+// -------------------------------------------------
 TOKEN :
 {
   < #DIGITS: (["0"-"9"])+>
 | < INTEGER: <DIGITS> >
+//| < DECIMAL: ( <DIGITS> "." (<DIGITS>)* | "." <DIGITS> ) >
 | < DECIMAL: (<DIGITS>)? "." <DIGITS> >
-| < DOUBLE:
+| < DOUBLE: // Required exponent.
       (
         ( (["0"-"9"])+ ("." (["0"-"9"])* )? )
         | ( "." (["0"-"9"])+ )
@@ -1858,12 +2121,15 @@ TOKEN :
 | < #QUOTE_3D: "\"\"\"">
 | < #QUOTE_3S: "'''">
 | <ECHAR: "\\" ( "t"|"b"|"n"|"r"|"f"|"\\"|"\""|"'") >
+// Done instream by JavaCC
 | < #UCHAR: <UCHAR8> >
 | < #UCHAR4: "\\" "u" <HEX> <HEX> <HEX> <HEX> >
 | < #UCHAR8: "\\" "U" <HEX> <HEX> <HEX> <HEX> <HEX> <HEX> <HEX> <HEX> >
 | < STRING_LITERAL1:
+      // Single quoted string
       "'" ( (~["'","\\","\n","\r"]) | <ECHAR> | <UCHAR> )* "'" >
 | < STRING_LITERAL2:
+    // Double quoted string
       "\"" ( (~["\"","\\","\n","\r"]) | <ECHAR> | <UCHAR> )* "\"" >
 | < STRING_LITERAL_LONG1:
      <QUOTE_3S>
@@ -1878,6 +2144,10 @@ TOKEN :
 {
   < LPAREN: "(" >
 | < RPAREN: ")" >
+// All the stuff for NUL is needed just to make a 
+// single list "() ." as a triple pattern illegal.
+// It leads to a lot of extra work.
+// Similarly [].
 | <NIL: <LPAREN> (<WSC>)* <RPAREN> >
 | < LBRACE: "{" >
 | < RBRACE: "}" >
@@ -1891,8 +2161,8 @@ TOKEN :
 | < NE: "!=" >
 | < GT: ">" >
 | < LT: "<" >
-| < LE: "<=" >
-| < GE: ">=" >
+| < LE: "<=" > // Maybe: | "=>" >
+| < GE: ">=" > // Maybe: | "=<" >
 | < L_TRIPLE: "<<(" >
 | < R_TRIPLE: ")>>" >
 | < LT2: "<<" >
@@ -1908,29 +2178,37 @@ TOKEN :
 | < MINUS: "-" >
 | < STAR: "*" >
 | < SLASH: "/" >
+//| < REM: "%" >
 | < DATATYPE: "^^">
 | < AT: "@">
+// Path related
 | < VBAR: "|" >
 | < CARAT: "^" >
 | < QMARK: "?" >
 }
+// See XML chars.txt for notes
 TOKEN:
 {
+  // XML 1.1 NCNameStartChar without "_"
   <#PN_CHARS_BASE:
           ["A"-"Z"] | ["a"-"z"] |
           ["\u00C0"-"\u00D6"] | ["\u00D8"-"\u00F6"] | ["\u00F8"-"\u02FF"] |
           ["\u0370"-"\u037D"] | ["\u037F"-"\u1FFF"] |
           ["\u200C"-"\u200D"] | ["\u2070"-"\u218F"] | ["\u2C00"-"\u2FEF"] |
           ["\u3001"-"\uD7FF"] | ["\uF900"-"\uFFFD"]
+          // [#x10000-#xEFFFF]
           >
 |
+  // With underscore
   <#PN_CHARS_U: <PN_CHARS_BASE> | "_" >
 |
   <#PN_CHARS: (<PN_CHARS_U> | "-" | ["0"-"9"] | "\u00B7" |
               ["\u0300"-"\u036F"] | ["\u203F"-"\u2040"] ) >
 |
+  // No leading "_", no trailing ".", can have dot inside prefix name.
   <#PN_PREFIX: <PN_CHARS_BASE> ((<PN_CHARS>|".")* <PN_CHARS>)? >
 |
+  // Local part.
   <#PN_LOCAL: (<PN_CHARS_U> | ":" | ["0"-"9"] | <PLX> )
               ( (<PN_CHARS> | "." |":" | <PLX> )*
                 (<PN_CHARS> | ":" | <PLX>) )? >
@@ -1939,6 +2217,7 @@ TOKEN:
              ( <PN_CHARS_U> | ["0"-"9"] | "\u00B7" |
                ["\u0300"-"\u036F"] | ["\u203F"-"\u2040"] )* >
 |
+  // Align with QueryParseBase unescapePName.
   < #PN_LOCAL_ESC: "\\"
           ( "_" |
             "~" | "." | "-" | "!" | "$" | "&" | "'" |
@@ -1951,7 +2230,17 @@ TOKEN:
 |
   < #PERCENT: "%" <HEX> <HEX> >
 }
+// Catch-all tokens.  Must be last.  
+// Any non-whitespace.  Causes a parser exception, rather than a
+// token manager error (which hides the line numbers).
 TOKEN:
 {
   <#UNKNOWN: (~[" ","\t","\n","\r","\f" ])+ >
 }
+/*
+# Local Variables:
+# tab-width: 4
+# indent-tabs-mode: nil
+# comment-default-style: "//"
+# End:
+*/
diff --git a/jena-arq/Grammar/sse/grammar-sse b/jena-arq/Grammar/sse/grammar-sse
index d7d35f9527..f26a63bcff 100755
--- a/jena-arq/Grammar/sse/grammar-sse
+++ b/jena-arq/Grammar/sse/grammar-sse
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/bash
 ## Licensed to the Apache Software Foundation (ASF) under one
 ## or more contributor license agreements.  See the NOTICE file
 ## distributed with this work for additional information
@@ -14,8 +14,8 @@
 ## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 ## See the License for the specific language governing permissions and
 ## limitations under the License.
-
-# Parser builder
+##
+## SPDX-License-Identifier: Apache-2.0
 
 GRAMMAR="${GRAMMAR:-"sse.jj"}"
 ROOT="../.."
@@ -54,23 +54,4 @@ function grammar
     echo "---- Done"
 }
 
-if [ $# == 0 ]
-then
-    set -- unisyn
-fi
-
-for G in "$@"
-do
-    case "$G" in
-	unisyn)
-## 	    cp ../header.jj parser.jj
-## 	    # The parser that is exactly the working group grammar
-## 	    cat "$GRAMMAR" | cpp -P >> parser.jj
-## 	    grammar parser.jj sse/lang/parser SSE_ParserCore
-## 	    [ "$RC" = 0 ] && rm parser.jj
-	    grammar sse.jj sse/lang/parser SSE_ParserCore
-	    ;;
-	*)    echo "**** Unknown grammar: $G" 1>&2
-	      ;;
-    esac
-done
+grammar sse.jj sse/lang/javacc SSE_ParserCore
diff --git a/jena-arq/Grammar/sse/sse.jj b/jena-arq/Grammar/sse/sse.jj
index 889ec82f26..e7540c9566 100644
--- a/jena-arq/Grammar/sse/sse.jj
+++ b/jena-arq/Grammar/sse/sse.jj
@@ -14,6 +14,8 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 options
@@ -43,12 +45,14 @@ PARSER_BEGIN(SSE_ParserCore)
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
  */
 
-package org.apache.jena.sparql.sse.lang.parser ;
+package org.apache.jena.sparql.sse.lang.javacc ;
 
 import org.apache.jena.sparql.sse.lang.ParserSSEBase ;
-import static org.apache.jena.riot.lang.extra.LangParserLib.*;
+import static org.apache.jena.riot.lang.LangParserLib.*;
 
 public class SSE_ParserCore extends ParserSSEBase
 {
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 c60cc8cb9b..b5b0e8d160 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
@@ -16,14 +16,19 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
  */
-package org.apache.jena.atlas.json.io.parserjavacc.javacc ;
+
+package org.apache.jena.atlas.json.io.parserjavacc.javacc;
+
 
 @SuppressWarnings("all")
 public class JSON_Parser extends JSON_ParserBase implements JSON_ParserConstants {
 
 // ---- Parser entry points
-  final public void unit() throws ParseException {Token t ;
+  final public 
+void unit() throws ParseException {Token t ;
 startParse(-1, -1) ;
     Object();
     t = jj_consume_token(0);
@@ -60,7 +65,8 @@ finishParse(t.beginLine, t.beginColumn) ;
 }
 
 // ---- Structures
-  final public void Value() throws ParseException {
+  final public 
+void Value() throws ParseException {
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
     case STRING_LITERAL2:
     case INTEGER:
@@ -190,7 +196,8 @@ element(line, col) ;
 }
 
 // ---- 
-  final public void SimpleValue() throws ParseException {
+  final public 
+void SimpleValue() throws ParseException {
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
     case STRING_LITERAL2:{
       String();
diff --git a/jena-arq/src/main/java/org/apache/jena/atlas/json/io/parserjavacc/javacc/JSON_ParserConstants.java b/jena-arq/src/main/java/org/apache/jena/atlas/json/io/parserjavacc/javacc/JSON_ParserConstants.java
index 43efbb1d61..8bbbb9105f 100644
--- a/jena-arq/src/main/java/org/apache/jena/atlas/json/io/parserjavacc/javacc/JSON_ParserConstants.java
+++ b/jena-arq/src/main/java/org/apache/jena/atlas/json/io/parserjavacc/javacc/JSON_ParserConstants.java
@@ -15,8 +15,11 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
  */
-package org.apache.jena.atlas.json.io.parserjavacc.javacc ;
+
+package org.apache.jena.atlas.json.io.parserjavacc.javacc;
 
 
 /**
diff --git a/jena-arq/src/main/java/org/apache/jena/atlas/json/io/parserjavacc/javacc/JSON_ParserTokenManager.java b/jena-arq/src/main/java/org/apache/jena/atlas/json/io/parserjavacc/javacc/JSON_ParserTokenManager.java
index 36fa18db1d..5caa2f7305 100644
--- a/jena-arq/src/main/java/org/apache/jena/atlas/json/io/parserjavacc/javacc/JSON_ParserTokenManager.java
+++ b/jena-arq/src/main/java/org/apache/jena/atlas/json/io/parserjavacc/javacc/JSON_ParserTokenManager.java
@@ -16,8 +16,11 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
  */
-package org.apache.jena.atlas.json.io.parserjavacc.javacc ;
+
+package org.apache.jena.atlas.json.io.parserjavacc.javacc;
 
 /** Token Manager. */
 public class JSON_ParserTokenManager implements JSON_ParserConstants {
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 11405c7652..b0834b70bb 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
@@ -16,8 +16,11 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
  */
-package org.apache.jena.atlas.json.io.parserjavacc.javacc ;
+
+package org.apache.jena.atlas.json.io.parserjavacc.javacc;
 
 /**
  * An implementation of interface CharStream, where the stream is assumed to
@@ -30,7 +33,7 @@ public
 class JavaCharStream
 {
   /** Whether parser is static. */
-
+  
 @SuppressWarnings("all")
 public static final boolean staticFlag = false;
 
@@ -82,7 +85,7 @@ public static final boolean staticFlag = false;
   }
 
 /* Position in buffer. */
-
+  
 @SuppressWarnings("all")
 public int bufpos = -1;
   int bufsize;
@@ -107,10 +110,10 @@ public int bufpos = -1;
   protected int tabSize = 1;
   protected boolean trackLineColumn = true;
 
-
+  
 @SuppressWarnings("all")
 public void setTabSize(int i) { tabSize = i; }
-
+  
 @SuppressWarnings("all")
 public int getTabSize() { return tabSize; }
 
@@ -202,7 +205,7 @@ public int getTabSize() { return tabSize; }
   }
 
 /* @return starting character for token. */
-
+  
 @SuppressWarnings("all")
 public char BeginToken() throws java.io.IOException
   {
@@ -284,7 +287,7 @@ public char BeginToken() throws java.io.IOException
   }
 
 /* Read a character. */
-
+  
 @SuppressWarnings("all")
 public char readChar() throws java.io.IOException
   {
@@ -384,7 +387,7 @@ public char readChar() throws java.io.IOException
    * @see #getEndColumn
    */
   @Deprecated
-
+  
 @SuppressWarnings("all")
 public int getColumn() {
     return bufcolumn[bufpos];
@@ -396,7 +399,7 @@ public int getColumn() {
    * @return the line number.
    */
   @Deprecated
-
+  
 @SuppressWarnings("all")
 public int getLine() {
     return bufline[bufpos];
@@ -405,7 +408,7 @@ public int getLine() {
 /** Get end column.
  * @return the end column or -1
  */
-
+  
 @SuppressWarnings("all")
 public int getEndColumn() {
     return bufcolumn[bufpos];
@@ -414,7 +417,7 @@ public int getEndColumn() {
 /** Get end line.
  * @return the end line number or -1
  */
-
+  
 @SuppressWarnings("all")
 public int getEndLine() {
     return bufline[bufpos];
@@ -422,21 +425,21 @@ public int getEndLine() {
 
 /** Get the beginning column.
  * @return column of token start */
-
+  
 @SuppressWarnings("all")
 public int getBeginColumn() {
     return bufcolumn[tokenBegin];
   }
 
 /** @return line number of token start */
-
+  
 @SuppressWarnings("all")
 public int getBeginLine() {
     return bufline[tokenBegin];
   }
 
 /** Retreat. */
-
+  
 @SuppressWarnings("all")
 public void backup(int amount) {
 
@@ -451,7 +454,7 @@ public void backup(int amount) {
  * @param startcolumn column number of the first character of the stream.
  * @param buffersize size of the buffer
  */
-
+  
 @SuppressWarnings("all")
 public JavaCharStream(java.io.Reader dstream,
                  int startline, int startcolumn, int buffersize)
@@ -472,7 +475,7 @@ public JavaCharStream(java.io.Reader dstream,
  * @param startline line number of the first character of the stream, mostly for error messages.
  * @param startcolumn column number of the first character of the stream.
  */
-
+  
 @SuppressWarnings("all")
 public JavaCharStream(java.io.Reader dstream,
                                         int startline, int startcolumn)
@@ -482,15 +485,16 @@ public JavaCharStream(java.io.Reader dstream,
 
 /** Constructor.
  * @param dstream the underlying data source.
+ * @param startline line number of the first character of the stream, mostly for error messages.
  */
-
+  
 @SuppressWarnings("all")
 public JavaCharStream(java.io.Reader dstream)
   {
     this(dstream, 1, 1, 4096);
   }
 /* Reinitialise. */
-
+  
 @SuppressWarnings("all")
 public void ReInit(java.io.Reader dstream,
                  int startline, int startcolumn, int buffersize)
@@ -513,7 +517,7 @@ public void ReInit(java.io.Reader dstream,
   }
 
 /* Reinitialise. */
-
+  
 @SuppressWarnings("all")
 public void ReInit(java.io.Reader dstream,
                                         int startline, int startcolumn)
@@ -522,14 +526,14 @@ public void ReInit(java.io.Reader dstream,
   }
 
 /* Reinitialise. */
-
+  
 @SuppressWarnings("all")
 public void ReInit(java.io.Reader dstream)
   {
     ReInit(dstream, 1, 1, 4096);
   }
 /** Constructor. */
-
+  
 @SuppressWarnings("all")
 public JavaCharStream(java.io.InputStream dstream, String encoding, int startline,
   int startcolumn, int buffersize) throws java.io.UnsupportedEncodingException
@@ -543,7 +547,7 @@ public JavaCharStream(java.io.InputStream dstream, String encoding, int startlin
  * @param startcolumn column number of the first character of the stream.
  * @param buffersize size of the buffer
  */
-
+  
 @SuppressWarnings("all")
 public JavaCharStream(java.io.InputStream dstream, int startline,
   int startcolumn, int buffersize)
@@ -556,9 +560,9 @@ public JavaCharStream(java.io.InputStream dstream, int startline,
  * @param encoding the character encoding of the data stream.
  * @param startline line number of the first character of the stream, mostly for error messages.
  * @param startcolumn column number of the first character of the stream.
- * @throws java.io.UnsupportedEncodingException encoding is invalid or unsupported.
+ * @throws UnsupportedEncodingException encoding is invalid or unsupported.
  */
-
+  
 @SuppressWarnings("all")
 public JavaCharStream(java.io.InputStream dstream, String encoding, int startline,
                         int startcolumn) throws java.io.UnsupportedEncodingException
@@ -571,7 +575,7 @@ public JavaCharStream(java.io.InputStream dstream, String encoding, int startlin
  * @param startline line number of the first character of the stream, mostly for error messages.
  * @param startcolumn column number of the first character of the stream.
  */
-
+  
 @SuppressWarnings("all")
 public JavaCharStream(java.io.InputStream dstream, int startline,
                         int startcolumn)
@@ -582,9 +586,9 @@ public JavaCharStream(java.io.InputStream dstream, int startline,
 /** Constructor.
  * @param dstream the underlying data source.
  * @param encoding the character encoding of the data stream.
- * @throws java.io.UnsupportedEncodingException encoding is invalid or unsupported.
+ * @throws UnsupportedEncodingException encoding is invalid or unsupported.
  */
-
+  
 @SuppressWarnings("all")
 public JavaCharStream(java.io.InputStream dstream, String encoding) throws java.io.UnsupportedEncodingException
   {
@@ -594,7 +598,7 @@ public JavaCharStream(java.io.InputStream dstream, String encoding) throws java.
   /** Constructor.
    * @param dstream the underlying data source.
    */
-
+  
 @SuppressWarnings("all")
 public JavaCharStream(java.io.InputStream dstream)
   {
@@ -608,7 +612,7 @@ public JavaCharStream(java.io.InputStream dstream)
  * @param startcolumn column number of the first character of the stream.
  * @param buffersize size of the buffer
  */
-
+  
 @SuppressWarnings("all")
 public void ReInit(java.io.InputStream dstream, String encoding, int startline,
   int startcolumn, int buffersize) throws java.io.UnsupportedEncodingException
@@ -622,7 +626,7 @@ public void ReInit(java.io.InputStream dstream, String encoding, int startline,
  * @param startcolumn column number of the first character of the stream.
  * @param buffersize size of the buffer
  */
-
+  
 @SuppressWarnings("all")
 public void ReInit(java.io.InputStream dstream, int startline,
   int startcolumn, int buffersize)
@@ -634,9 +638,9 @@ public void ReInit(java.io.InputStream dstream, int startline,
  * @param encoding the character encoding of the data stream.
  * @param startline line number of the first character of the stream, mostly for error messages.
  * @param startcolumn column number of the first character of the stream.
- * @throws java.io.UnsupportedEncodingException encoding is invalid or unsupported.
+ * @throws UnsupportedEncodingException encoding is invalid or unsupported.
  */
-
+  
 @SuppressWarnings("all")
 public void ReInit(java.io.InputStream dstream, String encoding, int startline,
                      int startcolumn) throws java.io.UnsupportedEncodingException
@@ -648,7 +652,7 @@ public void ReInit(java.io.InputStream dstream, String encoding, int startline,
  * @param startline line number of the first character of the stream, mostly for error messages.
  * @param startcolumn column number of the first character of the stream.
  */
-
+  
 @SuppressWarnings("all")
 public void ReInit(java.io.InputStream dstream, int startline,
                      int startcolumn)
@@ -658,9 +662,9 @@ public void ReInit(java.io.InputStream dstream, int startline,
 /** Reinitialise.
  * @param dstream the underlying data source.
  * @param encoding the character encoding of the data stream.
- * @throws java.io.UnsupportedEncodingException encoding is invalid or unsupported.
+ * @throws UnsupportedEncodingException encoding is invalid or unsupported.
  */
-
+  
 @SuppressWarnings("all")
 public void ReInit(java.io.InputStream dstream, String encoding) throws java.io.UnsupportedEncodingException
   {
@@ -670,7 +674,7 @@ public void ReInit(java.io.InputStream dstream, String encoding) throws java.io.
 /** Reinitialise.
  * @param dstream the underlying data source.
  */
-
+  
 @SuppressWarnings("all")
 public void ReInit(java.io.InputStream dstream)
   {
@@ -679,7 +683,7 @@ public void ReInit(java.io.InputStream dstream)
 
   /** Get the token timage.
    * @return token image as String */
-
+  
 @SuppressWarnings("all")
 public String GetImage()
   {
@@ -693,7 +697,7 @@ public String GetImage()
   /** Get the suffix as an array of characters.
    * @param len the length of the array to return.
    * @return suffix */
-
+  
 @SuppressWarnings("all")
 public char[] GetSuffix(int len)
   {
@@ -712,7 +716,7 @@ public char[] GetSuffix(int len)
   }
 
   /** Set buffers back to null when finished. */
-
+  
 @SuppressWarnings("all")
 public void Done()
   {
@@ -728,7 +732,7 @@ public void Done()
    * @param newLine the new line number.
    * @param newCol the new column number.
    */
-
+  
 @SuppressWarnings("all")
 public void adjustBeginLineColumn(int newLine, int newCol)
   {
@@ -777,4 +781,4 @@ public void adjustBeginLineColumn(int newLine, int newCol)
   void setTrackLineColumn(boolean tlc) { trackLineColumn = tlc; }
 
 }
-/* JavaCC - OriginalChecksum=f197f9d070b53f365514b8e01c7c4d6c (do not edit this line) */
+/* JavaCC - OriginalChecksum=2f803f7756bc8feda69c5e7bd84a74f5 (do not edit this line) */
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 ba444538fe..f05d57f6a2 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
@@ -16,8 +16,11 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
  */
-package org.apache.jena.atlas.json.io.parserjavacc.javacc ;
+
+package org.apache.jena.atlas.json.io.parserjavacc.javacc;
 
 /**
  * This exception is thrown when parse errors are encountered.
@@ -209,4 +212,4 @@ public class ParseException extends Exception {
    }
 
 }
-/* JavaCC - OriginalChecksum=88898db4ee5541decf0f86085cdcf1e4 (do not edit this line) */
+/* JavaCC - OriginalChecksum=4a8a414c54bab9e2a2f33e10fed4a8de (do not edit this line) */
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 7140fd2a68..0bc5a82bed 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
@@ -16,8 +16,11 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
  */
-package org.apache.jena.atlas.json.io.parserjavacc.javacc ;
+
+package org.apache.jena.atlas.json.io.parserjavacc.javacc;
 
 /**
  * Describes the input token stream.
@@ -146,4 +149,4 @@ public class Token implements java.io.Serializable {
   }
 
 }
-/* JavaCC - OriginalChecksum=9246de72e737b3871bb8c283dc9ff0e2 (do not edit this line) */
+/* JavaCC - OriginalChecksum=0398fa9c48266b88fcc06fa57ca72a89 (do not edit this line) */
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 60bb8f2abf..e5f71746f3 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
@@ -16,8 +16,11 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
  */
-package org.apache.jena.atlas.json.io.parserjavacc.javacc ;
+
+package org.apache.jena.atlas.json.io.parserjavacc.javacc;
 
 /** Token Manager Error. */
 
@@ -122,11 +125,10 @@ public class TokenMgrError extends Error
    * Note: You can customize the lexical error message by modifying this method.
    */
   protected static String LexicalErr(boolean EOFSeen, int lexState, int errorLine, int errorColumn, String errorAfter, int curChar) {
-    char curChar1 = (char)curChar;
     return("Lexical error at line " + //
           errorLine + ", column " + //
           errorColumn + ".  Encountered: " + //
-          (EOFSeen ? "<EOF>" : ("'" + addEscapes(String.valueOf(curChar)) + "' (" + (int)curChar + "),")) + //
+          (EOFSeen ? "<EOF>" : ("'" + addEscapes(String.valueOf(curChar)) + "' (" + curChar + "),")) + //
           (errorAfter == null || errorAfter.length() == 0 ? "" : " after prefix \"" + addEscapes(errorAfter) + "\"")) + //
           (lexState == 0 ? "" : " (in lexical state " + lexState + ")");
   }
@@ -164,4 +166,4 @@ public class TokenMgrError extends Error
     this(LexicalErr(EOFSeen, lexState, errorLine, errorColumn, errorAfter, curChar), reason);
   }
 }
-/* JavaCC - OriginalChecksum=5a29f2dc332fbf511784338d0f46edf3 (do not edit this line) */
+/* JavaCC - OriginalChecksum=6b600a38fb4eb2a7f20c91b89352e06f (do not edit this line) */
diff --git a/jena-arq/src/main/java/org/apache/jena/cdt/ParserForCDTLiterals.java b/jena-arq/src/main/java/org/apache/jena/cdt/ParserForCDTLiterals.java
index 748b4656aa..b43eb8a5ea 100644
--- a/jena-arq/src/main/java/org/apache/jena/cdt/ParserForCDTLiterals.java
+++ b/jena-arq/src/main/java/org/apache/jena/cdt/ParserForCDTLiterals.java
@@ -24,9 +24,9 @@ import java.io.StringReader;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.jena.cdt.parser.CDTLiteralParser;
-import org.apache.jena.cdt.parser.ParseException;
-import org.apache.jena.cdt.parser.TokenMgrError;
+import org.apache.jena.cdt.javacc.CDTLiteralParser;
+import org.apache.jena.cdt.javacc.ParseException;
+import org.apache.jena.cdt.javacc.TokenMgrError;
 import org.apache.jena.riot.system.ParserProfile;
 import org.apache.jena.riot.system.RiotLib;
 
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/javacc/CDTLiteralParser.java
similarity index 99%
rename from jena-arq/src/main/java/org/apache/jena/cdt/parser/CDTLiteralParser.java
rename to jena-arq/src/main/java/org/apache/jena/cdt/javacc/CDTLiteralParser.java
index 23a4e0b0b4..b71ccf3099 100644
--- a/jena-arq/src/main/java/org/apache/jena/cdt/parser/CDTLiteralParser.java
+++ b/jena-arq/src/main/java/org/apache/jena/cdt/javacc/CDTLiteralParser.java
@@ -16,11 +16,11 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
  */
 
-package org.apache.jena.cdt.parser;
-
-import static org.apache.jena.riot.lang.LangParserLib.*;
+package org.apache.jena.cdt.javacc;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -29,6 +29,7 @@ import java.util.Map;
 
 import org.apache.jena.cdt.*;
 import org.apache.jena.graph.Node;
+import static org.apache.jena.riot.lang.LangParserLib.*;
 
 public class CDTLiteralParser extends CDTLiteralParserBase implements CDTLiteralParserConstants {
 
diff --git a/jena-arq/src/main/java/org/apache/jena/cdt/parser/CDTLiteralParserConstants.java b/jena-arq/src/main/java/org/apache/jena/cdt/javacc/CDTLiteralParserConstants.java
similarity index 97%
rename from jena-arq/src/main/java/org/apache/jena/cdt/parser/CDTLiteralParserConstants.java
rename to jena-arq/src/main/java/org/apache/jena/cdt/javacc/CDTLiteralParserConstants.java
index 804c8a99a5..5ec0b5d15e 100644
--- a/jena-arq/src/main/java/org/apache/jena/cdt/parser/CDTLiteralParserConstants.java
+++ b/jena-arq/src/main/java/org/apache/jena/cdt/javacc/CDTLiteralParserConstants.java
@@ -15,9 +15,11 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
  */
 
-package org.apache.jena.cdt.parser;
+package org.apache.jena.cdt.javacc;
 
 
 /**
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/javacc/CDTLiteralParserTokenManager.java
similarity index 99%
rename from jena-arq/src/main/java/org/apache/jena/cdt/parser/CDTLiteralParserTokenManager.java
rename to jena-arq/src/main/java/org/apache/jena/cdt/javacc/CDTLiteralParserTokenManager.java
index 2461f330e1..a3a21a9abd 100644
--- a/jena-arq/src/main/java/org/apache/jena/cdt/parser/CDTLiteralParserTokenManager.java
+++ b/jena-arq/src/main/java/org/apache/jena/cdt/javacc/CDTLiteralParserTokenManager.java
@@ -16,17 +16,18 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
  */
 
-package org.apache.jena.cdt.parser;
-import static org.apache.jena.riot.lang.LangParserLib.*;
-
+package org.apache.jena.cdt.javacc;
 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.LangParserLib.*;
 
 /** Token Manager. */
 @SuppressWarnings ("unused")
diff --git a/jena-core/src/test/java/org/apache/jena/ttl_test/turtle/parser/JavaCharStream.java b/jena-arq/src/main/java/org/apache/jena/cdt/javacc/JavaCharStream.java
similarity index 99%
rename from jena-core/src/test/java/org/apache/jena/ttl_test/turtle/parser/JavaCharStream.java
rename to jena-arq/src/main/java/org/apache/jena/cdt/javacc/JavaCharStream.java
index 589c6a76dd..5bc9974187 100644
--- a/jena-core/src/test/java/org/apache/jena/ttl_test/turtle/parser/JavaCharStream.java
+++ b/jena-arq/src/main/java/org/apache/jena/cdt/javacc/JavaCharStream.java
@@ -16,9 +16,11 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
  */
 
-package org.apache.jena.ttl_test.turtle.parser;
+package org.apache.jena.cdt.javacc;
 
 /**
  * An implementation of interface CharStream, where the stream is assumed to
@@ -779,4 +781,4 @@ public void adjustBeginLineColumn(int newLine, int newCol)
   void setTrackLineColumn(boolean tlc) { trackLineColumn = tlc; }
 
 }
-/* JavaCC - OriginalChecksum=9de559d5082595b79322998d8e7a955b (do not edit this line) */
+/* JavaCC - OriginalChecksum=772c0794ff24129990e184b52e7815d7 (do not edit this line) */
diff --git a/jena-core/src/test/java/org/apache/jena/ttl_test/turtle/parser/ParseException.java b/jena-arq/src/main/java/org/apache/jena/cdt/javacc/ParseException.java
similarity index 98%
copy from jena-core/src/test/java/org/apache/jena/ttl_test/turtle/parser/ParseException.java
copy to jena-arq/src/main/java/org/apache/jena/cdt/javacc/ParseException.java
index f6d43f3bdc..55882da0b8 100644
--- a/jena-core/src/test/java/org/apache/jena/ttl_test/turtle/parser/ParseException.java
+++ b/jena-arq/src/main/java/org/apache/jena/cdt/javacc/ParseException.java
@@ -16,9 +16,11 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
  */
 
-package org.apache.jena.ttl_test.turtle.parser;
+package org.apache.jena.cdt.javacc;
 
 /**
  * This exception is thrown when parse errors are encountered.
@@ -210,4 +212,4 @@ public class ParseException extends Exception {
    }
 
 }
-/* JavaCC - OriginalChecksum=10dc416469508e8065e3958be462e2cd (do not edit this line) */
+/* JavaCC - OriginalChecksum=81ba347caef204191824d1b8ce6782e2 (do not edit this line) */
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/sse/lang/parser/Token.java b/jena-arq/src/main/java/org/apache/jena/cdt/javacc/Token.java
similarity index 97%
copy from jena-arq/src/main/java/org/apache/jena/sparql/sse/lang/parser/Token.java
copy to jena-arq/src/main/java/org/apache/jena/cdt/javacc/Token.java
index 0ef3d19c87..84bfd30442 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/sse/lang/parser/Token.java
+++ b/jena-arq/src/main/java/org/apache/jena/cdt/javacc/Token.java
@@ -16,9 +16,11 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
  */
 
-package org.apache.jena.sparql.sse.lang.parser ;
+package org.apache.jena.cdt.javacc;
 
 /**
  * Describes the input token stream.
@@ -147,4 +149,4 @@ public class Token implements java.io.Serializable {
   }
 
 }
-/* JavaCC - OriginalChecksum=b470e52e9e469b5131fc43edbb483298 (do not edit this line) */
+/* JavaCC - OriginalChecksum=a6fd8a78135580462506be3fbe4be0a9 (do not edit this line) */
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/sse/lang/parser/TokenMgrError.java b/jena-arq/src/main/java/org/apache/jena/cdt/javacc/TokenMgrError.java
similarity index 97%
rename from jena-arq/src/main/java/org/apache/jena/sparql/sse/lang/parser/TokenMgrError.java
rename to jena-arq/src/main/java/org/apache/jena/cdt/javacc/TokenMgrError.java
index 4649a60552..e45269cc18 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/sse/lang/parser/TokenMgrError.java
+++ b/jena-arq/src/main/java/org/apache/jena/cdt/javacc/TokenMgrError.java
@@ -16,9 +16,11 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
  */
 
-package org.apache.jena.sparql.sse.lang.parser ;
+package org.apache.jena.cdt.javacc;
 
 /** Token Manager Error. */
 
@@ -164,4 +166,4 @@ public class TokenMgrError extends Error
     this(LexicalErr(EOFSeen, lexState, errorLine, errorColumn, errorAfter, curChar), reason);
   }
 }
-/* JavaCC - OriginalChecksum=5a878c0dbfeb1b80583c6ddf2c88a8f6 (do not edit this line) */
+/* JavaCC - OriginalChecksum=75646b41136091b3ae99d015dcfff316 (do not edit this line) */
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/lang/turtlejcc/javacc/ParseException.java b/jena-arq/src/main/java/org/apache/jena/riot/lang/turtlejcc/javacc/ParseException.java
index dc7695a58b..1c1cab8bd4 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/lang/turtlejcc/javacc/ParseException.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/lang/turtlejcc/javacc/ParseException.java
@@ -16,6 +16,8 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 package org.apache.jena.riot.lang.turtlejcc.javacc;
@@ -210,4 +212,4 @@ public class ParseException extends Exception {
    }
 
 }
-/* JavaCC - OriginalChecksum=29e7bb342c6cf3e245929b9fd8149bac (do not edit this line) */
+/* JavaCC - OriginalChecksum=e79a66ce3f6fbde28350aa0f8e5a480f (do not edit this line) */
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/lang/turtlejcc/javacc/SimpleCharStream.java b/jena-arq/src/main/java/org/apache/jena/riot/lang/turtlejcc/javacc/SimpleCharStream.java
index deffc6cbf8..b853b030c7 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/lang/turtlejcc/javacc/SimpleCharStream.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/lang/turtlejcc/javacc/SimpleCharStream.java
@@ -16,6 +16,8 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 package org.apache.jena.riot.lang.turtlejcc.javacc;
@@ -487,4 +489,4 @@ public class SimpleCharStream
   boolean getTrackLineColumn() { return trackLineColumn; }
   void setTrackLineColumn(boolean tlc) { trackLineColumn = tlc; }
 }
-/* JavaCC - OriginalChecksum=32186373cb0e81e8631f76d36a3caa8c (do not edit this line) */
+/* JavaCC - OriginalChecksum=05d70475ba7d4c88086c6bf2d9a2204d (do not edit this line) */
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/lang/turtlejcc/javacc/Token.java b/jena-arq/src/main/java/org/apache/jena/riot/lang/turtlejcc/javacc/Token.java
index f7d0c9be7a..6b24fb3c96 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/lang/turtlejcc/javacc/Token.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/lang/turtlejcc/javacc/Token.java
@@ -16,6 +16,8 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 package org.apache.jena.riot.lang.turtlejcc.javacc;
@@ -147,4 +149,4 @@ public class Token implements java.io.Serializable {
   }
 
 }
-/* JavaCC - OriginalChecksum=86f7e20338a37f70eadbb3337db56872 (do not edit this line) */
+/* JavaCC - OriginalChecksum=5810fb5a4aa08316fd92aead1dccd1f7 (do not edit this line) */
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/lang/turtlejcc/javacc/TokenMgrError.java b/jena-arq/src/main/java/org/apache/jena/riot/lang/turtlejcc/javacc/TokenMgrError.java
index 412bb8926b..7b3aa3a86c 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/lang/turtlejcc/javacc/TokenMgrError.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/lang/turtlejcc/javacc/TokenMgrError.java
@@ -16,6 +16,8 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 package org.apache.jena.riot.lang.turtlejcc.javacc;
@@ -164,4 +166,4 @@ public class TokenMgrError extends Error
     this(LexicalErr(EOFSeen, lexState, errorLine, errorColumn, errorAfter, curChar), reason);
   }
 }
-/* JavaCC - OriginalChecksum=568f4fa9a2786005de0bec225a66eeae (do not edit this line) */
+/* JavaCC - OriginalChecksum=684816d89c4668227f64d26bb0d9ac0f (do not edit this line) */
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/lang/turtlejcc/javacc/TurtleJavacc.java b/jena-arq/src/main/java/org/apache/jena/riot/lang/turtlejcc/javacc/TurtleJavacc.java
index 6c4537e881..fac77d33dc 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/lang/turtlejcc/javacc/TurtleJavacc.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/lang/turtlejcc/javacc/TurtleJavacc.java
@@ -16,6 +16,8 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 package org.apache.jena.riot.lang.turtlejcc.javacc;
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/lang/turtlejcc/javacc/TurtleJavaccConstants.java b/jena-arq/src/main/java/org/apache/jena/riot/lang/turtlejcc/javacc/TurtleJavaccConstants.java
index 5427ee3965..6928a0e9ca 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/lang/turtlejcc/javacc/TurtleJavaccConstants.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/lang/turtlejcc/javacc/TurtleJavaccConstants.java
@@ -15,6 +15,8 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 package org.apache.jena.riot.lang.turtlejcc.javacc;
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/lang/turtlejcc/javacc/TurtleJavaccTokenManager.java b/jena-arq/src/main/java/org/apache/jena/riot/lang/turtlejcc/javacc/TurtleJavaccTokenManager.java
index 2b5ba0a61b..ce94ab1b68 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/lang/turtlejcc/javacc/TurtleJavaccTokenManager.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/lang/turtlejcc/javacc/TurtleJavaccTokenManager.java
@@ -16,6 +16,8 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 package org.apache.jena.riot.lang.turtlejcc.javacc;
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/lang/arq/javacc/ARQParser.java b/jena-arq/src/main/java/org/apache/jena/sparql/lang/arq/javacc/ARQParser.java
index a1978f6bdf..7ba5aacea7 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/lang/arq/javacc/ARQParser.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/lang/arq/javacc/ARQParser.java
@@ -1,5 +1,24 @@
 /* ARQParser.java */
 /* Generated By:JavaCC: Do not edit this line. ARQParser.java */
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
 package org.apache.jena.sparql.lang.arq.javacc ;
 import org.apache.jena.graph.* ;
 import org.apache.jena.query.* ;
@@ -18,6 +37,13 @@ import java.util.ArrayList;
 @SuppressWarnings("all")
 public class ARQParser extends org.apache.jena.sparql.lang.arq.ARQParserBase implements ARQParserConstants {
 
+// // Common top for single entry point.
+// void Top(): {}
+// {
+//     ( Query() | Update() )
+//     <EOF>
+// }
+// Query only entry point
   final public void QueryUnit() throws ParseException {
     ByteOrderMark();
 startQuery() ;
@@ -155,6 +181,7 @@ version = unescapeStr(version, t.beginLine, t.beginColumn) ;
     throw new Error("Missing return statement in function");
 }
 
+// ---- Query type clauses
   final public void SelectQuery() throws ParseException {
     SelectClause();
     label_2:
@@ -636,13 +663,15 @@ getQuery().setQueryResultStar(true) ;
 setAllowAggregatesInExpressions(false) ;
 }
 
+// Allows quads
   final public void ConstructQuery() throws ParseException {Template t ;
                           QuadAcc acc = new QuadAcc() ;
     jj_consume_token(CONSTRUCT);
 getQuery().setQueryConstructType() ;
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
     case LBRACE:{
-      t = ConstructTemplate();
+      // Full form.
+          t = ConstructTemplate();
 getQuery().setConstructTemplate(t) ;
       label_4:
       while (true) {
@@ -683,6 +712,7 @@ getQuery().setConstructTemplate(t) ;
       SolutionModifier();
 t = new Template(acc) ;
       getQuery().setConstructTemplate(t) ;
+      // Create a query in the same shape as the query created by writing out in full.
    ElementGroup elg = createQueryPattern(t);
       getQuery().setQueryPattern(elg) ;
       break;
@@ -823,7 +853,8 @@ getQuery().setQueryJsonType() ;
 
   final public void JsonObjectMember() throws ParseException {Node o ; String s ; Token t;
     s = String();
-    t = jj_consume_token(PNAME_NS);
+    // PNAME_NS would eval true before COLON (default namescape) so we make sure we got what we were expecting
+      t = jj_consume_token(PNAME_NS);
 if ( ! t.image.equals(":") )
       throwParseException("Prefix name expression not legal at this point : "+t.image, t.beginLine, t.beginColumn) ;
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
@@ -867,6 +898,7 @@ getQuery().addJsonMapping(s, o) ;
     }
 }
 
+// ----
   final public void DatasetClause() throws ParseException {
     jj_consume_token(FROM);
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
@@ -889,13 +921,15 @@ getQuery().addJsonMapping(s, o) ;
 
   final public void DefaultGraphClause() throws ParseException {String iri ;
     iri = SourceSelector();
-getQuery().addGraphURI(iri) ;
+// This checks for duplicates
+    getQuery().addGraphURI(iri) ;
 }
 
   final public void NamedGraphClause() throws ParseException {String iri ;
     jj_consume_token(NAMED);
     iri = SourceSelector();
-getQuery().addNamedGraphURI(iri) ;
+// This checks for duplicates
+    getQuery().addNamedGraphURI(iri) ;
 }
 
   final public String SourceSelector() throws ParseException {String iri ;
@@ -2200,6 +2234,13 @@ silent=true ;
     throw new Error("Missing return statement in function");
 }
 
+// #ifdef ARQ
+// void Meta() : { QuadDataAccSink qd = new QuadDataAccSink() ; }
+// {
+//    <META> 
+//    QuadData(qd)
+// }
+// #endif
   final public void InsertData() throws ParseException {QuadDataAccSink qd = createInsertDataSink() ; Token t ;
     t = jj_consume_token(INSERT_DATA);
 int beginLine = t.beginLine; int beginColumn = t.beginColumn; t = null;
@@ -2404,6 +2445,7 @@ n = createNode(iri) ; update.addUsingNamed(n) ;
     jj_consume_token(RBRACE);
 }
 
+//Ground data : As QuadPattern but don't allow variables.
   final public void QuadData(QuadDataAccSink acc) throws ParseException {
     jj_consume_token(LBRACE);
     Quads(acc);
@@ -2549,6 +2591,8 @@ setAccGraph(acc, gn) ;
 setAccGraph(acc, prev) ;
 }
 
+// See "/* TriG template :: ..... */" below.
+// If not TriG like, check this is not "QuadPattern" 
   final public void ConstructQuads(QuadAcc acc) throws ParseException {
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
     case IRIref:
@@ -2650,7 +2694,8 @@ setAccGraph(acc, prev) ;
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
     case GRAPH:{
       jj_consume_token(GRAPH);
-      gn = VarOrBlankNodeOrIri();
+      /* TriG template :: (<GRAPH>)?*/
+            gn = VarOrBlankNodeOrIri();
       break;
       }
     default:
@@ -2721,6 +2766,7 @@ setAccGraph(acc, prev) ;
     }
 }
 
+// ---- General Graph Pattern 
   final public Element GroupGraphPattern() throws ParseException {Element el = null ; Token t ;
     t = jj_consume_token(LBRACE);
 int beginLine = t.beginLine; int beginColumn = t.beginColumn; t = null;
@@ -2928,6 +2974,7 @@ if ( acc == null )
     throw new Error("Missing return statement in function");
 }
 
+// -----
   final public Element GraphPatternNotTriples() throws ParseException {Element el = null ;
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
     case LBRACE:{
@@ -2999,6 +3046,7 @@ if ( acc == null )
     throw new Error("Missing return statement in function");
 }
 
+// ---- Definitions of each pattern element
   final public Element OptionalGraphPattern() throws ParseException {Element el ;
     jj_consume_token(OPTIONAL);
     el = GroupGraphPattern();
@@ -3294,6 +3342,8 @@ finishDataBlockValueRow(beginLine, beginColumn) ;
     throw new Error("Missing return statement in function");
 }
 
+// ---- Reifier, various cases.
+// May return null.
   final public Node Reifier() throws ParseException {Token tok = null ; Node reifId = null ;
     tok = jj_consume_token(TILDE);
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
@@ -3315,6 +3365,28 @@ finishDataBlockValueRow(beginLine, beginColumn) ;
     throw new Error("Missing return statement in function");
 }
 
+// // No variables.
+// Node ReifierData() : { Token tok = null ; Node reifId = null ; }
+// {
+//     tok = <TILDE>
+//     (reifId = ReifierId() )?
+//     { return reifId; }
+// }
+// 
+// Node ReifierId() : { Node n = null ; String iri ; } 
+// {
+//   // No variable
+//   ( iri = iri()           { return createNode(iri) ; }
+//   | n = BlankNode()       { return n ; }
+//   )
+// }
+// 
+// Node VarOrReifierId() : { Node n = null; }
+// {
+//    ( n = Var()        { return n; }
+//    | n = ReifierId()  { return n; }
+//    )
+// }
   final public Node VarOrReifierId() throws ParseException {Node n = null; String iri = null;
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
     case VAR1:
@@ -3399,6 +3471,16 @@ finishDataBlockValueRow(beginLine, beginColumn) ;
     throw new Error("Missing return statement in function");
 }
 
+// Element UnionGraphPattern() : { Element el ; }
+// {
+//     <UNION>
+//     el = GroupGraphPattern()
+//     { return new ElementUnion(el) ; }
+// }
+// SPARQL 1.0: {pattern} UNION {pattern} UNION {pattern} ... :: 
+// SPARQL 1.1 may introduce: { pattern UNION pattern UNION ... }
+// G (union G)* can be a single group pattern
+// or a group pattern as part of an union.
   final public Element GroupOrUnionGraphPattern() throws ParseException {Element el = null ; ElementUnion el2 = null ;
     el = GroupGraphPattern();
     label_24:
@@ -3547,6 +3629,7 @@ el2.addElement(el) ;
     fname = iri();
     a = ArgList();
 if ( AggregateRegistry.isRegistered(fname) ) {
+         // aggregates
          if ( ! getAllowAggregatesInExpressions() )
             throwParseException("Aggregate expression not legal at this point : "+fname, token.beginLine, token.beginColumn) ;
          Aggregator agg = AggregatorFactory.createCustom(fname, a) ;
@@ -3645,6 +3728,7 @@ exprList.add(expr) ;
     throw new Error("Missing return statement in function");
 }
 
+// -------- Construct patterns
   final public Template ConstructTemplate() throws ParseException {QuadAcc acc = new QuadAcc() ;
                                  Template t = new Template (acc);
 setInConstructTemplate(true) ;
@@ -3679,6 +3763,8 @@ setInConstructTemplate(false) ;
     }
 }
 
+// -------- Triple lists with property and object lists
+// -------- Without paths: entry: TriplesSameSubject
   final public void TriplesSameSubject(TripleCollector acc) throws ParseException {Node s ;
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
     case IRIref:
@@ -3767,7 +3853,8 @@ insert(acc, tempAcc) ;
       case VAR1:
       case VAR2:
       case KW_A:{
-        p = Verb();
+        /* TriG template: LOOKAHEAD(2) */
+               p = Verb();
         ObjectList(s, p, acc);
         break;
         }
@@ -3827,6 +3914,8 @@ insert(tempAcc, mark, s, p, o) ; insert(acc, tempAcc) ;
     Annotation(acc, s, p, o);
 }
 
+// -------- BGPs with paths.
+// -------- Entry point: TriplesSameSubjectPath
   final public void TriplesSameSubjectPath(TripleCollector acc) throws ParseException {Node s ;
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
     case IRIref:
@@ -3992,7 +4081,9 @@ path = null ; p = null ;
 }
 
   final public Node VerbSimple() throws ParseException {Node p ;
-    p = Var();
+    // "a" now allowed in paths.
+      //( p = Var() | <KW_A> { p = nRDFtype ; } )
+      p = Var();
 {if ("" != null) return p ;}
     throw new Error("Missing return statement in function");
 }
@@ -4022,6 +4113,8 @@ insert(tempAcc, mark, s, p, path, o) ; insert(acc, tempAcc) ;
     AnnotationPath(acc, s, p, path, o);
 }
 
+// End paths stuff.
+// -------- Paths
   final public Path PathUnit() throws ParseException {Path p ;
     ByteOrderMark();
     p = Path();
@@ -4030,6 +4123,7 @@ insert(tempAcc, mark, s, p, path, o) ; insert(acc, tempAcc) ;
     throw new Error("Missing return statement in function");
 }
 
+// Weakest outermost
   final public Path Path() throws ParseException {Path p ;
     p = PathAlternative();
 {if ("" != null) return p ;}
@@ -4094,6 +4188,7 @@ p1 = PathFactory.pathSeq(p1, new P_Inverse(p2)) ;
     throw new Error("Missing return statement in function");
 }
 
+// Path unit element, no inverse
   final public Path PathElt() throws ParseException {String str ; Node n ; Path p ;
     p = PathPrimary();
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
@@ -4112,6 +4207,7 @@ p1 = PathFactory.pathSeq(p1, new P_Inverse(p2)) ;
     throw new Error("Missing return statement in function");
 }
 
+// Path unit element, including inverse.
   final public Path PathEltOrInverse() throws ParseException {String str ; Node n ; Path p ;
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
     case IRIref:
@@ -4174,7 +4270,8 @@ p = PathFactory.pathInverse(p) ;
         break;
         }
       case INTEGER:{
-        i1 = Integer();
+        // {N} {N,M} {N,}
+                  i1 = Integer();
         switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
         case COMMA:{
           jj_consume_token(COMMA);
@@ -4185,7 +4282,8 @@ p = PathFactory.pathInverse(p) ;
             break;
             }
           case INTEGER:{
-            i2 = Integer();
+            // case {N,M}
+                          i2 = Integer();
             jj_consume_token(RBRACE);
 {if ("" != null) return PathFactory.pathMod(p, i1, i2) ;}
             break;
@@ -4394,6 +4492,9 @@ n = createNode(str) ; {if ("" != null) return new P_ReverseLink(n) ;}
     throw new Error("Missing return statement in function");
 }
 
+// -------- Triple expansions
+// Anything that can stand in a node slot and which is
+// a number of triples
   final public Node TriplesNode(TripleCollector acc) throws ParseException {Node n ;
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
     case LPAREN:{
@@ -4452,6 +4553,7 @@ Node n = createBNode( t.beginLine, t.beginColumn) ;
     throw new Error("Missing return statement in function");
 }
 
+// ------- RDF collections
   final public Node Collection(TripleCollector acc) throws ParseException {Node listHead = nRDFnil ; Node lastCell = null ; int mark ; Node n ; Token t ;
     t = jj_consume_token(LPAREN);
 int beginLine = t.beginLine; int beginColumn = t.beginColumn; t = null;
@@ -4566,6 +4668,8 @@ if ( lastCell != null )
     throw new Error("Missing return statement in function");
 }
 
+// ---- RDF-star Annotation Syntax
+// Allow paths. Query graph patterns.
   final public void AnnotationPath(TripleCollector acc, Node s, Node p, Path path, Node o) throws ParseException {Node reifId = null ;
     label_37:
     while (true) {
@@ -4609,6 +4713,8 @@ clearReifierId();
     jj_consume_token(R_ANN);
 }
 
+// ---- RDF-star Annotation Syntax
+// No paths. Construct templates.
   final public void Annotation(TripleCollector acc, Node s, Node p, Node o) throws ParseException {Node reifId = null ;
     label_38:
     while (true) {
@@ -4651,6 +4757,9 @@ clearReifierId();
     jj_consume_token(R_ANN);
 }
 
+// -------- Nodes in a graph pattern or template
+// Object position RDF term, element of a list
+// No paths in TriplesNode
   final public Node GraphNode(TripleCollector acc) throws ParseException {Node n ;
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
     case IRIref:
@@ -4700,6 +4809,7 @@ clearReifierId();
     throw new Error("Missing return statement in function");
 }
 
+// Object position RDF term. NEW-SYNTAX Rename?
   final public Node GraphNodePath(TripleCollector acc) throws ParseException {Node n ;
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
     case IRIref:
@@ -4953,7 +5063,8 @@ o = createNode(iri) ;
 
   final public Node TripleTerm() throws ParseException {Node n = null ; Token openToken ; String iri ; Node s , p , o ;
     openToken = jj_consume_token(L_TRIPLE);
-    s = TripleTermSubject();
+    // @@ Alt name. ttSubject()?
+        s = TripleTermSubject();
     p = Verb();
     o = TripleTermObject();
 n = createTripleTerm(s, p, o, openToken.beginLine, openToken.beginColumn);
@@ -5078,7 +5189,8 @@ n = createNode(iri) ;
 
   final public Node TripleTermData() throws ParseException {Node n = null ; Token openToken ; String iri ; Node s , p , o ;
     openToken = jj_consume_token(L_TRIPLE);
-    s = TripleTermDataSubject();
+    // @@ Alt name? ttDataValueTerm
+        s = TripleTermDataSubject();
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
     case IRIref:
     case PNAME_NS:
@@ -5196,6 +5308,17 @@ n = createNode(iri) ;
     throw new Error("Missing return statement in function");
 }
 
+// // VarOrTerm except no var, no bnodes
+// // @@ Rename?
+// Node DataValueTerm() : {  Node n = null ; String iri ; Node s , p , o ; }
+// {
+//   iri = iri()            { return createNode(iri) ; }
+// | n = RDFLiteral()       { return n ; }
+// | n = NumericLiteral()   { return n ; }
+// | n = BooleanLiteral()   { return n ; }
+// | n = TripleTermData()   { return n; }
+// }
+// e.g. Property (if no bNodes) + DESCRIBE
   final public Node VarOrIri() throws ParseException {Node n = null ; String iri ;
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
     case VAR1:
@@ -5219,6 +5342,7 @@ n = createNode(iri) ;
     throw new Error("Missing return statement in function");
 }
 
+// e.g. INSERT DATA { GRAPH ... }
   final public Node VarOrBlankNodeOrIri() throws ParseException {Node n = null ; String iri ;
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
     case VAR1:
@@ -5266,6 +5390,7 @@ n = createNode(iri) ;
     throw new Error("Missing return statement in function");
 }
 
+// -------- Constraint syntax
   final public Expr Expression() throws ParseException {Expr expr ;
     expr = ConditionalOrExpression();
 {if ("" != null) return expr ;}
@@ -5855,6 +5980,17 @@ expr1 = new E_OpNumericIntegerDivide(expr1, expr2) ;
     throw new Error("Missing return statement in function");
 }
 
+// Node ExprVarOrTerm() : { Node n; String s;}
+// {
+//   ( s = iri() { n = createNode(s); }
+//   | n = RDFLiteral()
+//   | n = NumericLiteral()
+//   | n = BooleanLiteral()
+//   | n = Var()
+//   | n = ExprTripleTerm()
+//   )
+//   { return n; }
+// }
   final public Node ExprTripleTerm() throws ParseException {Token t ; Node s,p,o,n;
     t = jj_consume_token(L_TRIPLE);
     s = ExprTripleTermSubject();
@@ -6571,7 +6707,8 @@ a.add(expr) ;
       break;
       }
     case REGEX:{
-      expr = RegexExpression();
+      // Regular expression matcher
+          expr = RegexExpression();
 {if ("" != null) return expr ;}
       break;
       }
@@ -7326,6 +7463,7 @@ agg = AggregatorFactory.createCustom(iri, a) ;
       throw new ParseException();
     }
 if ( ! getAllowAggregatesInExpressions() )
+        // Do late so we have the token for line/column
         throwParseException("Aggregate expression not legal at this point", t.beginLine, t.beginColumn) ;
     if ( getAggregateDepth() > 1 )
         throwParseException("Nested aggregate in expression not legal", t.beginLine, t.beginColumn) ;
@@ -7335,6 +7473,9 @@ Expr exprAgg = getQuery().allocAggregate(agg) ;
     throw new Error("Missing return statement in function");
 }
 
+// See also FunctionCall.
+// The case of "q:name()" or "q:agg()" or just "q:name"
+// by expanding out FunctionCall()
   final public Expr iriOrFunction() throws ParseException {String iri ; Args a = null ;
     iri = iri();
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
@@ -7350,6 +7491,7 @@ Expr exprAgg = getQuery().allocAggregate(agg) ;
 if ( a == null )
        {if ("" != null) return asExpr(createNode(iri)) ;}
     if ( AggregateRegistry.isRegistered(iri) ) {
+         // aggregates
          if ( ! getAllowAggregatesInExpressions() )
             throwParseException("Aggregate expression not legal at this point : "+iri, token.beginLine, token.beginColumn) ;
          Aggregator agg = AggregatorFactory.createCustom(iri, a) ;
@@ -7598,7 +7740,8 @@ lex = unescapeStr(lex, t.beginLine, t.beginColumn) ;
       break;
       }
     case ANON:{
-      t = jj_consume_token(ANON);
+      //  <LBRACKET> <RBRACKET> { return createBNode(t.beginLine, t.beginColumn) ; }
+        t = jj_consume_token(ANON);
 {if ("" != null) return createBNode(t.beginLine, t.beginColumn) ;}
       break;
       }
@@ -7656,262 +7799,191 @@ lex = unescapeStr(lex, t.beginLine, t.beginColumn) ;
     finally { jj_save(4, xla); }
   }
 
-  private boolean jj_3R_NumericLiteralUnsigned_1909_3_207()
- {
-    if (jj_scan_token(DOUBLE)) return true;
-    return false;
-  }
-
-  private boolean jj_3R_NumericLiteralUnsigned_1908_3_206()
- {
-    if (jj_scan_token(DECIMAL)) return true;
-    return false;
-  }
-
-  private boolean jj_3R_NumericLiteralUnsigned_1907_3_205()
- {
-    if (jj_scan_token(INTEGER)) return true;
-    return false;
-  }
-
-  private boolean jj_3R_NumericLiteralUnsigned_1907_3_200()
+  private boolean jj_3R_BuiltInCall_1909_5_92()
  {
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_NumericLiteralUnsigned_1907_3_205()) {
-    jj_scanpos = xsp;
-    if (jj_3R_NumericLiteralUnsigned_1908_3_206()) {
-    jj_scanpos = xsp;
-    if (jj_3R_NumericLiteralUnsigned_1909_3_207()) return true;
-    }
-    }
+    if (jj_scan_token(SHA256)) return true;
+    if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_NumericLiteral_1901_5_190()
+  private boolean jj_3R_BuiltInCall_1908_5_91()
  {
-    if (jj_3R_NumericLiteralNegative_1919_3_202()) return true;
+    if (jj_scan_token(SHA1)) return true;
+    if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_NumericLiteral_1900_5_189()
+  private boolean jj_3R_BuiltInCall_1907_5_90()
  {
-    if (jj_3R_NumericLiteralPositive_1913_3_201()) return true;
+    if (jj_scan_token(MD5)) return true;
+    if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_NumericLiteral_1899_5_188()
+  private boolean jj_3R_BuiltInCall_1906_5_89()
  {
-    if (jj_3R_NumericLiteralUnsigned_1907_3_200()) return true;
+    if (jj_scan_token(STRUUID)) return true;
+    if (jj_scan_token(NIL)) return true;
     return false;
   }
 
-  private boolean jj_3R_NumericLiteral_1898_3_177()
+  private boolean jj_3R_BuiltInCall_1905_5_88()
  {
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_NumericLiteral_1899_5_188()) {
-    jj_scanpos = xsp;
-    if (jj_3R_NumericLiteral_1900_5_189()) {
-    jj_scanpos = xsp;
-    if (jj_3R_NumericLiteral_1901_5_190()) return true;
-    }
-    }
+    if (jj_scan_token(UUID)) return true;
+    if (jj_scan_token(NIL)) return true;
     return false;
   }
 
-  private boolean jj_3R_RDFLiteral_1886_3_176()
+  private boolean jj_3R_BuiltInCall_1904_5_87()
  {
-    if (jj_3R_String_1931_3_187()) return true;
+    if (jj_scan_token(NOW)) return true;
+    if (jj_scan_token(NIL)) return true;
     return false;
   }
 
-  private boolean jj_3R_Aggregate_1851_5_155()
+  private boolean jj_3R_ReifiedTriple_1521_3_171()
  {
-    if (jj_scan_token(AGG)) return true;
-    if (jj_3R_iri_1943_3_172()) return true;
+    if (jj_scan_token(LT2)) return true;
     return false;
   }
 
-  private boolean jj_3R_Aggregate_1831_5_154()
+  private boolean jj_3R_BuiltInCall_1900_5_86()
  {
-    if (jj_scan_token(FOLD)) return true;
+    if (jj_scan_token(ADJUST)) return true;
     if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_Aggregate_1829_5_153()
+  private boolean jj_3R_BuiltInCall_1899_5_85()
  {
-    if (jj_scan_token(VAR_POP)) return true;
+    if (jj_scan_token(TZ)) return true;
     if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_Aggregate_1827_5_152()
+  private boolean jj_3R_VarOrTerm_1515_5_168()
  {
-    if (jj_scan_token(VAR_SAMP)) return true;
-    if (jj_scan_token(LPAREN)) return true;
+    if (jj_3R_TripleTerm_1562_5_180()) return true;
     return false;
   }
 
-  private boolean jj_3R_Aggregate_1825_5_151()
+  private boolean jj_3R_BuiltInCall_1898_5_84()
  {
-    if (jj_scan_token(VARIANCE)) return true;
+    if (jj_scan_token(TIMEZONE)) return true;
     if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_Aggregate_1823_5_150()
+  private boolean jj_3R_VarOrTerm_1514_5_167()
  {
-    if (jj_scan_token(STDEV_POP)) return true;
-    if (jj_scan_token(LPAREN)) return true;
+    if (jj_scan_token(NIL)) return true;
     return false;
   }
 
-  private boolean jj_3R_Aggregate_1821_5_149()
+  private boolean jj_3R_BuiltInCall_1897_5_83()
  {
-    if (jj_scan_token(STDEV_SAMP)) return true;
+    if (jj_scan_token(SECONDS)) return true;
     if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_Var_1437_5_175()
- {
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_scan_token(14)) {
-    jj_scanpos = xsp;
-    if (jj_scan_token(15)) return true;
-    }
-    return false;
-  }
-
-  private boolean jj_3R_Aggregate_1819_5_148()
+  private boolean jj_3R_BuiltInCall_1896_5_82()
  {
-    if (jj_scan_token(STDEV)) return true;
+    if (jj_scan_token(MINUTES)) return true;
     if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3_5()
+  private boolean jj_3R_VarOrTerm_1512_5_166()
  {
-    if (jj_scan_token(SEMICOLON)) return true;
-    if (jj_scan_token(SEPARATOR)) return true;
+    if (jj_3R_BlankNode_2214_3_179()) return true;
     return false;
   }
 
-  private boolean jj_3R_Aggregate_1806_5_147()
+  private boolean jj_3R_BuiltInCall_1895_5_81()
  {
-    if (jj_scan_token(GROUP_CONCAT)) return true;
+    if (jj_scan_token(HOURS)) return true;
     if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_Aggregate_1804_5_146()
+  private boolean jj_3R_VarOrTerm_1511_5_165()
  {
-    if (jj_scan_token(SAMPLE)) return true;
-    if (jj_scan_token(LPAREN)) return true;
+    if (jj_3R_BooleanLiteral_2181_3_178()) return true;
     return false;
   }
 
-  private boolean jj_3R_Aggregate_1802_5_145()
+  private boolean jj_3R_BuiltInCall_1894_5_80()
  {
-    if (jj_scan_token(MODE)) return true;
+    if (jj_scan_token(DAY)) return true;
     if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_Aggregate_1800_5_144()
+  private boolean jj_3R_VarOrTerm_1510_5_164()
  {
-    if (jj_scan_token(MEDIAN)) return true;
-    if (jj_scan_token(LPAREN)) return true;
+    if (jj_3R_NumericLiteral_2154_3_177()) return true;
     return false;
   }
 
-  private boolean jj_3R_Aggregate_1798_5_143()
+  private boolean jj_3R_BuiltInCall_1893_5_79()
  {
-    if (jj_scan_token(AVG)) return true;
+    if (jj_scan_token(MONTH)) return true;
     if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_ReifiedTripleBlock_649_3_138()
+  private boolean jj_3R_VarOrTerm_1509_5_163()
  {
-    if (jj_3R_ReifiedTriple_1326_3_171()) return true;
+    if (jj_3R_RDFLiteral_2141_3_176()) return true;
     return false;
   }
 
-  private boolean jj_3R_Aggregate_1796_5_142()
+  private boolean jj_3R_BuiltInCall_1892_5_78()
  {
-    if (jj_scan_token(MAX)) return true;
+    if (jj_scan_token(YEAR)) return true;
     if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_Aggregate_1794_5_141()
+  private boolean jj_3R_VarOrTerm_1508_5_162()
  {
-    if (jj_scan_token(MIN)) return true;
-    if (jj_scan_token(LPAREN)) return true;
+    if (jj_3R_iri_2199_3_172()) return true;
     return false;
   }
 
-  private boolean jj_3R_Aggregate_1792_5_140()
+  private boolean jj_3R_VarOrTerm_1507_5_161()
  {
-    if (jj_scan_token(SUM)) return true;
-    if (jj_scan_token(LPAREN)) return true;
+    if (jj_3R_Var_1654_5_175()) return true;
     return false;
   }
 
-  private boolean jj_3R_Aggregate_1785_5_139()
+  private boolean jj_3R_BuiltInCall_1890_5_77()
  {
-    if (jj_scan_token(COUNT)) return true;
+    if (jj_scan_token(STRAFTER)) return true;
     if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_Aggregate_1784_3_124()
+  private boolean jj_3R_VarOrTerm_1507_3_136()
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_Aggregate_1785_5_139()) {
-    jj_scanpos = xsp;
-    if (jj_3R_Aggregate_1792_5_140()) {
-    jj_scanpos = xsp;
-    if (jj_3R_Aggregate_1794_5_141()) {
-    jj_scanpos = xsp;
-    if (jj_3R_Aggregate_1796_5_142()) {
-    jj_scanpos = xsp;
-    if (jj_3R_Aggregate_1798_5_143()) {
-    jj_scanpos = xsp;
-    if (jj_3R_Aggregate_1800_5_144()) {
-    jj_scanpos = xsp;
-    if (jj_3R_Aggregate_1802_5_145()) {
-    jj_scanpos = xsp;
-    if (jj_3R_Aggregate_1804_5_146()) {
+    if (jj_3R_VarOrTerm_1507_5_161()) {
     jj_scanpos = xsp;
-    if (jj_3R_Aggregate_1806_5_147()) {
+    if (jj_3R_VarOrTerm_1508_5_162()) {
     jj_scanpos = xsp;
-    if (jj_3R_Aggregate_1819_5_148()) {
+    if (jj_3R_VarOrTerm_1509_5_163()) {
     jj_scanpos = xsp;
-    if (jj_3R_Aggregate_1821_5_149()) {
+    if (jj_3R_VarOrTerm_1510_5_164()) {
     jj_scanpos = xsp;
-    if (jj_3R_Aggregate_1823_5_150()) {
+    if (jj_3R_VarOrTerm_1511_5_165()) {
     jj_scanpos = xsp;
-    if (jj_3R_Aggregate_1825_5_151()) {
+    if (jj_3R_VarOrTerm_1512_5_166()) {
     jj_scanpos = xsp;
-    if (jj_3R_Aggregate_1827_5_152()) {
+    if (jj_3R_VarOrTerm_1514_5_167()) {
     jj_scanpos = xsp;
-    if (jj_3R_Aggregate_1829_5_153()) {
-    jj_scanpos = xsp;
-    if (jj_3R_Aggregate_1831_5_154()) {
-    jj_scanpos = xsp;
-    if (jj_3R_Aggregate_1851_5_155()) return true;
-    }
-    }
-    }
-    }
-    }
-    }
+    if (jj_3R_VarOrTerm_1515_5_168()) return true;
     }
     }
     }
@@ -7919,982 +7991,1081 @@ lex = unescapeStr(lex, t.beginLine, t.beginColumn) ;
     }
     }
     }
-    }
-    }
-    }
-    return false;
-  }
-
-  private boolean jj_3R_NotExistsFunc_1774_4_132()
- {
-    if (jj_scan_token(NOT)) return true;
-    if (jj_scan_token(EXISTS)) return true;
-    return false;
-  }
-
-  private boolean jj_3R_ExistsFunc_1768_4_131()
- {
-    if (jj_scan_token(EXISTS)) return true;
-    if (jj_3R_GroupGraphPattern_600_3_157()) return true;
     return false;
   }
 
-  private boolean jj_3R_StrReplaceExpression_1757_3_129()
+  private boolean jj_3R_BuiltInCall_1888_5_76()
  {
-    if (jj_scan_token(REPLACE)) return true;
+    if (jj_scan_token(STRBEFORE)) return true;
     if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_GroupGraphPattern_600_3_157()
+  private boolean jj_3R_BuiltInCall_1886_5_75()
  {
-    if (jj_scan_token(LBRACE)) return true;
-    return false;
-  }
-
-  private boolean jj_3R_TripleTerm_1363_5_180()
- {
-    if (jj_scan_token(L_TRIPLE)) return true;
+    if (jj_scan_token(STRENDS)) return true;
+    if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3_3()
+  private boolean jj_3R_BuiltInCall_1884_5_74()
  {
-    if (jj_scan_token(DOT)) return true;
-    if (jj_3R_TriplesSameSubject_947_3_48()) return true;
+    if (jj_scan_token(STRSTARTS)) return true;
+    if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_SubstringExpression_1745_5_128()
+  private boolean jj_3R_BuiltInCall_1882_5_73()
  {
-    if (jj_scan_token(SUBSTR)) return true;
+    if (jj_scan_token(CONTAINS)) return true;
     if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_RegexExpression_1733_5_130()
+  private boolean jj_3R_TriplesSameSubject_1117_3_123()
  {
-    if (jj_scan_token(REGEX)) return true;
-    if (jj_scan_token(LPAREN)) return true;
+    if (jj_3R_ReifiedTripleBlock_769_3_138()) return true;
     return false;
   }
 
-  private boolean jj_3R_BuiltInCall_1727_5_119()
+  private boolean jj_3R_BuiltInCall_1881_5_72()
  {
-    if (jj_scan_token(OBJECT)) return true;
+    if (jj_scan_token(ENCODE_FOR_URI)) return true;
     if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_BuiltInCall_1725_5_118()
+  private boolean jj_3R_BuiltInCall_1880_5_71()
  {
-    if (jj_scan_token(PREDICATE)) return true;
+    if (jj_scan_token(LCASE)) return true;
     if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_BuiltInCall_1723_5_117()
+  private boolean jj_3R_BuiltInCall_1879_5_70()
  {
-    if (jj_scan_token(SUBJECT)) return true;
+    if (jj_scan_token(UCASE)) return true;
     if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_TriplesSameSubject_955_3_123()
+  private boolean jj_3R_BuiltInCall_1878_5_69()
  {
-    if (jj_3R_ReifiedTripleBlock_649_3_138()) return true;
+    if (jj_3R_StrReplaceExpression_2003_3_129()) return true;
     return false;
   }
 
-  private boolean jj_3R_BuiltInCall_1719_5_116()
+  private boolean jj_3R_BuiltInCall_1877_5_68()
  {
-    if (jj_scan_token(TRIPLE)) return true;
+    if (jj_scan_token(STRLEN)) return true;
     if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_BuiltInCall_1717_5_115()
+  private boolean jj_3R_TriplesSameSubject_1112_3_122()
  {
-    if (jj_scan_token(IS_TRIPLE)) return true;
-    if (jj_scan_token(LPAREN)) return true;
+    if (jj_3R_TriplesNode_1357_4_137()) return true;
     return false;
   }
 
-  private boolean jj_3R_BuiltInCall_1716_5_114()
+  private boolean jj_3R_BuiltInCall_1876_5_67()
  {
-    if (jj_3R_NotExistsFunc_1774_4_132()) return true;
+    if (jj_3R_SubstringExpression_1991_5_128()) return true;
     return false;
   }
 
-  private boolean jj_3R_BuiltInCall_1715_5_113()
+  private boolean jj_3R_BuiltInCall_1875_5_66()
  {
-    if (jj_3R_ExistsFunc_1768_4_131()) return true;
+    if (jj_scan_token(CONCAT)) return true;
+    if (jj_3R_ExpressionList_1076_3_127()) return true;
     return false;
   }
 
-  private boolean jj_3R_BuiltInCall_1714_5_112()
+  private boolean jj_3R_BuiltInCall_1874_5_65()
  {
-    if (jj_3R_RegexExpression_1733_5_130()) return true;
+    if (jj_scan_token(IDIV)) return true;
+    if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_TriplesSameSubject_950_3_122()
+  private boolean jj_3R_BuiltInCall_1873_5_64()
  {
-    if (jj_3R_TriplesNode_1176_4_137()) return true;
+    if (jj_scan_token(MOD)) return true;
+    if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_TriplesSameSubject_947_3_48()
+  private boolean jj_3R_TriplesSameSubject_1108_3_48()
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_TriplesSameSubject_947_3_121()) {
+    if (jj_3R_TriplesSameSubject_1108_3_121()) {
     jj_scanpos = xsp;
-    if (jj_3R_TriplesSameSubject_950_3_122()) {
+    if (jj_3R_TriplesSameSubject_1112_3_122()) {
     jj_scanpos = xsp;
-    if (jj_3R_TriplesSameSubject_955_3_123()) return true;
+    if (jj_3R_TriplesSameSubject_1117_3_123()) return true;
     }
     }
     return false;
   }
 
-  private boolean jj_3R_TriplesSameSubject_947_3_121()
+  private boolean jj_3R_TriplesSameSubject_1108_3_121()
  {
-    if (jj_3R_VarOrTerm_1313_3_136()) return true;
+    if (jj_3R_VarOrTerm_1507_3_136()) return true;
     return false;
   }
 
-  private boolean jj_3R_BuiltInCall_1711_5_111()
+  private boolean jj_3R_BuiltInCall_1872_5_63()
  {
-    if (jj_scan_token(HAS_LANGDIR)) return true;
+    if (jj_scan_token(ROUND)) return true;
     if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3_4()
- {
-    if (jj_scan_token(DOT)) return true;
-    if (jj_3R_TriplesSameSubject_947_3_48()) return true;
-    return false;
-  }
-
-  private boolean jj_3R_BuiltInCall_1709_5_110()
+  private boolean jj_3R_BuiltInCall_1871_5_62()
  {
-    if (jj_scan_token(HAS_LANG)) return true;
+    if (jj_scan_token(FLOOR)) return true;
     if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_ReifiedTriple_1326_3_171()
- {
-    if (jj_scan_token(LT2)) return true;
-    return false;
-  }
-
-  private boolean jj_3R_BuiltInCall_1707_5_109()
+  private boolean jj_3R_BuiltInCall_1870_5_61()
  {
-    if (jj_scan_token(IS_NUMERIC)) return true;
+    if (jj_scan_token(CEIL)) return true;
     if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_BuiltInCall_1705_5_108()
+  private boolean jj_3R_BuiltInCall_1869_5_60()
  {
-    if (jj_scan_token(IS_LITERAL)) return true;
+    if (jj_scan_token(ABS)) return true;
     if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_VarOrTerm_1320_5_168()
- {
-    if (jj_3R_TripleTerm_1363_5_180()) return true;
-    return false;
-  }
-
-  private boolean jj_3R_BuiltInCall_1703_5_107()
+  private boolean jj_3_4()
  {
-    if (jj_scan_token(IS_BLANK)) return true;
-    if (jj_scan_token(LPAREN)) return true;
+    if (jj_scan_token(DOT)) return true;
+    if (jj_3R_TriplesSameSubject_1108_3_48()) return true;
     return false;
   }
 
-  private boolean jj_3R_VarOrTerm_1319_5_167()
+  private boolean jj_3R_BuiltInCall_1868_5_59()
  {
+    if (jj_scan_token(RAND)) return true;
     if (jj_scan_token(NIL)) return true;
     return false;
   }
 
-  private boolean jj_3R_VarOrTerm_1318_5_166()
+  private boolean jj_3R_BuiltInCall_1866_7_126()
  {
-    if (jj_3R_BlankNode_1958_3_179()) return true;
+    if (jj_scan_token(NIL)) return true;
     return false;
   }
 
-  private boolean jj_3R_BuiltInCall_1701_5_106()
+  private boolean jj_3R_BuiltInCall_1863_7_125()
  {
-    if (jj_scan_token(IS_URI)) return true;
     if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_VarOrTerm_1317_5_165()
- {
-    if (jj_3R_BooleanLiteral_1925_3_178()) return true;
-    return false;
-  }
-
-  private boolean jj_3R_VarOrTerm_1316_5_164()
+  private boolean jj_3R_GroupGraphPattern_717_3_157()
  {
-    if (jj_3R_NumericLiteral_1898_3_177()) return true;
+    if (jj_scan_token(LBRACE)) return true;
     return false;
   }
 
-  private boolean jj_3R_BuiltInCall_1699_5_105()
+  private boolean jj_3R_BuiltInCall_1862_5_58()
  {
-    if (jj_scan_token(IS_IRI)) return true;
-    if (jj_scan_token(LPAREN)) return true;
+    if (jj_scan_token(BNODE)) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_BuiltInCall_1863_7_125()) {
+    jj_scanpos = xsp;
+    if (jj_3R_BuiltInCall_1866_7_126()) return true;
+    }
     return false;
   }
 
-  private boolean jj_3R_VarOrTerm_1315_5_163()
+  private boolean jj_3_3()
  {
-    if (jj_3R_RDFLiteral_1886_3_176()) return true;
+    if (jj_scan_token(DOT)) return true;
+    if (jj_3R_TriplesSameSubject_1108_3_48()) return true;
     return false;
   }
 
-  private boolean jj_3R_VarOrTerm_1314_5_162()
+  private boolean jj_3R_BuiltInCall_1860_5_57()
  {
-    if (jj_3R_iri_1943_3_172()) return true;
+    if (jj_scan_token(URI)) return true;
+    if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_BuiltInCall_1697_5_104()
+  private boolean jj_3R_BuiltInCall_1858_5_56()
  {
-    if (jj_scan_token(SAME_VALUE)) return true;
+    if (jj_scan_token(IRI)) return true;
     if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_VarOrTerm_1313_5_161()
+  private boolean jj_3R_BuiltInCall_1853_5_55()
  {
-    if (jj_3R_Var_1437_5_175()) return true;
+    if (jj_scan_token(BOUND)) return true;
+    if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_BuiltInCall_1695_5_103()
+  private boolean jj_3R_BuiltInCall_1851_5_54()
  {
-    if (jj_scan_token(SAME_TERM)) return true;
+    if (jj_scan_token(DTYPE)) return true;
     if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_VarOrTerm_1313_3_136()
+  private boolean jj_3R_BuiltInCall_1849_5_53()
  {
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_VarOrTerm_1313_5_161()) {
-    jj_scanpos = xsp;
-    if (jj_3R_VarOrTerm_1314_5_162()) {
-    jj_scanpos = xsp;
-    if (jj_3R_VarOrTerm_1315_5_163()) {
-    jj_scanpos = xsp;
-    if (jj_3R_VarOrTerm_1316_5_164()) {
-    jj_scanpos = xsp;
-    if (jj_3R_VarOrTerm_1317_5_165()) {
-    jj_scanpos = xsp;
-    if (jj_3R_VarOrTerm_1318_5_166()) {
-    jj_scanpos = xsp;
-    if (jj_3R_VarOrTerm_1319_5_167()) {
-    jj_scanpos = xsp;
-    if (jj_3R_VarOrTerm_1320_5_168()) return true;
-    }
-    }
-    }
-    }
-    }
-    }
-    }
+    if (jj_scan_token(LANGDIR)) return true;
+    if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_BuiltInCall_1693_5_102()
+  private boolean jj_3R_BuiltInCall_1846_5_52()
  {
-    if (jj_scan_token(STRDT)) return true;
+    if (jj_scan_token(LANGMATCHES)) return true;
     if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_BuiltInCall_1689_5_101()
+  private boolean jj_3R_ExpressionList_1079_5_156()
  {
-    if (jj_scan_token(STRLANGDIR)) return true;
     if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_ExpressionList_922_5_156()
+  private boolean jj_3R_BuiltInCall_1844_5_51()
  {
+    if (jj_scan_token(LANG)) return true;
     if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_BuiltInCall_1687_5_100()
+  private boolean jj_3R_BuiltInCall_1842_5_50()
  {
-    if (jj_scan_token(STRLANG)) return true;
+    if (jj_scan_token(STR)) return true;
     if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_ExpressionList_919_3_127()
+  private boolean jj_3R_ExpressionList_1076_3_127()
  {
     Token xsp;
     xsp = jj_scanpos;
     if (jj_scan_token(195)) {
     jj_scanpos = xsp;
-    if (jj_3R_ExpressionList_922_5_156()) return true;
+    if (jj_3R_ExpressionList_1079_5_156()) return true;
     }
     return false;
   }
 
-  private boolean jj_3R_BuiltInCall_1683_5_99()
- {
-    if (jj_scan_token(IF)) return true;
-    if (jj_scan_token(LPAREN)) return true;
-    return false;
-  }
-
-  private boolean jj_3R_BuiltInCall_1676_5_98()
- {
-    if (jj_scan_token(CALL)) return true;
-    if (jj_scan_token(LPAREN)) return true;
-    return false;
-  }
-
-  private boolean jj_3R_BuiltInCall_1674_5_97()
- {
-    if (jj_scan_token(COALESCE)) return true;
-    if (jj_3R_ExpressionList_919_3_127()) return true;
-    return false;
-  }
-
-  private boolean jj_3R_BuiltInCall_1673_5_96()
- {
-    if (jj_scan_token(EBV)) return true;
-    if (jj_scan_token(LPAREN)) return true;
-    return false;
-  }
-
-  private boolean jj_3R_BuiltInCall_1672_5_95()
+  private boolean jj_3R_BuiltInCall_1840_5_49()
  {
-    if (jj_scan_token(VERSION)) return true;
-    if (jj_scan_token(NIL)) return true;
+    if (jj_3R_Aggregate_2032_3_124()) return true;
     return false;
   }
 
-  private boolean jj_3R_BuiltInCall_1671_5_94()
+  private boolean jj_3R_BuiltInCall_1840_5_46()
  {
-    if (jj_scan_token(SHA512)) return true;
-    if (jj_scan_token(LPAREN)) return true;
-    return false;
-  }
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_BuiltInCall_1840_5_49()) {
+    jj_scanpos = xsp;
+    if (jj_3R_BuiltInCall_1842_5_50()) {
+    jj_scanpos = xsp;
+    if (jj_3R_BuiltInCall_1844_5_51()) {
+    jj_scanpos = xsp;
+    if (jj_3R_BuiltInCall_1846_5_52()) {
+    jj_scanpos = xsp;
+    if (jj_3R_BuiltInCall_1849_5_53()) {
+    jj_scanpos = xsp;
+    if (jj_3R_BuiltInCall_1851_5_54()) {
+    jj_scanpos = xsp;
+    if (jj_3R_BuiltInCall_1853_5_55()) {
+    jj_scanpos = xsp;
+    if (jj_3R_BuiltInCall_1858_5_56()) {
+    jj_scanpos = xsp;
+    if (jj_3R_BuiltInCall_1860_5_57()) {
+    jj_scanpos = xsp;
+    if (jj_3R_BuiltInCall_1862_5_58()) {
+    jj_scanpos = xsp;
+    if (jj_3R_BuiltInCall_1868_5_59()) {
+    jj_scanpos = xsp;
+    if (jj_3R_BuiltInCall_1869_5_60()) {
+    jj_scanpos = xsp;
+    if (jj_3R_BuiltInCall_1870_5_61()) {
+    jj_scanpos = xsp;
+    if (jj_3R_BuiltInCall_1871_5_62()) {
+    jj_scanpos = xsp;
+    if (jj_3R_BuiltInCall_1872_5_63()) {
+    jj_scanpos = xsp;
+    if (jj_3R_BuiltInCall_1873_5_64()) {
+    jj_scanpos = xsp;
+    if (jj_3R_BuiltInCall_1874_5_65()) {
+    jj_scanpos = xsp;
+    if (jj_3R_BuiltInCall_1875_5_66()) {
+    jj_scanpos = xsp;
+    if (jj_3R_BuiltInCall_1876_5_67()) {
+    jj_scanpos = xsp;
+    if (jj_3R_BuiltInCall_1877_5_68()) {
+    jj_scanpos = xsp;
+    if (jj_3R_BuiltInCall_1878_5_69()) {
+    jj_scanpos = xsp;
+    if (jj_3R_BuiltInCall_1879_5_70()) {
+    jj_scanpos = xsp;
+    if (jj_3R_BuiltInCall_1880_5_71()) {
+    jj_scanpos = xsp;
+    if (jj_3R_BuiltInCall_1881_5_72()) {
+    jj_scanpos = xsp;
+    if (jj_3R_BuiltInCall_1882_5_73()) {
+    jj_scanpos = xsp;
+    if (jj_3R_BuiltInCall_1884_5_74()) {
+    jj_scanpos = xsp;
+    if (jj_3R_BuiltInCall_1886_5_75()) {
+    jj_scanpos = xsp;
+    if (jj_3R_BuiltInCall_1888_5_76()) {
+    jj_scanpos = xsp;
+    if (jj_3R_BuiltInCall_1890_5_77()) {
+    jj_scanpos = xsp;
+    if (jj_3R_BuiltInCall_1892_5_78()) {
+    jj_scanpos = xsp;
+    if (jj_3R_BuiltInCall_1893_5_79()) {
+    jj_scanpos = xsp;
+    if (jj_3R_BuiltInCall_1894_5_80()) {
+    jj_scanpos = xsp;
+    if (jj_3R_BuiltInCall_1895_5_81()) {
+    jj_scanpos = xsp;
+    if (jj_3R_BuiltInCall_1896_5_82()) {
+    jj_scanpos = xsp;
+    if (jj_3R_BuiltInCall_1897_5_83()) {
+    jj_scanpos = xsp;
+    if (jj_3R_BuiltInCall_1898_5_84()) {
+    jj_scanpos = xsp;
+    if (jj_3R_BuiltInCall_1899_5_85()) {
+    jj_scanpos = xsp;
+    if (jj_3R_BuiltInCall_1900_5_86()) {
+    jj_scanpos = xsp;
+    if (jj_3R_BuiltInCall_1904_5_87()) {
+    jj_scanpos = xsp;
+    if (jj_3R_BuiltInCall_1905_5_88()) {
+    jj_scanpos = xsp;
+    if (jj_3R_BuiltInCall_1906_5_89()) {
+    jj_scanpos = xsp;
+    if (jj_3R_BuiltInCall_1907_5_90()) {
+    jj_scanpos = xsp;
+    if (jj_3R_BuiltInCall_1908_5_91()) {
+    jj_scanpos = xsp;
+    if (jj_3R_BuiltInCall_1909_5_92()) {
+    jj_scanpos = xsp;
+    if (jj_3R_BuiltInCall_1910_5_93()) {
+    jj_scanpos = xsp;
+    if (jj_3R_BuiltInCall_1911_5_94()) {
+    jj_scanpos = xsp;
+    if (jj_3R_BuiltInCall_1913_5_95()) {
+    jj_scanpos = xsp;
+    if (jj_3R_BuiltInCall_1915_5_96()) {
+    jj_scanpos = xsp;
+    if (jj_3R_BuiltInCall_1916_5_97()) {
+    jj_scanpos = xsp;
+    if (jj_3R_BuiltInCall_1921_5_98()) {
+    jj_scanpos = xsp;
+    if (jj_3R_BuiltInCall_1929_5_99()) {
+    jj_scanpos = xsp;
+    if (jj_3R_BuiltInCall_1933_5_100()) {
+    jj_scanpos = xsp;
+    if (jj_3R_BuiltInCall_1935_5_101()) {
+    jj_scanpos = xsp;
+    if (jj_3R_BuiltInCall_1939_5_102()) {
+    jj_scanpos = xsp;
+    if (jj_3R_BuiltInCall_1941_5_103()) {
+    jj_scanpos = xsp;
+    if (jj_3R_BuiltInCall_1943_5_104()) {
+    jj_scanpos = xsp;
+    if (jj_3R_BuiltInCall_1945_5_105()) {
+    jj_scanpos = xsp;
+    if (jj_3R_BuiltInCall_1947_5_106()) {
+    jj_scanpos = xsp;
+    if (jj_3R_BuiltInCall_1949_5_107()) {
+    jj_scanpos = xsp;
+    if (jj_3R_BuiltInCall_1951_5_108()) {
+    jj_scanpos = xsp;
+    if (jj_3R_BuiltInCall_1953_5_109()) {
+    jj_scanpos = xsp;
+    if (jj_3R_BuiltInCall_1955_5_110()) {
+    jj_scanpos = xsp;
+    if (jj_3R_BuiltInCall_1957_5_111()) {
+    jj_scanpos = xsp;
+    if (jj_3R_BuiltInCall_1960_5_112()) {
+    jj_scanpos = xsp;
+    if (jj_3R_BuiltInCall_1961_5_113()) {
+    jj_scanpos = xsp;
+    if (jj_3R_BuiltInCall_1962_5_114()) {
+    jj_scanpos = xsp;
+    if (jj_3R_BuiltInCall_1963_5_115()) {
+    jj_scanpos = xsp;
+    if (jj_3R_BuiltInCall_1965_5_116()) {
+    jj_scanpos = xsp;
+    if (jj_3R_BuiltInCall_1969_5_117()) {
+    jj_scanpos = xsp;
+    if (jj_3R_BuiltInCall_1971_5_118()) {
+    jj_scanpos = xsp;
+    if (jj_3R_BuiltInCall_1973_5_119()) return true;
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    return false;
+  }
 
-  private boolean jj_3R_BuiltInCall_1670_5_93()
+  private boolean jj_3R_IRIREF_2222_3_173()
  {
-    if (jj_scan_token(SHA384)) return true;
-    if (jj_scan_token(LPAREN)) return true;
+    if (jj_scan_token(IRIref)) return true;
     return false;
   }
 
-  private boolean jj_3R_BuiltInCall_1669_5_92()
+  private boolean jj_3R_BlankNode_2218_3_194()
  {
-    if (jj_scan_token(SHA256)) return true;
-    if (jj_scan_token(LPAREN)) return true;
+    if (jj_scan_token(ANON)) return true;
     return false;
   }
 
-  private boolean jj_3R_BuiltInCall_1668_5_91()
+  private boolean jj_3R_BlankNode_2214_3_193()
  {
-    if (jj_scan_token(SHA1)) return true;
-    if (jj_scan_token(LPAREN)) return true;
+    if (jj_scan_token(BLANK_NODE_LABEL)) return true;
     return false;
   }
 
-  private boolean jj_3R_BuiltInCall_1667_5_90()
+  private boolean jj_3R_BlankNode_2214_3_179()
  {
-    if (jj_scan_token(MD5)) return true;
-    if (jj_scan_token(LPAREN)) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_BlankNode_2214_3_193()) {
+    jj_scanpos = xsp;
+    if (jj_3R_BlankNode_2218_3_194()) return true;
+    }
     return false;
   }
 
-  private boolean jj_3R_BuiltInCall_1666_5_89()
+  private boolean jj_3R_PrefixedName_2208_5_204()
  {
-    if (jj_scan_token(STRUUID)) return true;
-    if (jj_scan_token(NIL)) return true;
+    if (jj_scan_token(PNAME_NS)) return true;
     return false;
   }
 
-  private boolean jj_3R_BuiltInCall_1665_5_88()
+  private boolean jj_3R_PrefixedName_2205_5_203()
  {
-    if (jj_scan_token(UUID)) return true;
-    if (jj_scan_token(NIL)) return true;
+    if (jj_scan_token(PNAME_LN)) return true;
     return false;
   }
 
-  private boolean jj_3R_BuiltInCall_1664_5_87()
+  private boolean jj_3R_PrefixedName_2205_3_195()
  {
-    if (jj_scan_token(NOW)) return true;
-    if (jj_scan_token(NIL)) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_PrefixedName_2205_5_203()) {
+    jj_scanpos = xsp;
+    if (jj_3R_PrefixedName_2208_5_204()) return true;
+    }
     return false;
   }
 
-  private boolean jj_3_1()
+  private boolean jj_3R_iri_2201_3_184()
  {
-    if (jj_3R_BuiltInCall_1604_5_46()) return true;
+    if (jj_3R_PrefixedName_2205_3_195()) return true;
     return false;
   }
 
-  private boolean jj_3R_BuiltInCall_1661_5_86()
+  private boolean jj_3R_iri_2199_3_172()
  {
-    if (jj_scan_token(ADJUST)) return true;
-    if (jj_scan_token(LPAREN)) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_iri_2199_3_183()) {
+    jj_scanpos = xsp;
+    if (jj_3R_iri_2201_3_184()) return true;
+    }
     return false;
   }
 
-  private boolean jj_3R_BuiltInCall_1660_5_85()
+  private boolean jj_3R_iri_2199_3_183()
  {
-    if (jj_scan_token(TZ)) return true;
-    if (jj_scan_token(LPAREN)) return true;
+    if (jj_3R_IRIREF_2222_3_173()) return true;
     return false;
   }
 
-  private boolean jj_3R_BuiltInCall_1659_5_84()
+  private boolean jj_3R_String_2190_5_199()
  {
-    if (jj_scan_token(TIMEZONE)) return true;
-    if (jj_scan_token(LPAREN)) return true;
+    if (jj_scan_token(STRING_LITERAL_LONG2)) return true;
     return false;
   }
 
-  private boolean jj_3R_BuiltInCall_1658_5_83()
+  private boolean jj_3R_String_2189_5_198()
  {
-    if (jj_scan_token(SECONDS)) return true;
-    if (jj_scan_token(LPAREN)) return true;
+    if (jj_scan_token(STRING_LITERAL_LONG1)) return true;
     return false;
   }
 
-  private boolean jj_3R_BuiltInCall_1657_5_82()
+  private boolean jj_3R_String_2188_5_197()
  {
-    if (jj_scan_token(MINUTES)) return true;
-    if (jj_scan_token(LPAREN)) return true;
+    if (jj_scan_token(STRING_LITERAL2)) return true;
     return false;
   }
 
-  private boolean jj_3R_BuiltInCall_1656_5_81()
+  private boolean jj_3R_String_2187_5_196()
  {
-    if (jj_scan_token(HOURS)) return true;
-    if (jj_scan_token(LPAREN)) return true;
+    if (jj_scan_token(STRING_LITERAL1)) return true;
     return false;
   }
 
-  private boolean jj_3R_BuiltInCall_1655_5_80()
+  private boolean jj_3R_String_2187_3_187()
  {
-    if (jj_scan_token(DAY)) return true;
-    if (jj_scan_token(LPAREN)) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_String_2187_5_196()) {
+    jj_scanpos = xsp;
+    if (jj_3R_String_2188_5_197()) {
+    jj_scanpos = xsp;
+    if (jj_3R_String_2189_5_198()) {
+    jj_scanpos = xsp;
+    if (jj_3R_String_2190_5_199()) return true;
+    }
+    }
+    }
     return false;
   }
 
-  private boolean jj_3R_BuiltInCall_1654_5_79()
+  private boolean jj_3R_BooleanLiteral_2183_3_192()
  {
-    if (jj_scan_token(MONTH)) return true;
-    if (jj_scan_token(LPAREN)) return true;
+    if (jj_scan_token(FALSE)) return true;
     return false;
   }
 
-  private boolean jj_3R_BuiltInCall_1653_5_78()
+  private boolean jj_3R_BooleanLiteral_2181_3_191()
  {
-    if (jj_scan_token(YEAR)) return true;
-    if (jj_scan_token(LPAREN)) return true;
+    if (jj_scan_token(TRUE)) return true;
     return false;
   }
 
-  private boolean jj_3R_BuiltInCall_1651_5_77()
+  private boolean jj_3R_BooleanLiteral_2181_3_178()
  {
-    if (jj_scan_token(STRAFTER)) return true;
-    if (jj_scan_token(LPAREN)) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_BooleanLiteral_2181_3_191()) {
+    jj_scanpos = xsp;
+    if (jj_3R_BooleanLiteral_2183_3_192()) return true;
+    }
     return false;
   }
 
-  private boolean jj_3R_BuiltInCall_1649_5_76()
+  private boolean jj_3R_NumericLiteralNegative_2177_3_213()
  {
-    if (jj_scan_token(STRBEFORE)) return true;
-    if (jj_scan_token(LPAREN)) return true;
+    if (jj_scan_token(DOUBLE_NEGATIVE)) return true;
     return false;
   }
 
-  private boolean jj_3R_BuiltInCall_1647_5_75()
+  private boolean jj_3R_NumericLiteralNegative_2176_3_212()
  {
-    if (jj_scan_token(STRENDS)) return true;
-    if (jj_scan_token(LPAREN)) return true;
+    if (jj_scan_token(DECIMAL_NEGATIVE)) return true;
     return false;
   }
 
-  private boolean jj_3R_BuiltInCall_1645_5_74()
+  private boolean jj_3R_NumericLiteralNegative_2175_3_211()
  {
-    if (jj_scan_token(STRSTARTS)) return true;
-    if (jj_scan_token(LPAREN)) return true;
+    if (jj_scan_token(INTEGER_NEGATIVE)) return true;
     return false;
   }
 
-  private boolean jj_3R_BuiltInCall_1643_5_73()
+  private boolean jj_3R_NumericLiteralNegative_2175_3_202()
  {
-    if (jj_scan_token(CONTAINS)) return true;
-    if (jj_scan_token(LPAREN)) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_NumericLiteralNegative_2175_3_211()) {
+    jj_scanpos = xsp;
+    if (jj_3R_NumericLiteralNegative_2176_3_212()) {
+    jj_scanpos = xsp;
+    if (jj_3R_NumericLiteralNegative_2177_3_213()) return true;
+    }
+    }
     return false;
   }
 
-  private boolean jj_3R_BuiltInCall_1642_5_72()
+  private boolean jj_3R_NumericLiteralPositive_2171_3_210()
  {
-    if (jj_scan_token(ENCODE_FOR_URI)) return true;
-    if (jj_scan_token(LPAREN)) return true;
+    if (jj_scan_token(DOUBLE_POSITIVE)) return true;
     return false;
   }
 
-  private boolean jj_3R_BuiltInCall_1641_5_71()
+  private boolean jj_3R_NumericLiteralPositive_2170_3_209()
  {
-    if (jj_scan_token(LCASE)) return true;
-    if (jj_scan_token(LPAREN)) return true;
+    if (jj_scan_token(DECIMAL_POSITIVE)) return true;
     return false;
   }
 
-  private boolean jj_3R_BuiltInCall_1640_5_70()
+  private boolean jj_3R_NumericLiteralPositive_2169_3_208()
  {
-    if (jj_scan_token(UCASE)) return true;
-    if (jj_scan_token(LPAREN)) return true;
+    if (jj_scan_token(INTEGER_POSITIVE)) return true;
     return false;
   }
 
-  private boolean jj_3R_BuiltInCall_1639_5_69()
+  private boolean jj_3R_NumericLiteralPositive_2169_3_201()
  {
-    if (jj_3R_StrReplaceExpression_1757_3_129()) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_NumericLiteralPositive_2169_3_208()) {
+    jj_scanpos = xsp;
+    if (jj_3R_NumericLiteralPositive_2170_3_209()) {
+    jj_scanpos = xsp;
+    if (jj_3R_NumericLiteralPositive_2171_3_210()) return true;
+    }
+    }
     return false;
   }
 
-  private boolean jj_3R_BuiltInCall_1638_5_68()
+  private boolean jj_3R_NumericLiteralUnsigned_2165_3_207()
  {
-    if (jj_scan_token(STRLEN)) return true;
-    if (jj_scan_token(LPAREN)) return true;
+    if (jj_scan_token(DOUBLE)) return true;
     return false;
   }
 
-  private boolean jj_3R_BuiltInCall_1637_5_67()
+  private boolean jj_3R_NumericLiteralUnsigned_2164_3_206()
  {
-    if (jj_3R_SubstringExpression_1745_5_128()) return true;
+    if (jj_scan_token(DECIMAL)) return true;
     return false;
   }
 
-  private boolean jj_3R_BuiltInCall_1636_5_66()
+  private boolean jj_3R_NumericLiteralUnsigned_2163_3_205()
  {
-    if (jj_scan_token(CONCAT)) return true;
-    if (jj_3R_ExpressionList_919_3_127()) return true;
+    if (jj_scan_token(INTEGER)) return true;
     return false;
   }
 
-  private boolean jj_3R_BuiltInCall_1635_5_65()
+  private boolean jj_3R_NumericLiteralUnsigned_2163_3_200()
  {
-    if (jj_scan_token(IDIV)) return true;
-    if (jj_scan_token(LPAREN)) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_NumericLiteralUnsigned_2163_3_205()) {
+    jj_scanpos = xsp;
+    if (jj_3R_NumericLiteralUnsigned_2164_3_206()) {
+    jj_scanpos = xsp;
+    if (jj_3R_NumericLiteralUnsigned_2165_3_207()) return true;
+    }
+    }
     return false;
   }
 
-  private boolean jj_3R_BuiltInCall_1634_5_64()
+  private boolean jj_3R_NumericLiteral_2157_5_190()
  {
-    if (jj_scan_token(MOD)) return true;
-    if (jj_scan_token(LPAREN)) return true;
+    if (jj_3R_NumericLiteralNegative_2175_3_202()) return true;
     return false;
   }
 
-  private boolean jj_3R_BuiltInCall_1633_5_63()
+  private boolean jj_3R_NumericLiteral_2156_5_189()
  {
-    if (jj_scan_token(ROUND)) return true;
-    if (jj_scan_token(LPAREN)) return true;
+    if (jj_3R_NumericLiteralPositive_2169_3_201()) return true;
     return false;
   }
 
-  private boolean jj_3R_Prologue_72_33_135()
+  private boolean jj_3R_NumericLiteral_2155_5_188()
  {
-    if (jj_3R_VersionDecl_87_5_160()) return true;
+    if (jj_3R_NumericLiteralUnsigned_2163_3_200()) return true;
     return false;
   }
 
-  private boolean jj_3R_BuiltInCall_1632_5_62()
+  private boolean jj_3R_NumericLiteral_2154_3_177()
  {
-    if (jj_scan_token(FLOOR)) return true;
-    if (jj_scan_token(LPAREN)) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_NumericLiteral_2155_5_188()) {
+    jj_scanpos = xsp;
+    if (jj_3R_NumericLiteral_2156_5_189()) {
+    jj_scanpos = xsp;
+    if (jj_3R_NumericLiteral_2157_5_190()) return true;
+    }
+    }
     return false;
   }
 
-  private boolean jj_3R_BuiltInCall_1631_5_61()
+  private boolean jj_3R_Collection_1387_3_181()
  {
-    if (jj_scan_token(CEIL)) return true;
     if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_BuiltInCall_1630_5_60()
+  private boolean jj_3R_RDFLiteral_2141_3_176()
  {
-    if (jj_scan_token(ABS)) return true;
-    if (jj_scan_token(LPAREN)) return true;
+    if (jj_3R_String_2187_3_187()) return true;
     return false;
   }
 
-  private boolean jj_3R_BuiltInCall_1629_5_59()
+  private boolean jj_3_1()
  {
-    if (jj_scan_token(RAND)) return true;
-    if (jj_scan_token(NIL)) return true;
+    if (jj_3R_BuiltInCall_1840_5_46()) return true;
     return false;
   }
 
-  private boolean jj_3R_BuiltInCall_1627_7_126()
+  private boolean jj_3R_BlankNodePropertyList_1363_3_182()
  {
-    if (jj_scan_token(NIL)) return true;
+    if (jj_scan_token(LBRACKET)) return true;
     return false;
   }
 
-  private boolean jj_3R_VersionSpecifier_93_7_186()
+  private boolean jj_3R_TriplesNode_1359_4_170()
  {
-    if (jj_scan_token(STRING_LITERAL2)) return true;
+    if (jj_3R_BlankNodePropertyList_1363_3_182()) return true;
     return false;
   }
 
-  private boolean jj_3R_VersionSpecifier_92_7_185()
+  private boolean jj_3R_TriplesNode_1357_4_137()
  {
-    if (jj_scan_token(STRING_LITERAL1)) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_TriplesNode_1357_4_169()) {
+    jj_scanpos = xsp;
+    if (jj_3R_TriplesNode_1359_4_170()) return true;
+    }
     return false;
   }
 
-  private boolean jj_3R_BuiltInCall_1624_7_125()
+  private boolean jj_3R_TriplesNode_1357_4_169()
  {
-    if (jj_scan_token(LPAREN)) return true;
+    if (jj_3R_Collection_1387_3_181()) return true;
     return false;
   }
 
-  private boolean jj_3R_VersionSpecifier_92_5_174()
+  private boolean jj_3R_Prologue_158_33_135()
  {
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_VersionSpecifier_92_7_185()) {
-    jj_scanpos = xsp;
-    if (jj_3R_VersionSpecifier_93_7_186()) return true;
-    }
+    if (jj_3R_VersionDecl_173_5_160()) return true;
     return false;
   }
 
-  private boolean jj_3R_BuiltInCall_1623_5_58()
+  private boolean jj_3R_Aggregate_2101_5_155()
+ {
+    if (jj_scan_token(AGG)) return true;
+    if (jj_3R_iri_2199_3_172()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_VersionSpecifier_179_7_186()
+ {
+    if (jj_scan_token(STRING_LITERAL2)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_VersionSpecifier_178_7_185()
+ {
+    if (jj_scan_token(STRING_LITERAL1)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_VersionSpecifier_178_5_174()
  {
-    if (jj_scan_token(BNODE)) return true;
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_BuiltInCall_1624_7_125()) {
+    if (jj_3R_VersionSpecifier_178_7_185()) {
     jj_scanpos = xsp;
-    if (jj_3R_BuiltInCall_1627_7_126()) return true;
+    if (jj_3R_VersionSpecifier_179_7_186()) return true;
     }
     return false;
   }
 
-  private boolean jj_3R_BuiltInCall_1621_5_57()
+  private boolean jj_3R_VersionDecl_173_5_160()
  {
-    if (jj_scan_token(URI)) return true;
+    if (jj_scan_token(VERSION)) return true;
+    if (jj_3R_VersionSpecifier_178_5_174()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_Prologue_158_18_134()
+ {
+    if (jj_3R_PrefixDecl_167_5_159()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_PrefixDecl_167_5_159()
+ {
+    if (jj_scan_token(PREFIX)) return true;
+    if (jj_scan_token(PNAME_NS)) return true;
+    if (jj_3R_IRIREF_2222_3_173()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_Aggregate_2080_5_154()
+ {
+    if (jj_scan_token(FOLD)) return true;
     if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_VersionDecl_87_5_160()
+  private boolean jj_3R_Aggregate_2078_5_153()
  {
-    if (jj_scan_token(VERSION)) return true;
-    if (jj_3R_VersionSpecifier_92_5_174()) return true;
+    if (jj_scan_token(VAR_POP)) return true;
+    if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_BuiltInCall_1619_5_56()
+  private boolean jj_3R_Aggregate_2076_5_152()
  {
-    if (jj_scan_token(IRI)) return true;
+    if (jj_scan_token(VAR_SAMP)) return true;
     if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_Prologue_72_18_134()
+  private boolean jj_3R_BaseDecl_162_3_158()
  {
-    if (jj_3R_PrefixDecl_81_5_159()) return true;
+    if (jj_scan_token(BASE)) return true;
+    if (jj_3R_IRIREF_2222_3_173()) return true;
     return false;
   }
 
-  private boolean jj_3R_BuiltInCall_1617_5_55()
+  private boolean jj_3R_Aggregate_2074_5_151()
  {
-    if (jj_scan_token(BOUND)) return true;
+    if (jj_scan_token(VARIANCE)) return true;
     if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_BuiltInCall_1615_5_54()
+  private boolean jj_3R_Prologue_158_5_120()
  {
-    if (jj_scan_token(DTYPE)) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_Prologue_158_5_133()) {
+    jj_scanpos = xsp;
+    if (jj_3R_Prologue_158_18_134()) {
+    jj_scanpos = xsp;
+    if (jj_3R_Prologue_158_33_135()) return true;
+    }
+    }
+    return false;
+  }
+
+  private boolean jj_3R_Prologue_158_5_133()
+ {
+    if (jj_3R_BaseDecl_162_3_158()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_Aggregate_2072_5_150()
+ {
+    if (jj_scan_token(STDEV_POP)) return true;
     if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_PrefixDecl_81_5_159()
+  private boolean jj_3R_Prologue_158_3_47()
  {
-    if (jj_scan_token(PREFIX)) return true;
-    if (jj_scan_token(PNAME_NS)) return true;
-    if (jj_3R_IRIREF_1965_3_173()) return true;
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_Prologue_158_5_120()) { jj_scanpos = xsp; break; }
+    }
     return false;
   }
 
-  private boolean jj_3R_BuiltInCall_1613_5_53()
+  private boolean jj_3R_Aggregate_2070_5_149()
  {
-    if (jj_scan_token(LANGDIR)) return true;
+    if (jj_scan_token(STDEV_SAMP)) return true;
     if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_BuiltInCall_1610_5_52()
+  private boolean jj_3R_Aggregate_2068_5_148()
  {
-    if (jj_scan_token(LANGMATCHES)) return true;
+    if (jj_scan_token(STDEV)) return true;
     if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_BuiltInCall_1608_5_51()
+  private boolean jj_3_5()
+ {
+    if (jj_scan_token(SEMICOLON)) return true;
+    if (jj_scan_token(SEPARATOR)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_Aggregate_2054_5_147()
  {
-    if (jj_scan_token(LANG)) return true;
+    if (jj_scan_token(GROUP_CONCAT)) return true;
     if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_BaseDecl_76_3_158()
+  private boolean jj_3R_Aggregate_2052_5_146()
  {
-    if (jj_scan_token(BASE)) return true;
-    if (jj_3R_IRIREF_1965_3_173()) return true;
+    if (jj_scan_token(SAMPLE)) return true;
+    if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_BuiltInCall_1606_5_50()
+  private boolean jj_3R_Aggregate_2050_5_145()
  {
-    if (jj_scan_token(STR)) return true;
+    if (jj_scan_token(MODE)) return true;
     if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_Prologue_72_5_120()
+  private boolean jj_3R_Aggregate_2048_5_144()
  {
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_Prologue_72_5_133()) {
-    jj_scanpos = xsp;
-    if (jj_3R_Prologue_72_18_134()) {
-    jj_scanpos = xsp;
-    if (jj_3R_Prologue_72_33_135()) return true;
-    }
-    }
+    if (jj_scan_token(MEDIAN)) return true;
+    if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_Prologue_72_5_133()
+  private boolean jj_3R_Aggregate_2046_5_143()
  {
-    if (jj_3R_BaseDecl_76_3_158()) return true;
+    if (jj_scan_token(AVG)) return true;
+    if (jj_scan_token(LPAREN)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_Aggregate_2044_5_142()
+ {
+    if (jj_scan_token(MAX)) return true;
+    if (jj_scan_token(LPAREN)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_Aggregate_2042_5_141()
+ {
+    if (jj_scan_token(MIN)) return true;
+    if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_BuiltInCall_1604_5_49()
+  private boolean jj_3R_Aggregate_2040_5_140()
  {
-    if (jj_3R_Aggregate_1784_3_124()) return true;
+    if (jj_scan_token(SUM)) return true;
+    if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_BuiltInCall_1604_5_46()
+  private boolean jj_3R_Var_1654_5_175()
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_BuiltInCall_1604_5_49()) {
-    jj_scanpos = xsp;
-    if (jj_3R_BuiltInCall_1606_5_50()) {
-    jj_scanpos = xsp;
-    if (jj_3R_BuiltInCall_1608_5_51()) {
-    jj_scanpos = xsp;
-    if (jj_3R_BuiltInCall_1610_5_52()) {
-    jj_scanpos = xsp;
-    if (jj_3R_BuiltInCall_1613_5_53()) {
-    jj_scanpos = xsp;
-    if (jj_3R_BuiltInCall_1615_5_54()) {
-    jj_scanpos = xsp;
-    if (jj_3R_BuiltInCall_1617_5_55()) {
-    jj_scanpos = xsp;
-    if (jj_3R_BuiltInCall_1619_5_56()) {
-    jj_scanpos = xsp;
-    if (jj_3R_BuiltInCall_1621_5_57()) {
-    jj_scanpos = xsp;
-    if (jj_3R_BuiltInCall_1623_5_58()) {
-    jj_scanpos = xsp;
-    if (jj_3R_BuiltInCall_1629_5_59()) {
-    jj_scanpos = xsp;
-    if (jj_3R_BuiltInCall_1630_5_60()) {
-    jj_scanpos = xsp;
-    if (jj_3R_BuiltInCall_1631_5_61()) {
-    jj_scanpos = xsp;
-    if (jj_3R_BuiltInCall_1632_5_62()) {
-    jj_scanpos = xsp;
-    if (jj_3R_BuiltInCall_1633_5_63()) {
-    jj_scanpos = xsp;
-    if (jj_3R_BuiltInCall_1634_5_64()) {
-    jj_scanpos = xsp;
-    if (jj_3R_BuiltInCall_1635_5_65()) {
-    jj_scanpos = xsp;
-    if (jj_3R_BuiltInCall_1636_5_66()) {
-    jj_scanpos = xsp;
-    if (jj_3R_BuiltInCall_1637_5_67()) {
-    jj_scanpos = xsp;
-    if (jj_3R_BuiltInCall_1638_5_68()) {
-    jj_scanpos = xsp;
-    if (jj_3R_BuiltInCall_1639_5_69()) {
-    jj_scanpos = xsp;
-    if (jj_3R_BuiltInCall_1640_5_70()) {
-    jj_scanpos = xsp;
-    if (jj_3R_BuiltInCall_1641_5_71()) {
-    jj_scanpos = xsp;
-    if (jj_3R_BuiltInCall_1642_5_72()) {
-    jj_scanpos = xsp;
-    if (jj_3R_BuiltInCall_1643_5_73()) {
-    jj_scanpos = xsp;
-    if (jj_3R_BuiltInCall_1645_5_74()) {
-    jj_scanpos = xsp;
-    if (jj_3R_BuiltInCall_1647_5_75()) {
-    jj_scanpos = xsp;
-    if (jj_3R_BuiltInCall_1649_5_76()) {
-    jj_scanpos = xsp;
-    if (jj_3R_BuiltInCall_1651_5_77()) {
-    jj_scanpos = xsp;
-    if (jj_3R_BuiltInCall_1653_5_78()) {
-    jj_scanpos = xsp;
-    if (jj_3R_BuiltInCall_1654_5_79()) {
-    jj_scanpos = xsp;
-    if (jj_3R_BuiltInCall_1655_5_80()) {
-    jj_scanpos = xsp;
-    if (jj_3R_BuiltInCall_1656_5_81()) {
-    jj_scanpos = xsp;
-    if (jj_3R_BuiltInCall_1657_5_82()) {
-    jj_scanpos = xsp;
-    if (jj_3R_BuiltInCall_1658_5_83()) {
-    jj_scanpos = xsp;
-    if (jj_3R_BuiltInCall_1659_5_84()) {
-    jj_scanpos = xsp;
-    if (jj_3R_BuiltInCall_1660_5_85()) {
-    jj_scanpos = xsp;
-    if (jj_3R_BuiltInCall_1661_5_86()) {
-    jj_scanpos = xsp;
-    if (jj_3R_BuiltInCall_1664_5_87()) {
-    jj_scanpos = xsp;
-    if (jj_3R_BuiltInCall_1665_5_88()) {
-    jj_scanpos = xsp;
-    if (jj_3R_BuiltInCall_1666_5_89()) {
-    jj_scanpos = xsp;
-    if (jj_3R_BuiltInCall_1667_5_90()) {
-    jj_scanpos = xsp;
-    if (jj_3R_BuiltInCall_1668_5_91()) {
-    jj_scanpos = xsp;
-    if (jj_3R_BuiltInCall_1669_5_92()) {
-    jj_scanpos = xsp;
-    if (jj_3R_BuiltInCall_1670_5_93()) {
-    jj_scanpos = xsp;
-    if (jj_3R_BuiltInCall_1671_5_94()) {
-    jj_scanpos = xsp;
-    if (jj_3R_BuiltInCall_1672_5_95()) {
-    jj_scanpos = xsp;
-    if (jj_3R_BuiltInCall_1673_5_96()) {
-    jj_scanpos = xsp;
-    if (jj_3R_BuiltInCall_1674_5_97()) {
-    jj_scanpos = xsp;
-    if (jj_3R_BuiltInCall_1676_5_98()) {
-    jj_scanpos = xsp;
-    if (jj_3R_BuiltInCall_1683_5_99()) {
-    jj_scanpos = xsp;
-    if (jj_3R_BuiltInCall_1687_5_100()) {
-    jj_scanpos = xsp;
-    if (jj_3R_BuiltInCall_1689_5_101()) {
-    jj_scanpos = xsp;
-    if (jj_3R_BuiltInCall_1693_5_102()) {
+    if (jj_scan_token(14)) {
     jj_scanpos = xsp;
-    if (jj_3R_BuiltInCall_1695_5_103()) {
+    if (jj_scan_token(15)) return true;
+    }
+    return false;
+  }
+
+  private boolean jj_3R_Aggregate_2033_5_139()
+ {
+    if (jj_scan_token(COUNT)) return true;
+    if (jj_scan_token(LPAREN)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_Aggregate_2032_3_124()
+ {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_Aggregate_2033_5_139()) {
     jj_scanpos = xsp;
-    if (jj_3R_BuiltInCall_1697_5_104()) {
+    if (jj_3R_Aggregate_2040_5_140()) {
     jj_scanpos = xsp;
-    if (jj_3R_BuiltInCall_1699_5_105()) {
+    if (jj_3R_Aggregate_2042_5_141()) {
     jj_scanpos = xsp;
-    if (jj_3R_BuiltInCall_1701_5_106()) {
+    if (jj_3R_Aggregate_2044_5_142()) {
     jj_scanpos = xsp;
-    if (jj_3R_BuiltInCall_1703_5_107()) {
+    if (jj_3R_Aggregate_2046_5_143()) {
     jj_scanpos = xsp;
-    if (jj_3R_BuiltInCall_1705_5_108()) {
+    if (jj_3R_Aggregate_2048_5_144()) {
     jj_scanpos = xsp;
-    if (jj_3R_BuiltInCall_1707_5_109()) {
+    if (jj_3R_Aggregate_2050_5_145()) {
     jj_scanpos = xsp;
-    if (jj_3R_BuiltInCall_1709_5_110()) {
+    if (jj_3R_Aggregate_2052_5_146()) {
     jj_scanpos = xsp;
-    if (jj_3R_BuiltInCall_1711_5_111()) {
+    if (jj_3R_Aggregate_2054_5_147()) {
     jj_scanpos = xsp;
-    if (jj_3R_BuiltInCall_1714_5_112()) {
+    if (jj_3R_Aggregate_2068_5_148()) {
     jj_scanpos = xsp;
-    if (jj_3R_BuiltInCall_1715_5_113()) {
+    if (jj_3R_Aggregate_2070_5_149()) {
     jj_scanpos = xsp;
-    if (jj_3R_BuiltInCall_1716_5_114()) {
+    if (jj_3R_Aggregate_2072_5_150()) {
     jj_scanpos = xsp;
-    if (jj_3R_BuiltInCall_1717_5_115()) {
+    if (jj_3R_Aggregate_2074_5_151()) {
     jj_scanpos = xsp;
-    if (jj_3R_BuiltInCall_1719_5_116()) {
+    if (jj_3R_Aggregate_2076_5_152()) {
     jj_scanpos = xsp;
-    if (jj_3R_BuiltInCall_1723_5_117()) {
+    if (jj_3R_Aggregate_2078_5_153()) {
     jj_scanpos = xsp;
-    if (jj_3R_BuiltInCall_1725_5_118()) {
+    if (jj_3R_Aggregate_2080_5_154()) {
     jj_scanpos = xsp;
-    if (jj_3R_BuiltInCall_1727_5_119()) return true;
-    }
-    }
-    }
-    }
-    }
-    }
-    }
-    }
-    }
-    }
-    }
-    }
-    }
-    }
-    }
-    }
-    }
-    }
-    }
-    }
-    }
-    }
-    }
-    }
-    }
-    }
-    }
-    }
-    }
-    }
-    }
-    }
-    }
-    }
-    }
-    }
-    }
-    }
-    }
-    }
-    }
+    if (jj_3R_Aggregate_2101_5_155()) return true;
     }
     }
     }
@@ -8911,6 +9082,42 @@ lex = unescapeStr(lex, t.beginLine, t.beginColumn) ;
     }
     }
     }
+    return false;
+  }
+
+  private boolean jj_3_2()
+ {
+    if (jj_scan_token(SEMICOLON)) return true;
+    if (jj_3R_Prologue_158_3_47()) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_scan_token(157)) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(158)) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(165)) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(160)) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(161)) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(162)) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(159)) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(170)) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(153)) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(152)) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(171)) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(154)) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(155)) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(156)) return true;
     }
     }
     }
@@ -8927,300 +9134,236 @@ lex = unescapeStr(lex, t.beginLine, t.beginColumn) ;
     return false;
   }
 
-  private boolean jj_3R_Prologue_72_3_47()
+  private boolean jj_3R_NotExistsFunc_2020_4_132()
  {
-    Token xsp;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3R_Prologue_72_5_120()) { jj_scanpos = xsp; break; }
-    }
+    if (jj_scan_token(NOT)) return true;
+    if (jj_scan_token(EXISTS)) return true;
     return false;
   }
 
-  private boolean jj_3R_Collection_1205_3_181()
+  private boolean jj_3R_ExistsFunc_2014_4_131()
  {
+    if (jj_scan_token(EXISTS)) return true;
+    if (jj_3R_GroupGraphPattern_717_3_157()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_StrReplaceExpression_2003_3_129()
+ {
+    if (jj_scan_token(REPLACE)) return true;
     if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_IRIREF_1965_3_173()
+  private boolean jj_3R_SubstringExpression_1991_5_128()
  {
-    if (jj_scan_token(IRIref)) return true;
+    if (jj_scan_token(SUBSTR)) return true;
+    if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_BlankNode_1961_3_194()
+  private boolean jj_3R_RegexExpression_1979_5_130()
  {
-    if (jj_scan_token(ANON)) return true;
+    if (jj_scan_token(REGEX)) return true;
+    if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_BlankNode_1958_3_193()
+  private boolean jj_3R_BuiltInCall_1973_5_119()
  {
-    if (jj_scan_token(BLANK_NODE_LABEL)) return true;
+    if (jj_scan_token(OBJECT)) return true;
+    if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_BlankNode_1958_3_179()
+  private boolean jj_3R_BuiltInCall_1971_5_118()
  {
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_BlankNode_1958_3_193()) {
-    jj_scanpos = xsp;
-    if (jj_3R_BlankNode_1961_3_194()) return true;
-    }
+    if (jj_scan_token(PREDICATE)) return true;
+    if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_PrefixedName_1952_5_204()
+  private boolean jj_3R_BuiltInCall_1969_5_117()
  {
-    if (jj_scan_token(PNAME_NS)) return true;
+    if (jj_scan_token(SUBJECT)) return true;
+    if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_PrefixedName_1949_5_203()
+  private boolean jj_3R_BuiltInCall_1965_5_116()
  {
-    if (jj_scan_token(PNAME_LN)) return true;
+    if (jj_scan_token(TRIPLE)) return true;
+    if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_PrefixedName_1949_3_195()
+  private boolean jj_3R_BuiltInCall_1963_5_115()
  {
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_PrefixedName_1949_5_203()) {
-    jj_scanpos = xsp;
-    if (jj_3R_PrefixedName_1952_5_204()) return true;
-    }
+    if (jj_scan_token(IS_TRIPLE)) return true;
+    if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_BlankNodePropertyList_1182_3_182()
+  private boolean jj_3R_BuiltInCall_1962_5_114()
  {
-    if (jj_scan_token(LBRACKET)) return true;
+    if (jj_3R_NotExistsFunc_2020_4_132()) return true;
     return false;
   }
 
-  private boolean jj_3R_iri_1945_3_184()
+  private boolean jj_3R_BuiltInCall_1961_5_113()
  {
-    if (jj_3R_PrefixedName_1949_3_195()) return true;
+    if (jj_3R_ExistsFunc_2014_4_131()) return true;
     return false;
   }
 
-  private boolean jj_3R_TriplesNode_1178_4_170()
+  private boolean jj_3R_BuiltInCall_1960_5_112()
  {
-    if (jj_3R_BlankNodePropertyList_1182_3_182()) return true;
+    if (jj_3R_RegexExpression_1979_5_130()) return true;
     return false;
   }
 
-  private boolean jj_3R_TriplesNode_1176_4_137()
+  private boolean jj_3R_BuiltInCall_1957_5_111()
  {
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_TriplesNode_1176_4_169()) {
-    jj_scanpos = xsp;
-    if (jj_3R_TriplesNode_1178_4_170()) return true;
-    }
+    if (jj_scan_token(HAS_LANGDIR)) return true;
+    if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_TriplesNode_1176_4_169()
+  private boolean jj_3R_BuiltInCall_1955_5_110()
  {
-    if (jj_3R_Collection_1205_3_181()) return true;
+    if (jj_scan_token(HAS_LANG)) return true;
+    if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_iri_1943_3_172()
+  private boolean jj_3R_BuiltInCall_1953_5_109()
  {
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_iri_1943_3_183()) {
-    jj_scanpos = xsp;
-    if (jj_3R_iri_1945_3_184()) return true;
-    }
+    if (jj_scan_token(IS_NUMERIC)) return true;
+    if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_iri_1943_3_183()
+  private boolean jj_3R_BuiltInCall_1951_5_108()
  {
-    if (jj_3R_IRIREF_1965_3_173()) return true;
+    if (jj_scan_token(IS_LITERAL)) return true;
+    if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_String_1934_5_199()
+  private boolean jj_3R_BuiltInCall_1949_5_107()
  {
-    if (jj_scan_token(STRING_LITERAL_LONG2)) return true;
+    if (jj_scan_token(IS_BLANK)) return true;
+    if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_String_1933_5_198()
+  private boolean jj_3R_BuiltInCall_1947_5_106()
  {
-    if (jj_scan_token(STRING_LITERAL_LONG1)) return true;
+    if (jj_scan_token(IS_URI)) return true;
+    if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_String_1932_5_197()
+  private boolean jj_3R_TripleTerm_1562_5_180()
  {
-    if (jj_scan_token(STRING_LITERAL2)) return true;
+    if (jj_scan_token(L_TRIPLE)) return true;
     return false;
   }
 
-  private boolean jj_3R_String_1931_5_196()
+  private boolean jj_3R_BuiltInCall_1945_5_105()
  {
-    if (jj_scan_token(STRING_LITERAL1)) return true;
+    if (jj_scan_token(IS_IRI)) return true;
+    if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_String_1931_3_187()
+  private boolean jj_3R_BuiltInCall_1943_5_104()
  {
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_String_1931_5_196()) {
-    jj_scanpos = xsp;
-    if (jj_3R_String_1932_5_197()) {
-    jj_scanpos = xsp;
-    if (jj_3R_String_1933_5_198()) {
-    jj_scanpos = xsp;
-    if (jj_3R_String_1934_5_199()) return true;
-    }
-    }
-    }
+    if (jj_scan_token(SAME_VALUE)) return true;
+    if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_BooleanLiteral_1927_3_192()
+  private boolean jj_3R_BuiltInCall_1941_5_103()
  {
-    if (jj_scan_token(FALSE)) return true;
+    if (jj_scan_token(SAME_TERM)) return true;
+    if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_BooleanLiteral_1925_3_191()
+  private boolean jj_3R_BuiltInCall_1939_5_102()
  {
-    if (jj_scan_token(TRUE)) return true;
+    if (jj_scan_token(STRDT)) return true;
+    if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_BooleanLiteral_1925_3_178()
+  private boolean jj_3R_BuiltInCall_1935_5_101()
  {
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_BooleanLiteral_1925_3_191()) {
-    jj_scanpos = xsp;
-    if (jj_3R_BooleanLiteral_1927_3_192()) return true;
-    }
+    if (jj_scan_token(STRLANGDIR)) return true;
+    if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_NumericLiteralNegative_1921_3_213()
+  private boolean jj_3R_BuiltInCall_1933_5_100()
  {
-    if (jj_scan_token(DOUBLE_NEGATIVE)) return true;
+    if (jj_scan_token(STRLANG)) return true;
+    if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_NumericLiteralNegative_1920_3_212()
+  private boolean jj_3R_BuiltInCall_1929_5_99()
  {
-    if (jj_scan_token(DECIMAL_NEGATIVE)) return true;
+    if (jj_scan_token(IF)) return true;
+    if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_NumericLiteralNegative_1919_3_211()
+  private boolean jj_3R_BuiltInCall_1921_5_98()
  {
-    if (jj_scan_token(INTEGER_NEGATIVE)) return true;
+    if (jj_scan_token(CALL)) return true;
+    if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_NumericLiteralNegative_1919_3_202()
+  private boolean jj_3R_ReifiedTripleBlock_769_3_138()
  {
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_NumericLiteralNegative_1919_3_211()) {
-    jj_scanpos = xsp;
-    if (jj_3R_NumericLiteralNegative_1920_3_212()) {
-    jj_scanpos = xsp;
-    if (jj_3R_NumericLiteralNegative_1921_3_213()) return true;
-    }
-    }
+    if (jj_3R_ReifiedTriple_1521_3_171()) return true;
     return false;
   }
 
-  private boolean jj_3_2()
+  private boolean jj_3R_BuiltInCall_1916_5_97()
  {
-    if (jj_scan_token(SEMICOLON)) return true;
-    if (jj_3R_Prologue_72_3_47()) return true;
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_scan_token(157)) {
-    jj_scanpos = xsp;
-    if (jj_scan_token(158)) {
-    jj_scanpos = xsp;
-    if (jj_scan_token(165)) {
-    jj_scanpos = xsp;
-    if (jj_scan_token(160)) {
-    jj_scanpos = xsp;
-    if (jj_scan_token(161)) {
-    jj_scanpos = xsp;
-    if (jj_scan_token(162)) {
-    jj_scanpos = xsp;
-    if (jj_scan_token(159)) {
-    jj_scanpos = xsp;
-    if (jj_scan_token(170)) {
-    jj_scanpos = xsp;
-    if (jj_scan_token(153)) {
-    jj_scanpos = xsp;
-    if (jj_scan_token(152)) {
-    jj_scanpos = xsp;
-    if (jj_scan_token(171)) {
-    jj_scanpos = xsp;
-    if (jj_scan_token(154)) {
-    jj_scanpos = xsp;
-    if (jj_scan_token(155)) {
-    jj_scanpos = xsp;
-    if (jj_scan_token(156)) return true;
-    }
-    }
-    }
-    }
-    }
-    }
-    }
-    }
-    }
-    }
-    }
-    }
-    }
+    if (jj_scan_token(COALESCE)) return true;
+    if (jj_3R_ExpressionList_1076_3_127()) return true;
     return false;
   }
 
-  private boolean jj_3R_NumericLiteralPositive_1915_3_210()
+  private boolean jj_3R_BuiltInCall_1915_5_96()
  {
-    if (jj_scan_token(DOUBLE_POSITIVE)) return true;
+    if (jj_scan_token(EBV)) return true;
+    if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_NumericLiteralPositive_1914_3_209()
+  private boolean jj_3R_BuiltInCall_1913_5_95()
  {
-    if (jj_scan_token(DECIMAL_POSITIVE)) return true;
+    if (jj_scan_token(VERSION)) return true;
+    if (jj_scan_token(NIL)) return true;
     return false;
   }
 
-  private boolean jj_3R_NumericLiteralPositive_1913_3_208()
+  private boolean jj_3R_BuiltInCall_1911_5_94()
  {
-    if (jj_scan_token(INTEGER_POSITIVE)) return true;
+    if (jj_scan_token(SHA512)) return true;
+    if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_NumericLiteralPositive_1913_3_201()
+  private boolean jj_3R_BuiltInCall_1910_5_93()
  {
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_NumericLiteralPositive_1913_3_208()) {
-    jj_scanpos = xsp;
-    if (jj_3R_NumericLiteralPositive_1914_3_209()) {
-    jj_scanpos = xsp;
-    if (jj_3R_NumericLiteralPositive_1915_3_210()) return true;
-    }
-    }
+    if (jj_scan_token(SHA384)) return true;
+    if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/lang/arq/javacc/ARQParserConstants.java b/jena-arq/src/main/java/org/apache/jena/sparql/lang/arq/javacc/ARQParserConstants.java
index 476c660042..c40b02b0fc 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/lang/arq/javacc/ARQParserConstants.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/lang/arq/javacc/ARQParserConstants.java
@@ -1,4 +1,23 @@
 /* Generated By:JavaCC: Do not edit this line. ARQParserConstants.java */
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
 package org.apache.jena.sparql.lang.arq.javacc ;
 
 
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/lang/arq/javacc/ARQParserTokenManager.java b/jena-arq/src/main/java/org/apache/jena/sparql/lang/arq/javacc/ARQParserTokenManager.java
index d000ea0b7f..d979171c9f 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/lang/arq/javacc/ARQParserTokenManager.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/lang/arq/javacc/ARQParserTokenManager.java
@@ -1,5 +1,24 @@
 /* ARQParserTokenManager.java */
 /* Generated By:JavaCC: Do not edit this line. ARQParserTokenManager.java */
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
 package org.apache.jena.sparql.lang.arq.javacc ;
 import org.apache.jena.graph.* ;
 import org.apache.jena.query.* ;
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/lang/arq/javacc/ParseException.java b/jena-arq/src/main/java/org/apache/jena/sparql/lang/arq/javacc/ParseException.java
index e372cbd4e1..0f6959d767 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/lang/arq/javacc/ParseException.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/lang/arq/javacc/ParseException.java
@@ -1,5 +1,24 @@
 /* Generated By:JavaCC: Do not edit this line. ParseException.java Version 7.0 */
 /* JavaCCOptions:KEEP_LINE_COLUMN=true */
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
 package org.apache.jena.sparql.lang.arq.javacc ;
 
 /**
@@ -192,4 +211,4 @@ public class ParseException extends Exception {
    }
 
 }
-/* JavaCC - OriginalChecksum=481959af21dccd5944e1500dbb9a4cfd (do not edit this line) */
+/* JavaCC - OriginalChecksum=362fb86fd5c6c0ed2f64aeac41efbdb4 (do not edit this line) */
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/lang/arq/javacc/SimpleCharStream.java b/jena-arq/src/main/java/org/apache/jena/sparql/lang/arq/javacc/SimpleCharStream.java
index d8ffd1ddba..3673e3f283 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/lang/arq/javacc/SimpleCharStream.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/lang/arq/javacc/SimpleCharStream.java
@@ -1,5 +1,24 @@
 /* Generated By:JavaCC: Do not edit this line. SimpleCharStream.java Version 7.0 */
 /* JavaCCOptions:STATIC=false,SUPPORT_CLASS_VISIBILITY_PUBLIC=true */
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
 package org.apache.jena.sparql.lang.arq.javacc ;
 
 /**
@@ -469,4 +488,4 @@ public class SimpleCharStream
   boolean getTrackLineColumn() { return trackLineColumn; }
   void setTrackLineColumn(boolean tlc) { trackLineColumn = tlc; }
 }
-/* JavaCC - OriginalChecksum=998e7d6690753a66d2ca7608e53c1761 (do not edit this line) */
+/* JavaCC - OriginalChecksum=cd310c107ade89017195b2df7f545dba (do not edit this line) */
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/lang/arq/javacc/Token.java b/jena-arq/src/main/java/org/apache/jena/sparql/lang/arq/javacc/Token.java
index 32e2e7abe6..bb7e170a53 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/lang/arq/javacc/Token.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/lang/arq/javacc/Token.java
@@ -1,5 +1,24 @@
 /* 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 */
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
 package org.apache.jena.sparql.lang.arq.javacc ;
 
 /**
@@ -129,4 +148,4 @@ public class Token implements java.io.Serializable {
   }
 
 }
-/* JavaCC - OriginalChecksum=be6ea7686a7ad6d4ba6dcbcd7f228d68 (do not edit this line) */
+/* JavaCC - OriginalChecksum=92185867e1cd099cdf1af95d3dcecc5d (do not edit this line) */
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/lang/arq/javacc/TokenMgrError.java b/jena-arq/src/main/java/org/apache/jena/sparql/lang/arq/javacc/TokenMgrError.java
index 1b45fa1bd1..36e73c511c 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/lang/arq/javacc/TokenMgrError.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/lang/arq/javacc/TokenMgrError.java
@@ -1,5 +1,24 @@
 /* Generated By:JavaCC: Do not edit this line. TokenMgrError.java Version 7.0 */
 /* JavaCCOptions: */
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
 package org.apache.jena.sparql.lang.arq.javacc ;
 
 /** Token Manager Error. */
@@ -144,4 +163,4 @@ public class TokenMgrError extends Error
     this(LexicalErr(EOFSeen, lexState, errorLine, errorColumn, errorAfter, curChar), reason);
   }
 }
-/* JavaCC - OriginalChecksum=3ce6496d28ffe3225a80cc695081abdc (do not edit this line) */
+/* JavaCC - OriginalChecksum=8c2c291adc311b3f67b86ad569e8e606 (do not edit this line) */
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_10/ParserSPARQL10.java b/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_10/ParserSPARQL10.java
index 7e3f2da58c..ed77e2714e 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_10/ParserSPARQL10.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_10/ParserSPARQL10.java
@@ -28,6 +28,7 @@ import org.apache.jena.query.QueryParseException;
 import org.apache.jena.query.Syntax;
 import org.apache.jena.shared.JenaException;
 import org.apache.jena.sparql.lang.SPARQLParser;
+import org.apache.jena.sparql.lang.sparql_10.javacc.SPARQLParser10;
 import org.apache.jena.sparql.syntax.Element;
 import org.apache.jena.sparql.syntax.Template;
 
@@ -73,9 +74,9 @@ public class ParserSPARQL10 extends SPARQLParser
             query.setStrict(true);
             parser.setQuery(query);
             action.exec(parser);
-        } catch (org.apache.jena.sparql.lang.sparql_10.ParseException ex) {
+        } catch (org.apache.jena.sparql.lang.sparql_10.javacc.ParseException ex) {
             throw new QueryParseException(ex.getMessage(), ex.currentToken.beginLine, ex.currentToken.beginColumn);
-        } catch (org.apache.jena.sparql.lang.sparql_10.TokenMgrError tErr) {
+        } catch (org.apache.jena.sparql.lang.sparql_10.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/sparql_10/SPARQLParser10Base.java b/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_10/SPARQLParser10Base.java
index 7f91382e2e..2cce285399 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_10/SPARQLParser10Base.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_10/SPARQLParser10Base.java
@@ -23,7 +23,7 @@ import org.apache.jena.datatypes.TypeMapper;
 import org.apache.jena.graph.Node;
 import org.apache.jena.graph.NodeFactory;
 
-class SPARQLParser10Base extends Legacy10.SPARQLParserBase {
+public abstract class SPARQLParser10Base extends Legacy10.SPARQLParserBase {
 
     protected Node createLiteral(String lexicalForm, String langTag, String datatypeURI) {
         Node n = null;
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_10/JavaCharStream.java b/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_10/javacc/JavaCharStream.java
similarity index 99%
rename from jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_10/JavaCharStream.java
rename to jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_10/javacc/JavaCharStream.java
index 9d492a7b29..a75878bbc7 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_10/JavaCharStream.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_10/javacc/JavaCharStream.java
@@ -18,7 +18,7 @@
  * limitations under the License.
  */
 
-package org.apache.jena.sparql.lang.sparql_10 ;
+package org.apache.jena.sparql.lang.sparql_10.javacc ;
 
 /**
  * An implementation of interface CharStream, where the stream is assumed to
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_10/ParseException.java b/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_10/javacc/ParseException.java
similarity index 99%
rename from jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_10/ParseException.java
rename to jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_10/javacc/ParseException.java
index 7de80c559b..8640894d5c 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_10/ParseException.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_10/javacc/ParseException.java
@@ -18,7 +18,7 @@
  * limitations under the License.
  */
 
-package org.apache.jena.sparql.lang.sparql_10 ;
+package org.apache.jena.sparql.lang.sparql_10.javacc ;
 
 /**
  * This exception is thrown when parse errors are encountered.
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_10/SPARQLParser10.java b/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_10/javacc/SPARQLParser10.java
similarity index 99%
rename from jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_10/SPARQLParser10.java
rename to jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_10/javacc/SPARQLParser10.java
index d3049f7803..f580b1e676 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_10/SPARQLParser10.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_10/javacc/SPARQLParser10.java
@@ -17,12 +17,13 @@
  * limitations under the License.
  */
 
-package org.apache.jena.sparql.lang.sparql_10 ;
+package org.apache.jena.sparql.lang.sparql_10.javacc ;
 
 import org.apache.jena.graph.* ;
 import org.apache.jena.query.* ;
 import org.apache.jena.sparql.core.Var ;
 import org.apache.jena.sparql.expr.* ;
+import org.apache.jena.sparql.lang.sparql_10.SPARQLParser10Base;
 import org.apache.jena.sparql.path.* ;
 import org.apache.jena.sparql.syntax.* ;
 
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_10/SPARQLParser10Constants.java b/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_10/javacc/SPARQLParser10Constants.java
similarity index 99%
rename from jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_10/SPARQLParser10Constants.java
rename to jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_10/javacc/SPARQLParser10Constants.java
index 2ec606bdc8..c3c867dfe9 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_10/SPARQLParser10Constants.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_10/javacc/SPARQLParser10Constants.java
@@ -17,7 +17,7 @@
  * limitations under the License.
  */
 
-package org.apache.jena.sparql.lang.sparql_10 ;
+package org.apache.jena.sparql.lang.sparql_10.javacc ;
 
 
 /**
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_10/SPARQLParser10TokenManager.java b/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_10/javacc/SPARQLParser10TokenManager.java
similarity index 99%
rename from jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_10/SPARQLParser10TokenManager.java
rename to jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_10/javacc/SPARQLParser10TokenManager.java
index 9e88e0c82b..42d79a41b9 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_10/SPARQLParser10TokenManager.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_10/javacc/SPARQLParser10TokenManager.java
@@ -17,7 +17,7 @@
  * limitations under the License.
  */
 
-package org.apache.jena.sparql.lang.sparql_10 ;
+package org.apache.jena.sparql.lang.sparql_10.javacc ;
 
 
 
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_10/Token.java b/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_10/javacc/Token.java
similarity index 98%
rename from jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_10/Token.java
rename to jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_10/javacc/Token.java
index 1dacd45539..43b80a2ece 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_10/Token.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_10/javacc/Token.java
@@ -18,7 +18,7 @@
  * limitations under the License.
  */
 
-package org.apache.jena.sparql.lang.sparql_10 ;
+package org.apache.jena.sparql.lang.sparql_10.javacc ;
 
 /**
  * Describes the input token stream.
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_10/TokenMgrError.java b/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_10/javacc/TokenMgrError.java
similarity index 98%
rename from jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_10/TokenMgrError.java
rename to jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_10/javacc/TokenMgrError.java
index 267fa68263..ffce893852 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_10/TokenMgrError.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_10/javacc/TokenMgrError.java
@@ -18,7 +18,7 @@
  * limitations under the License.
  */
 
-package org.apache.jena.sparql.lang.sparql_10 ;
+package org.apache.jena.sparql.lang.sparql_10.javacc ;
 
 /** Token Manager Error. */
 public class TokenMgrError extends Error
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_11/ParserSPARQL11.java b/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_11/ParserSPARQL11.java
index 21b2ef1451..7b4d277112 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_11/ParserSPARQL11.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_11/ParserSPARQL11.java
@@ -28,6 +28,7 @@ import org.apache.jena.query.QueryParseException;
 import org.apache.jena.query.Syntax;
 import org.apache.jena.shared.JenaException;
 import org.apache.jena.sparql.lang.SPARQLParser;
+import org.apache.jena.sparql.lang.sparql_11.javacc.SPARQLParser11;
 import org.apache.jena.sparql.syntax.Element;
 import org.apache.jena.sparql.syntax.Template;
 
@@ -73,9 +74,9 @@ public class ParserSPARQL11 extends SPARQLParser
             query.setStrict(true);
             parser.setQuery(query);
             action.exec(parser);
-        } catch (org.apache.jena.sparql.lang.sparql_11.ParseException ex) {
+        } catch (org.apache.jena.sparql.lang.sparql_11.javacc.ParseException ex) {
             throw new QueryParseException(ex.getMessage(), ex.currentToken.beginLine, ex.currentToken.beginColumn);
-        } catch (org.apache.jena.sparql.lang.sparql_11.TokenMgrError tErr) {
+        } catch (org.apache.jena.sparql.lang.sparql_11.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/sparql_11/ParserSPARQL11Update.java b/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_11/ParserSPARQL11Update.java
index a3e3ecf8d8..76597cfcf7 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_11/ParserSPARQL11Update.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_11/ParserSPARQL11Update.java
@@ -26,6 +26,7 @@ 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.UpdateParser;
+import org.apache.jena.sparql.lang.sparql_11.javacc.SPARQLParser11;
 import org.apache.jena.sparql.modify.UpdateSink;
 import org.apache.jena.update.UpdateException;
 
@@ -40,9 +41,9 @@ public class ParserSPARQL11Update extends UpdateParser
             parser = new SPARQLParser11(r);
             parser.setUpdate(prologue, sink);
             parser.UpdateUnit();
-        } catch (org.apache.jena.sparql.lang.sparql_11.ParseException ex) {
+        } catch (org.apache.jena.sparql.lang.sparql_11.javacc.ParseException ex) {
             throw new QueryParseException(ex.getMessage(), ex.currentToken.beginLine, ex.currentToken.beginColumn);
-        } catch (org.apache.jena.sparql.lang.sparql_11.TokenMgrError tErr) {
+        } catch (org.apache.jena.sparql.lang.sparql_11.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/sparql_11/SPARQLParser11Base.java b/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_11/SPARQLParser11Base.java
index d68f2a3150..6709e13475 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_11/SPARQLParser11Base.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_11/SPARQLParser11Base.java
@@ -23,7 +23,7 @@ import org.apache.jena.datatypes.TypeMapper;
 import org.apache.jena.graph.Node;
 import org.apache.jena.graph.NodeFactory;
 
-class SPARQLParser11Base extends Legacy11.SPARQLParserBase {
+public abstract class SPARQLParser11Base extends Legacy11.SPARQLParserBase {
 
     protected Node createLiteral(String lexicalForm, String langTag, String datatypeURI) {
         Node n = null;
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_11/JavaCharStream.java b/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_11/javacc/JavaCharStream.java
similarity index 99%
rename from jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_11/JavaCharStream.java
rename to jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_11/javacc/JavaCharStream.java
index 57b1eb0b3b..43c94c0aca 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_11/JavaCharStream.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_11/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_11 ;
+package org.apache.jena.sparql.lang.sparql_11.javacc ;
 
 /**
  * An implementation of interface CharStream, where the stream is assumed to
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_11/ParseException.java b/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_11/javacc/ParseException.java
similarity index 99%
rename from jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_11/ParseException.java
rename to jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_11/javacc/ParseException.java
index da8e2a3c81..af6457c2cc 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_11/ParseException.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_11/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_11 ;
+package org.apache.jena.sparql.lang.sparql_11.javacc ;
 
 /**
  * This exception is thrown when parse errors are encountered.
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_11/SPARQLParser11.java b/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_11/javacc/SPARQLParser11.java
similarity index 99%
rename from jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_11/SPARQLParser11.java
rename to jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_11/javacc/SPARQLParser11.java
index 08011a0693..9fdc0d94bb 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_11/SPARQLParser11.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_11/javacc/SPARQLParser11.java
@@ -1,6 +1,6 @@
 /* SPARQLParser11.java */
 /* Generated By:JavaCC: Do not edit this line. SPARQLParser11.java */
-package org.apache.jena.sparql.lang.sparql_11 ;
+package org.apache.jena.sparql.lang.sparql_11.javacc ;
 import org.apache.jena.graph.* ;
 import org.apache.jena.query.* ;
 import org.apache.jena.sparql.core.Var ;
@@ -8,6 +8,7 @@ import org.apache.jena.sparql.syntax.* ;
 import org.apache.jena.sparql.expr.* ;
 import org.apache.jena.sparql.path.* ;
 import org.apache.jena.sparql.expr.aggregate.* ;
+import org.apache.jena.sparql.lang.sparql_11.SPARQLParser11Base;
 import org.apache.jena.update.* ;
 import org.apache.jena.sparql.modify.request.* ;
 
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_11/SPARQLParser11Constants.java b/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_11/javacc/SPARQLParser11Constants.java
similarity index 99%
rename from jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_11/SPARQLParser11Constants.java
rename to jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_11/javacc/SPARQLParser11Constants.java
index 5864830676..893482bb21 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_11/SPARQLParser11Constants.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_11/javacc/SPARQLParser11Constants.java
@@ -1,5 +1,5 @@
 /* Generated By:JavaCC: Do not edit this line. SPARQLParser11Constants.java */
-package org.apache.jena.sparql.lang.sparql_11 ;
+package org.apache.jena.sparql.lang.sparql_11.javacc ;
 
 
 /**
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_11/SPARQLParser11TokenManager.java b/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_11/javacc/SPARQLParser11TokenManager.java
similarity index 99%
rename from jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_11/SPARQLParser11TokenManager.java
rename to jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_11/javacc/SPARQLParser11TokenManager.java
index 01388d7db0..00d43d84ad 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_11/SPARQLParser11TokenManager.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_11/javacc/SPARQLParser11TokenManager.java
@@ -1,6 +1,6 @@
 /* SPARQLParser11TokenManager.java */
 /* Generated By:JavaCC: Do not edit this line. SPARQLParser11TokenManager.java */
-package org.apache.jena.sparql.lang.sparql_11 ;
+package org.apache.jena.sparql.lang.sparql_11.javacc ;
 
 /** Token Manager. */
 public class SPARQLParser11TokenManager implements SPARQLParser11Constants {
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_11/Token.java b/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_11/javacc/Token.java
similarity index 98%
rename from jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_11/Token.java
rename to jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_11/javacc/Token.java
index 9c283db5a8..fff0abb55a 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_11/Token.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_11/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_11 ;
+package org.apache.jena.sparql.lang.sparql_11.javacc ;
 
 /**
  * Describes the input token stream.
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_11/TokenMgrError.java b/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_11/javacc/TokenMgrError.java
similarity index 98%
rename from jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_11/TokenMgrError.java
rename to jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_11/javacc/TokenMgrError.java
index a7d04ca932..003663d17e 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_11/TokenMgrError.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_11/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_11 ;
+package org.apache.jena.sparql.lang.sparql_11.javacc ;
 
 /** Token Manager Error. */
 
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_12/javacc/JavaCharStream.java b/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_12/javacc/JavaCharStream.java
index e0e07b46f2..1db8645221 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_12/javacc/JavaCharStream.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_12/javacc/JavaCharStream.java
@@ -1,5 +1,24 @@
 /* Generated By:JavaCC: Do not edit this line. JavaCharStream.java Version 7.0 */
 /* JavaCCOptions:STATIC=false,SUPPORT_CLASS_VISIBILITY_PUBLIC=true */
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
 package org.apache.jena.sparql.lang.sparql_12.javacc ;
 
 /**
@@ -689,4 +708,4 @@ class JavaCharStream
   void setTrackLineColumn(boolean tlc) { trackLineColumn = tlc; }
 
 }
-/* JavaCC - OriginalChecksum=431471b0c34e8a862d93c540c01c5564 (do not edit this line) */
+/* JavaCC - OriginalChecksum=5cba76439ca2495d156f7e0493cfbc38 (do not edit this line) */
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_12/javacc/ParseException.java b/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_12/javacc/ParseException.java
index d9016ff579..cf7692d8d2 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_12/javacc/ParseException.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_12/javacc/ParseException.java
@@ -1,5 +1,24 @@
 /* Generated By:JavaCC: Do not edit this line. ParseException.java Version 7.0 */
 /* JavaCCOptions:KEEP_LINE_COLUMN=true */
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
 package org.apache.jena.sparql.lang.sparql_12.javacc ;
 
 /**
@@ -192,4 +211,4 @@ public class ParseException extends Exception {
    }
 
 }
-/* JavaCC - OriginalChecksum=3ad271b7a12861cbc7e039bfd2a9aff6 (do not edit this line) */
+/* JavaCC - OriginalChecksum=01309f8fe7ec03cedd621e7f9a2c9f6e (do not edit this line) */
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_12/javacc/SPARQLParser12.java b/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_12/javacc/SPARQLParser12.java
index d23e2732d4..24e139cf0c 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_12/javacc/SPARQLParser12.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_12/javacc/SPARQLParser12.java
@@ -1,5 +1,24 @@
 /* SPARQLParser12.java */
 /* Generated By:JavaCC: Do not edit this line. SPARQLParser12.java */
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
 package org.apache.jena.sparql.lang.sparql_12.javacc ;
 import org.apache.jena.graph.* ;
 import org.apache.jena.query.* ;
@@ -15,6 +34,13 @@ import org.apache.jena.sparql.modify.request.* ;
 @SuppressWarnings("all")
 public class SPARQLParser12 extends org.apache.jena.sparql.lang.sparql_12.SPARQLParser12Base implements SPARQLParser12Constants {
 
+// // Common top for single entry point.
+// void Top(): {}
+// {
+//     ( Query() | Update() )
+//     <EOF>
+// }
+// Query only entry point
   final public void QueryUnit() throws ParseException {
 startQuery() ;
     Query();
@@ -134,6 +160,7 @@ version = unescapeStr(version, t.beginLine, t.beginColumn) ;
     throw new Error("Missing return statement in function");
 }
 
+// ---- Query type clauses
   final public void SelectQuery() throws ParseException {
     SelectClause();
     label_2:
@@ -251,7 +278,8 @@ setAllowAggregatesInExpressions(false) ;
 getQuery().setQueryConstructType() ;
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
     case LBRACE:{
-      t = ConstructTemplate();
+      // Full form.
+          t = ConstructTemplate();
 getQuery().setConstructTemplate(t) ;
       label_4:
       while (true) {
@@ -326,6 +354,7 @@ getQuery().setConstructTemplate(t) ;
       SolutionModifier();
 t = new Template(acc.getBGP()) ;
       getQuery().setConstructTemplate(t) ;
+      // Create a query in the same shape as the query created by writing out in full.
       ElementPathBlock epb = new ElementPathBlock(acc.getBGP()) ;
       ElementGroup elg = new ElementGroup() ;
       elg.addElement(epb) ;
@@ -425,6 +454,7 @@ getQuery().setQueryAskType() ;
     SolutionModifier();
 }
 
+// ----
   final public void DatasetClause() throws ParseException {
     jj_consume_token(FROM);
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
@@ -447,13 +477,15 @@ getQuery().setQueryAskType() ;
 
   final public void DefaultGraphClause() throws ParseException {String iri ;
     iri = SourceSelector();
-getQuery().addGraphURI(iri) ;
+// This checks for duplicates
+    getQuery().addGraphURI(iri) ;
 }
 
   final public void NamedGraphClause() throws ParseException {String iri ;
     jj_consume_token(NAMED);
     iri = SourceSelector();
-getQuery().addNamedGraphURI(iri) ;
+// This checks for duplicates
+    getQuery().addNamedGraphURI(iri) ;
 }
 
   final public String SourceSelector() throws ParseException {String iri ;
@@ -1181,6 +1213,7 @@ finishValuesClause(t.beginLine, t.beginColumn) ;
     }
 }
 
+// Strict SPARQL 1.1 : mandatory separator, optional terminator.
   final public void Update() throws ParseException {
     Prologue();
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
@@ -1409,6 +1442,13 @@ silent=true ;
     throw new Error("Missing return statement in function");
 }
 
+// #ifdef ARQ
+// void Meta() : { QuadDataAccSink qd = new QuadDataAccSink() ; }
+// {
+//    <META> 
+//    QuadData(qd)
+// }
+// #endif
   final public void InsertData() throws ParseException {QuadDataAccSink qd = createInsertDataSink() ; Token t ;
     t = jj_consume_token(INSERT_DATA);
 int beginLine = t.beginLine; int beginColumn = t.beginColumn; t = null;
@@ -1613,6 +1653,7 @@ n = createNode(iri) ; update.addUsingNamed(n) ;
     jj_consume_token(RBRACE);
 }
 
+//Ground data : As QuadPattern but don't allow variables.
   final public void QuadData(QuadDataAccSink acc) throws ParseException {
     jj_consume_token(LBRACE);
     Quads(acc);
@@ -1806,6 +1847,7 @@ setAccGraph(acc, prev) ;
     }
 }
 
+// ---- General Graph Pattern 
   final public Element GroupGraphPattern() throws ParseException {Element el = null ; Token t ;
     t = jj_consume_token(LBRACE);
 int beginLine = t.beginLine; int beginColumn = t.beginColumn; t = null;
@@ -2006,6 +2048,7 @@ if ( acc == null )
     throw new Error("Missing return statement in function");
 }
 
+// -----
   final public Element GraphPatternNotTriples() throws ParseException {Element el = null ;
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
     case LBRACE:{
@@ -2049,6 +2092,7 @@ if ( acc == null )
     throw new Error("Missing return statement in function");
 }
 
+// ---- Definitions of each pattern element
   final public Element OptionalGraphPattern() throws ParseException {Element el ;
     jj_consume_token(OPTIONAL);
     el = GroupGraphPattern();
@@ -2323,6 +2367,8 @@ finishDataBlockValueRow(beginLine, beginColumn) ;
     throw new Error("Missing return statement in function");
 }
 
+// ---- Reifier, various cases.
+// May return null.
   final public Node Reifier() throws ParseException {Token tok = null ; Node reifId = null ;
     tok = jj_consume_token(TILDE);
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
@@ -2344,6 +2390,28 @@ finishDataBlockValueRow(beginLine, beginColumn) ;
     throw new Error("Missing return statement in function");
 }
 
+// // No variables.
+// Node ReifierData() : { Token tok = null ; Node reifId = null ; }
+// {
+//     tok = <TILDE>
+//     (reifId = ReifierId() )?
+//     { return reifId; }
+// }
+// 
+// Node ReifierId() : { Node n = null ; String iri ; } 
+// {
+//   // No variable
+//   ( iri = iri()           { return createNode(iri) ; }
+//   | n = BlankNode()       { return n ; }
+//   )
+// }
+// 
+// Node VarOrReifierId() : { Node n = null; }
+// {
+//    ( n = Var()        { return n; }
+//    | n = ReifierId()  { return n; }
+//    )
+// }
   final public Node VarOrReifierId() throws ParseException {Node n = null; String iri = null;
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
     case VAR1:
@@ -2380,6 +2448,16 @@ finishDataBlockValueRow(beginLine, beginColumn) ;
     throw new Error("Missing return statement in function");
 }
 
+// Element UnionGraphPattern() : { Element el ; }
+// {
+//     <UNION>
+//     el = GroupGraphPattern()
+//     { return new ElementUnion(el) ; }
+// }
+// SPARQL 1.0: {pattern} UNION {pattern} UNION {pattern} ... :: 
+// SPARQL 1.1 may introduce: { pattern UNION pattern UNION ... }
+// G (union G)* can be a single group pattern
+// or a group pattern as part of an union.
   final public Element GroupOrUnionGraphPattern() throws ParseException {Element el = null ; ElementUnion el2 = null ;
     el = GroupGraphPattern();
     label_19:
@@ -2511,6 +2589,7 @@ el2.addElement(el) ;
     fname = iri();
     a = ArgList();
 if ( AggregateRegistry.isRegistered(fname) ) {
+         // aggregates
          if ( ! getAllowAggregatesInExpressions() )
             throwParseException("Aggregate expression not legal at this point : "+fname, token.beginLine, token.beginColumn) ;
          Aggregator agg = AggregatorFactory.createCustom(fname, a) ;
@@ -2609,6 +2688,7 @@ exprList.add(expr) ;
     throw new Error("Missing return statement in function");
 }
 
+// -------- Construct patterns
   final public Template ConstructTemplate() throws ParseException {TripleCollectorBGP acc = new TripleCollectorBGP();
                                  Template t = new Template(acc.getBGP()) ;
 setInConstructTemplate(true) ;
@@ -2702,6 +2782,8 @@ setInConstructTemplate(false) ;
     }
 }
 
+// -------- Triple lists with property and object lists
+// -------- Without paths: entry: TriplesSameSubject
   final public void TriplesSameSubject(TripleCollector acc) throws ParseException {Node s ;
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
     case IRIref:
@@ -2790,7 +2872,8 @@ insert(acc, tempAcc) ;
       case VAR1:
       case VAR2:
       case KW_A:{
-        p = Verb();
+        /* TriG template: LOOKAHEAD(2) */
+               p = Verb();
         ObjectList(s, p, acc);
         break;
         }
@@ -2850,6 +2933,8 @@ insert(tempAcc, mark, s, p, o) ; insert(acc, tempAcc) ;
     Annotation(acc, s, p, o);
 }
 
+// -------- BGPs with paths.
+// -------- Entry point: TriplesSameSubjectPath
   final public void TriplesSameSubjectPath(TripleCollector acc) throws ParseException {Node s ;
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
     case IRIref:
@@ -3003,7 +3088,9 @@ path = null ; p = null ;
 }
 
   final public Node VerbSimple() throws ParseException {Node p ;
-    p = Var();
+    // "a" now allowed in paths.
+      //( p = Var() | <KW_A> { p = nRDFtype ; } )
+      p = Var();
 {if ("" != null) return p ;}
     throw new Error("Missing return statement in function");
 }
@@ -3033,6 +3120,9 @@ insert(tempAcc, mark, s, p, path, o) ; insert(acc, tempAcc) ;
     AnnotationPath(acc, s, p, path, o);
 }
 
+// End paths stuff.
+// -------- Paths
+// Weakest outermost
   final public Path Path() throws ParseException {Path p ;
     p = PathAlternative();
 {if ("" != null) return p ;}
@@ -3081,6 +3171,7 @@ p1 = PathFactory.pathSeq(p1, p2) ;
     throw new Error("Missing return statement in function");
 }
 
+// Path unit element, no inverse
   final public Path PathElt() throws ParseException {String str ; Node n ; Path p ;
     p = PathPrimary();
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
@@ -3098,6 +3189,7 @@ p1 = PathFactory.pathSeq(p1, p2) ;
     throw new Error("Missing return statement in function");
 }
 
+// Path unit element, including inverse.
   final public Path PathEltOrInverse() throws ParseException {String str ; Node n ; Path p ;
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
     case IRIref:
@@ -3282,6 +3374,9 @@ n = createNode(str) ; {if ("" != null) return new P_ReverseLink(n) ;}
     throw new Error("Missing return statement in function");
 }
 
+// -------- Triple expansions
+// Anything that can stand in a node slot and which is
+// a number of triples
   final public Node TriplesNode(TripleCollector acc) throws ParseException {Node n ;
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
     case LPAREN:{
@@ -3340,6 +3435,7 @@ Node n = createBNode( t.beginLine, t.beginColumn) ;
     throw new Error("Missing return statement in function");
 }
 
+// ------- RDF collections
   final public Node Collection(TripleCollector acc) throws ParseException {Node listHead = nRDFnil ; Node lastCell = null ; int mark ; Node n ; Token t ;
     t = jj_consume_token(LPAREN);
 int beginLine = t.beginLine; int beginColumn = t.beginColumn; t = null;
@@ -3454,6 +3550,8 @@ if ( lastCell != null )
     throw new Error("Missing return statement in function");
 }
 
+// ---- RDF-star Annotation Syntax
+// Allow paths. Query graph patterns.
   final public void AnnotationPath(TripleCollector acc, Node s, Node p, Path path, Node o) throws ParseException {Node reifId = null ;
     label_31:
     while (true) {
@@ -3497,6 +3595,8 @@ clearReifierId();
     jj_consume_token(R_ANN);
 }
 
+// ---- RDF-star Annotation Syntax
+// No paths. Construct templates.
   final public void Annotation(TripleCollector acc, Node s, Node p, Node o) throws ParseException {Node reifId = null ;
     label_32:
     while (true) {
@@ -3539,6 +3639,9 @@ clearReifierId();
     jj_consume_token(R_ANN);
 }
 
+// -------- Nodes in a graph pattern or template
+// Object position RDF term, element of a list
+// No paths in TriplesNode
   final public Node GraphNode(TripleCollector acc) throws ParseException {Node n ;
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
     case IRIref:
@@ -3588,6 +3691,7 @@ clearReifierId();
     throw new Error("Missing return statement in function");
 }
 
+// Object position RDF term. NEW-SYNTAX Rename?
   final public Node GraphNodePath(TripleCollector acc) throws ParseException {Node n ;
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
     case IRIref:
@@ -3841,7 +3945,8 @@ o = createNode(iri) ;
 
   final public Node TripleTerm() throws ParseException {Node n = null ; Token openToken ; String iri ; Node s , p , o ;
     openToken = jj_consume_token(L_TRIPLE);
-    s = TripleTermSubject();
+    // @@ Alt name. ttSubject()?
+        s = TripleTermSubject();
     p = Verb();
     o = TripleTermObject();
 n = createTripleTerm(s, p, o, openToken.beginLine, openToken.beginColumn);
@@ -3966,7 +4071,8 @@ n = createNode(iri) ;
 
   final public Node TripleTermData() throws ParseException {Node n = null ; Token openToken ; String iri ; Node s , p , o ;
     openToken = jj_consume_token(L_TRIPLE);
-    s = TripleTermDataSubject();
+    // @@ Alt name? ttDataValueTerm
+        s = TripleTermDataSubject();
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
     case IRIref:
     case PNAME_NS:
@@ -4084,6 +4190,17 @@ n = createNode(iri) ;
     throw new Error("Missing return statement in function");
 }
 
+// // VarOrTerm except no var, no bnodes
+// // @@ Rename?
+// Node DataValueTerm() : {  Node n = null ; String iri ; Node s , p , o ; }
+// {
+//   iri = iri()            { return createNode(iri) ; }
+// | n = RDFLiteral()       { return n ; }
+// | n = NumericLiteral()   { return n ; }
+// | n = BooleanLiteral()   { return n ; }
+// | n = TripleTermData()   { return n; }
+// }
+// e.g. Property (if no bNodes) + DESCRIBE
   final public Node VarOrIri() throws ParseException {Node n = null ; String iri ;
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
     case VAR1:
@@ -4107,6 +4224,7 @@ n = createNode(iri) ;
     throw new Error("Missing return statement in function");
 }
 
+// e.g. INSERT DATA { GRAPH ... }
   final public Var Var() throws ParseException {Token t ;
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
     case VAR1:{
@@ -4126,6 +4244,7 @@ n = createNode(iri) ;
     throw new Error("Missing return statement in function");
 }
 
+// -------- Constraint syntax
   final public Expr Expression() throws ParseException {Expr expr ;
     expr = ConditionalOrExpression();
 {if ("" != null) return expr ;}
@@ -4667,6 +4786,17 @@ expr1 = new E_Divide(expr1, expr2) ;
     throw new Error("Missing return statement in function");
 }
 
+// Node ExprVarOrTerm() : { Node n; String s;}
+// {
+//   ( s = iri() { n = createNode(s); }
+//   | n = RDFLiteral()
+//   | n = NumericLiteral()
+//   | n = BooleanLiteral()
+//   | n = Var()
+//   | n = ExprTripleTerm()
+//   )
+//   { return n; }
+// }
   final public Node ExprTripleTerm() throws ParseException {Token t ; Node s,p,o,n;
     t = jj_consume_token(L_TRIPLE);
     s = ExprTripleTermSubject();
@@ -5266,7 +5396,8 @@ n = createNode(iri);
       break;
       }
     case REGEX:{
-      expr = RegexExpression();
+      // Regular expression matcher
+          expr = RegexExpression();
 {if ("" != null) return expr ;}
       break;
       }
@@ -5671,6 +5802,7 @@ agg = AggregatorFactory.createGroupConcat(distinct, expr, sep, ordered) ;
       throw new ParseException();
     }
 if ( ! getAllowAggregatesInExpressions() )
+        // Do late so we have the token for line/column
         throwParseException("Aggregate expression not legal at this point", t.beginLine, t.beginColumn) ;
     if ( getAggregateDepth() > 1 )
         throwParseException("Nested aggregate in expression not legal", t.beginLine, t.beginColumn) ;
@@ -5680,6 +5812,9 @@ Expr exprAgg = getQuery().allocAggregate(agg) ;
     throw new Error("Missing return statement in function");
 }
 
+// See also FunctionCall.
+// The case of "q:name()" or "q:agg()" or just "q:name"
+// by expanding out FunctionCall()
   final public Expr iriOrFunction() throws ParseException {String iri ; Args a = null ;
     iri = iri();
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
@@ -5695,6 +5830,7 @@ Expr exprAgg = getQuery().allocAggregate(agg) ;
 if ( a == null )
        {if ("" != null) return asExpr(createNode(iri)) ;}
     if ( AggregateRegistry.isRegistered(iri) ) {
+         // aggregates
          if ( ! getAllowAggregatesInExpressions() )
             throwParseException("Aggregate expression not legal at this point : "+iri, token.beginLine, token.beginColumn) ;
          Aggregator agg = AggregatorFactory.createCustom(iri, a) ;
@@ -5943,7 +6079,8 @@ lex = unescapeStr(lex, t.beginLine, t.beginColumn) ;
       break;
       }
     case ANON:{
-      t = jj_consume_token(ANON);
+      //  <LBRACKET> <RBRACKET> { return createBNode(t.beginLine, t.beginColumn) ; }
+        t = jj_consume_token(ANON);
 {if ("" != null) return createBNode(t.beginLine, t.beginColumn) ;}
       break;
       }
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_12/javacc/SPARQLParser12Constants.java b/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_12/javacc/SPARQLParser12Constants.java
index de7c6377f6..2a021df06b 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_12/javacc/SPARQLParser12Constants.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_12/javacc/SPARQLParser12Constants.java
@@ -1,4 +1,23 @@
 /* Generated By:JavaCC: Do not edit this line. SPARQLParser12Constants.java */
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
 package org.apache.jena.sparql.lang.sparql_12.javacc ;
 
 
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_12/javacc/SPARQLParser12TokenManager.java b/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_12/javacc/SPARQLParser12TokenManager.java
index 374d87fecb..1b758ac1f5 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_12/javacc/SPARQLParser12TokenManager.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_12/javacc/SPARQLParser12TokenManager.java
@@ -1,5 +1,24 @@
 /* SPARQLParser12TokenManager.java */
 /* Generated By:JavaCC: Do not edit this line. SPARQLParser12TokenManager.java */
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
 package org.apache.jena.sparql.lang.sparql_12.javacc ;
 import org.apache.jena.graph.* ;
 import org.apache.jena.query.* ;
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_12/javacc/Token.java b/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_12/javacc/Token.java
index a64db9b3e2..b866cfc9e3 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_12/javacc/Token.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_12/javacc/Token.java
@@ -1,5 +1,24 @@
 /* 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 */
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
 package org.apache.jena.sparql.lang.sparql_12.javacc ;
 
 /**
@@ -129,4 +148,4 @@ public class Token implements java.io.Serializable {
   }
 
 }
-/* JavaCC - OriginalChecksum=716c697b14d703fafca7130103b3421e (do not edit this line) */
+/* JavaCC - OriginalChecksum=9da22c9f6ce45912877b4a331ce86d77 (do not edit this line) */
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_12/javacc/TokenMgrError.java b/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_12/javacc/TokenMgrError.java
index 7dee69decf..b26bff2399 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_12/javacc/TokenMgrError.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_12/javacc/TokenMgrError.java
@@ -1,5 +1,24 @@
 /* Generated By:JavaCC: Do not edit this line. TokenMgrError.java Version 7.0 */
 /* JavaCCOptions: */
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
 package org.apache.jena.sparql.lang.sparql_12.javacc ;
 
 /** Token Manager Error. */
@@ -144,4 +163,4 @@ public class TokenMgrError extends Error
     this(LexicalErr(EOFSeen, lexState, errorLine, errorColumn, errorAfter, curChar), reason);
   }
 }
-/* JavaCC - OriginalChecksum=8101d56944cc76b1e7511c5b99ed1ea8 (do not edit this line) */
+/* JavaCC - OriginalChecksum=ad9482a684db6200034fbcf77a7e0deb (do not edit this line) */
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/sse/lang/SSE_Parser.java b/jena-arq/src/main/java/org/apache/jena/sparql/sse/lang/SSE_Parser.java
index 108a60b408..200d288493 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/sse/lang/SSE_Parser.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/sse/lang/SSE_Parser.java
@@ -21,9 +21,9 @@ package org.apache.jena.sparql.sse.lang;
 import java.io.Reader;
 
 import org.apache.jena.sparql.sse.SSE_ParseException;
-import org.apache.jena.sparql.sse.lang.parser.ParseException;
-import org.apache.jena.sparql.sse.lang.parser.SSE_ParserCore;
-import org.apache.jena.sparql.sse.lang.parser.TokenMgrError;
+import org.apache.jena.sparql.sse.lang.javacc.ParseException;
+import org.apache.jena.sparql.sse.lang.javacc.SSE_ParserCore;
+import org.apache.jena.sparql.sse.lang.javacc.TokenMgrError;
 
 /** Public interface to the SSE parser */
 public class SSE_Parser
diff --git a/jena-arq/src/main/java/org/apache/jena/cdt/parser/ParseException.java b/jena-arq/src/main/java/org/apache/jena/sparql/sse/lang/javacc/ParseException.java
similarity index 97%
rename from jena-arq/src/main/java/org/apache/jena/cdt/parser/ParseException.java
rename to jena-arq/src/main/java/org/apache/jena/sparql/sse/lang/javacc/ParseException.java
index 24e3b9daa7..8a105f95fb 100644
--- a/jena-arq/src/main/java/org/apache/jena/cdt/parser/ParseException.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/sse/lang/javacc/ParseException.java
@@ -16,9 +16,11 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
  */
 
-package org.apache.jena.cdt.parser;
+package org.apache.jena.sparql.sse.lang.javacc ;
 
 /**
  * This exception is thrown when parse errors are encountered.
@@ -210,4 +212,4 @@ public class ParseException extends Exception {
    }
 
 }
-/* JavaCC - OriginalChecksum=ae45c177e8251ffb3eb197993240df1d (do not edit this line) */
+/* JavaCC - OriginalChecksum=c87ce430c893b3a9645a47eed9cbc530 (do not edit this line) */
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/javacc/SSE_ParserCore.java
similarity index 99%
rename from jena-arq/src/main/java/org/apache/jena/sparql/sse/lang/parser/SSE_ParserCore.java
rename to jena-arq/src/main/java/org/apache/jena/sparql/sse/lang/javacc/SSE_ParserCore.java
index 2d9da86bbe..fcc79372e8 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/javacc/SSE_ParserCore.java
@@ -16,13 +16,14 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
  */
 
-package org.apache.jena.sparql.sse.lang.parser ;
-
-import static org.apache.jena.riot.lang.LangParserLib.*;
+package org.apache.jena.sparql.sse.lang.javacc ;
 
 import org.apache.jena.sparql.sse.lang.ParserSSEBase ;
+import static org.apache.jena.riot.lang.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_ParserCoreConstants.java b/jena-arq/src/main/java/org/apache/jena/sparql/sse/lang/javacc/SSE_ParserCoreConstants.java
similarity index 98%
rename from jena-arq/src/main/java/org/apache/jena/sparql/sse/lang/parser/SSE_ParserCoreConstants.java
rename to jena-arq/src/main/java/org/apache/jena/sparql/sse/lang/javacc/SSE_ParserCoreConstants.java
index b641127ea4..233a254d1d 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/sse/lang/parser/SSE_ParserCoreConstants.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/sse/lang/javacc/SSE_ParserCoreConstants.java
@@ -15,9 +15,11 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
  */
 
-package org.apache.jena.sparql.sse.lang.parser ;
+package org.apache.jena.sparql.sse.lang.javacc ;
 
 
 /**
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/javacc/SSE_ParserCoreTokenManager.java
similarity index 99%
rename from jena-arq/src/main/java/org/apache/jena/sparql/sse/lang/parser/SSE_ParserCoreTokenManager.java
rename to jena-arq/src/main/java/org/apache/jena/sparql/sse/lang/javacc/SSE_ParserCoreTokenManager.java
index 7617b32f58..ee91f56d4c 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/javacc/SSE_ParserCoreTokenManager.java
@@ -16,12 +16,13 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
  */
 
-package org.apache.jena.sparql.sse.lang.parser ;
-import static org.apache.jena.riot.lang.LangParserLib.*;
-
+package org.apache.jena.sparql.sse.lang.javacc ;
 import org.apache.jena.sparql.sse.lang.ParserSSEBase ;
+import static org.apache.jena.riot.lang.LangParserLib.*;
 
 /** Token Manager. */
 @SuppressWarnings ("unused")
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/sse/lang/parser/SimpleCharStream.java b/jena-arq/src/main/java/org/apache/jena/sparql/sse/lang/javacc/SimpleCharStream.java
similarity index 99%
rename from jena-arq/src/main/java/org/apache/jena/sparql/sse/lang/parser/SimpleCharStream.java
rename to jena-arq/src/main/java/org/apache/jena/sparql/sse/lang/javacc/SimpleCharStream.java
index 64f39903a6..17b1fec5cd 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/sse/lang/parser/SimpleCharStream.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/sse/lang/javacc/SimpleCharStream.java
@@ -18,7 +18,7 @@
  * limitations under the License.
  */
 
-package org.apache.jena.sparql.sse.lang.parser ;
+package org.apache.jena.sparql.sse.lang.javacc ;
 
 /**
  * An implementation of interface CharStream, where the stream is assumed to
diff --git a/jena-arq/src/main/java/org/apache/jena/cdt/parser/Token.java b/jena-arq/src/main/java/org/apache/jena/sparql/sse/lang/javacc/Token.java
similarity index 96%
rename from jena-arq/src/main/java/org/apache/jena/cdt/parser/Token.java
rename to jena-arq/src/main/java/org/apache/jena/sparql/sse/lang/javacc/Token.java
index 5fab125108..9c22504815 100644
--- a/jena-arq/src/main/java/org/apache/jena/cdt/parser/Token.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/sse/lang/javacc/Token.java
@@ -16,9 +16,11 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
  */
 
-package org.apache.jena.cdt.parser;
+package org.apache.jena.sparql.sse.lang.javacc ;
 
 /**
  * Describes the input token stream.
@@ -147,4 +149,4 @@ public class Token implements java.io.Serializable {
   }
 
 }
-/* JavaCC - OriginalChecksum=d2beb9f825ecfb19fedd31da408e3820 (do not edit this line) */
+/* JavaCC - OriginalChecksum=9632c5317d4d65c4dab196a87d5dce64 (do not edit this line) */
diff --git a/jena-core/src/test/java/org/apache/jena/ttl_test/turtle/parser/TokenMgrError.java b/jena-arq/src/main/java/org/apache/jena/sparql/sse/lang/javacc/TokenMgrError.java
similarity index 97%
rename from jena-core/src/test/java/org/apache/jena/ttl_test/turtle/parser/TokenMgrError.java
rename to jena-arq/src/main/java/org/apache/jena/sparql/sse/lang/javacc/TokenMgrError.java
index 6b25d2dff9..823268ca1d 100644
--- a/jena-core/src/test/java/org/apache/jena/ttl_test/turtle/parser/TokenMgrError.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/sse/lang/javacc/TokenMgrError.java
@@ -16,9 +16,11 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
  */
 
-package org.apache.jena.ttl_test.turtle.parser;
+package org.apache.jena.sparql.sse.lang.javacc ;
 
 /** Token Manager Error. */
 
@@ -164,4 +166,4 @@ public class TokenMgrError extends Error
     this(LexicalErr(EOFSeen, lexState, errorLine, errorColumn, errorAfter, curChar), reason);
   }
 }
-/* JavaCC - OriginalChecksum=1ccc5440ac04daf89788416d736930a7 (do not edit this line) */
+/* JavaCC - OriginalChecksum=9c60f927e98f04b3d544e693d6cbe7f7 (do not edit this line) */
diff --git a/jena-core/src/test/java/org/apache/jena/ttl_test/test/turtle/TestTurtleInternal.java b/jena-core/src/test/java/org/apache/jena/ttl_test/test/turtle/TestTurtleInternal.java
index b70536c901..bf75263338 100644
--- a/jena-core/src/test/java/org/apache/jena/ttl_test/test/turtle/TestTurtleInternal.java
+++ b/jena-core/src/test/java/org/apache/jena/ttl_test/test/turtle/TestTurtleInternal.java
@@ -23,7 +23,7 @@ import junit.framework.*;
 import java.io.*;
 
 import org.apache.jena.ttl_test.turtle.TurtleEventNull;
-import org.apache.jena.ttl_test.turtle.parser.TurtleParser;
+import org.apache.jena.ttl_test.turtle.javacc.TurtleParser;
 import org.apache.jena.util.junit.TestUtils;
 
 public class TestTurtleInternal extends TestSuite
diff --git a/jena-core/src/test/java/org/apache/jena/ttl_test/turtle/ParserTurtle.java b/jena-core/src/test/java/org/apache/jena/ttl_test/turtle/ParserTurtle.java
index 630f74f2af..41bafc9ad1 100644
--- a/jena-core/src/test/java/org/apache/jena/ttl_test/turtle/ParserTurtle.java
+++ b/jena-core/src/test/java/org/apache/jena/ttl_test/turtle/ParserTurtle.java
@@ -22,9 +22,9 @@ import java.io.InputStream;
 import java.io.Reader;
 
 import org.apache.jena.graph.Graph;
-import org.apache.jena.ttl_test.turtle.parser.ParseException;
-import org.apache.jena.ttl_test.turtle.parser.TokenMgrError;
-import org.apache.jena.ttl_test.turtle.parser.TurtleParser;
+import org.apache.jena.ttl_test.turtle.javacc.ParseException;
+import org.apache.jena.ttl_test.turtle.javacc.TokenMgrError;
+import org.apache.jena.ttl_test.turtle.javacc.TurtleParser;
 import org.apache.jena.util.FileUtils;
 
 
diff --git a/jena-arq/src/main/java/org/apache/jena/cdt/parser/JavaCharStream.java b/jena-core/src/test/java/org/apache/jena/ttl_test/turtle/javacc/JavaCharStream.java
similarity index 96%
rename from jena-arq/src/main/java/org/apache/jena/cdt/parser/JavaCharStream.java
rename to jena-core/src/test/java/org/apache/jena/ttl_test/turtle/javacc/JavaCharStream.java
index aa1a739d51..0e8963bafb 100644
--- a/jena-arq/src/main/java/org/apache/jena/cdt/parser/JavaCharStream.java
+++ b/jena-core/src/test/java/org/apache/jena/ttl_test/turtle/javacc/JavaCharStream.java
@@ -16,9 +16,11 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
  */
 
-package org.apache.jena.cdt.parser;
+package org.apache.jena.ttl_test.turtle.javacc;
 
 /**
  * An implementation of interface CharStream, where the stream is assumed to
@@ -31,7 +33,7 @@ public
 class JavaCharStream
 {
   /** Whether parser is static. */
-
+  
 @SuppressWarnings("all")
 public static final boolean staticFlag = false;
 
@@ -83,7 +85,7 @@ public static final boolean staticFlag = false;
   }
 
 /* Position in buffer. */
-
+  
 @SuppressWarnings("all")
 public int bufpos = -1;
   int bufsize;
@@ -108,10 +110,10 @@ public int bufpos = -1;
   protected int tabSize = 1;
   protected boolean trackLineColumn = true;
 
-
+  
 @SuppressWarnings("all")
 public void setTabSize(int i) { tabSize = i; }
-
+  
 @SuppressWarnings("all")
 public int getTabSize() { return tabSize; }
 
@@ -203,7 +205,7 @@ public int getTabSize() { return tabSize; }
   }
 
 /* @return starting character for token. */
-
+  
 @SuppressWarnings("all")
 public char BeginToken() throws java.io.IOException
   {
@@ -285,7 +287,7 @@ public char BeginToken() throws java.io.IOException
   }
 
 /* Read a character. */
-
+  
 @SuppressWarnings("all")
 public char readChar() throws java.io.IOException
   {
@@ -385,7 +387,7 @@ public char readChar() throws java.io.IOException
    * @see #getEndColumn
    */
   @Deprecated
-
+  
 @SuppressWarnings("all")
 public int getColumn() {
     return bufcolumn[bufpos];
@@ -397,7 +399,7 @@ public int getColumn() {
    * @return the line number.
    */
   @Deprecated
-
+  
 @SuppressWarnings("all")
 public int getLine() {
     return bufline[bufpos];
@@ -406,7 +408,7 @@ public int getLine() {
 /** Get end column.
  * @return the end column or -1
  */
-
+  
 @SuppressWarnings("all")
 public int getEndColumn() {
     return bufcolumn[bufpos];
@@ -415,7 +417,7 @@ public int getEndColumn() {
 /** Get end line.
  * @return the end line number or -1
  */
-
+  
 @SuppressWarnings("all")
 public int getEndLine() {
     return bufline[bufpos];
@@ -423,21 +425,21 @@ public int getEndLine() {
 
 /** Get the beginning column.
  * @return column of token start */
-
+  
 @SuppressWarnings("all")
 public int getBeginColumn() {
     return bufcolumn[tokenBegin];
   }
 
 /** @return line number of token start */
-
+  
 @SuppressWarnings("all")
 public int getBeginLine() {
     return bufline[tokenBegin];
   }
 
 /** Retreat. */
-
+  
 @SuppressWarnings("all")
 public void backup(int amount) {
 
@@ -452,7 +454,7 @@ public void backup(int amount) {
  * @param startcolumn column number of the first character of the stream.
  * @param buffersize size of the buffer
  */
-
+  
 @SuppressWarnings("all")
 public JavaCharStream(java.io.Reader dstream,
                  int startline, int startcolumn, int buffersize)
@@ -473,7 +475,7 @@ public JavaCharStream(java.io.Reader dstream,
  * @param startline line number of the first character of the stream, mostly for error messages.
  * @param startcolumn column number of the first character of the stream.
  */
-
+  
 @SuppressWarnings("all")
 public JavaCharStream(java.io.Reader dstream,
                                         int startline, int startcolumn)
@@ -483,15 +485,16 @@ public JavaCharStream(java.io.Reader dstream,
 
 /** Constructor.
  * @param dstream the underlying data source.
+ * @param startline line number of the first character of the stream, mostly for error messages.
  */
-
+  
 @SuppressWarnings("all")
 public JavaCharStream(java.io.Reader dstream)
   {
     this(dstream, 1, 1, 4096);
   }
 /* Reinitialise. */
-
+  
 @SuppressWarnings("all")
 public void ReInit(java.io.Reader dstream,
                  int startline, int startcolumn, int buffersize)
@@ -514,7 +517,7 @@ public void ReInit(java.io.Reader dstream,
   }
 
 /* Reinitialise. */
-
+  
 @SuppressWarnings("all")
 public void ReInit(java.io.Reader dstream,
                                         int startline, int startcolumn)
@@ -523,14 +526,14 @@ public void ReInit(java.io.Reader dstream,
   }
 
 /* Reinitialise. */
-
+  
 @SuppressWarnings("all")
 public void ReInit(java.io.Reader dstream)
   {
     ReInit(dstream, 1, 1, 4096);
   }
 /** Constructor. */
-
+  
 @SuppressWarnings("all")
 public JavaCharStream(java.io.InputStream dstream, String encoding, int startline,
   int startcolumn, int buffersize) throws java.io.UnsupportedEncodingException
@@ -544,7 +547,7 @@ public JavaCharStream(java.io.InputStream dstream, String encoding, int startlin
  * @param startcolumn column number of the first character of the stream.
  * @param buffersize size of the buffer
  */
-
+  
 @SuppressWarnings("all")
 public JavaCharStream(java.io.InputStream dstream, int startline,
   int startcolumn, int buffersize)
@@ -557,9 +560,9 @@ public JavaCharStream(java.io.InputStream dstream, int startline,
  * @param encoding the character encoding of the data stream.
  * @param startline line number of the first character of the stream, mostly for error messages.
  * @param startcolumn column number of the first character of the stream.
- * @throws java.io.UnsupportedEncodingException encoding is invalid or unsupported.
+ * @throws UnsupportedEncodingException encoding is invalid or unsupported.
  */
-
+  
 @SuppressWarnings("all")
 public JavaCharStream(java.io.InputStream dstream, String encoding, int startline,
                         int startcolumn) throws java.io.UnsupportedEncodingException
@@ -572,7 +575,7 @@ public JavaCharStream(java.io.InputStream dstream, String encoding, int startlin
  * @param startline line number of the first character of the stream, mostly for error messages.
  * @param startcolumn column number of the first character of the stream.
  */
-
+  
 @SuppressWarnings("all")
 public JavaCharStream(java.io.InputStream dstream, int startline,
                         int startcolumn)
@@ -583,9 +586,9 @@ public JavaCharStream(java.io.InputStream dstream, int startline,
 /** Constructor.
  * @param dstream the underlying data source.
  * @param encoding the character encoding of the data stream.
- * @throws java.io.UnsupportedEncodingException encoding is invalid or unsupported.
+ * @throws UnsupportedEncodingException encoding is invalid or unsupported.
  */
-
+  
 @SuppressWarnings("all")
 public JavaCharStream(java.io.InputStream dstream, String encoding) throws java.io.UnsupportedEncodingException
   {
@@ -595,7 +598,7 @@ public JavaCharStream(java.io.InputStream dstream, String encoding) throws java.
   /** Constructor.
    * @param dstream the underlying data source.
    */
-
+  
 @SuppressWarnings("all")
 public JavaCharStream(java.io.InputStream dstream)
   {
@@ -609,7 +612,7 @@ public JavaCharStream(java.io.InputStream dstream)
  * @param startcolumn column number of the first character of the stream.
  * @param buffersize size of the buffer
  */
-
+  
 @SuppressWarnings("all")
 public void ReInit(java.io.InputStream dstream, String encoding, int startline,
   int startcolumn, int buffersize) throws java.io.UnsupportedEncodingException
@@ -623,7 +626,7 @@ public void ReInit(java.io.InputStream dstream, String encoding, int startline,
  * @param startcolumn column number of the first character of the stream.
  * @param buffersize size of the buffer
  */
-
+  
 @SuppressWarnings("all")
 public void ReInit(java.io.InputStream dstream, int startline,
   int startcolumn, int buffersize)
@@ -635,9 +638,9 @@ public void ReInit(java.io.InputStream dstream, int startline,
  * @param encoding the character encoding of the data stream.
  * @param startline line number of the first character of the stream, mostly for error messages.
  * @param startcolumn column number of the first character of the stream.
- * @throws java.io.UnsupportedEncodingException encoding is invalid or unsupported.
+ * @throws UnsupportedEncodingException encoding is invalid or unsupported.
  */
-
+  
 @SuppressWarnings("all")
 public void ReInit(java.io.InputStream dstream, String encoding, int startline,
                      int startcolumn) throws java.io.UnsupportedEncodingException
@@ -649,7 +652,7 @@ public void ReInit(java.io.InputStream dstream, String encoding, int startline,
  * @param startline line number of the first character of the stream, mostly for error messages.
  * @param startcolumn column number of the first character of the stream.
  */
-
+  
 @SuppressWarnings("all")
 public void ReInit(java.io.InputStream dstream, int startline,
                      int startcolumn)
@@ -659,9 +662,9 @@ public void ReInit(java.io.InputStream dstream, int startline,
 /** Reinitialise.
  * @param dstream the underlying data source.
  * @param encoding the character encoding of the data stream.
- * @throws java.io.UnsupportedEncodingException encoding is invalid or unsupported.
+ * @throws UnsupportedEncodingException encoding is invalid or unsupported.
  */
-
+  
 @SuppressWarnings("all")
 public void ReInit(java.io.InputStream dstream, String encoding) throws java.io.UnsupportedEncodingException
   {
@@ -671,7 +674,7 @@ public void ReInit(java.io.InputStream dstream, String encoding) throws java.io.
 /** Reinitialise.
  * @param dstream the underlying data source.
  */
-
+  
 @SuppressWarnings("all")
 public void ReInit(java.io.InputStream dstream)
   {
@@ -680,7 +683,7 @@ public void ReInit(java.io.InputStream dstream)
 
   /** Get the token timage.
    * @return token image as String */
-
+  
 @SuppressWarnings("all")
 public String GetImage()
   {
@@ -694,7 +697,7 @@ public String GetImage()
   /** Get the suffix as an array of characters.
    * @param len the length of the array to return.
    * @return suffix */
-
+  
 @SuppressWarnings("all")
 public char[] GetSuffix(int len)
   {
@@ -713,7 +716,7 @@ public char[] GetSuffix(int len)
   }
 
   /** Set buffers back to null when finished. */
-
+  
 @SuppressWarnings("all")
 public void Done()
   {
@@ -729,7 +732,7 @@ public void Done()
    * @param newLine the new line number.
    * @param newCol the new column number.
    */
-
+  
 @SuppressWarnings("all")
 public void adjustBeginLineColumn(int newLine, int newCol)
   {
@@ -778,4 +781,4 @@ public void adjustBeginLineColumn(int newLine, int newCol)
   void setTrackLineColumn(boolean tlc) { trackLineColumn = tlc; }
 
 }
-/* JavaCC - OriginalChecksum=daed28e1cd2df650024933c0cf62aeef (do not edit this line) */
+/* JavaCC - OriginalChecksum=23caaa453750482178ac43d0df92264c (do not edit this line) */
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/sse/lang/parser/ParseException.java b/jena-core/src/test/java/org/apache/jena/ttl_test/turtle/javacc/ParseException.java
similarity index 97%
rename from jena-arq/src/main/java/org/apache/jena/sparql/sse/lang/parser/ParseException.java
rename to jena-core/src/test/java/org/apache/jena/ttl_test/turtle/javacc/ParseException.java
index a8163760d8..3ab3b52cbf 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/sse/lang/parser/ParseException.java
+++ b/jena-core/src/test/java/org/apache/jena/ttl_test/turtle/javacc/ParseException.java
@@ -16,9 +16,11 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
  */
 
-package org.apache.jena.sparql.sse.lang.parser ;
+package org.apache.jena.ttl_test.turtle.javacc;
 
 /**
  * This exception is thrown when parse errors are encountered.
@@ -210,4 +212,4 @@ public class ParseException extends Exception {
    }
 
 }
-/* JavaCC - OriginalChecksum=ac43afa487728cd66c7be8df3e35a3b8 (do not edit this line) */
+/* JavaCC - OriginalChecksum=8531b94f7a8788ef0992d1be052c4c81 (do not edit this line) */
diff --git a/jena-core/src/test/java/org/apache/jena/ttl_test/turtle/parser/Token.java b/jena-core/src/test/java/org/apache/jena/ttl_test/turtle/javacc/Token.java
similarity index 96%
rename from jena-core/src/test/java/org/apache/jena/ttl_test/turtle/parser/Token.java
rename to jena-core/src/test/java/org/apache/jena/ttl_test/turtle/javacc/Token.java
index 33f592cd23..21e5b21d2e 100644
--- a/jena-core/src/test/java/org/apache/jena/ttl_test/turtle/parser/Token.java
+++ b/jena-core/src/test/java/org/apache/jena/ttl_test/turtle/javacc/Token.java
@@ -16,9 +16,11 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
  */
 
-package org.apache.jena.ttl_test.turtle.parser;
+package org.apache.jena.ttl_test.turtle.javacc;
 
 /**
  * Describes the input token stream.
@@ -147,4 +149,4 @@ public class Token implements java.io.Serializable {
   }
 
 }
-/* JavaCC - OriginalChecksum=879d3febc0185e65e0b92d55458baddd (do not edit this line) */
+/* JavaCC - OriginalChecksum=29726366ad9146239bfd04cc538097ad (do not edit this line) */
diff --git a/jena-arq/src/main/java/org/apache/jena/cdt/parser/TokenMgrError.java b/jena-core/src/test/java/org/apache/jena/ttl_test/turtle/javacc/TokenMgrError.java
similarity index 97%
rename from jena-arq/src/main/java/org/apache/jena/cdt/parser/TokenMgrError.java
rename to jena-core/src/test/java/org/apache/jena/ttl_test/turtle/javacc/TokenMgrError.java
index 09317489ca..1a93af4ae6 100644
--- a/jena-arq/src/main/java/org/apache/jena/cdt/parser/TokenMgrError.java
+++ b/jena-core/src/test/java/org/apache/jena/ttl_test/turtle/javacc/TokenMgrError.java
@@ -16,9 +16,11 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
  */
 
-package org.apache.jena.cdt.parser;
+package org.apache.jena.ttl_test.turtle.javacc;
 
 /** Token Manager Error. */
 
@@ -164,4 +166,4 @@ public class TokenMgrError extends Error
     this(LexicalErr(EOFSeen, lexState, errorLine, errorColumn, errorAfter, curChar), reason);
   }
 }
-/* JavaCC - OriginalChecksum=2a351950eeffed92fd5e8ec488d61b44 (do not edit this line) */
+/* JavaCC - OriginalChecksum=2f932b2c32fcdab48fe89a8299c0d2bd (do not edit this line) */
diff --git a/jena-core/src/test/java/org/apache/jena/ttl_test/turtle/parser/TurtleParser.java b/jena-core/src/test/java/org/apache/jena/ttl_test/turtle/javacc/TurtleParser.java
similarity index 86%
rename from jena-core/src/test/java/org/apache/jena/ttl_test/turtle/parser/TurtleParser.java
rename to jena-core/src/test/java/org/apache/jena/ttl_test/turtle/javacc/TurtleParser.java
index 6c50b61515..54a12f98fc 100644
--- a/jena-core/src/test/java/org/apache/jena/ttl_test/turtle/parser/TurtleParser.java
+++ b/jena-core/src/test/java/org/apache/jena/ttl_test/turtle/javacc/TurtleParser.java
@@ -16,9 +16,11 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
  */
 
-package org.apache.jena.ttl_test.turtle.parser;
+package org.apache.jena.ttl_test.turtle.javacc;
 
 import org.apache.jena.ttl_test.turtle.*;
 import org.apache.jena.graph.*;
@@ -35,7 +37,7 @@ void parse() throws ParseException {
       }
     default:
       jj_la1[0] = jj_gen;
-     ;
+      ;
     }
     label_1:
     while (true) {
@@ -61,7 +63,7 @@ void parse() throws ParseException {
       case LBRACE:
       case LBRACKET:
       case ANON:{
-       ;
+        ;
         break;
         }
       default:
@@ -110,20 +112,20 @@ void parse() throws ParseException {
     jj_consume_token(DOT);
 }
 
-  final public void Directive() throws ParseException {Token t; String iri;
+  final public void Directive() throws ParseException {Token t ; String iri ;
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
     case PREFIX:{
       jj_consume_token(PREFIX);
       t = jj_consume_token(PNAME_NS);
       iri = IRI_REF();
-String s = fixupPrefix(t.image, t.beginLine, t.beginColumn);
-      setPrefix(t.beginLine, t.beginColumn, s, iri);
+String s = fixupPrefix(t.image, t.beginLine, t.beginColumn) ;
+      setPrefix(t.beginLine, t.beginColumn, s, iri) ;
       break;
       }
     case BASE:{
       t = jj_consume_token(BASE);
       iri = IRI_REF();
-setBase(iri, t.beginLine, t.beginColumn);
+setBase(iri, t.beginLine, t.beginColumn) ;
       break;
       }
     default:
@@ -135,7 +137,7 @@ setBase(iri, t.beginLine, t.beginColumn);
 
 // ---- TRIPLES
   final public 
-void TriplesSameSubject() throws ParseException {Node s;
+void TriplesSameSubject() throws ParseException {Node s ;
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
     case TRUE:
     case FALSE:
@@ -185,19 +187,19 @@ void TriplesSameSubject() throws ParseException {Node s;
       }
     default:
       jj_la1[5] = jj_gen;
-     ;
+      ;
     }
 }
 
 // Non-recursive for Turtle long PropertyList tests
-  final public void PropertyListNotEmpty(Node s) throws ParseException {Node p;
+  final public void PropertyListNotEmpty(Node s) throws ParseException {Node p ;
     p = Verb();
     ObjectList(s, p);
     label_2:
     while (true) {
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case SEMICOLON:{
-       ;
+        ;
         break;
         }
       default:
@@ -218,19 +220,19 @@ void TriplesSameSubject() throws ParseException {Node s;
         }
       default:
         jj_la1[7] = jj_gen;
-       ;
+        ;
       }
     }
 }
 
 // Non-recursive for Turtle long PropertyList tests
-  final public void ObjectList(Node s, Node p) throws ParseException {Node o;
+  final public void ObjectList(Node s, Node p) throws ParseException {Node o ;
     Object(s, p);
     label_3:
     while (true) {
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case COMMA:{
-       ;
+        ;
         break;
         }
       default:
@@ -242,40 +244,40 @@ void TriplesSameSubject() throws ParseException {Node s;
     }
 }
 
-  final public void Object(Node s, Node p) throws ParseException {Node o;
+  final public void Object(Node s, Node p) throws ParseException {Node o ;
     o = GraphNode();
-Triple t = Triple.create(s,p,o);
-    emitTriple(token.beginLine, token.beginColumn, t);
+Triple t = Triple.create(s,p,o) ;
+    emitTriple(token.beginLine, token.beginColumn, t) ;
 }
 
-  final public Node Verb() throws ParseException {Node p; String iri;
+  final public Node Verb() throws ParseException {Node p ; String iri ;
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
     case IRIref:
     case PNAME_NS:
     case PNAME_LN:{
       iri = IRIref();
-p = createNode(iri);
+p = createNode(iri) ;
       break;
       }
     case KW_A:{
       jj_consume_token(KW_A);
-p = nRDFtype;
+p = nRDFtype ;
       break;
       }
     case EQ:{
       jj_consume_token(EQ);
-p = nOwlSameAs;
+p = nOwlSameAs ;
         if ( strictTurtle )
           throwParseException("= (owl:sameAs) not legal in Turtle",
-                          token.beginLine, token.beginColumn );
+                          token.beginLine, token.beginColumn ) ;
       break;
       }
     case ARROW:{
       jj_consume_token(ARROW);
-p = nLogImplies;
+p = nLogImplies ;
         if ( strictTurtle )
           throwParseException("=> (log:implies) not legal in Turtle",
-                          token.beginLine, token.beginColumn );
+                          token.beginLine, token.beginColumn ) ;
       break;
       }
     default:
@@ -283,7 +285,7 @@ p = nLogImplies;
       jj_consume_token(-1);
       throw new ParseException();
     }
-{if ("" != null) return p;}
+{if ("" != null) return p ;}
     throw new Error("Missing return statement in function");
 }
 
@@ -292,16 +294,16 @@ p = nLogImplies;
 // Anything that can stand in a node slot and which is
 // a number of triples
   final public 
-Node TriplesNode() throws ParseException {Node n;
+Node TriplesNode() throws ParseException {Node n ;
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
     case LPAREN:{
       n = Collection();
-{if ("" != null) return n;}
+{if ("" != null) return n ;}
       break;
       }
     case LBRACKET:{
       n = BlankNodePropertyList();
-{if ("" != null) return n;}
+{if ("" != null) return n ;}
       break;
       }
     default:
@@ -314,30 +316,30 @@ Node TriplesNode() throws ParseException {Node n;
 
   final public Node BlankNodePropertyList() throws ParseException {
     jj_consume_token(LBRACKET);
-Node n = createBNode();
+Node n = createBNode() ;
     PropertyListNotEmpty(n);
     jj_consume_token(RBRACKET);
-{if ("" != null) return n;}
+{if ("" != null) return n ;}
     throw new Error("Missing return statement in function");
 }
 
 // ------- RDF collections
 
 // Code not as SPARQL/ARQ because of output ordering.
-  final public Node Collection() throws ParseException {Node listHead = nRDFnil; Node lastCell = null; Node n;
+  final public Node Collection() throws ParseException {Node listHead = nRDFnil ; Node lastCell = null ; Node n ;
     jj_consume_token(LPAREN);
     label_4:
     while (true) {
-Node cell = createBNode();
+Node cell = createBNode() ;
       if ( listHead == nRDFnil )
-         listHead = cell;
+         listHead = cell ;
       if ( lastCell != null )
         emitTriple(token.beginLine, token.beginColumn,
-                   Triple.create(lastCell, nRDFrest,  cell));
+                   Triple.create(lastCell, nRDFrest,  cell)) ;
       n = GraphNode();
 emitTriple(token.beginLine, token.beginColumn,
-                 Triple.create(cell, nRDFfirst,  n));
-      lastCell = cell;
+                 Triple.create(cell, nRDFfirst,  n)) ;
+      lastCell = cell ;
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case TRUE:
       case FALSE:
@@ -358,7 +360,7 @@ emitTriple(token.beginLine, token.beginColumn,
       case LBRACE:
       case LBRACKET:
       case ANON:{
-       ;
+        ;
         break;
         }
       default:
@@ -369,14 +371,14 @@ emitTriple(token.beginLine, token.beginColumn,
     jj_consume_token(RPAREN);
 if ( lastCell != null )
        emitTriple(token.beginLine, token.beginColumn,
-                  Triple.create(lastCell, nRDFrest,  nRDFnil));
-     {if ("" != null) return listHead;}
+                  Triple.create(lastCell, nRDFrest,  nRDFnil)) ;
+     {if ("" != null) return listHead ;}
     throw new Error("Missing return statement in function");
 }
 
 // -------- Nodes in a graph pattern or template
   final public 
-Node GraphNode() throws ParseException {Node n;
+Node GraphNode() throws ParseException {Node n ;
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
     case TRUE:
     case FALSE:
@@ -396,13 +398,13 @@ Node GraphNode() throws ParseException {Node n;
     case LBRACE:
     case ANON:{
       n = VarOrTerm();
-{if ("" != null) return n;}
+{if ("" != null) return n ;}
       break;
       }
     case LPAREN:
     case LBRACKET:{
       n = TriplesNode();
-{if ("" != null) return n;}
+{if ("" != null) return n ;}
       break;
       }
     default:
@@ -413,7 +415,7 @@ Node GraphNode() throws ParseException {Node n;
     throw new Error("Missing return statement in function");
 }
 
-  final public Node VarOrTerm() throws ParseException {Node n = null;
+  final public Node VarOrTerm() throws ParseException {Node n = null ;
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
     case VAR:{
       n = Var();
@@ -446,19 +448,19 @@ Node GraphNode() throws ParseException {Node n;
       jj_consume_token(-1);
       throw new ParseException();
     }
-{if ("" != null) return n;}
+{if ("" != null) return n ;}
     throw new Error("Missing return statement in function");
 }
 
-  final public Node Formula() throws ParseException {Token t;
+  final public Node Formula() throws ParseException {Token t ;
     t = jj_consume_token(LBRACE);
-startFormula(t.beginLine, t.beginColumn);
+startFormula(t.beginLine, t.beginColumn) ;
     TriplesSameSubject();
     label_5:
     while (true) {
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case DOT:{
-       ;
+        ;
         break;
         }
       default:
@@ -491,28 +493,28 @@ startFormula(t.beginLine, t.beginColumn);
         }
       default:
         jj_la1[15] = jj_gen;
-       ;
+        ;
       }
     }
     t = jj_consume_token(RBRACE);
-endFormula(t.beginLine, t.beginColumn);
-{if ("" != null) return null;}
+endFormula(t.beginLine, t.beginColumn) ;
+{if ("" != null) return null ;}
     throw new Error("Missing return statement in function");
 }
 
-  final public Node Var() throws ParseException {Token t;
+  final public Node Var() throws ParseException {Token t ;
     t = jj_consume_token(VAR);
-{if ("" != null) return createVariable(t.image, t.beginLine, t.beginColumn);}
+{if ("" != null) return createVariable(t.image, t.beginLine, t.beginColumn) ;}
     throw new Error("Missing return statement in function");
 }
 
-  final public Node GraphTerm() throws ParseException {Node n; String iri;
+  final public Node GraphTerm() throws ParseException {Node n ; String iri ;
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
     case IRIref:
     case PNAME_NS:
     case PNAME_LN:{
       iri = IRIref();
-{if ("" != null) return createNode(iri);}
+{if ("" != null) return createNode(iri) ;}
       break;
       }
     case STRING_LITERAL1:
@@ -520,7 +522,7 @@ endFormula(t.beginLine, t.beginColumn);
     case STRING_LITERAL_LONG1:
     case STRING_LITERAL_LONG2:{
       n = RDFLiteral();
-{if ("" != null) return n;}
+{if ("" != null) return n ;}
       break;
       }
     case INTEGER:
@@ -528,24 +530,24 @@ endFormula(t.beginLine, t.beginColumn);
     case DOUBLE:{
       // Cleaner sign handling in Turtle.
         n = NumericLiteral();
-{if ("" != null) return n;}
+{if ("" != null) return n ;}
       break;
       }
     case TRUE:
     case FALSE:{
       n = BooleanLiteral();
-{if ("" != null) return n;}
+{if ("" != null) return n ;}
       break;
       }
     case BLANK_NODE_LABEL:
     case ANON:{
       n = BlankNode();
-{if ("" != null) return n;}
+{if ("" != null) return n ;}
       break;
       }
     case NIL:{
       jj_consume_token(NIL);
-{if ("" != null) return nRDFnil;}
+{if ("" != null) return nRDFnil ;}
       break;
       }
     default:
@@ -558,21 +560,21 @@ endFormula(t.beginLine, t.beginColumn);
 
 // ---- Basic terms
   final public 
-Node NumericLiteral() throws ParseException {Token t;
+Node NumericLiteral() throws ParseException {Token t ;
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
     case INTEGER:{
       t = jj_consume_token(INTEGER);
-{if ("" != null) return createLiteralInteger(t.image);}
+{if ("" != null) return createLiteralInteger(t.image) ;}
       break;
       }
     case DECIMAL:{
       t = jj_consume_token(DECIMAL);
-{if ("" != null) return createLiteralDecimal(t.image);}
+{if ("" != null) return createLiteralDecimal(t.image) ;}
       break;
       }
     case DOUBLE:{
       t = jj_consume_token(DOUBLE);
-{if ("" != null) return createLiteralDouble(t.image);}
+{if ("" != null) return createLiteralDouble(t.image) ;}
       break;
       }
     default:
@@ -583,9 +585,9 @@ Node NumericLiteral() throws ParseException {Token t;
     throw new Error("Missing return statement in function");
 }
 
-  final public Node RDFLiteral() throws ParseException {Token t; String lex = null;
+  final public Node RDFLiteral() throws ParseException {Token t ; String lex = null ;
     lex = String();
-String lang = null; String dt = null;
+String lang = null ; String dt = null ;
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
     case PREFIX:
     case BASE:
@@ -612,13 +614,13 @@ String lang = null; String dt = null;
       }
     default:
       jj_la1[19] = jj_gen;
-     ;
+      ;
     }
-{if ("" != null) return createLiteral(lex, lang, dt);}
+{if ("" != null) return createLiteral(lex, lang, dt) ;}
     throw new Error("Missing return statement in function");
 }
 
-  final public String Langtag() throws ParseException {Token t;
+  final public String Langtag() throws ParseException {Token t ;
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
     case LANGTAG:{
       t = jj_consume_token(LANGTAG);
@@ -634,11 +636,11 @@ String lang = null; String dt = null;
       jj_consume_token(-1);
       throw new ParseException();
     }
-String lang = stripChars(t.image, 1); {if ("" != null) return lang;}
+String lang = stripChars(t.image, 1) ; {if ("" != null) return lang ;}
     throw new Error("Missing return statement in function");
 }
 
-  final public Token AnyDirective() throws ParseException {Token t;
+  final public Token AnyDirective() throws ParseException {Token t ;
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
     case PREFIX:{
       t = jj_consume_token(PREFIX);
@@ -653,7 +655,7 @@ String lang = stripChars(t.image, 1); {if ("" != null) return lang;}
       jj_consume_token(-1);
       throw new ParseException();
     }
-{if ("" != null) return t;}
+{if ("" != null) return t ;}
     throw new Error("Missing return statement in function");
 }
 
@@ -661,12 +663,12 @@ String lang = stripChars(t.image, 1); {if ("" != null) return lang;}
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
     case TRUE:{
       jj_consume_token(TRUE);
-{if ("" != null) return XSD_TRUE;}
+{if ("" != null) return XSD_TRUE ;}
       break;
       }
     case FALSE:{
       jj_consume_token(FALSE);
-{if ("" != null) return XSD_FALSE;}
+{if ("" != null) return XSD_FALSE ;}
       break;
       }
     default:
@@ -677,26 +679,26 @@ String lang = stripChars(t.image, 1); {if ("" != null) return lang;}
     throw new Error("Missing return statement in function");
 }
 
-  final public String String() throws ParseException {Token t;  String lex;
+  final public String String() throws ParseException {Token t ;  String lex ;
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
     case STRING_LITERAL1:{
       t = jj_consume_token(STRING_LITERAL1);
-lex = stripQuotes(t.image);
+lex = stripQuotes(t.image) ;
       break;
       }
     case STRING_LITERAL2:{
       t = jj_consume_token(STRING_LITERAL2);
-lex = stripQuotes(t.image);
+lex = stripQuotes(t.image) ;
       break;
       }
     case STRING_LITERAL_LONG1:{
       t = jj_consume_token(STRING_LITERAL_LONG1);
-lex = stripQuotes3(t.image);
+lex = stripQuotes3(t.image) ;
       break;
       }
     case STRING_LITERAL_LONG2:{
       t = jj_consume_token(STRING_LITERAL_LONG2);
-lex = stripQuotes3(t.image);
+lex = stripQuotes3(t.image) ;
       break;
       }
     default:
@@ -704,22 +706,22 @@ lex = stripQuotes3(t.image);
       jj_consume_token(-1);
       throw new ParseException();
     }
-lex = unescapeStr(lex,  t.beginLine, t.beginColumn);
-      {if ("" != null) return lex;}
+lex = unescapeStr(lex,  t.beginLine, t.beginColumn) ;
+      {if ("" != null) return lex ;}
     throw new Error("Missing return statement in function");
 }
 
-  final public String IRIref() throws ParseException {String iri;
+  final public String IRIref() throws ParseException {String iri ;
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
     case IRIref:{
       iri = IRI_REF();
-{if ("" != null) return iri;}
+{if ("" != null) return iri ;}
       break;
       }
     case PNAME_NS:
     case PNAME_LN:{
       iri = PrefixedName();
-{if ("" != null) return iri;}
+{if ("" != null) return iri ;}
       break;
       }
     default:
@@ -730,16 +732,16 @@ lex = unescapeStr(lex,  t.beginLine, t.beginColumn);
     throw new Error("Missing return statement in function");
 }
 
-  final public String PrefixedName() throws ParseException {Token t;
+  final public String PrefixedName() throws ParseException {Token t ;
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
     case PNAME_LN:{
       t = jj_consume_token(PNAME_LN);
-{if ("" != null) return resolvePName(t.image, t.beginLine, t.beginColumn);}
+{if ("" != null) return resolvePName(t.image, t.beginLine, t.beginColumn) ;}
       break;
       }
     case PNAME_NS:{
       t = jj_consume_token(PNAME_NS);
-{if ("" != null) return resolvePName(t.image, t.beginLine, t.beginColumn);}
+{if ("" != null) return resolvePName(t.image, t.beginLine, t.beginColumn) ;}
       break;
       }
     default:
@@ -750,16 +752,16 @@ lex = unescapeStr(lex,  t.beginLine, t.beginColumn);
     throw new Error("Missing return statement in function");
 }
 
-  final public Node BlankNode() throws ParseException {Token t = null;
+  final public Node BlankNode() throws ParseException {Token t = null ;
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
     case BLANK_NODE_LABEL:{
       t = jj_consume_token(BLANK_NODE_LABEL);
-{if ("" != null) return createBNode(t.image, t.beginLine, t.beginColumn);}
+{if ("" != null) return createBNode(t.image, t.beginLine, t.beginColumn) ;}
       break;
       }
     case ANON:{
       jj_consume_token(ANON);
-{if ("" != null) return createBNode();}
+{if ("" != null) return createBNode() ;}
       break;
       }
     default:
@@ -770,9 +772,9 @@ lex = unescapeStr(lex,  t.beginLine, t.beginColumn);
     throw new Error("Missing return statement in function");
 }
 
-  final public String IRI_REF() throws ParseException {Token t;
+  final public String IRI_REF() throws ParseException {Token t ;
     t = jj_consume_token(IRIref);
-{if ("" != null) return resolveQuotedIRI(t.image, t.beginLine, t.beginColumn);}
+{if ("" != null) return resolveQuotedIRI(t.image, t.beginLine, t.beginColumn) ;}
     throw new Error("Missing return statement in function");
 }
 
diff --git a/jena-core/src/test/java/org/apache/jena/ttl_test/turtle/parser/TurtleParserConstants.java b/jena-core/src/test/java/org/apache/jena/ttl_test/turtle/javacc/TurtleParserConstants.java
similarity index 98%
rename from jena-core/src/test/java/org/apache/jena/ttl_test/turtle/parser/TurtleParserConstants.java
rename to jena-core/src/test/java/org/apache/jena/ttl_test/turtle/javacc/TurtleParserConstants.java
index 1e96312a6f..b33a39a193 100644
--- a/jena-core/src/test/java/org/apache/jena/ttl_test/turtle/parser/TurtleParserConstants.java
+++ b/jena-core/src/test/java/org/apache/jena/ttl_test/turtle/javacc/TurtleParserConstants.java
@@ -15,9 +15,11 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
  */
 
-package org.apache.jena.ttl_test.turtle.parser;
+package org.apache.jena.ttl_test.turtle.javacc;
 
 
 /**
diff --git a/jena-core/src/test/java/org/apache/jena/ttl_test/turtle/parser/TurtleParserTokenManager.java b/jena-core/src/test/java/org/apache/jena/ttl_test/turtle/javacc/TurtleParserTokenManager.java
similarity index 98%
rename from jena-core/src/test/java/org/apache/jena/ttl_test/turtle/parser/TurtleParserTokenManager.java
rename to jena-core/src/test/java/org/apache/jena/ttl_test/turtle/javacc/TurtleParserTokenManager.java
index f19d0dc566..ecdbc535d9 100644
--- a/jena-core/src/test/java/org/apache/jena/ttl_test/turtle/parser/TurtleParserTokenManager.java
+++ b/jena-core/src/test/java/org/apache/jena/ttl_test/turtle/javacc/TurtleParserTokenManager.java
@@ -16,11 +16,16 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
  */
 
-package org.apache.jena.ttl_test.turtle.parser;
+package org.apache.jena.ttl_test.turtle.javacc;
+import org.apache.jena.ttl_test.turtle.*;
+import org.apache.jena.graph.*;
 
 /** Token Manager. */
+@SuppressWarnings ("unused")
 public class TurtleParserTokenManager implements TurtleParserConstants {
 
   /** Debug output. */
@@ -1176,12 +1181,12 @@ private int jjMoveNfa_0(int startState, int curPos)
 
 /** Token literal values. */
 public static final String[] jjstrLiteralImages = {
-"", "\41", "\174", "\136", "\55\76", "\74\55", null, null, null, null, null,
-null, null, "\141", "\100\160\162\145\146\151\170", "\100\142\141\163\145", null,
-null, null, null, null, null, null, null, null, null, null, null, null, null, null,
-null, null, null, null, null, null, null, "\50", "\51", null, "\173", "\175",
-"\133", "\135", null, "\73", "\54", "\56", "\75", "\75\76", "\44", "\77", "\176",
-"\72", "\52", "\57", "\134", "\ufeff", "\136\136", "\100", null, null, null, null,
+"", "\41", "\174", "\136", "\55\76", "\74\55", null, null, null, null, null, 
+null, null, "\141", "\100\160\162\145\146\151\170", "\100\142\141\163\145", null, 
+null, null, null, null, null, null, null, null, null, null, null, null, null, null, 
+null, null, null, null, null, null, null, "\50", "\51", null, "\173", "\175", 
+"\133", "\135", null, "\73", "\54", "\56", "\75", "\75\76", "\44", "\77", "\176", 
+"\72", "\52", "\57", "\134", "\ufeff", "\136\136", "\100", null, null, null, null, 
 null, null, null, };
 protected Token jjFillToken()
 {
@@ -1207,11 +1212,11 @@ protected Token jjFillToken()
    return t;
 }
 static final int[] jjnextStates = {
-   73, 74, 75, 85, 86, 91, 92, 96, 73, 74, 77, 79, 84, 57, 60, 61,
-   1, 2, 4, 13, 14, 16, 8, 9, 11, 18, 19, 21, 23, 24, 26, 30,
-   31, 33, 35, 36, 38, 57, 58, 59, 63, 60, 61, 65, 66, 67, 71, 68,
-   69, 65, 68, 69, 85, 86, 91, 92, 99, 100, 102, 103, 99, 100, 101, 102,
-   103, 104, 42, 43, 82, 83, 89, 90, 93, 94,
+   73, 74, 75, 85, 86, 91, 92, 96, 73, 74, 77, 79, 84, 57, 60, 61, 
+   1, 2, 4, 13, 14, 16, 8, 9, 11, 18, 19, 21, 23, 24, 26, 30, 
+   31, 33, 35, 36, 38, 57, 58, 59, 63, 60, 61, 65, 66, 67, 71, 68, 
+   69, 65, 68, 69, 85, 86, 91, 92, 99, 100, 102, 103, 99, 100, 101, 102, 
+   103, 104, 42, 43, 82, 83, 89, 90, 93, 94, 
 };
 private static final boolean jjCanMove_0(int hiByte, int i1, int i2, long l1, long l2)
 {
@@ -1282,7 +1287,7 @@ int jjmatchedPos;
 int jjmatchedKind;
 
 /** Get the next Token. */
-public Token getNextToken()
+public Token getNextToken() 
 {
   Token specialToken = null;
   Token matchedToken;
@@ -1424,7 +1429,7 @@ private void jjCheckNAddStates(int start, int end)
   }
 
   /** Reinitialise parser. */
-
+  
   public void ReInit(JavaCharStream stream)
   {
 
@@ -1447,7 +1452,7 @@ private void jjCheckNAddStates(int start, int end)
 
   /** Reinitialise parser. */
   public void ReInit(JavaCharStream stream, int lexState)
-
+  
   {
     ReInit(stream);
     SwitchTo(lexState);
@@ -1470,21 +1475,21 @@ public static final String[] lexStateNames = {
 
 /** Lex State array. */
 public static final int[] jjnewLexState = {
-   -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-   -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-   -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+   -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
+   -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
+   -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
 };
 static final long[] jjtoToken = {
-   0x1fffffcfff1fe03fL, 0x0L,
+   0x1fffffcfff1fe03fL, 0x0L, 
 };
 static final long[] jjtoSkip = {
-   0x17c0L, 0x0L,
+   0x17c0L, 0x0L, 
 };
 static final long[] jjtoSpecial = {
-   0x1000L, 0x0L,
+   0x1000L, 0x0L, 
 };
 static final long[] jjtoMore = {
-   0x0L, 0x0L,
+   0x0L, 0x0L, 
 };
     protected JavaCharStream  input_stream;
 
diff --git a/jena-core/testing/ttl_test/README b/jena-core/testing/ttl_test/README
index 712f26a7e6..1c42389e64 100644
--- a/jena-core/testing/ttl_test/README
+++ b/jena-core/testing/ttl_test/README
@@ -1,6 +1,6 @@
 This is a Turtle parser used in support of jena-core tests and nothing more.
 
-It is not compliant with RDF 1.1 Turtle.
+It is not compliant with RDF Turtle.
 
 It is added to the jena-core RDFReaderFImpl so it is available in jena-core.
 It will be replaced if jena-arq is on the classpath by RIOT initialization.
diff --git a/jena-core/testing/ttl_test/turtle-test-parser b/jena-core/testing/ttl_test/turtle-test-parser
index 1d2a135fe4..082a9447f7 100755
--- a/jena-core/testing/ttl_test/turtle-test-parser
+++ b/jena-core/testing/ttl_test/turtle-test-parser
@@ -14,10 +14,11 @@
 ## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 ## See the License for the specific language governing permissions and
 ## limitations under the License.
+##
+## SPDX-License-Identifier: Apache-2.0
 
-# Parser builder
 
-DIR="../../src/test/java/org/apache/jena/ttl_test/turtle/parser"
+DIR="../../src/test/java/org/apache/jena/ttl_test/turtle/javacc"
 FILE=turtle-test.jj
 CLASS=TurtleParser
 
diff --git a/jena-core/testing/ttl_test/turtle-test.jj b/jena-core/testing/ttl_test/turtle-test.jj
index d9d078d8de..6cfd4bca68 100644
--- a/jena-core/testing/ttl_test/turtle-test.jj
+++ b/jena-core/testing/ttl_test/turtle-test.jj
@@ -14,13 +14,11 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
  */
 
-// Turtle & N3 for Jena 
-
-// N3 compatible:
-// All legal Turtle documents are acceped by this grammar.
-// Some N3 features, which are stil RDF, are provided.
+// Turtle for Jena testing
 
 options
 {
@@ -52,12 +50,14 @@ PARSER_BEGIN(TurtleParser)
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
  */
 
-package org.apache.jena.ttl_test.turtle.parser;
+package org.apache.jena.ttl_test.turtle.javacc;
 
 import org.apache.jena.ttl_test.turtle.*;
-import org.apache.jena.graph.* ;
+import org.apache.jena.graph.*;
 
 public class TurtleParser extends TurtleParserBase
 {
diff --git a/jena-shacl/shaclc/shaclc-parser b/jena-shacl/shaclc/shaclc-parser
index 3896e7586c..7e7ad84117 100755
--- a/jena-shacl/shaclc/shaclc-parser
+++ b/jena-shacl/shaclc/shaclc-parser
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/bash
 ## Licensed to the Apache Software Foundation (ASF) under one
 ## or more contributor license agreements.  See the NOTICE file
 ## distributed with this work for additional information
@@ -14,8 +14,10 @@
 ## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 ## See the License for the specific language governing permissions and
 ## limitations under the License.
+##
+## SPDX-License-Identifier: Apache-2.0
 
-DIR=../src/main/java/org/apache/jena/shacl/compact/reader/parser
+DIR=../src/main/java/org/apache/jena/shacl/compact/reader/javacc
 FILE="shaclc.jj"
 CLASS=ShaclCompactParserJJ
 
diff --git a/jena-shacl/shaclc/shaclc.jj b/jena-shacl/shaclc/shaclc.jj
index e54c28571a..33af9c875f 100644
--- a/jena-shacl/shaclc/shaclc.jj
+++ b/jena-shacl/shaclc/shaclc.jj
@@ -14,6 +14,8 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 options
@@ -49,16 +51,18 @@ PARSER_BEGIN(ShaclCompactParserJJ)
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
  */
 
-package org.apache.jena.shacl.compact.reader.parser;
+package org.apache.jena.shacl.compact.reader.javacc;
 
 import java.util.List;
 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.*;
+import static org.apache.jena.riot.lang.LangParserLib.*;
 
 public class ShaclCompactParserJJ extends ShaclCompactParser
 {}
diff --git a/jena-shacl/src/main/java/org/apache/jena/shacl/compact/ShaclcParser.java b/jena-shacl/src/main/java/org/apache/jena/shacl/compact/ShaclcParser.java
index 9759b93e91..d78e85fe09 100644
--- a/jena-shacl/src/main/java/org/apache/jena/shacl/compact/ShaclcParser.java
+++ b/jena-shacl/src/main/java/org/apache/jena/shacl/compact/ShaclcParser.java
@@ -28,9 +28,9 @@ import org.apache.jena.irix.IRIxResolver;
 import org.apache.jena.riot.system.*;
 import org.apache.jena.shacl.Shapes;
 import org.apache.jena.shacl.compact.reader.ShaclcParseException;
-import org.apache.jena.shacl.compact.reader.parser.ParseException;
-import org.apache.jena.shacl.compact.reader.parser.ShaclCompactParserJJ;
-import org.apache.jena.shacl.compact.reader.parser.TokenMgrError;
+import org.apache.jena.shacl.compact.reader.javacc.ParseException;
+import org.apache.jena.shacl.compact.reader.javacc.ShaclCompactParserJJ;
+import org.apache.jena.shacl.compact.reader.javacc.TokenMgrError;
 import org.apache.jena.sparql.graph.GraphFactory;
 import org.apache.jena.sparql.util.Context;
 
diff --git a/jena-core/src/test/java/org/apache/jena/ttl_test/turtle/parser/ParseException.java b/jena-shacl/src/main/java/org/apache/jena/shacl/compact/reader/javacc/ParseException.java
similarity index 97%
rename from jena-core/src/test/java/org/apache/jena/ttl_test/turtle/parser/ParseException.java
rename to jena-shacl/src/main/java/org/apache/jena/shacl/compact/reader/javacc/ParseException.java
index f6d43f3bdc..9725fc2910 100644
--- a/jena-core/src/test/java/org/apache/jena/ttl_test/turtle/parser/ParseException.java
+++ b/jena-shacl/src/main/java/org/apache/jena/shacl/compact/reader/javacc/ParseException.java
@@ -16,9 +16,11 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
  */
 
-package org.apache.jena.ttl_test.turtle.parser;
+package org.apache.jena.shacl.compact.reader.javacc;
 
 /**
  * This exception is thrown when parse errors are encountered.
@@ -210,4 +212,4 @@ public class ParseException extends Exception {
    }
 
 }
-/* JavaCC - OriginalChecksum=10dc416469508e8065e3958be462e2cd (do not edit this line) */
+/* JavaCC - OriginalChecksum=3a305b98490e18d4b0d6106259a3e4b6 (do not edit this line) */
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/javacc/ShaclCompactParserJJ.java
similarity index 99%
rename from jena-shacl/src/main/java/org/apache/jena/shacl/compact/reader/parser/ShaclCompactParserJJ.java
rename to jena-shacl/src/main/java/org/apache/jena/shacl/compact/reader/javacc/ShaclCompactParserJJ.java
index 3a2f61a29f..3e22f2f100 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/javacc/ShaclCompactParserJJ.java
@@ -16,18 +16,18 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
  */
 
-package org.apache.jena.shacl.compact.reader.parser;
+package org.apache.jena.shacl.compact.reader.javacc;
 
 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.LangParserLib.*;
 
 public class ShaclCompactParserJJ extends ShaclCompactParser implements ShaclCompactParserJJConstants {
 
diff --git a/jena-shacl/src/main/java/org/apache/jena/shacl/compact/reader/parser/ShaclCompactParserJJConstants.java b/jena-shacl/src/main/java/org/apache/jena/shacl/compact/reader/javacc/ShaclCompactParserJJConstants.java
similarity index 98%
rename from jena-shacl/src/main/java/org/apache/jena/shacl/compact/reader/parser/ShaclCompactParserJJConstants.java
rename to jena-shacl/src/main/java/org/apache/jena/shacl/compact/reader/javacc/ShaclCompactParserJJConstants.java
index 4bc35fb02d..5eab2397e4 100644
--- a/jena-shacl/src/main/java/org/apache/jena/shacl/compact/reader/parser/ShaclCompactParserJJConstants.java
+++ b/jena-shacl/src/main/java/org/apache/jena/shacl/compact/reader/javacc/ShaclCompactParserJJConstants.java
@@ -15,9 +15,11 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
  */
 
-package org.apache.jena.shacl.compact.reader.parser;
+package org.apache.jena.shacl.compact.reader.javacc;
 
 
 /**
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/javacc/ShaclCompactParserJJTokenManager.java
similarity index 99%
rename from jena-shacl/src/main/java/org/apache/jena/shacl/compact/reader/parser/ShaclCompactParserJJTokenManager.java
rename to jena-shacl/src/main/java/org/apache/jena/shacl/compact/reader/javacc/ShaclCompactParserJJTokenManager.java
index 71f4567c5a..5eadf656a7 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/javacc/ShaclCompactParserJJTokenManager.java
@@ -16,17 +16,17 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
  */
 
-package org.apache.jena.shacl.compact.reader.parser;
+package org.apache.jena.shacl.compact.reader.javacc;
 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.LangParserLib.*;
 
 /** Token Manager. */
 @SuppressWarnings ("unused")
diff --git a/jena-shacl/src/main/java/org/apache/jena/shacl/compact/reader/parser/SimpleCharStream.java b/jena-shacl/src/main/java/org/apache/jena/shacl/compact/reader/javacc/SimpleCharStream.java
similarity index 98%
rename from jena-shacl/src/main/java/org/apache/jena/shacl/compact/reader/parser/SimpleCharStream.java
rename to jena-shacl/src/main/java/org/apache/jena/shacl/compact/reader/javacc/SimpleCharStream.java
index 25fdacc258..cad52c5dd4 100644
--- a/jena-shacl/src/main/java/org/apache/jena/shacl/compact/reader/parser/SimpleCharStream.java
+++ b/jena-shacl/src/main/java/org/apache/jena/shacl/compact/reader/javacc/SimpleCharStream.java
@@ -16,9 +16,11 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
  */
 
-package org.apache.jena.shacl.compact.reader.parser;
+package org.apache.jena.shacl.compact.reader.javacc;
 
 /**
  * An implementation of interface CharStream, where the stream is assumed to
@@ -487,4 +489,4 @@ public class SimpleCharStream
   boolean getTrackLineColumn() { return trackLineColumn; }
   void setTrackLineColumn(boolean tlc) { trackLineColumn = tlc; }
 }
-/* JavaCC - OriginalChecksum=6129d3fe3efc970cbce1c4026f18d3f2 (do not edit this line) */
+/* JavaCC - OriginalChecksum=5c9345202fb6701b577eca1cb5f64426 (do not edit this line) */
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/sse/lang/parser/Token.java b/jena-shacl/src/main/java/org/apache/jena/shacl/compact/reader/javacc/Token.java
similarity index 96%
rename from jena-arq/src/main/java/org/apache/jena/sparql/sse/lang/parser/Token.java
rename to jena-shacl/src/main/java/org/apache/jena/shacl/compact/reader/javacc/Token.java
index 0ef3d19c87..5bcd01f726 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/sse/lang/parser/Token.java
+++ b/jena-shacl/src/main/java/org/apache/jena/shacl/compact/reader/javacc/Token.java
@@ -16,9 +16,11 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
  */
 
-package org.apache.jena.sparql.sse.lang.parser ;
+package org.apache.jena.shacl.compact.reader.javacc;
 
 /**
  * Describes the input token stream.
@@ -147,4 +149,4 @@ public class Token implements java.io.Serializable {
   }
 
 }
-/* JavaCC - OriginalChecksum=b470e52e9e469b5131fc43edbb483298 (do not edit this line) */
+/* JavaCC - OriginalChecksum=47826a03f08440dc48312b12292d4469 (do not edit this line) */
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/lang/turtlejcc/javacc/TokenMgrError.java b/jena-shacl/src/main/java/org/apache/jena/shacl/compact/reader/javacc/TokenMgrError.java
similarity index 97%
copy from jena-arq/src/main/java/org/apache/jena/riot/lang/turtlejcc/javacc/TokenMgrError.java
copy to jena-shacl/src/main/java/org/apache/jena/shacl/compact/reader/javacc/TokenMgrError.java
index 412bb8926b..bef2e2b5ec 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/lang/turtlejcc/javacc/TokenMgrError.java
+++ b/jena-shacl/src/main/java/org/apache/jena/shacl/compact/reader/javacc/TokenMgrError.java
@@ -16,9 +16,11 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
  */
 
-package org.apache.jena.riot.lang.turtlejcc.javacc;
+package org.apache.jena.shacl.compact.reader.javacc;
 
 /** Token Manager Error. */
 
@@ -164,4 +166,4 @@ public class TokenMgrError extends Error
     this(LexicalErr(EOFSeen, lexState, errorLine, errorColumn, errorAfter, curChar), reason);
   }
 }
-/* JavaCC - OriginalChecksum=568f4fa9a2786005de0bec225a66eeae (do not edit this line) */
+/* JavaCC - OriginalChecksum=203e7f31947bf950726d27996e849272 (do not edit this line) */
diff --git a/jena-shacl/src/main/java/org/apache/jena/shacl/compact/reader/parser/ParseException.java b/jena-shacl/src/main/java/org/apache/jena/shacl/compact/reader/parser/ParseException.java
deleted file mode 100644
index 441566e12d..0000000000
--- a/jena-shacl/src/main/java/org/apache/jena/shacl/compact/reader/parser/ParseException.java
+++ /dev/null
@@ -1,213 +0,0 @@
-/* Generated By:JavaCC: Do not edit this line. ParseException.java Version 7.0 */
-/* JavaCCOptions:KEEP_LINE_COLUMN=true */
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.jena.shacl.compact.reader.parser;
-
-/**
- * This exception is thrown when parse errors are encountered.
- * You can explicitly create objects of this exception type by
- * calling the method generateParseException in the generated
- * parser.
- *
- * You can modify this class to customize your error reporting
- * mechanisms so long as you retain the public fields.
- */
-public class ParseException extends Exception {
-
-  /**
-   * The version identifier for this Serializable class.
-   * Increment only if the <i>serialized</i> form of the
-   * class changes.
-   */
-  private static final long serialVersionUID = 1L;
-
-  /**
-   * The end of line string for this machine.
-   */
-  protected static String EOL = System.getProperty("line.separator", "\n");
-
-  /**
-   * This constructor is used by the method "generateParseException"
-   * in the generated parser.  Calling this constructor generates
-   * a new object of this type with the fields "currentToken",
-   * "expectedTokenSequences", and "tokenImage" set.
-   */
-  public ParseException(Token currentTokenVal,
-                        int[][] expectedTokenSequencesVal,
-                        String[] tokenImageVal
-                       )
-  {
-    super(initialise(currentTokenVal, expectedTokenSequencesVal, tokenImageVal));
-    currentToken = currentTokenVal;
-    expectedTokenSequences = expectedTokenSequencesVal;
-    tokenImage = tokenImageVal;
-  }
-
-  /**
-   * The following constructors are for use by you for whatever
-   * purpose you can think of.  Constructing the exception in this
-   * manner makes the exception behave in the normal way - i.e., as
-   * documented in the class "Throwable".  The fields "errorToken",
-   * "expectedTokenSequences", and "tokenImage" do not contain
-   * relevant information.  The JavaCC generated code does not use
-   * these constructors.
-   */
-
-  public ParseException() {
-    super();
-  }
-
-  /** Constructor with message. */
-  public ParseException(String message) {
-    super(message);
-  }
-
-
-  /**
-   * This is the last token that has been consumed successfully.  If
-   * this object has been created due to a parse error, the token
-   * following this token will (therefore) be the first error token.
-   */
-  public Token currentToken;
-
-  /**
-   * Each entry in this array is an array of integers.  Each array
-   * of integers represents a sequence of tokens (by their ordinal
-   * values) that is expected at this point of the parse.
-   */
-  public int[][] expectedTokenSequences;
-
-  /**
-   * This is a reference to the "tokenImage" array of the generated
-   * parser within which the parse error occurred.  This array is
-   * defined in the generated ...Constants interface.
-   */
-  public String[] tokenImage;
-
-  /**
-   * It uses "currentToken" and "expectedTokenSequences" to generate a parse
-   * error message and returns it.  If this object has been created
-   * due to a parse error, and you do not catch it (it gets thrown
-   * from the parser) the correct error message
-   * gets displayed.
-   */
-  private static String initialise(Token currentToken,
-                           int[][] expectedTokenSequences,
-                           String[] tokenImage) {
-
-    StringBuilder expected = new StringBuilder();
-    int maxSize = 0;
-    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++) {
-      if (i != 0) retval += " ";
-      if (tok.kind == 0) {
-        retval += tokenImage[0];
-        break;
-      }
-      retval += " " + tokenImage[tok.kind];
-      retval += " \"";
-      retval += add_escapes(tok.image);
-      retval += " \"";
-      tok = tok.next;
-    }
-    if (currentToken.next != null) {
-      retval += "\" at line " + currentToken.next.beginLine + ", column " + currentToken.next.beginColumn;
-    }
-    retval += "." + EOL;
-    
-    
-    if (expectedTokenSequences.length == 0) {
-        // Nothing to add here
-    } else {
-	    if (expectedTokenSequences.length == 1) {
-	      retval += "Was expecting:" + EOL + "    ";
-	    } else {
-	      retval += "Was expecting one of:" + EOL + "    ";
-	    }
-	    retval += expected.toString();
-    }
-    
-    return retval;
-  }
-
-
-  /**
-   * Used to convert raw characters to their escaped version
-   * when these raw version cannot be used as part of an ASCII
-   * string literal.
-   */
-  static String add_escapes(String str) {
-      StringBuilder retval = new StringBuilder();
-      char ch;
-      for (int i = 0; i < str.length(); i++) {
-        switch (str.charAt(i))
-        {
-           case '\b':
-              retval.append("\\b");
-              continue;
-           case '\t':
-              retval.append("\\t");
-              continue;
-           case '\n':
-              retval.append("\\n");
-              continue;
-           case '\f':
-              retval.append("\\f");
-              continue;
-           case '\r':
-              retval.append("\\r");
-              continue;
-           case '\"':
-              retval.append("\\\"");
-              continue;
-           case '\'':
-              retval.append("\\\'");
-              continue;
-           case '\\':
-              retval.append("\\\\");
-              continue;
-           default:
-              if ((ch = str.charAt(i)) < 0x20 || ch > 0x7e) {
-                 String s = "0000" + Integer.toString(ch, 16);
-                 retval.append("\\u" + s.substring(s.length() - 4, s.length()));
-              } else {
-                 retval.append(ch);
-              }
-              continue;
-        }
-      }
-      return retval.toString();
-   }
-
-}
-/* JavaCC - OriginalChecksum=d6d921dd37a6a3796fc9da5a40fe044a (do not edit this line) */
diff --git a/jena-shacl/src/main/java/org/apache/jena/shacl/compact/reader/parser/Token.java b/jena-shacl/src/main/java/org/apache/jena/shacl/compact/reader/parser/Token.java
deleted file mode 100644
index 8071c7291e..0000000000
--- a/jena-shacl/src/main/java/org/apache/jena/shacl/compact/reader/parser/Token.java
+++ /dev/null
@@ -1,150 +0,0 @@
-/* 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 */
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.jena.shacl.compact.reader.parser;
-
-/**
- * Describes the input token stream.
- */
-
-public class Token implements java.io.Serializable {
-
-  /**
-   * The version identifier for this Serializable class.
-   * Increment only if the <i>serialized</i> form of the
-   * class changes.
-   */
-  private static final long serialVersionUID = 1L;
-
-  /**
-   * An integer that describes the kind of this token.  This numbering
-   * system is determined by JavaCCParser, and a table of these numbers is
-   * stored in the file ...Constants.java.
-   */
-  public int kind;
-
-  /** The line number of the first character of this Token. */
-  public int beginLine;
-  /** The column number of the first character of this Token. */
-  public int beginColumn;
-  /** The line number of the last character of this Token. */
-  public int endLine;
-  /** The column number of the last character of this Token. */
-  public int endColumn;
-
-  /**
-   * The string image of the token.
-   */
-  public String image;
-
-  /**
-   * A reference to the next regular (non-special) token from the input
-   * stream.  If this is the last token from the input stream, or if the
-   * token manager has not read tokens beyond this one, this field is
-   * set to null.  This is true only if this token is also a regular
-   * token.  Otherwise, see below for a description of the contents of
-   * this field.
-   */
-  public Token next;
-
-  /**
-   * This field is used to access special tokens that occur prior to this
-   * token, but after the immediately preceding regular (non-special) token.
-   * If there are no such special tokens, this field is set to null.
-   * When there are more than one such special token, this field refers
-   * to the last of these special tokens, which in turn refers to the next
-   * previous special token through its specialToken field, and so on
-   * until the first special token (whose specialToken field is null).
-   * The next fields of special tokens refer to other special tokens that
-   * immediately follow it (without an intervening regular token).  If there
-   * is no such token, this field is null.
-   */
-  public Token specialToken;
-
-  /**
-   * An optional attribute value of the Token.
-   * Tokens which are not used as syntactic sugar will often contain
-   * meaningful values that will be used later on by the compiler or
-   * interpreter. This attribute value is often different from the image.
-   * Any subclass of Token that actually wants to return a non-null value can
-   * override this method as appropriate.
-   */
-  public Object getValue() {
-    return null;
-  }
-
-  /**
-   * No-argument constructor
-   */
-  public Token() {}
-
-  /**
-   * Constructs a new token for the specified Image.
-   */
-  public Token(int kind)
-  {
-    this(kind, null);
-  }
-
-  /**
-   * Constructs a new token for the specified Image and Kind.
-   */
-  public Token(int kind, String image)
-  {
-    this.kind = kind;
-    this.image = image;
-  }
-
-  /**
-   * Returns the image.
-   */
-  @Override
-  public String toString()
-  {
-    return image;
-  }
-
-  /**
-   * Returns a new Token object, by default. However, if you want, you
-   * can create and return subclass objects based on the value of ofKind.
-   * Simply add the cases to the switch for all those special cases.
-   * For example, if you have a subclass of Token called IDToken that
-   * you want to create if ofKind is ID, simply add something like :
-   *
-   *    case MyParserConstants.ID : return new IDToken(ofKind, image);
-   *
-   * to the following switch statement. Then you can cast matchedToken
-   * variable to the appropriate type and use sit in your lexical actions.
-   */
-  public static Token newToken(int ofKind, String image)
-  {
-    switch(ofKind)
-    {
-      default : return new Token(ofKind, image);
-    }
-  }
-
-  public static Token newToken(int ofKind)
-  {
-    return newToken(ofKind, null);
-  }
-
-}
-/* JavaCC - OriginalChecksum=56619e1c65e96d82cb1e8d838dc3c1b0 (do not edit this line) */
diff --git a/jena-shacl/src/main/java/org/apache/jena/shacl/compact/reader/parser/TokenMgrError.java b/jena-shacl/src/main/java/org/apache/jena/shacl/compact/reader/parser/TokenMgrError.java
deleted file mode 100644
index 3635a241d2..0000000000
--- a/jena-shacl/src/main/java/org/apache/jena/shacl/compact/reader/parser/TokenMgrError.java
+++ /dev/null
@@ -1,167 +0,0 @@
-/* Generated By:JavaCC: Do not edit this line. TokenMgrError.java Version 7.0 */
-/* JavaCCOptions: */
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.jena.shacl.compact.reader.parser;
-
-/** Token Manager Error. */
-
-@SuppressWarnings("all")
-public class TokenMgrError extends Error
-{
-
-  /**
-   * The version identifier for this Serializable class.
-   * Increment only if the <i>serialized</i> form of the
-   * class changes.
-   */
-  private static final long serialVersionUID = 1L;
-
-  /*
-   * Ordinals for various reasons why an Error of this type can be thrown.
-   */
-
-  /**
-   * Lexical error occurred.
-   */
-  public static final int LEXICAL_ERROR = 0;
-
-  /**
-   * An attempt was made to create a second instance of a static token manager.
-   */
-  public static final int STATIC_LEXER_ERROR = 1;
-
-  /**
-   * Tried to change to an invalid lexical state.
-   */
-  public static final int INVALID_LEXICAL_STATE = 2;
-
-  /**
-   * Detected (and bailed out of) an infinite loop in the token manager.
-   */
-  public static final int LOOP_DETECTED = 3;
-
-  /**
-   * Indicates the reason why the exception is thrown. It will have
-   * one of the above 4 values.
-   */
-  int errorCode;
-
-  /**
-   * Replaces unprintable characters by their escaped (or unicode escaped)
-   * equivalents in the given string
-   */
-  protected static final String addEscapes(String str) {
-    StringBuilder retval = new StringBuilder();
-    char ch;
-    for (int i = 0; i < str.length(); i++) {
-      switch (str.charAt(i))
-      {
-        case '\b':
-          retval.append("\\b");
-          continue;
-        case '\t':
-          retval.append("\\t");
-          continue;
-        case '\n':
-          retval.append("\\n");
-          continue;
-        case '\f':
-          retval.append("\\f");
-          continue;
-        case '\r':
-          retval.append("\\r");
-          continue;
-        case '\"':
-          retval.append("\\\"");
-          continue;
-        case '\'':
-          retval.append("\\\'");
-          continue;
-        case '\\':
-          retval.append("\\\\");
-          continue;
-        default:
-          if ((ch = str.charAt(i)) < 0x20 || ch > 0x7e) {
-            String s = "0000" + Integer.toString(ch, 16);
-            retval.append("\\u" + s.substring(s.length() - 4, s.length()));
-          } else {
-            retval.append(ch);
-          }
-          continue;
-      }
-    }
-    return retval.toString();
-  }
-
-  /**
-   * Returns a detailed message for the Error when it is thrown by the
-   * token manager to indicate a lexical error.
-   * Parameters :
-   *    EOFSeen     : indicates if EOF caused the lexical error
-   *    lexState    : lexical state in which this error occurred
-   *    errorLine   : line number when the error occurred
-   *    errorColumn : column number when the error occurred
-   *    errorAfter  : prefix that was seen before this error occurred
-   *    curchar     : the offending character
-   * Note: You can customize the lexical error message by modifying this method.
-   */
-  protected static String LexicalErr(boolean EOFSeen, int lexState, int errorLine, int errorColumn, String errorAfter, int curChar) {
-    return("Lexical error at line " + //
-          errorLine + ", column " + //
-          errorColumn + ".  Encountered: " + //
-          (EOFSeen ? "<EOF>" : ("'" + addEscapes(String.valueOf(curChar)) + "' (" + curChar + "),")) + //
-          (errorAfter == null || errorAfter.length() == 0 ? "" : " after prefix \"" + addEscapes(errorAfter) + "\"")) + //
-          (lexState == 0 ? "" : " (in lexical state " + lexState + ")");
-  }
-
-  /**
-   * You can also modify the body of this method to customize your error messages.
-   * For example, cases like LOOP_DETECTED and INVALID_LEXICAL_STATE are not
-   * of end-users concern, so you can return something like :
-   *
-   *     "Internal Error : Please file a bug report .... "
-   *
-   * from this method for such cases in the release version of your parser.
-   */
-  @Override
-  public String getMessage() {
-    return super.getMessage();
-  }
-
-  /*
-   * Constructors of various flavors follow.
-   */
-
-  /** No arg constructor. */
-  public TokenMgrError() {
-  }
-
-  /** Constructor with message and reason. */
-  public TokenMgrError(String message, int reason) {
-    super(message);
-    errorCode = reason;
-  }
-
-  /** Full Constructor. */
-  public TokenMgrError(boolean EOFSeen, int lexState, int errorLine, int errorColumn, String errorAfter, int curChar, int reason) {
-    this(LexicalErr(EOFSeen, lexState, errorLine, errorColumn, errorAfter, curChar), reason);
-  }
-}
-/* JavaCC - OriginalChecksum=d164666275ee355fa466386aad606682 (do not edit this line) */
diff --git a/jena-shex/shexc/shex-parser b/jena-shex/shexc/shex-parser
index 1e70ccdfca..74fcd33a79 100755
--- a/jena-shex/shexc/shex-parser
+++ b/jena-shex/shexc/shex-parser
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/bash
 ## Licensed to the Apache Software Foundation (ASF) under one
 ## or more contributor license agreements.  See the NOTICE file
 ## distributed with this work for additional information
@@ -14,8 +14,8 @@
 ## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 ## See the License for the specific language governing permissions and
 ## limitations under the License.
-
-# Parser builder
+##
+## SPDX-License-Identifier: Apache-2.0
 
 DIR="../src/main/java/org/apache/jena/shex/parser/javacc"
 FILE="shex.jj"
diff --git a/jena-shex/shexc/shex.jj b/jena-shex/shexc/shex.jj
index 40d2ac970a..c1212ec3e8 100644
--- a/jena-shex/shexc/shex.jj
+++ b/jena-shex/shexc/shex.jj
@@ -14,6 +14,8 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 options
@@ -43,6 +45,8 @@ PARSER_BEGIN(ShExJavacc)
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 package org.apache.jena.shex.parser.javacc;
@@ -51,7 +55,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
diff --git a/jena-shex/src/main/java/org/apache/jena/shex/parser/javacc/ParseException.java b/jena-shex/src/main/java/org/apache/jena/shex/parser/javacc/ParseException.java
index d91e8e84bb..b0b82f9620 100644
--- a/jena-shex/src/main/java/org/apache/jena/shex/parser/javacc/ParseException.java
+++ b/jena-shex/src/main/java/org/apache/jena/shex/parser/javacc/ParseException.java
@@ -16,6 +16,8 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 package org.apache.jena.shex.parser.javacc;
@@ -210,4 +212,4 @@ public class ParseException extends Exception {
    }
 
 }
-/* JavaCC - OriginalChecksum=a3ec69c1dd4ca694bcf142b44289fc52 (do not edit this line) */
+/* JavaCC - OriginalChecksum=0f319fb63126a4fbcfc32e85d92fa44d (do not edit this line) */
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 7fac1949aa..243a15e98c 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
@@ -16,6 +16,8 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 package org.apache.jena.shex.parser.javacc;
@@ -115,7 +117,7 @@ finishShexDoc();
 }
 
 // ----
-  final public
+  final public 
 void directive() throws ParseException {
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
     case BASE:{
@@ -157,7 +159,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 +229,7 @@ semActs(semAct, token.beginLine, token.beginColumn);
 }
 
 // ----
-  final public
+  final public 
 void shapeExprDecl() throws ParseException {Node n;
 startShapeExprDecl();
     n = shapeExprLabel();
@@ -781,7 +783,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 +1162,7 @@ extras.add(p);
 // {
 //     oneOfTripleExpr()
 // }
-//
+// 
 // void oneOfTripleExpr() : {}
 // {
 //  	(LOOKAHEAD(2)
@@ -1168,12 +1170,12 @@ extras.add(p);
 //     | multiElementOneOf()
 //     )
 // }
-//
+// 
 // void multiElementOneOf() : {}
 // {
 //    	groupTripleExpr() (<VBAR> groupTripleExpr())+
 // }
-//
+// 
 // void groupTripleExpr() : {}
 // {
 //     ( LOOKAHEAD(2)
@@ -1181,12 +1183,12 @@ extras.add(p);
 //     | multiElementGroup()
 //     )
 // }
-//
+// 
 // void singleElementGroup() : {}
 // {
 //   	unaryTripleExpr() (<SEMI_COLON>)?
 // }
-//
+// 
 // void multiElementGroup() : {}
 // {
 //   	unaryTripleExpr()
@@ -1253,7 +1255,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 +1466,7 @@ finishValueSet();
 // {
 //     iriRange() | literalRange() | languageRange() | (LOOKAHEAD(2) exclusion())+
 // }
-//
+// 
 // void exclusion() : {}
 // {
 //   	<MINUS>
@@ -1472,7 +1474,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 +1585,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 +1639,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 +1697,7 @@ if ( ! haveSet ) { valueSetLiteralRange(lit, false); }
 //     <AT> <TILDE> ( languageExclusion() )*
 //     )
 // }
-//
+// 
 // void languageExclusion() : {}
 // {
 //     <MINUS> <LANGTAG> (<TILDE>)?
@@ -1950,7 +1952,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 +2156,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 +2284,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:
@@ -2470,181 +2472,181 @@ o = focusNode;
     finally { jj_save(1, xla); }
   }
 
-  private boolean jj_3R_unaryTripleExpr_463_5_31()
- {
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_unaryTripleExpr_465_7_33()) {
-    jj_scanpos = xsp;
-    if (jj_3R_unaryTripleExpr_466_7_34()) return true;
-    }
-    return false;
-  }
-
-  private boolean jj_3R_codeDecl_698_5_32()
- {
-    if (jj_scan_token(CODE_BLOCK)) return true;
-    return false;
-  }
-
-  private boolean jj_3R_iri_792_3_48()
- {
-    if (jj_3R_prefixedName_803_3_50()) return true;
-    return false;
-  }
-
-  private boolean jj_3R_iri_790_3_47()
+  private boolean jj_3R_iri_794_3_47()
  {
-    if (jj_3R_IRIREF_813_3_49()) return true;
+    if (jj_3R_IRIREF_817_3_49()) return true;
     return false;
   }
 
-  private boolean jj_3R_iri_790_3_46()
+  private boolean jj_3R_iri_794_3_46()
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_iri_790_3_47()) {
+    if (jj_3R_iri_794_3_47()) {
     jj_scanpos = xsp;
-    if (jj_3R_iri_792_3_48()) return true;
+    if (jj_3R_iri_796_3_48()) return true;
     }
     return false;
   }
 
-  private boolean jj_3R_senseFlags_501_9_43()
+  private boolean jj_3R_senseFlags_505_9_43()
  {
     if (jj_scan_token(CARAT)) return true;
     return false;
   }
 
-  private boolean jj_3R_unaryTripleExpr_465_44_36()
+  private boolean jj_3R_unaryTripleExpr_469_44_36()
  {
-    if (jj_3R_tripleConstraint_483_5_39()) return true;
+    if (jj_3R_tripleConstraint_487_5_39()) return true;
     return false;
   }
 
   private boolean jj_3_1()
  {
     if (jj_scan_token(SEMI_COLON)) return true;
-    if (jj_3R_unaryTripleExpr_463_5_31()) return true;
+    if (jj_3R_unaryTripleExpr_467_5_31()) return true;
     return false;
   }
 
   private boolean jj_3_2()
  {
-    if (jj_3R_codeDecl_698_5_32()) return true;
+    if (jj_3R_codeDecl_702_5_32()) return true;
     return false;
   }
 
-  private boolean jj_3R_tripleConstraint_484_11_41()
+  private boolean jj_3R_tripleConstraint_488_11_41()
  {
-    if (jj_3R_senseFlags_501_9_43()) return true;
+    if (jj_3R_senseFlags_505_9_43()) return true;
     return false;
   }
 
-  private boolean jj_3R_tripleConstraint_483_5_39()
+  private boolean jj_3R_tripleConstraint_487_5_39()
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_tripleConstraint_484_11_41()) jj_scanpos = xsp;
-    if (jj_3R_predicate_709_5_42()) return true;
+    if (jj_3R_tripleConstraint_488_11_41()) jj_scanpos = xsp;
+    if (jj_3R_predicate_713_5_42()) return true;
     return false;
   }
 
-  private boolean jj_3R_IRIREF_813_3_49()
+  private boolean jj_3R_IRIREF_817_3_49()
  {
     if (jj_scan_token(IRIref)) return true;
     return false;
... 380 lines suppressed ...


(jena) 01/02: Switch license to ASF contributed form

Posted by an...@apache.org.
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 20c55627fcab56d3f9ad33314e746789faa32352
Author: Andy Seaborne <an...@apache.org>
AuthorDate: Thu Dec 11 17:00:10 2025 +0000

    Switch license to ASF contributed form
---
 jena-langtag/pom.xml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/jena-langtag/pom.xml b/jena-langtag/pom.xml
index 42e5bca5ed..07a3fbafc7 100644
--- a/jena-langtag/pom.xml
+++ b/jena-langtag/pom.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-   Licensed 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
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
 
        http://www.apache.org/licenses/LICENSE-2.0
 
@@ -11,9 +14,6 @@
    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
    See the License for the specific language governing permissions and
    limitations under the License.
- 
-   See the NOTICE file distributed with this work for additional
-   information regarding copyright ownership.
 -->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">