You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by rv...@apache.org on 2013/08/15 01:44:58 UTC
svn commit: r1514099 -
/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/
Author: rvesse
Date: Wed Aug 14 23:44:57 2013
New Revision: 1514099
URL: http://svn.apache.org/r1514099
Log:
Ensure SPARQL built-in expressions use symbol constants from Tags wherever possible instead of hard coding values in each file (JENA-512)
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_BNode.java
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_Bound.java
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_Call.java
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_Coalesce.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_Datatype.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_Exists.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_IRI.java
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_IsBlank.java
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_IsIRI.java
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_IsLiteral.java
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_IsNumeric.java
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_IsURI.java
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_Lang.java
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_LangMatches.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_NotExists.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_Random.java
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_Regex.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_Str.java
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_StrConcat.java
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_StrDatatype.java
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_StrLang.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_URI.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
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=1514099&r1=1514098&r2=1514099&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 Wed Aug 14 23:44:57 2013
@@ -21,11 +21,12 @@ package com.hp.hpl.jena.sparql.expr;
import com.hp.hpl.jena.query.ARQ ;
import com.hp.hpl.jena.sparql.expr.nodevalue.NodeValueOps ;
import com.hp.hpl.jena.sparql.expr.nodevalue.XSDFuncOp ;
+import com.hp.hpl.jena.sparql.sse.Tags;
public class E_Add extends ExprFunction2
{
private static final String printName = "add" ;
- private static final String symbol = "+" ;
+ private static final String symbol = Tags.symPlus ;
public E_Add(Expr left, Expr right)
{
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_BNode.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_BNode.java?rev=1514099&r1=1514098&r2=1514099&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_BNode.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_BNode.java Wed Aug 14 23:44:57 2013
@@ -26,12 +26,13 @@ import com.hp.hpl.jena.graph.NodeFactory
import com.hp.hpl.jena.sparql.ARQInternalErrorException ;
import com.hp.hpl.jena.sparql.engine.binding.Binding ;
import com.hp.hpl.jena.sparql.function.FunctionEnv ;
+import com.hp.hpl.jena.sparql.sse.Tags;
import com.hp.hpl.jena.sparql.util.LabelToNodeMap ;
import com.hp.hpl.jena.sparql.util.Symbol ;
public class E_BNode extends ExprFunctionN // 0 or one
{
- private static final String symbol = "bnode" ;
+ private static final String symbol = Tags.tagBNode ;
private static final Symbol keyMap = Symbol.create("arq:internal:bNodeMappings") ;
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_Bound.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_Bound.java?rev=1514099&r1=1514098&r2=1514099&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_Bound.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_Bound.java Wed Aug 14 23:44:57 2013
@@ -20,10 +20,11 @@ package com.hp.hpl.jena.sparql.expr;
import com.hp.hpl.jena.sparql.engine.binding.Binding ;
import com.hp.hpl.jena.sparql.function.FunctionEnv ;
+import com.hp.hpl.jena.sparql.sse.Tags;
public class E_Bound extends ExprFunction1
{
- private static final String symbol = "bound" ;
+ private static final String symbol = Tags.tagBound ;
boolean isBound = false ;
public E_Bound(Expr expr)
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_Call.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_Call.java?rev=1514099&r1=1514098&r2=1514099&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_Call.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_Call.java Wed Aug 14 23:44:57 2013
@@ -25,6 +25,7 @@ import java.util.Map ;
import com.hp.hpl.jena.sparql.ARQInternalErrorException ;
import com.hp.hpl.jena.sparql.engine.binding.Binding ;
import com.hp.hpl.jena.sparql.function.FunctionEnv ;
+import com.hp.hpl.jena.sparql.sse.Tags;
import com.hp.hpl.jena.sparql.util.Context ;
/**
@@ -32,7 +33,7 @@ import com.hp.hpl.jena.sparql.util.Conte
*/
public class E_Call extends ExprFunctionN
{
- private static final String symbol = "call" ;
+ private static final String symbol = Tags.tagCall ;
private Map<String,Expr> functionCache = new HashMap<String, Expr>();
private Expr identExpr;
private List<Expr> argExprs;
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_Coalesce.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_Coalesce.java?rev=1514099&r1=1514098&r2=1514099&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_Coalesce.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_Coalesce.java Wed Aug 14 23:44:57 2013
@@ -23,12 +23,13 @@ import java.util.List ;
import com.hp.hpl.jena.sparql.ARQInternalErrorException ;
import com.hp.hpl.jena.sparql.engine.binding.Binding ;
import com.hp.hpl.jena.sparql.function.FunctionEnv ;
+import com.hp.hpl.jena.sparql.sse.Tags;
/** SPARQL coalesce special form. */
public class E_Coalesce extends ExprFunctionN
{
- private static final String name = "coalesce" ;
+ private static final String name = Tags.tagCoalesce ;
public E_Coalesce(ExprList args)
{
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=1514099&r1=1514098&r2=1514099&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 Wed Aug 14 23:44:57 2013
@@ -21,12 +21,13 @@ package com.hp.hpl.jena.sparql.expr;
import com.hp.hpl.jena.sparql.ARQInternalErrorException ;
import com.hp.hpl.jena.sparql.engine.binding.Binding ;
import com.hp.hpl.jena.sparql.function.FunctionEnv ;
+import com.hp.hpl.jena.sparql.sse.Tags;
/** IF(expr, expr, expr) */
public class E_Conditional extends ExprFunction3
{
- private static final String printName = "if" ;
+ private static final String printName = Tags.tagIf ;
private final Expr condition ;
private final Expr thenExpr ;
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_Datatype.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_Datatype.java?rev=1514099&r1=1514098&r2=1514099&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_Datatype.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_Datatype.java Wed Aug 14 23:44:57 2013
@@ -19,10 +19,11 @@
package com.hp.hpl.jena.sparql.expr;
import com.hp.hpl.jena.sparql.expr.nodevalue.NodeFunctions ;
+import com.hp.hpl.jena.sparql.sse.Tags;
public class E_Datatype extends ExprFunction1
{
- private static final String symbol = "datatype" ;
+ private static final String symbol = Tags.tagDatatype ;
public E_Datatype(Expr expr)
{
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=1514099&r1=1514098&r2=1514099&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 Wed Aug 14 23:44:57 2013
@@ -21,11 +21,12 @@ package com.hp.hpl.jena.sparql.expr;
import com.hp.hpl.jena.query.ARQ ;
import com.hp.hpl.jena.sparql.expr.nodevalue.NodeValueOps ;
import com.hp.hpl.jena.sparql.expr.nodevalue.XSDFuncOp ;
+import com.hp.hpl.jena.sparql.sse.Tags;
public class E_Divide extends ExprFunction2
{
private static final String printName = "div" ;
- private static final String symbol = "/" ;
+ private static final String symbol = Tags.symDiv ;
public E_Divide(Expr left, Expr right)
{
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=1514099&r1=1514098&r2=1514099&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 Wed Aug 14 23:44:57 2013
@@ -18,10 +18,12 @@
package com.hp.hpl.jena.sparql.expr;
+import com.hp.hpl.jena.sparql.sse.Tags;
+
public class E_Equals extends ExprFunction2
{
private static final String printName = "eq" ;
- private static final String symbol = "=" ;
+ private static final String symbol = Tags.symEQ ;
public E_Equals(Expr left, Expr right)
{
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_Exists.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_Exists.java?rev=1514099&r1=1514098&r2=1514099&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_Exists.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_Exists.java Wed Aug 14 23:44:57 2013
@@ -26,11 +26,12 @@ import com.hp.hpl.jena.sparql.engine.bin
import com.hp.hpl.jena.sparql.function.FunctionEnv ;
import com.hp.hpl.jena.sparql.graph.NodeTransform ;
import com.hp.hpl.jena.sparql.graph.NodeTransformLib ;
+import com.hp.hpl.jena.sparql.sse.Tags;
import com.hp.hpl.jena.sparql.syntax.Element ;
public class E_Exists extends ExprFunctionOp
{
- private static final String symbol = "exists" ;
+ private static final String symbol = Tags.tagExists ;
public E_Exists(Op op)
{
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=1514099&r1=1514098&r2=1514099&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 Wed Aug 14 23:44:57 2013
@@ -18,10 +18,12 @@
package com.hp.hpl.jena.sparql.expr;
+import com.hp.hpl.jena.sparql.sse.Tags;
+
public class E_GreaterThan extends ExprFunction2
{
private static final String printName = "gt" ;
- private static final String symbol = ">" ;
+ private static final String symbol = Tags.symGT ;
public E_GreaterThan(Expr left, Expr right)
{
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=1514099&r1=1514098&r2=1514099&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 Wed Aug 14 23:44:57 2013
@@ -18,10 +18,12 @@
package com.hp.hpl.jena.sparql.expr;
+import com.hp.hpl.jena.sparql.sse.Tags;
+
public class E_GreaterThanOrEqual extends ExprFunction2
{
private static final String printName = "ge" ;
- private static final String symbol = ">=" ;
+ private static final String symbol = Tags.symGE ;
public E_GreaterThanOrEqual(Expr left, Expr right)
{
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_IRI.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_IRI.java?rev=1514099&r1=1514098&r2=1514099&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_IRI.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_IRI.java Wed Aug 14 23:44:57 2013
@@ -23,10 +23,11 @@ import com.hp.hpl.jena.sparql.ARQConstan
import com.hp.hpl.jena.sparql.ARQInternalErrorException ;
import com.hp.hpl.jena.sparql.expr.nodevalue.NodeFunctions ;
import com.hp.hpl.jena.sparql.function.FunctionEnv ;
+import com.hp.hpl.jena.sparql.sse.Tags;
public class E_IRI extends ExprFunction1
{
- private static final String symbol = "iri" ;
+ private static final String symbol = Tags.tagIri ;
public E_IRI(Expr expr)
{
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_IsBlank.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_IsBlank.java?rev=1514099&r1=1514098&r2=1514099&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_IsBlank.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_IsBlank.java Wed Aug 14 23:44:57 2013
@@ -19,10 +19,11 @@
package com.hp.hpl.jena.sparql.expr;
import com.hp.hpl.jena.sparql.expr.nodevalue.NodeFunctions ;
+import com.hp.hpl.jena.sparql.sse.Tags;
public class E_IsBlank extends ExprFunction1
{
- private static final String symbol = "isBlank" ;
+ private static final String symbol = Tags.tagIsBlank ;
public E_IsBlank(Expr expr)
{
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_IsIRI.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_IsIRI.java?rev=1514099&r1=1514098&r2=1514099&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_IsIRI.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_IsIRI.java Wed Aug 14 23:44:57 2013
@@ -19,10 +19,11 @@
package com.hp.hpl.jena.sparql.expr;
import com.hp.hpl.jena.sparql.expr.nodevalue.NodeFunctions ;
+import com.hp.hpl.jena.sparql.sse.Tags;
public class E_IsIRI extends ExprFunction1
{
- private static final String symbol = "isIRI" ;
+ private static final String symbol = Tags.tagIsIRI ;
public E_IsIRI(Expr expr)
{
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_IsLiteral.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_IsLiteral.java?rev=1514099&r1=1514098&r2=1514099&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_IsLiteral.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_IsLiteral.java Wed Aug 14 23:44:57 2013
@@ -18,10 +18,12 @@
package com.hp.hpl.jena.sparql.expr;
+import com.hp.hpl.jena.sparql.sse.Tags;
+
public class E_IsLiteral extends ExprFunction1
{
- private static final String symbol = "isLiteral" ;
+ private static final String symbol = Tags.tagIsLiteral ;
public E_IsLiteral(Expr expr)
{
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_IsNumeric.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_IsNumeric.java?rev=1514099&r1=1514098&r2=1514099&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_IsNumeric.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_IsNumeric.java Wed Aug 14 23:44:57 2013
@@ -18,10 +18,12 @@
package com.hp.hpl.jena.sparql.expr;
+import com.hp.hpl.jena.sparql.sse.Tags;
+
public class E_IsNumeric extends ExprFunction1
{
- private static final String symbol = "isNumeric" ;
+ private static final String symbol = Tags.tagIsNumeric ;
public E_IsNumeric(Expr expr)
{
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_IsURI.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_IsURI.java?rev=1514099&r1=1514098&r2=1514099&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_IsURI.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_IsURI.java Wed Aug 14 23:44:57 2013
@@ -19,12 +19,13 @@
package com.hp.hpl.jena.sparql.expr;
import com.hp.hpl.jena.sparql.expr.nodevalue.NodeFunctions ;
+import com.hp.hpl.jena.sparql.sse.Tags;
public class E_IsURI extends E_IsIRI
{
// "isURI" is another name for "isIRI" -- we try to keep the parse name.
- private static final String symbol = "isURI" ;
+ private static final String symbol = Tags.tagIsURI ;
public E_IsURI(Expr expr)
{
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_Lang.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_Lang.java?rev=1514099&r1=1514098&r2=1514099&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_Lang.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_Lang.java Wed Aug 14 23:44:57 2013
@@ -19,10 +19,11 @@
package com.hp.hpl.jena.sparql.expr;
import com.hp.hpl.jena.sparql.expr.nodevalue.NodeFunctions ;
+import com.hp.hpl.jena.sparql.sse.Tags;
public class E_Lang extends ExprFunction1
{
- private static final String symbol = "lang" ;
+ private static final String symbol = Tags.tagLang ;
public E_Lang(Expr expr)
{
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_LangMatches.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_LangMatches.java?rev=1514099&r1=1514098&r2=1514099&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_LangMatches.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_LangMatches.java Wed Aug 14 23:44:57 2013
@@ -19,10 +19,11 @@
package com.hp.hpl.jena.sparql.expr;
import com.hp.hpl.jena.sparql.expr.nodevalue.NodeFunctions ;
+import com.hp.hpl.jena.sparql.sse.Tags;
public class E_LangMatches extends ExprFunction2
{
- private static final String symbol = "langMatches" ;
+ private static final String symbol = Tags.tagLangMatches ;
public E_LangMatches(Expr expr1, Expr expr2)
{
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=1514099&r1=1514098&r2=1514099&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 Wed Aug 14 23:44:57 2013
@@ -18,10 +18,12 @@
package com.hp.hpl.jena.sparql.expr;
+import com.hp.hpl.jena.sparql.sse.Tags;
+
public class E_LessThan extends ExprFunction2
{
private static final String printName = "lt" ;
- private static final String symbol = "<" ;
+ private static final String symbol = Tags.symLT ;
public E_LessThan(Expr left, Expr right)
{
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=1514099&r1=1514098&r2=1514099&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 Wed Aug 14 23:44:57 2013
@@ -18,10 +18,12 @@
package com.hp.hpl.jena.sparql.expr;
+import com.hp.hpl.jena.sparql.sse.Tags;
+
public class E_LessThanOrEqual extends ExprFunction2
{
private static final String printName = "le" ;
- private static final String symbol = "<=" ;
+ private static final String symbol = Tags.symLE ;
public E_LessThanOrEqual(Expr left, Expr right)
{
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=1514099&r1=1514098&r2=1514099&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 Wed Aug 14 23:44:57 2013
@@ -21,13 +21,14 @@ package com.hp.hpl.jena.sparql.expr;
import com.hp.hpl.jena.sparql.engine.binding.Binding ;
import com.hp.hpl.jena.sparql.expr.nodevalue.XSDFuncOp ;
import com.hp.hpl.jena.sparql.function.FunctionEnv ;
+import com.hp.hpl.jena.sparql.sse.Tags;
public class E_LogicalAnd extends ExprFunction2
{
// See logical OR
- private static final String printName = "and" ;
- private static final String symbol = "&&" ;
-
+ private static final String printName = Tags.tagAnd ;
+ private static final String symbol = Tags.symAnd ;
+
public E_LogicalAnd(Expr left, Expr right)
{
super(left, right, printName, symbol) ;
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=1514099&r1=1514098&r2=1514099&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 Wed Aug 14 23:44:57 2013
@@ -19,14 +19,15 @@
package com.hp.hpl.jena.sparql.expr;
import com.hp.hpl.jena.sparql.expr.nodevalue.XSDFuncOp ;
+import com.hp.hpl.jena.sparql.sse.Tags;
public class E_LogicalNot extends ExprFunction1
{
// See logicalOR for truth table.
// Errors propage as normal.
- private static final String printName = "not" ;
- private static final String symbol = "!" ;
+ private static final String printName = Tags.tagNot ;
+ private static final String symbol = Tags.symNot ;
public E_LogicalNot(Expr expr)
{
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=1514099&r1=1514098&r2=1514099&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 Wed Aug 14 23:44:57 2013
@@ -21,6 +21,7 @@ package com.hp.hpl.jena.sparql.expr;
import com.hp.hpl.jena.sparql.engine.binding.Binding ;
import com.hp.hpl.jena.sparql.expr.nodevalue.XSDFuncOp ;
import com.hp.hpl.jena.sparql.function.FunctionEnv ;
+import com.hp.hpl.jena.sparql.sse.Tags;
/*
Logical OR and AND is special with respect to handling errors truth table.
@@ -41,8 +42,8 @@ import com.hp.hpl.jena.sparql.function.F
public class E_LogicalOr extends ExprFunction2
{
- private static final String printName = "or" ;
- private static final String symbol = "||" ;
+ private static final String printName = Tags.tagOr ;
+ private static final String symbol = Tags.symOr ;
public E_LogicalOr(Expr left, Expr right)
{
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=1514099&r1=1514098&r2=1514099&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 Wed Aug 14 23:44:57 2013
@@ -21,11 +21,12 @@ package com.hp.hpl.jena.sparql.expr;
import com.hp.hpl.jena.query.ARQ ;
import com.hp.hpl.jena.sparql.expr.nodevalue.NodeValueOps ;
import com.hp.hpl.jena.sparql.expr.nodevalue.XSDFuncOp ;
+import com.hp.hpl.jena.sparql.sse.Tags;
public class E_Multiply extends ExprFunction2
{
private static final String printName = "mul" ;
- private static final String symbol = "*" ;
+ private static final String symbol = Tags.symMult ;
public E_Multiply(Expr left, Expr right)
{
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=1514099&r1=1514098&r2=1514099&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 Wed Aug 14 23:44:57 2013
@@ -18,10 +18,12 @@
package com.hp.hpl.jena.sparql.expr;
+import com.hp.hpl.jena.sparql.sse.Tags;
+
public class E_NotEquals extends ExprFunction2
{
private static final String printName = "ne" ;
- private static final String symbol = "!=" ;
+ private static final String symbol = Tags.symNE ;
public E_NotEquals(Expr left, Expr right)
{
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_NotExists.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_NotExists.java?rev=1514099&r1=1514098&r2=1514099&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_NotExists.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_NotExists.java Wed Aug 14 23:44:57 2013
@@ -26,12 +26,13 @@ import com.hp.hpl.jena.sparql.engine.bin
import com.hp.hpl.jena.sparql.function.FunctionEnv ;
import com.hp.hpl.jena.sparql.graph.NodeTransform ;
import com.hp.hpl.jena.sparql.graph.NodeTransformLib ;
+import com.hp.hpl.jena.sparql.sse.Tags;
import com.hp.hpl.jena.sparql.syntax.Element ;
public class E_NotExists extends ExprFunctionOp
{
// Translated to "(not (exists (...)))"
- private static final String symbol = "notexists" ;
+ private static final String symbol = Tags.tagNotExists ;
public E_NotExists(Op op)
{
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=1514099&r1=1514098&r2=1514099&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 Wed Aug 14 23:44:57 2013
@@ -23,10 +23,11 @@ import java.util.List ;
import com.hp.hpl.jena.sparql.ARQInternalErrorException ;
import com.hp.hpl.jena.sparql.engine.binding.Binding ;
import com.hp.hpl.jena.sparql.function.FunctionEnv ;
+import com.hp.hpl.jena.sparql.sse.Tags;
public class E_NotOneOf extends E_OneOfBase
{
- private static final String printName = "notin" ;
+ private static final String printName = Tags.tagNotIn ;
public E_NotOneOf(Expr expr, ExprList args)
{
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=1514099&r1=1514098&r2=1514099&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 Wed Aug 14 23:44:57 2013
@@ -23,11 +23,12 @@ import java.util.List ;
import com.hp.hpl.jena.sparql.ARQInternalErrorException ;
import com.hp.hpl.jena.sparql.engine.binding.Binding ;
import com.hp.hpl.jena.sparql.function.FunctionEnv ;
+import com.hp.hpl.jena.sparql.sse.Tags;
public class E_OneOf extends E_OneOfBase
{
- private static final String printName = "in" ;
+ private static final String printName = Tags.tagIn ;
public E_OneOf(Expr expr, ExprList args)
{
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_Random.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_Random.java?rev=1514099&r1=1514098&r2=1514099&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_Random.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_Random.java Wed Aug 14 23:44:57 2013
@@ -21,10 +21,11 @@ package com.hp.hpl.jena.sparql.expr;
import org.apache.jena.atlas.lib.RandomLib ;
import com.hp.hpl.jena.sparql.function.FunctionEnv ;
+import com.hp.hpl.jena.sparql.sse.Tags;
public class E_Random extends ExprFunction0
{
- private static final String symbol = "rand" ;
+ private static final String symbol = Tags.tagRand ;
public E_Random()
{
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_Regex.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_Regex.java?rev=1514099&r1=1514098&r2=1514099&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_Regex.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_Regex.java Wed Aug 14 23:44:57 2013
@@ -25,6 +25,7 @@ import org.apache.jena.atlas.logging.Log
import com.hp.hpl.jena.graph.Node ;
import com.hp.hpl.jena.query.ARQ ;
import com.hp.hpl.jena.sparql.expr.nodevalue.NodeFunctions ;
+import com.hp.hpl.jena.sparql.sse.Tags;
import com.hp.hpl.jena.sparql.util.Symbol ;
/** Indirect to the choosen regular expression implementation */
@@ -53,7 +54,7 @@ public class E_Regex extends ExprFunctio
}
}
- private static final String name = "regex" ;
+ private static final String name = Tags.tagRegex ;
private RegexEngine regexEngine = null ;
public E_Regex(Expr expr, Expr pattern, Expr flags)
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=1514099&r1=1514098&r2=1514099&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 Wed Aug 14 23:44:57 2013
@@ -19,10 +19,11 @@
package com.hp.hpl.jena.sparql.expr;
import com.hp.hpl.jena.sparql.expr.nodevalue.NodeFunctions ;
+import com.hp.hpl.jena.sparql.sse.Tags;
public class E_SameTerm extends ExprFunction2
{
- private static final String printName = "sameTerm" ;
+ private static final String printName = Tags.tagSameTerm ;
public E_SameTerm(Expr left, Expr right)
{
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_Str.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_Str.java?rev=1514099&r1=1514098&r2=1514099&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_Str.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_Str.java Wed Aug 14 23:44:57 2013
@@ -19,10 +19,11 @@
package com.hp.hpl.jena.sparql.expr;
import com.hp.hpl.jena.sparql.expr.nodevalue.NodeFunctions ;
+import com.hp.hpl.jena.sparql.sse.Tags;
public class E_Str extends ExprFunction1
{
- private static final String symbol = "str" ;
+ private static final String symbol = Tags.tagStr ;
public E_Str(Expr expr)
{
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_StrConcat.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_StrConcat.java?rev=1514099&r1=1514098&r2=1514099&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_StrConcat.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_StrConcat.java Wed Aug 14 23:44:57 2013
@@ -21,12 +21,13 @@ package com.hp.hpl.jena.sparql.expr;
import java.util.List ;
import com.hp.hpl.jena.sparql.expr.nodevalue.XSDFuncOp ;
+import com.hp.hpl.jena.sparql.sse.Tags;
/** SPARQL CONCATs */
public class E_StrConcat extends ExprFunctionN
{
- private static final String name = "concat" ;
+ private static final String name = Tags.tagConcat ;
public E_StrConcat(ExprList args)
{
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_StrDatatype.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_StrDatatype.java?rev=1514099&r1=1514098&r2=1514099&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_StrDatatype.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_StrDatatype.java Wed Aug 14 23:44:57 2013
@@ -19,11 +19,12 @@
package com.hp.hpl.jena.sparql.expr;
import com.hp.hpl.jena.sparql.expr.nodevalue.NodeFunctions ;
+import com.hp.hpl.jena.sparql.sse.Tags;
/** Create a literal from lexical form and datatype URI */
public class E_StrDatatype extends ExprFunction2
{
- private static final String symbol = "strdt" ;
+ private static final String symbol = Tags.tagStrDatatype ;
public E_StrDatatype(Expr expr1, Expr expr2)
{
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_StrLang.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_StrLang.java?rev=1514099&r1=1514098&r2=1514099&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_StrLang.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_StrLang.java Wed Aug 14 23:44:57 2013
@@ -19,11 +19,12 @@
package com.hp.hpl.jena.sparql.expr;
import com.hp.hpl.jena.sparql.expr.nodevalue.NodeFunctions ;
+import com.hp.hpl.jena.sparql.sse.Tags;
/** Create a literal from lexical form and language tag */
public class E_StrLang extends ExprFunction2
{
- private static final String symbol = "strlang" ;
+ private static final String symbol = Tags.tagStrLang ;
public E_StrLang(Expr expr1, Expr expr2)
{
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=1514099&r1=1514098&r2=1514099&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 Wed Aug 14 23:44:57 2013
@@ -21,11 +21,12 @@ package com.hp.hpl.jena.sparql.expr;
import com.hp.hpl.jena.query.ARQ ;
import com.hp.hpl.jena.sparql.expr.nodevalue.NodeValueOps ;
import com.hp.hpl.jena.sparql.expr.nodevalue.XSDFuncOp ;
+import com.hp.hpl.jena.sparql.sse.Tags;
public class E_Subtract extends ExprFunction2
{
private static final String printName = "sub" ;
- private static final String symbol = "-" ;
+ private static final String symbol = Tags.symMinus ;
public E_Subtract(Expr left, Expr right)
{
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_URI.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_URI.java?rev=1514099&r1=1514098&r2=1514099&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_URI.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_URI.java Wed Aug 14 23:44:57 2013
@@ -18,10 +18,12 @@
package com.hp.hpl.jena.sparql.expr;
+import com.hp.hpl.jena.sparql.sse.Tags;
+
public class E_URI extends E_IRI
{
- private static final String symbol = "uri" ;
+ private static final String symbol = Tags.tagUri ;
public E_URI(Expr expr)
{
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=1514099&r1=1514098&r2=1514099&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 Wed Aug 14 23:44:57 2013
@@ -19,11 +19,12 @@
package com.hp.hpl.jena.sparql.expr;
import com.hp.hpl.jena.sparql.expr.nodevalue.XSDFuncOp ;
+import com.hp.hpl.jena.sparql.sse.Tags;
public class E_UnaryMinus extends ExprFunction1
{
private static final String printName = "unaryMinus" ;
- private static final String symbol = "-" ;
+ private static final String symbol = Tags.tagMinus ;
public E_UnaryMinus(Expr expr)
{
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=1514099&r1=1514098&r2=1514099&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 Wed Aug 14 23:44:57 2013
@@ -19,11 +19,12 @@
package com.hp.hpl.jena.sparql.expr;
import com.hp.hpl.jena.sparql.expr.nodevalue.XSDFuncOp ;
+import com.hp.hpl.jena.sparql.sse.Tags;
public class E_UnaryPlus extends ExprFunction1
{
private static final String printName = "unaryPlus" ;
- private static final String symbol = "+" ;
+ private static final String symbol = Tags.symPlus ;
public E_UnaryPlus(Expr expr)
{