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 cd96ec2991dfc5d8d81868c5c6950f46164b5f17 Author: Andy Seaborne <[email protected]> AuthorDate: Thu Sep 4 16:36:10 2025 +0100 SPARQL Grammar fix: '! UnaryExpression' --- jena-arq/Grammar/arq.jj | 2 +- jena-arq/Grammar/main.jj | 2 +- jena-arq/Grammar/sparql_12.jj | 2 +- .../src/main/java/org/apache/jena/sparql/lang/arq/javacc/ARQParser.java | 2 +- .../org/apache/jena/sparql/lang/sparql_12/javacc/SPARQLParser12.java | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/jena-arq/Grammar/arq.jj b/jena-arq/Grammar/arq.jj index 5eee9e31af..f53137d127 100644 --- a/jena-arq/Grammar/arq.jj +++ b/jena-arq/Grammar/arq.jj @@ -1543,7 +1543,7 @@ Expr MultiplicativeExpression() : { Expr expr1, expr2 ; } } Expr UnaryExpression() : { Expr expr ; } { - <BANG> expr = PrimaryExpression() + <BANG> expr = UnaryExpression() { return new E_LogicalNot(expr) ; } | <PLUS> expr = PrimaryExpression() { return new E_UnaryPlus(expr) ; } | <MINUS> expr = PrimaryExpression() { return new E_UnaryMinus(expr) ; } diff --git a/jena-arq/Grammar/main.jj b/jena-arq/Grammar/main.jj index d45b2f9ae4..87206a44d5 100644 --- a/jena-arq/Grammar/main.jj +++ b/jena-arq/Grammar/main.jj @@ -2063,7 +2063,7 @@ Expr MultiplicativeExpression() : { Expr expr1, expr2 ; } Expr UnaryExpression() : { Expr expr ; } { - <BANG> expr = PrimaryExpression() + <BANG> expr = UnaryExpression() { return new E_LogicalNot(expr) ; } | <PLUS> expr = PrimaryExpression() { return new E_UnaryPlus(expr) ; } | <MINUS> expr = PrimaryExpression() { return new E_UnaryMinus(expr) ; } diff --git a/jena-arq/Grammar/sparql_12.jj b/jena-arq/Grammar/sparql_12.jj index 339c458dfb..cdc0cb60e1 100644 --- a/jena-arq/Grammar/sparql_12.jj +++ b/jena-arq/Grammar/sparql_12.jj @@ -1319,7 +1319,7 @@ Expr MultiplicativeExpression() : { Expr expr1, expr2 ; } } Expr UnaryExpression() : { Expr expr ; } { - <BANG> expr = PrimaryExpression() + <BANG> expr = UnaryExpression() { return new E_LogicalNot(expr) ; } | <PLUS> expr = PrimaryExpression() { return new E_UnaryPlus(expr) ; } | <MINUS> expr = PrimaryExpression() { return new E_UnaryMinus(expr) ; } 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 68c4522afa..a1978f6bdf 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 @@ -5567,7 +5567,7 @@ expr1 = new E_OpNumericIntegerDivide(expr1, expr2) ; switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) { case BANG:{ jj_consume_token(BANG); - expr = PrimaryExpression(); + expr = UnaryExpression(); {if ("" != null) return new E_LogicalNot(expr) ;} break; } 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 2cfcc8281a..d23e2732d4 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 @@ -4413,7 +4413,7 @@ expr1 = new E_Divide(expr1, expr2) ; switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) { case BANG:{ jj_consume_token(BANG); - expr = PrimaryExpression(); + expr = UnaryExpression(); {if ("" != null) return new E_LogicalNot(expr) ;} break; }
