Skip to content

Prep for Jena6. Fix SPARQL BNF production script. #3722

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
afs merged 3 commits into from
Jan 26, 2026
Merged

Prep for Jena6. Fix SPARQL BNF production script. #3722

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
093fb3b
Correct comment
afs Jan 23, 2026
9827cb5
Make argument order of emitTriple consistent
afs Jan 24, 2026
c0443a7
Fix for SPARQL BNF output
afs Jan 26, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions jena-arq/Grammar/Turtle/turtle.jj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,11 +151,11 @@ void PredicateObjectList(Node s) : { Node p = null ; }
void ObjectList(Node s, Node p): { Node o ; }
{
o = Object()
{ emitTriple(token.beginLine, token.beginColumn, s, p, o) ; }
{ emitTriple(s, p, o, token.beginLine, token.beginColumn) ; }
Annotation(s, p, o)
(
<COMMA> o = Object()
{ emitTriple(token.beginLine, token.beginColumn, s, p, o) ; }
{ emitTriple(s, p, o, token.beginLine, token.beginColumn) ; }
Annotation(s, p, o)
)*
}
Expand Down Expand Up @@ -365,7 +365,7 @@ Node ReifiedTriple() : { Node reifId = null ; Token tok ; Node s; Node p ; Node
p = Verb()
o = ReifiedTripleObject()
( reifId = Reifier())?
{ reifId = emitTripleReifier(tok.beginLine, tok.beginColumn, reifId, s, p, o); }
{ reifId = emitTripleReifier(reifId, s, p, o, tok.beginLine, tok.beginColumn); }
<GT2>
{ return reifId ; }
}
Expand Down Expand Up @@ -425,7 +425,7 @@ void Annotation(Node s, Node p, Node o) : { Node reifId = null; }
{
(
reifId = Reifier()
{ reifId = emitTripleReifier(token.beginLine, token.beginColumn, reifId, s, p, o) ; }
{ reifId = emitTripleReifier(reifId, s, p, o, token.beginLine, token.beginColumn) ; }
{ setReifierId(reifId); }
|
{ reifId = getOrAllocReifierId(s, p, o, token.beginLine, token.beginColumn); }
Expand Down
14 changes: 9 additions & 5 deletions jena-arq/Grammar/jj2bnf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,10 +53,12 @@ $grammar =~ s!^[\n\s]*!\n! ;
# Merge alts
$grammar =~ s!\n\s*\|!\ |!g ;

# Tab after |
$grammar =~ s!\|\t!\| !g ;

$tokens =~ s!//.*!!g ;
$tokens =~ s!\r!!g ;


## Grammar

@g = split(/\n\s*/, $grammar) ;
Expand Down Expand Up @@ -254,13 +256,15 @@ sub fixupRule {
print STDERR "A:",$body,"\n" if $p ;

## Fix up for BNODE that uses "|" - put in marker.
$body =~ s%'BNODE' \( '\(' Expression '\)' \| \<NIL\> \)%XXX-BNODE-XXX%;

## | followed by <NIL>
$body =~ s%'BNODE' \( '\(' Expression '\)' \| NIL \)%XXX-BNODE-XXX%;

## Alternative more general removal: NB space-) - matched the BNF parens
##$body =~ s%'BNODE'.*? \)%XXX-BNODE-XXX%;

$body =~ s%\|\s*%\n | %g ;

## Replace marker
$body =~ s%XXX-BNODE-XXX%'BNODE' \( '(' Expression ')' \| \<NIL\> \)%;
$body =~ s%XXX-BNODE-XXX%'BNODE' \( '(' Expression ')' \| NIL \)%;
}

if ( $head eq "Aggregate" )
Expand Down
13 changes: 12 additions & 1 deletion jena-arq/src/main/java/org/apache/jena/riot/lang/LangParserBase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ public class LangParserBase {
protected final Node nRDFpredicate = RDF.Nodes.predicate ;
protected final Node nRDFobject = RDF.Nodes.object ;

protected final Node nRDFreifies = RDF.Nodes.reifies;
protected final Node nRDFreifies = RDF.Nodes.reifies;

protected StreamRDF stream;
protected ParserProfile profile;
Expand Down Expand Up @@ -206,11 +206,22 @@ protected void declareVersion(String version, int line, int column) {
stream.version(version);
}

@Deprecated(forRemoval = true)
protected void emitTriple(int line, int column, Node s, Node p, Node o) {
emitTriple(s, p, o, line, column);
}

protected void emitTriple(Node s, Node p, Node o, int line, int column) {
stream.triple(Triple.create(s, p, o));
}


@Deprecated(forRemoval = true)
protected Node emitTripleReifier(int line, int column, Node reifierId, Node s, Node p, Node o) {
return emitTripleReifier(reifierId, s, p, o, line, column);
}

protected Node emitTripleReifier(Node reifierId, Node s, Node p, Node o, int line, int column) {
Node tripleTerm = createTripleTerm(s, p, o, line, column);
if ( reifierId == null )
reifierId = createBNode(line, column);
Expand Down
8 changes: 4 additions & 4 deletions jena-arq/src/main/java/org/apache/jena/riot/lang/turtlejcc/LangTurtleJCCParserBase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,11 +230,11 @@ protected void declareVersion(String version, int line, int column) {
output.version(version);
}

protected void emitTriple(int line, int column, Node s, Node p, Node o) {
protected void emitTriple(Node s, Node p, Node o, int line, int column) {
output.triple(Triple.create(s, p, o));
}

protected Node emitTripleReifier(int line, int column, Node reifierId, Node s, Node p, Node o) {
protected Node emitTripleReifier(Node reifierId, Node s, Node p, Node o, int line, int column) {
Node tripleTerm = createTripleTerm(s, p, o, line, column);
if ( reifierId == null )
reifierId = createBNode(line, column);
Expand All @@ -253,7 +253,7 @@ protected Node getOrAllocReifierId(Node s, Node p, Node o, int line, int column)
if ( annotationReifierId != null )
return annotationReifierId;
Node reifierId = createBNode(line, column);
emitTripleReifier(line, column, reifierId, s, p, o);
emitTripleReifier(reifierId, s, p, o, line, column);
return reifierId;
}

Expand All @@ -270,6 +270,6 @@ protected String unescapeIRI(String iriStr) {
}

protected void listStart(int line, int column) {};
protected void listTriple(int line, int column, Node s, Node p , Node o) { emitTriple(line, column, s, p, o); }
protected void listTriple(int line, int column, Node s, Node p , Node o) { emitTriple(s, p, o, line, column); }
protected void listFinish(int line, int column) {};
}
8 changes: 4 additions & 4 deletions jena-arq/src/main/java/org/apache/jena/riot/lang/turtlejcc/javacc/TurtleJavacc.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -275,7 +275,7 @@ final public void Statement() throws ParseException {

final public void ObjectList(Node s, Node p) throws ParseException {Node o ;
o = Object();
emitTriple(token.beginLine, token.beginColumn, s, p, o) ;
emitTriple(s, p, o, token.beginLine, token.beginColumn) ;
Annotation(s, p, o);
label_3:
while (true) {
Expand All @@ -290,7 +290,7 @@ final public void Statement() throws ParseException {
}
jj_consume_token(COMMA);
o = Object();
emitTriple(token.beginLine, token.beginColumn, s, p, o) ;
emitTriple(s, p, o, token.beginLine, token.beginColumn) ;
Annotation(s, p, o);
}
}
Expand Down Expand Up @@ -786,7 +786,7 @@ final public Node BooleanLiteral() throws ParseException {
jj_la1[29] = jj_gen;
;
}
reifId = emitTripleReifier(tok.beginLine, tok.beginColumn, reifId, s, p, o);
reifId = emitTripleReifier(reifId, s, p, o, tok.beginLine, tok.beginColumn);
jj_consume_token(GT2);
{if ("" != null) return reifId ;}
throw new Error("Missing return statement in function");
Expand Down Expand Up @@ -955,7 +955,7 @@ final public Node BooleanLiteral() throws ParseException {
switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
case TILDE:{
reifId = Reifier();
reifId = emitTripleReifier(token.beginLine, token.beginColumn, reifId, s, p, o) ;
reifId = emitTripleReifier(reifId, s, p, o, token.beginLine, token.beginColumn) ;
setReifierId(reifId);
break;
}
Expand Down
3 changes: 2 additions & 1 deletion jena-arq/src/test/java/org/apache/jena/arq/junit/sparql/tests/SparqlTestLib.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,8 @@ static String getStringOrURI(Node node, String context) {
throw new TestSetupException("Not a string or URI for "+context+": "+node);
}

// For tests which directly have the action as a URi to a file.
// For tests which directly have the action as a URI to a file
// i.e. not via a blank node.
static String getAction(ManifestEntry entry) {
Graph graph = entry.getGraph();
if ( entry.getAction().isBlank() )
Expand Down
Loading