You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by an...@apache.org on 2015/11/29 22:01:46 UTC
[2/3] jena git commit: Notes for TriG templates in CONSTRUCT quads
Notes for TriG templates in CONSTRUCT quads
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/0a6b7d99
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/0a6b7d99
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/0a6b7d99
Branch: refs/heads/master
Commit: 0a6b7d99ccac65147f8467ad6bb01ba2f7d3bf0b
Parents: ad3b910
Author: Andy Seaborne <an...@apache.org>
Authored: Sun Nov 29 15:04:57 2015 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Sun Nov 29 15:04:57 2015 +0000
----------------------------------------------------------------------
jena-arq/Grammar/arq.jj | 4 ++--
jena-arq/Grammar/master.jj | 11 ++++++-----
2 files changed, 8 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/0a6b7d99/jena-arq/Grammar/arq.jj
----------------------------------------------------------------------
diff --git a/jena-arq/Grammar/arq.jj b/jena-arq/Grammar/arq.jj
index 459ed7c..acae4fd 100644
--- a/jena-arq/Grammar/arq.jj
+++ b/jena-arq/Grammar/arq.jj
@@ -501,11 +501,11 @@ void QuadsNotTriples(QuadAccSink acc) : {Node gn ; Node prev = acc.getGraph() ;
}
void ConstructQuads(QuadAcc acc) : {}
{
- (TriplesTemplate(acc))?
+ ( TriplesTemplate(acc))?
(
ConstructQuadsNotTriples(acc)
(<DOT>)?
- (TriplesTemplate(acc))?
+ ( TriplesTemplate(acc))?
)*
}
void ConstructQuadsNotTriples(QuadAccSink acc) : {Node gn = Quad.defaultGraphNodeGenerated ; Node prev = acc.getGraph() ; }
http://git-wip-us.apache.org/repos/asf/jena/blob/0a6b7d99/jena-arq/Grammar/master.jj
----------------------------------------------------------------------
diff --git a/jena-arq/Grammar/master.jj b/jena-arq/Grammar/master.jj
index 043f745..c1f7ef8 100644
--- a/jena-arq/Grammar/master.jj
+++ b/jena-arq/Grammar/master.jj
@@ -741,20 +741,21 @@ void QuadsNotTriples(QuadAccSink acc) : {Node gn ; Node prev = acc.getGraph() ;
}
#ifdef ARQ
+// See "/* TriG template :: ..... */" below.
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) : {Node gn = Quad.defaultGraphNodeGenerated ; Node prev = acc.getGraph() ; }
{
(
- <GRAPH>
+ <GRAPH> /* TriG template :: (<GRAPH>)?*/
gn = VarOrIri()
)?
@@ -1178,7 +1179,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) :
@@ -1187,7 +1188,7 @@ void PropertyListNotEmpty(Node s, TripleCollector acc) :
p = Verb()
ObjectList(s, p, null, acc)
( <SEMICOLON>
- (
+ ( /* TriG template: LOOKAHEAD(2) */
p = Verb()
ObjectList(s, p, null, acc)
)?