Merge commit 'refs/pull/89/head' of github.com:apache/jena into JENA-491-construct-quads
Project: http://git-wip-us.apache.org/repos/asf/jena/repo Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/bdb1101e Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/bdb1101e Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/bdb1101e Branch: refs/heads/master Commit: bdb1101e53883634e9660eb214d3442cc0c74c28 Parents: c8528b7 6f39740 Author: Andy Seaborne <[email protected]> Authored: Mon Aug 17 14:02:51 2015 +0100 Committer: Andy Seaborne <[email protected]> Committed: Mon Aug 17 14:02:51 2015 +0100 ---------------------------------------------------------------------- jena-arq/Grammar/arq.jj | 38 +- jena-arq/Grammar/master.jj | 76 + .../constructquads/ExampleConstructQuads.java | 199 ++ .../main/java/org/apache/jena/query/Query.java | 3 +- .../org/apache/jena/query/QueryExecution.java | 23 +- .../jena/sparql/engine/QueryExecutionBase.java | 110 +- .../sparql/engine/http/QueryEngineHTTP.java | 11 + .../apache/jena/sparql/lang/arq/ARQParser.java | 1797 +++++++++--------- .../jena/sparql/lang/arq/ARQParserBase.java | 27 + .../sparql/lang/arq/ARQParserConstants.java | 1266 ++++++------ .../sparql/lang/arq/ARQParserTokenManager.java | 1 + .../jena/sparql/lang/arq/JavaCharStream.java | 1234 ++++++------ .../jena/sparql/lang/arq/ParseException.java | 374 ++-- .../org/apache/jena/sparql/lang/arq/Token.java | 2 +- .../jena/sparql/lang/arq/TokenMgrError.java | 2 +- .../sparql/lang/sparql_11/JavaCharStream.java | 1234 ++++++------ .../sparql/lang/sparql_11/ParseException.java | 374 ++-- .../lang/sparql_11/SPARQLParser11Constants.java | 1224 ++++++------ .../jena/sparql/lang/sparql_11/Token.java | 2 +- .../sparql/lang/sparql_11/TokenMgrError.java | 2 +- .../jena/sparql/resultset/ResultsFormat.java | 13 + .../jena/sparql/resultset/SPARQLResult.java | 33 +- .../jena/sparql/serializer/FmtTemplate.java | 47 +- .../org/apache/jena/sparql/syntax/Template.java | 137 +- .../org/apache/jena/sparql/api/TestAPI.java | 262 ++- .../org/apache/jena/sparql/junit/QueryTest.java | 117 +- .../org/apache/jena/sparql/junit/TestItem.java | 45 +- jena-arq/testing/ARQ/Construct/dft.ttl | 2 + jena-arq/testing/ARQ/Construct/g1.ttl | 3 + jena-arq/testing/ARQ/Construct/g2.ttl | 2 + jena-arq/testing/ARQ/Construct/manifest.ttl | 120 ++ .../ARQ/Construct/q-construct-quad-dataset.arq | 6 + .../q-construct-quad-default-graph-1.arq | 6 + .../q-construct-quad-default-graph-2.arq | 6 + .../Construct/q-construct-quad-named-graph.arq | 6 + .../Construct/q-construct-quad-short-form-1.arq | 5 + .../Construct/q-construct-quad-short-form-2.arq | 5 + .../Construct/q-construct-quad-short-form-3.arq | 5 + .../ARQ/Construct/q-construct-quad-syntax-1.arq | 3 + .../ARQ/Construct/q-construct-quad-syntax-2.arq | 3 + .../ARQ/Construct/q-construct-quad-syntax-3.arq | 4 + .../ARQ/Construct/q-construct-quad-syntax-4.arq | 9 + .../ARQ/Construct/q-construct-quad-syntax-5.arq | 9 + .../ARQ/Construct/q-construct-quad-syntax-6.arq | 14 + .../ARQ/Construct/q-construct-quad-syntax-7.arq | 7 + .../ARQ/Construct/q-construct-quad-syntax-8.arq | 9 + .../Construct/results-construct-quad-data-2.ttl | 2 + .../results-construct-quad-dataset.trig | 4 + .../results-construct-quad-default-graph.ttl | 3 + .../results-construct-quad-named-graph.trig | 3 + .../results-construct-quad-short-form-1.trig | 3 + .../results-construct-quad-short-form-2.ttl | 2 + .../results-construct-quad-short-form-3.trig | 4 + .../results-construct-quad-syntax-1.trig | 2 + .../results-construct-quad-syntax-2.trig | 0 .../results-construct-quad-syntax-3.ttl | 2 + .../results-construct-quad-syntax-4.trig | 6 + .../results-construct-quad-syntax-5.trig | 6 + .../results-construct-quad-syntax-6.trig | 6 + .../results-construct-quad-syntax-7.ttl | 2 + .../results-construct-quad-syntax-8.trig | 0 .../testing/ARQ/Syntax/Syntax-ARQ/manifest.ttl | 69 +- .../Syntax-ARQ/syntax-quad-construct-01.arq | 3 + .../Syntax-ARQ/syntax-quad-construct-02.arq | 3 + .../Syntax-ARQ/syntax-quad-construct-03.arq | 3 + .../Syntax-ARQ/syntax-quad-construct-04.arq | 8 + .../Syntax-ARQ/syntax-quad-construct-05.arq | 8 + .../Syntax-ARQ/syntax-quad-construct-06.arq | 13 + .../Syntax-ARQ/syntax-quad-construct-07.arq | 6 + .../Syntax-ARQ/syntax-quad-construct-08.arq | 8 + .../Syntax-ARQ/syntax-quad-construct-09.arq | 7 + .../Syntax-ARQ/syntax-quad-construct-10.arq | 7 + .../Syntax-ARQ/syntax-quad-construct-11.arq | 7 + .../Syntax-ARQ/syntax-quad-construct-12.arq | 7 + .../Syntax-ARQ/syntax-quad-construct-bad-01.arq | 7 + jena-arq/testing/ARQ/Syntax/syn-arq.sh | 82 +- 76 files changed, 5274 insertions(+), 3886 deletions(-) ----------------------------------------------------------------------
