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 2013/08/16 20:24:40 UTC
svn commit: r1514832 - in /jena/trunk/jena-arq/src:
main/java/com/hp/hpl/jena/sparql/expr/ main/java/com/hp/hpl/jena/sparql/sse/
main/java/com/hp/hpl/jena/sparql/sse/builders/
test/java/com/hp/hpl/jena/sparql/syntax/
Author: andy
Date: Fri Aug 16 18:24:40 2013
New Revision: 1514832
URL: http://svn.apache.org/r1514832
Log:
JENA-512
Put algebra function names in Tags.
Add equivalent builders for expessions by function name.
Use constants in E_* classes.
Rename printName as functionName.
Some tests.
Modified:
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_Add.java
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_Conditional.java
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_Divide.java
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_Equals.java
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_GreaterThan.java
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_GreaterThanOrEqual.java
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_LessThan.java
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_LessThanOrEqual.java
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_LogicalAnd.java
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_LogicalNot.java
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_LogicalOr.java
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_Multiply.java
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_NotEquals.java
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_NotOneOf.java
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_OneOf.java
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_SameTerm.java
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_Subtract.java
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_UnaryMinus.java
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_UnaryPlus.java
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/ExprFunction.java
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/sse/Tags.java
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/sse/builders/BuilderExpr.java
jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/syntax/TestSSE_Builder.java
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_Add.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_Add.java?rev=1514832&r1=1514831&r2=1514832&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_Add.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_Add.java Fri Aug 16 18:24:40 2013
@@ -25,12 +25,12 @@ import com.hp.hpl.jena.sparql.sse.Tags;
public class E_Add extends ExprFunction2
{
- private static final String printName = "add" ;
+ private static final String functionName = Tags.tagAdd ;
private static final String symbol = Tags.symPlus ;
public E_Add(Expr left, Expr right)
{
- super(left, right, printName, symbol) ;
+ super(left, right, functionName, symbol) ;
}
@Override
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_Conditional.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_Conditional.java?rev=1514832&r1=1514831&r2=1514832&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_Conditional.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_Conditional.java Fri Aug 16 18:24:40 2013
@@ -27,7 +27,7 @@ import com.hp.hpl.jena.sparql.sse.Tags;
public class E_Conditional extends ExprFunction3
{
- private static final String printName = Tags.tagIf ;
+ private static final String functionName = Tags.tagIf ;
private final Expr condition ;
private final Expr thenExpr ;
@@ -36,7 +36,7 @@ public class E_Conditional extends ExprF
public E_Conditional(Expr condition, Expr thenExpr, Expr elseExpr)
{
// Don't let the parent eval the theEpxr or ifExpr.
- super(condition, thenExpr, elseExpr, printName) ;
+ super(condition, thenExpr, elseExpr, functionName) ;
// Better names,
this.condition = condition ;
this.thenExpr = thenExpr ;
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_Divide.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_Divide.java?rev=1514832&r1=1514831&r2=1514832&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_Divide.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_Divide.java Fri Aug 16 18:24:40 2013
@@ -25,12 +25,12 @@ import com.hp.hpl.jena.sparql.sse.Tags;
public class E_Divide extends ExprFunction2
{
- private static final String printName = "div" ;
+ private static final String functionName = Tags.tagDivide ;
private static final String symbol = Tags.symDiv ;
public E_Divide(Expr left, Expr right)
{
- super(left, right, printName, symbol) ;
+ super(left, right, functionName, symbol) ;
}
@Override
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_Equals.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_Equals.java?rev=1514832&r1=1514831&r2=1514832&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_Equals.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_Equals.java Fri Aug 16 18:24:40 2013
@@ -22,12 +22,12 @@ import com.hp.hpl.jena.sparql.sse.Tags;
public class E_Equals extends ExprFunction2
{
- private static final String printName = "eq" ;
+ private static final String functionName = Tags.tagEQ ;
private static final String symbol = Tags.symEQ ;
public E_Equals(Expr left, Expr right)
{
- super(left, right, printName, symbol) ;
+ super(left, right, functionName, symbol) ;
}
@Override
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_GreaterThan.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_GreaterThan.java?rev=1514832&r1=1514831&r2=1514832&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_GreaterThan.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_GreaterThan.java Fri Aug 16 18:24:40 2013
@@ -22,12 +22,12 @@ import com.hp.hpl.jena.sparql.sse.Tags;
public class E_GreaterThan extends ExprFunction2
{
- private static final String printName = "gt" ;
+ private static final String functionName = Tags.tagGT ;
private static final String symbol = Tags.symGT ;
public E_GreaterThan(Expr left, Expr right)
{
- super(left, right, printName, symbol) ;
+ super(left, right, functionName, symbol) ;
}
@Override
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_GreaterThanOrEqual.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_GreaterThanOrEqual.java?rev=1514832&r1=1514831&r2=1514832&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_GreaterThanOrEqual.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_GreaterThanOrEqual.java Fri Aug 16 18:24:40 2013
@@ -22,12 +22,12 @@ import com.hp.hpl.jena.sparql.sse.Tags;
public class E_GreaterThanOrEqual extends ExprFunction2
{
- private static final String printName = "ge" ;
+ private static final String functionName = Tags.tagGE ;
private static final String symbol = Tags.symGE ;
public E_GreaterThanOrEqual(Expr left, Expr right)
{
- super(left, right, printName, symbol) ;
+ super(left, right, functionName, symbol) ;
}
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_LessThan.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_LessThan.java?rev=1514832&r1=1514831&r2=1514832&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_LessThan.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_LessThan.java Fri Aug 16 18:24:40 2013
@@ -22,12 +22,12 @@ import com.hp.hpl.jena.sparql.sse.Tags;
public class E_LessThan extends ExprFunction2
{
- private static final String printName = "lt" ;
+ private static final String functionName = Tags.tagLT ;
private static final String symbol = Tags.symLT ;
public E_LessThan(Expr left, Expr right)
{
- super(left, right, printName, symbol) ;
+ super(left, right, functionName, symbol) ;
}
@Override
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_LessThanOrEqual.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_LessThanOrEqual.java?rev=1514832&r1=1514831&r2=1514832&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_LessThanOrEqual.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_LessThanOrEqual.java Fri Aug 16 18:24:40 2013
@@ -22,12 +22,12 @@ import com.hp.hpl.jena.sparql.sse.Tags;
public class E_LessThanOrEqual extends ExprFunction2
{
- private static final String printName = "le" ;
+ private static final String functionName = Tags.tagLE ;
private static final String symbol = Tags.symLE ;
public E_LessThanOrEqual(Expr left, Expr right)
{
- super(left, right, printName, symbol) ;
+ super(left, right, functionName, symbol) ;
}
@Override
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_LogicalAnd.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_LogicalAnd.java?rev=1514832&r1=1514831&r2=1514832&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_LogicalAnd.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_LogicalAnd.java Fri Aug 16 18:24:40 2013
@@ -26,12 +26,12 @@ import com.hp.hpl.jena.sparql.sse.Tags;
public class E_LogicalAnd extends ExprFunction2
{
// See logical OR
- private static final String printName = Tags.tagAnd ;
+ private static final String functionName = Tags.tagAnd ;
private static final String symbol = Tags.symAnd ;
public E_LogicalAnd(Expr left, Expr right)
{
- super(left, right, printName, symbol) ;
+ super(left, right, functionName, symbol) ;
}
// Special : does not evaluate RHS if LHS means it is unnecessary.
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_LogicalNot.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_LogicalNot.java?rev=1514832&r1=1514831&r2=1514832&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_LogicalNot.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_LogicalNot.java Fri Aug 16 18:24:40 2013
@@ -26,12 +26,12 @@ public class E_LogicalNot extends ExprFu
// See logicalOR for truth table.
// Errors propage as normal.
- private static final String printName = Tags.tagNot ;
+ private static final String functionName = Tags.tagNot ;
private static final String symbol = Tags.symNot ;
public E_LogicalNot(Expr expr)
{
- super(expr, printName, symbol) ;
+ super(expr, functionName, symbol) ;
}
@Override
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_LogicalOr.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_LogicalOr.java?rev=1514832&r1=1514831&r2=1514832&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_LogicalOr.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_LogicalOr.java Fri Aug 16 18:24:40 2013
@@ -42,12 +42,12 @@ import com.hp.hpl.jena.sparql.sse.Tags;
public class E_LogicalOr extends ExprFunction2
{
- private static final String printName = Tags.tagOr ;
+ private static final String functionName = Tags.tagOr ;
private static final String symbol = Tags.symOr ;
public E_LogicalOr(Expr left, Expr right)
{
- super(left, right, printName, symbol) ;
+ super(left, right, functionName, symbol) ;
}
@Override
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_Multiply.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_Multiply.java?rev=1514832&r1=1514831&r2=1514832&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_Multiply.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_Multiply.java Fri Aug 16 18:24:40 2013
@@ -25,12 +25,12 @@ import com.hp.hpl.jena.sparql.sse.Tags;
public class E_Multiply extends ExprFunction2
{
- private static final String printName = "mul" ;
+ private static final String functionName = Tags.tagMultiply ;
private static final String symbol = Tags.symMult ;
public E_Multiply(Expr left, Expr right)
{
- super(left, right, printName, symbol) ;
+ super(left, right, functionName, symbol) ;
}
@Override
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_NotEquals.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_NotEquals.java?rev=1514832&r1=1514831&r2=1514832&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_NotEquals.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_NotEquals.java Fri Aug 16 18:24:40 2013
@@ -22,12 +22,12 @@ import com.hp.hpl.jena.sparql.sse.Tags;
public class E_NotEquals extends ExprFunction2
{
- private static final String printName = "ne" ;
+ private static final String functionName = Tags.tagNE ;
private static final String symbol = Tags.symNE ;
public E_NotEquals(Expr left, Expr right)
{
- super(left, right, printName, symbol) ;
+ super(left, right, functionName, symbol) ;
}
@Override
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_NotOneOf.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_NotOneOf.java?rev=1514832&r1=1514831&r2=1514832&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_NotOneOf.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_NotOneOf.java Fri Aug 16 18:24:40 2013
@@ -27,16 +27,16 @@ import com.hp.hpl.jena.sparql.sse.Tags;
public class E_NotOneOf extends E_OneOfBase
{
- private static final String printName = Tags.tagNotIn ;
+ private static final String functionName = Tags.tagNotIn ;
public E_NotOneOf(Expr expr, ExprList args)
{
- super(printName, expr, args) ;
+ super(functionName, expr, args) ;
}
protected E_NotOneOf(ExprList args)
{
- super(printName, args) ;
+ super(functionName, args) ;
}
@Override
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_OneOf.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_OneOf.java?rev=1514832&r1=1514831&r2=1514832&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_OneOf.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_OneOf.java Fri Aug 16 18:24:40 2013
@@ -28,16 +28,16 @@ import com.hp.hpl.jena.sparql.sse.Tags;
public class E_OneOf extends E_OneOfBase
{
- private static final String printName = Tags.tagIn ;
+ private static final String functionName = Tags.tagIn ;
public E_OneOf(Expr expr, ExprList args)
{
- super(printName, expr, args) ;
+ super(functionName, expr, args) ;
}
protected E_OneOf(ExprList args)
{
- super(printName, args) ;
+ super(functionName, args) ;
}
@Override
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_SameTerm.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_SameTerm.java?rev=1514832&r1=1514831&r2=1514832&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_SameTerm.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_SameTerm.java Fri Aug 16 18:24:40 2013
@@ -23,11 +23,11 @@ import com.hp.hpl.jena.sparql.sse.Tags;
public class E_SameTerm extends ExprFunction2
{
- private static final String printName = Tags.tagSameTerm ;
+ private static final String functionName = Tags.tagSameTerm ;
public E_SameTerm(Expr left, Expr right)
{
- super(left, right, printName) ;
+ super(left, right, functionName) ;
}
@Override
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_Subtract.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_Subtract.java?rev=1514832&r1=1514831&r2=1514832&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_Subtract.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_Subtract.java Fri Aug 16 18:24:40 2013
@@ -25,12 +25,12 @@ import com.hp.hpl.jena.sparql.sse.Tags;
public class E_Subtract extends ExprFunction2
{
- private static final String printName = "sub" ;
+ private static final String functionName = Tags.tagSubtract ;
private static final String symbol = Tags.symMinus ;
public E_Subtract(Expr left, Expr right)
{
- super(left, right, printName, symbol) ;
+ super(left, right, functionName, symbol) ;
}
@Override
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_UnaryMinus.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_UnaryMinus.java?rev=1514832&r1=1514831&r2=1514832&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_UnaryMinus.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_UnaryMinus.java Fri Aug 16 18:24:40 2013
@@ -23,12 +23,12 @@ import com.hp.hpl.jena.sparql.sse.Tags;
public class E_UnaryMinus extends ExprFunction1
{
- private static final String printName = "unaryMinus" ;
+ private static final String functionName = Tags.tagUnaryMinus ;
private static final String symbol = Tags.symMinus ;
public E_UnaryMinus(Expr expr)
{
- super(expr, printName, symbol) ;
+ super(expr, functionName, symbol) ;
}
@Override
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_UnaryPlus.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_UnaryPlus.java?rev=1514832&r1=1514831&r2=1514832&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_UnaryPlus.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_UnaryPlus.java Fri Aug 16 18:24:40 2013
@@ -23,12 +23,12 @@ import com.hp.hpl.jena.sparql.sse.Tags;
public class E_UnaryPlus extends ExprFunction1
{
- private static final String printName = "unaryPlus" ;
+ private static final String functionName = Tags.tagUnaryPlus ;
private static final String symbol = Tags.symPlus ;
public E_UnaryPlus(Expr expr)
{
- super(expr, printName, symbol) ;
+ super(expr, functionName, symbol) ;
}
@Override
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/ExprFunction.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/ExprFunction.java?rev=1514832&r1=1514831&r2=1514832&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/ExprFunction.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/ExprFunction.java Fri Aug 16 18:24:40 2013
@@ -118,13 +118,14 @@ public abstract class ExprFunction exten
public String getFunctionName(SerializationContext cxt)
{ return funcSymbol.getSymbol() ; }
+ /** Used to get a unique name for the function, which is intern'ed. Used in hashCode() */
public FunctionLabel getFunctionSymbol()
{ return funcSymbol ; }
/** URI for this function, whether custom or specification defined URI (these are keywords in the language) */
public String getFunctionIRI() { return null ; }
- /** Get the symbol name (+, ! etc) for this function -- Maybe null for none */
+ /** Get the symbol name (+, ! etc) for this function -- maybe null for none */
public String getOpName()
{ return opSign ; }
}
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/sse/Tags.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/sse/Tags.java?rev=1514832&r1=1514831&r2=1514832&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/sse/Tags.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/sse/Tags.java Fri Aug 16 18:24:40 2013
@@ -119,21 +119,34 @@ public class Tags
public static final String tagExprList = "exprlist" ;
public static final String symEQ = "=" ;
+ public static final String tagEQ = "eq" ;
public static final String symNE = "!=" ;
+ public static final String tagNE = "ne" ;
public static final String symGT = ">" ;
+ public static final String tagGT = "gt" ;
public static final String symLT = "<" ;
+ public static final String tagLT = "lt" ;
public static final String symLE = "<=" ;
+ public static final String tagLE = "le" ;
public static final String symGE = ">=" ;
+ public static final String tagGE = "ge" ;
public static final String symOr = "||" ;
public static final String tagOr = "or" ;
public static final String symAnd = "&&" ;
public static final String tagAnd = "and" ;
+
public static final String symPlus = "+" ;
+ public static final String tagAdd = "add" ;
+ public static final String tagUnaryPlus = "unaryplus" ;
public static final String symMinus = "-" ;
+ public static final String tagSubtract = "subtract" ;
+ public static final String tagUnaryMinus = "unaryminus" ;
public static final String symMult = "*" ;
+ public static final String tagMultiply = "multiply" ;
public static final String symDiv = "/" ;
- public static final String symNot = "!" ;
+ public static final String tagDivide = "divide" ;
+ public static final String symNot = "!" ;
public static final String tagNot = "not" ;
public static final String tagStr = "str" ;
public static final String tagStrLang = "strlang" ;
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/sse/builders/BuilderExpr.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/sse/builders/BuilderExpr.java?rev=1514832&r1=1514831&r2=1514832&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/sse/builders/BuilderExpr.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/sse/builders/BuilderExpr.java Fri Aug 16 18:24:40 2013
@@ -215,19 +215,36 @@ public class BuilderExpr
{
dispatch.put(Tags.tagRegex, buildRegex) ;
dispatch.put(Tags.symEQ, buildEQ) ;
+ dispatch.put(Tags.tagEQ, buildEQ) ;
dispatch.put(Tags.symNE, buildNE) ;
+ dispatch.put(Tags.tagNE, buildNE) ;
dispatch.put(Tags.symGT, buildGT) ;
+ dispatch.put(Tags.tagGT, buildGT) ;
dispatch.put(Tags.symLT, buildLT) ;
+ dispatch.put(Tags.tagLT, buildLT) ;
dispatch.put(Tags.symLE, buildLE) ;
+ dispatch.put(Tags.tagLE, buildLE) ;
dispatch.put(Tags.symGE, buildGE) ;
+ dispatch.put(Tags.tagGE, buildGE) ;
dispatch.put(Tags.symOr, buildOr) ; // Same builders for (or ..) and (|| ..)
dispatch.put(Tags.tagOr, buildOr) ;
dispatch.put(Tags.symAnd, buildAnd) ; // Same builders for (and ..) and (&& ..)
dispatch.put(Tags.tagAnd, buildAnd) ;
dispatch.put(Tags.symPlus, buildPlus) ;
+ dispatch.put(Tags.tagAdd, buildPlus) ;
dispatch.put(Tags.symMinus, buildMinus) ;
+ dispatch.put(Tags.tagSubtract, buildMinus) ; // Not to be confused with Op for SPARQL MINUS
+ dispatch.put(Tags.tagMinus, buildMinus) ;
+
+ dispatch.put(Tags.tagUnaryPlus, buildUnaryPlus) ;
+ dispatch.put(Tags.tagUnaryMinus, buildUnaryMinus) ;
+
dispatch.put(Tags.symMult, buildMult) ;
+ dispatch.put(Tags.tagMultiply, buildMult) ;
+
dispatch.put(Tags.symDiv, buildDiv) ;
+ dispatch.put(Tags.tagDivide, buildDiv) ;
+
dispatch.put(Tags.tagNot, buildNot) ; // Same builders for (not ..) and (! ..)
dispatch.put(Tags.symNot, buildNot) ;
dispatch.put(Tags.tagStr, buildStr) ;
@@ -391,6 +408,17 @@ public class BuilderExpr
return new E_Add(left, right) ;
}
};
+
+ final protected Build buildUnaryPlus = new Build()
+ {
+ @Override
+ public Expr make(ItemList list)
+ {
+ BuilderLib.checkLength(2, list, "unaryplus: wanted 1 argument") ;
+ Expr ex = buildExpr(list.get(1)) ;
+ return new E_UnaryPlus(ex) ;
+ }
+ };
final protected Build buildMinus = new Build()
{
@@ -410,6 +438,17 @@ public class BuilderExpr
}
};
+ final protected Build buildUnaryMinus = new Build()
+ {
+ @Override
+ public Expr make(ItemList list)
+ {
+ BuilderLib.checkLength(2, list, "unaryminus: wanted 1 argument") ;
+ Expr ex = buildExpr(list.get(1)) ;
+ return new E_UnaryMinus(ex) ;
+ }
+ };
+
private static int numArgs(ItemList list) { return list.size()-1 ; }
final protected Build buildEQ = new Build()
Modified: jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/syntax/TestSSE_Builder.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/syntax/TestSSE_Builder.java?rev=1514832&r1=1514831&r2=1514832&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/syntax/TestSSE_Builder.java (original)
+++ jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/syntax/TestSSE_Builder.java Fri Aug 16 18:24:40 2013
@@ -51,69 +51,145 @@ public class TestSSE_Builder extends Tes
@Test public void testOp_04() { opSame("(label 'ABC' (table unit))", OpLabel.create("ABC", OpTable.unit())) ; }
- private static void opSame(String str)
- {
+ private static void opSame(String str) {
opSame(str, SSE.parseOp(str)) ;
}
-
- private static void opSame(String str , Op other)
- {
+
+ private static void opSame(String str, Op other) {
Op op = SSE.parseOp(str) ;
assertEquals(op, other) ;
}
-
- @Test public void testBuildInt_01()
- {
+
+ @Test
+ public void testBuildInt_01() {
Item item = SSE.parseItem("1") ;
int i = BuilderNode.buildInt(item) ;
assertEquals(1, i) ;
}
- @Test public void testBuildInt_02()
- {
+ @Test
+ public void testBuildInt_02() {
Item item = SSE.parseItem("1") ;
int i = BuilderNode.buildInt(item, 23) ;
assertEquals(1, i) ;
}
- @Test public void testBuildInt_03()
- {
+ @Test
+ public void testBuildInt_03() {
Item item = SSE.parseItem("_") ;
int i = BuilderNode.buildInt(item, 23) ;
assertEquals(23, i) ;
}
-
- @Test public void testBuildLong_01()
- {
+
+ @Test
+ public void testBuildLong_01() {
Item item = SSE.parseItem("100000000000") ;
long i = BuilderNode.buildLong(item) ;
assertEquals(100000000000L, i) ;
}
- @Test public void testBuildLong_02()
- {
+ @Test
+ public void testBuildLong_02() {
Item item = SSE.parseItem("100000000000") ;
long i = BuilderNode.buildLong(item, 23) ;
assertEquals(100000000000L, i) ;
}
- @Test public void testBuildLong_03()
- {
+ @Test
+ public void testBuildLong_03() {
Item item = SSE.parseItem("_") ;
long i = BuilderNode.buildLong(item, 23) ;
assertEquals(23, i) ;
}
+
+ @Test
+ public void testBuildExpr_01() {
+ Expr e = SSE.parseExpr("(sameTerm (?x) (?y))") ;
+ assertTrue(e instanceof E_SameTerm) ;
+ }
+
+ @Test
+ public void testBuildExpr_02() {
+ Expr e = SSE.parseExpr("(isNumeric ?x)") ;
+ assertTrue(e instanceof E_IsNumeric) ;
+ }
+
+ private static void testExprForms(String str1, String str2) {
+ Expr e1 = SSE.parseExpr(str1) ;
+ Expr e2 = SSE.parseExpr(str2) ;
+ assertEquals(str1+" "+str2, e1, e2) ;
+ }
+
+ @Test
+ public void testBuildExpr_03() {
+ testExprForms("(add ?x ?y)",
+ "(+ ?x ?y)") ;
+ }
+
+ @Test
+ public void testBuildExpr_04() {
+ testExprForms("(subtract ?x ?y)",
+ "(- ?x ?y)") ;
+ }
- @Test public void testBuildExpr_01()
- {
- Expr e = SSE.parseExpr("(sameTerm (?x) (?y))");
- assertTrue(e instanceof E_SameTerm);
+ @Test
+ public void testBuildExpr_05() {
+ testExprForms("(multiply ?x ?y)",
+ "(* ?x ?y)") ;
}
- @Test public void testBuildExpr_02()
- {
- Expr e = SSE.parseExpr("(isNumeric ?x)");
- assertTrue(e instanceof E_IsNumeric);
+ @Test
+ public void testBuildExpr_06() {
+ testExprForms("(divide ?x ?y)",
+ "(/ ?x ?y)") ;
+ }
+
+ @Test
+ public void testBuildExpr_07() {
+ testExprForms("(lt ?x ?y)",
+ "(< ?x ?y)") ;
+ }
+
+ @Test
+ public void testBuildExpr_08() {
+ testExprForms("(le ?x ?y)",
+ "(<= ?x ?y)") ;
+ }
+
+ @Test
+ public void testBuildExpr_09() {
+ testExprForms("(gt ?x ?y)",
+ "(> ?x ?y)") ;
+ }
+
+ @Test
+ public void testBuildExpr_10() {
+ testExprForms("(ge ?x ?y)",
+ "(>= ?x ?y)") ;
+ }
+
+ @Test
+ public void testBuildExpr_11() {
+ testExprForms("(unaryplus ?x)",
+ "(+ ?x)") ;
+ }
+
+ @Test
+ public void testBuildExpr_12() {
+ testExprForms("(unaryminus ?x)",
+ "(- ?x)") ;
+ }
+
+ @Test
+ public void testBuildExpr_13() {
+ testExprForms("(eq ?x ?y)",
+ "(= ?x ?y)") ;
+ }
+
+ @Test
+ public void testBuildExpr_14() {
+ testExprForms("(ne ?x ?y)",
+ "(!= ?x ?y)") ;
}
}