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 2014/04/09 19:26:29 UTC
svn commit: r1586045 - in
/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr:
E_BNode.java E_Call.java E_Coalesce.java E_Function.java E_NotOneOf.java
E_OneOf.java E_StrConcat.java E_StrReplace.java E_StrSubstring.java
ExprFunctionN.java
Author: andy
Date: Wed Apr 9 17:26:29 2014
New Revision: 1586045
URL: http://svn.apache.org/r1586045
Log:
Make ExprFunctionN.eval(List<NodeValue) public.
Note for some functions which are special forms, this is a meaningless operation.
Modified:
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_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_Function.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_StrConcat.java
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_StrReplace.java
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_StrSubstring.java
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/ExprFunctionN.java
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=1586045&r1=1586044&r2=1586045&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 Apr 9 17:26:29 2014
@@ -85,7 +85,7 @@ public class E_BNode extends ExprFunctio
}
@Override
- protected NodeValue eval(List<NodeValue> args)
+ public NodeValue eval(List<NodeValue> args)
{ throw new ARQInternalErrorException() ; }
@Override
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=1586045&r1=1586044&r2=1586045&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 Apr 9 17:26:29 2014
@@ -97,7 +97,7 @@ public class E_Call extends ExprFunction
}
@Override
- protected NodeValue eval(List<NodeValue> args) {
+ public NodeValue eval(List<NodeValue> args) {
// eval(List, FunctionEnv) should be called.
throw new ARQInternalErrorException();
}
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=1586045&r1=1586044&r2=1586045&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 Apr 9 17:26:29 2014
@@ -56,6 +56,6 @@ public class E_Coalesce extends ExprFunc
}
@Override
- protected NodeValue eval(List<NodeValue> args)
+ public NodeValue eval(List<NodeValue> args)
{ throw new ARQInternalErrorException() ; }
}
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_Function.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_Function.java?rev=1586045&r1=1586044&r2=1586045&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_Function.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_Function.java Wed Apr 9 17:26:29 2014
@@ -73,7 +73,7 @@ public class E_Function extends ExprFunc
}
@Override
- protected NodeValue eval(List<NodeValue> args)
+ public NodeValue eval(List<NodeValue> args)
{
// For functions, we delay argument evaluation to the "Function" heierarchy
// so applications can add their own functional forms.
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=1586045&r1=1586044&r2=1586045&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 Apr 9 17:26:29 2014
@@ -47,7 +47,7 @@ public class E_NotOneOf extends E_OneOfB
}
@Override
- protected NodeValue eval(List<NodeValue> args)
+ public NodeValue eval(List<NodeValue> args)
{ throw new ARQInternalErrorException() ; }
@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=1586045&r1=1586044&r2=1586045&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 Apr 9 17:26:29 2014
@@ -48,7 +48,7 @@ public class E_OneOf extends E_OneOfBase
}
@Override
- protected NodeValue eval(List<NodeValue> args)
+ public NodeValue eval(List<NodeValue> args)
{ throw new ARQInternalErrorException() ; }
@Override
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=1586045&r1=1586044&r2=1586045&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 Apr 9 17:26:29 2014
@@ -41,7 +41,7 @@ public class E_StrConcat extends ExprFun
}
@Override
- protected NodeValue eval(List<NodeValue> args)
+ public NodeValue eval(List<NodeValue> args)
{
return XSDFuncOp.strConcat(args) ;
}
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_StrReplace.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_StrReplace.java?rev=1586045&r1=1586044&r2=1586045&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_StrReplace.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_StrReplace.java Wed Apr 9 17:26:29 2014
@@ -46,7 +46,7 @@ public class E_StrReplace extends ExprFu
private static boolean isString(Expr expr) { return expr.isConstant() && expr.getConstant().isString() ; }
@Override
- protected NodeValue eval(List<NodeValue> args)
+ public NodeValue eval(List<NodeValue> args)
{
if ( pattern != null )
return XSDFuncOp.strReplace(args.get(0), pattern, args.get(2)) ;
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_StrSubstring.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_StrSubstring.java?rev=1586045&r1=1586044&r2=1586045&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_StrSubstring.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_StrSubstring.java Wed Apr 9 17:26:29 2014
@@ -33,7 +33,7 @@ public class E_StrSubstring extends Expr
}
@Override
- protected NodeValue eval(List<NodeValue> args)
+ public NodeValue eval(List<NodeValue> args)
{
if ( args.size() == 2 )
return XSDFuncOp.substring(args.get(0), args.get(1)) ;
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/ExprFunctionN.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/ExprFunctionN.java?rev=1586045&r1=1586044&r2=1586045&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/ExprFunctionN.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/ExprFunctionN.java Wed Apr 9 17:26:29 2014
@@ -135,7 +135,7 @@ public abstract class ExprFunctionN exte
public NodeValue eval(List<NodeValue> args, FunctionEnv env) { return eval(args) ; }
- protected abstract NodeValue eval(List<NodeValue> args) ;
+ public abstract NodeValue eval(List<NodeValue> args) ;
public abstract Expr copy(ExprList newArgs) ;