jena-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a...@apache.org
Subject [27/51] [partial] jena git commit: Rename com.hp.hpl.jena.* as org.apache.jena.*
Date Thu, 23 Apr 2015 19:56:43 GMT
http://git-wip-us.apache.org/repos/asf/jena/blob/56534eac/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_NumCeiling.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_NumCeiling.java b/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_NumCeiling.java
deleted file mode 100644
index 148a967..0000000
--- a/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_NumCeiling.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-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_NumCeiling extends ExprFunction1
-{
-    private static final String symbol = Tags.tagNumCeiling ;
-
-    public E_NumCeiling(Expr expr)
-    {
-        super(expr, symbol) ;
-    }
-    
-    @Override
-    public NodeValue eval(NodeValue v) { return XSDFuncOp.ceiling(v) ; }
-    
-    @Override
-    public Expr copy(Expr expr) { return new E_NumCeiling(expr) ; } 
-}

http://git-wip-us.apache.org/repos/asf/jena/blob/56534eac/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_NumFloor.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_NumFloor.java b/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_NumFloor.java
deleted file mode 100644
index ea33571..0000000
--- a/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_NumFloor.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-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_NumFloor extends ExprFunction1
-{
-    private static final String symbol = Tags.tagNumFloor ;
-
-    public E_NumFloor(Expr expr)
-    {
-        super(expr, symbol) ;
-    }
-    
-    @Override
-    public NodeValue eval(NodeValue v) { return XSDFuncOp.floor(v) ; }
-    
-    @Override
-    public Expr copy(Expr expr) { return new E_NumFloor(expr) ; } 
-}

http://git-wip-us.apache.org/repos/asf/jena/blob/56534eac/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_NumRound.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_NumRound.java b/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_NumRound.java
deleted file mode 100644
index afbf089..0000000
--- a/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_NumRound.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-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_NumRound extends ExprFunction1
-{
-    private static final String symbol = Tags.tagNumRound ;
-
-    public E_NumRound(Expr expr)
-    {
-        super(expr, symbol) ;
-    }
-    
-    @Override
-    public NodeValue eval(NodeValue v) { return XSDFuncOp.round(v) ; }
-    
-    @Override
-    public Expr copy(Expr expr) { return new E_NumRound(expr) ; } 
-}

http://git-wip-us.apache.org/repos/asf/jena/blob/56534eac/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_OneOf.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_OneOf.java b/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_OneOf.java
deleted file mode 100644
index 7e75d85..0000000
--- a/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_OneOf.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.hp.hpl.jena.sparql.expr;
-
-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 functionName = Tags.tagIn ;
-    
-    public E_OneOf(Expr expr, ExprList args)
-    {
-        super(functionName, expr, args) ;
-    }
-    
-    protected E_OneOf(ExprList args)
-    {
-        super(functionName, args) ;
-    }
-
-    @Override
-    public NodeValue evalSpecial(Binding binding, FunctionEnv env)
-    {
-        boolean b = super.evalOneOf(binding, env) ;
-        return NodeValue.booleanReturn(b) ;
-    }
-    
-    @Override
-    public NodeValue eval(List<NodeValue> args)
-    { throw new ARQInternalErrorException() ; }
-    
-    @Override
-    public Expr copy(ExprList newArgs)
-    {
-        return new E_OneOf(newArgs) ;
-    }
-}

http://git-wip-us.apache.org/repos/asf/jena/blob/56534eac/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_OneOfBase.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_OneOfBase.java b/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_OneOfBase.java
deleted file mode 100644
index 53e5067..0000000
--- a/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_OneOfBase.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.hp.hpl.jena.sparql.expr;
-
-import com.hp.hpl.jena.sparql.engine.binding.Binding ;
-import com.hp.hpl.jena.sparql.function.FunctionEnv ;
-
-public abstract class E_OneOfBase extends ExprFunctionN
-{   
-    /* This operation stores it's arguments as a single list.
-     * The first element of the array is the expression being tested,
-     * the rest are the items to be used to test against.
-     * There are cached copies of the LHS (car) and RHS (cdr).
-     */
-    
-    // Cached values.
-    protected final Expr expr ;
-    protected final ExprList possibleValues ;
-    
-    protected E_OneOfBase(String name, Expr expr, ExprList args)
-    {
-        super(name, fixup(expr, args)) ;
-        this.expr = expr ;
-        this.possibleValues = args ;
-    }
-    
-    // All ArgList, first arg is the expression.
-    protected E_OneOfBase(String name, ExprList args)
-    {
-        super(name, args) ;
-        this.expr = args.get(0) ;
-        this.possibleValues = args.tail(1) ;
-    }
-    
-    private static ExprList fixup(Expr expr2, ExprList args)
-    {
-        ExprList allArgs = new ExprList(expr2) ;
-        allArgs.addAll(args) ;
-        return allArgs ;
-    }
-
-    public Expr getLHS()        { return expr ; }
-    public ExprList getRHS()    { return possibleValues; }
-
-    
-//    public Expr getLHS() { return expr ; }
-//    public ExprList getRHS() { return possibleValues ; }
-
-    protected boolean evalOneOf(Binding binding, FunctionEnv env)
-    {
-        // Special form.
-        // Like ( expr = expr1 ) || ( expr = expr2 ) || ...
-
-        NodeValue nv = expr.eval(binding, env) ;
-        ExprEvalException error = null ;
-        for ( Expr inExpr : possibleValues )
-        {
-            try {
-                NodeValue maybe = inExpr.eval(binding, env) ;
-                if ( NodeValue.sameAs(nv, maybe) )
-                    return true ;
-            } catch (ExprEvalException ex)
-            {
-                error = ex ;
-            }
-        }
-        if ( error != null )
-            throw error ;
-        return false ;
-    }
-    
-    protected boolean evalNotOneOf(Binding binding, FunctionEnv env)
-    {
-        return ! evalOneOf(binding, env) ;
-    }
-}

http://git-wip-us.apache.org/repos/asf/jena/blob/56534eac/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_Random.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_Random.java b/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_Random.java
deleted file mode 100644
index deaa799..0000000
--- a/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_Random.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-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 = Tags.tagRand ;
-    
-    public E_Random()
-    {
-        super(symbol) ;
-    }
-    
-    @Override
-    public NodeValue eval(FunctionEnv env)
-    { 
-        double d = RandomLib.random.nextDouble() ;
-        return NodeValue.makeDouble(d) ;
-    }
-
-    @Override
-    public Expr copy()
-    {
-        return new E_Random() ;
-    } 
-}

http://git-wip-us.apache.org/repos/asf/jena/blob/56534eac/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_Regex.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_Regex.java b/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_Regex.java
deleted file mode 100644
index bb7bb53..0000000
--- a/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_Regex.java
+++ /dev/null
@@ -1,130 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.hp.hpl.jena.sparql.expr;
-
-import java.util.List ;
-
-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 */
-
-public class E_Regex extends ExprFunctionN
-{
-    private static Symbol regexImpl = null ;
-    static
-    {
-        Object v = ARQ.getContext().get(ARQ.regexImpl, ARQ.javaRegex) ;
-        if ( v instanceof Symbol )
-            regexImpl = (Symbol)v ;
-        if ( v instanceof String )
-            regexImpl = Symbol.create((String)v) ;
-        
-        if ( regexImpl == null )
-        {
-            Log.warn(E_Regex.class, "Regex implementation some weird setting: default to Java") ;
-            regexImpl = ARQ.javaRegex;
-        }
-        if ( !regexImpl.equals(ARQ.javaRegex) &&
-             !regexImpl.equals(ARQ.xercesRegex) )
-        {
-            Log.warn(E_Regex.class, "Regex implementation not recognized : default to Java") ;
-            regexImpl = ARQ.javaRegex;
-        }  
-    }
-    
-    private static final String name = Tags.tagRegex ;
-    private RegexEngine regexEngine = null ;
-    
-    public E_Regex(Expr expr, Expr pattern, Expr flags)
-    {
-        super(name, expr, pattern, flags) ;
-        init(pattern, flags) ;
-    }
-
-    // Not used by parser
-    public E_Regex(Expr expr, String pattern, String flags)
-    {
-        super(name, expr, NodeValue.makeString(pattern), NodeValue.makeString(flags)) ;
-        init(getArg(2), getArg(3)) ;
-    }
-    
-    private void init(Expr pattern, Expr flags)
-    {
-        if ( pattern.isConstant() && pattern.getConstant().isString() && ( flags==null || flags.isConstant() ) )
-            regexEngine = makeRegexEngine(pattern.getConstant(), (flags==null)?null:flags.getConstant()) ;
-    }
-    
-
-    @Override
-    public NodeValue eval(List<NodeValue> args)
-    {
-        Node arg = NodeFunctions.checkAndGetStringLiteral("REGEX", args.get(0)) ;
-        NodeValue vPattern = args.get(1) ;
-        NodeValue vFlags = ( args.size() == 2 ? null : args.get(2) ) ;
-        
-        RegexEngine regex = regexEngine ;
-        if ( regex == null  )
-            regex = makeRegexEngine(vPattern, vFlags) ;
-        
-        boolean b = regex.match(arg.getLiteralLexicalForm()) ;
-        
-        return b ?  NodeValue.TRUE : NodeValue.FALSE ; 
-    }
-
-    public static RegexEngine makeRegexEngine(NodeValue vPattern, NodeValue vFlags)
-    {
-        if ( ! vPattern.isString() )
-            throw new ExprException("REGEX: Pattern is not a string: "+vPattern) ;
-        if ( vFlags != null && ! vFlags.isString() )
-            throw new ExprException("REGEX: Pattern flags are not a string: "+vFlags) ;
-        String s = (vFlags==null)?null:vFlags.getString() ;
-        
-        return makeRegexEngine(vPattern.getString(), s) ;
-    }
-    
-    public static RegexEngine makeRegexEngine(String pattern, String flags)
-    {
-        if ( regexImpl.equals(ARQ.xercesRegex))
-            return new RegexXerces(pattern, flags) ;
-        return new RegexJava(pattern, flags) ;
-    }
-    
-//    /** @return Returns the expr of the regex */
-//    public final Expr getRegexExpr() { return expr1 ; }
-//
-//    /** @return Returns the pattern. */
-//    public final Expr getPattern()  { return expr2 ; }
-//
-//    /** @return Returns the flags. */
-//    public final Expr getFlags() { return expr3 ; }
-
-    @Override
-    public Expr copy(ExprList newArgs)
-    {
-        if ( newArgs.size() == 2 )
-            return new E_Regex(newArgs.get(0), newArgs.get(1), null) ; 
-        return new E_Regex(newArgs.get(0), newArgs.get(1), newArgs.get(2)) ;   
-    }
-}

http://git-wip-us.apache.org/repos/asf/jena/blob/56534eac/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_SHA1.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_SHA1.java b/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_SHA1.java
deleted file mode 100644
index f6cb96a..0000000
--- a/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_SHA1.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.hp.hpl.jena.sparql.expr;
-
-import java.util.Locale ;
-
-import com.hp.hpl.jena.sparql.sse.Tags ;
-
-public class E_SHA1 extends ExprDigest
-{
-    private static final String symbol = Tags.tagSHA1.toUpperCase(Locale.ROOT) ;
-
-    public E_SHA1(Expr expr)
-    {
-        super(expr, symbol, "SHA-1") ;
-    }
-    
-    @Override
-    public Expr copy(Expr expr) { return new E_SHA1(expr) ; } 
-}

http://git-wip-us.apache.org/repos/asf/jena/blob/56534eac/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_SHA224.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_SHA224.java b/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_SHA224.java
deleted file mode 100644
index b68d76b..0000000
--- a/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_SHA224.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.hp.hpl.jena.sparql.expr;
-
-import java.util.Locale ;
-
-import com.hp.hpl.jena.sparql.sse.Tags ;
-
-public class E_SHA224 extends ExprDigest
-{
-    private static final String symbol = Tags.tagSHA224.toUpperCase(Locale.ROOT) ;
-
-    public E_SHA224(Expr expr)
-    {
-        super(expr, symbol, "SHA-224") ;
-    }
-    
-    @Override
-    public Expr copy(Expr expr) { return new E_SHA224(expr) ; } 
-}

http://git-wip-us.apache.org/repos/asf/jena/blob/56534eac/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_SHA256.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_SHA256.java b/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_SHA256.java
deleted file mode 100644
index 7a9ed9b..0000000
--- a/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_SHA256.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.hp.hpl.jena.sparql.expr;
-
-import java.util.Locale ;
-
-import com.hp.hpl.jena.sparql.sse.Tags ;
-
-public class E_SHA256 extends ExprDigest
-{
-    private static final String symbol = Tags.tagSHA256.toUpperCase(Locale.ROOT) ;
-
-    public E_SHA256(Expr expr)
-    {
-        super(expr, symbol, "SHA-256") ;
-    }
-    
-    @Override
-    public Expr copy(Expr expr) { return new E_SHA256(expr) ; } 
-}

http://git-wip-us.apache.org/repos/asf/jena/blob/56534eac/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_SHA384.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_SHA384.java b/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_SHA384.java
deleted file mode 100644
index 4afa2ad..0000000
--- a/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_SHA384.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.hp.hpl.jena.sparql.expr;
-
-import java.util.Locale ;
-
-import com.hp.hpl.jena.sparql.sse.Tags ;
-
-public class E_SHA384 extends ExprDigest
-{
-    private static final String symbol = Tags.tagSHA384.toUpperCase(Locale.ROOT) ;
-
-    public E_SHA384(Expr expr)
-    {
-        super(expr, symbol, "SHA-384") ;
-    }
-    
-    @Override
-    public Expr copy(Expr expr) { return new E_SHA384(expr) ; } 
-}

http://git-wip-us.apache.org/repos/asf/jena/blob/56534eac/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_SHA512.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_SHA512.java b/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_SHA512.java
deleted file mode 100644
index 345fe97..0000000
--- a/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_SHA512.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.hp.hpl.jena.sparql.expr;
-
-import java.util.Locale ;
-
-import com.hp.hpl.jena.sparql.sse.Tags ;
-
-public class E_SHA512 extends ExprDigest
-{
-    private static final String symbol = Tags.tagSHA512.toUpperCase(Locale.ROOT) ;
-
-    public E_SHA512(Expr expr)
-    {
-        super(expr, symbol, "SHA-512") ;
-    }
-    
-    @Override
-    public Expr copy(Expr expr) { return new E_SHA512(expr) ; } 
-}

http://git-wip-us.apache.org/repos/asf/jena/blob/56534eac/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_SameTerm.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_SameTerm.java b/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_SameTerm.java
deleted file mode 100644
index d0525bd..0000000
--- a/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_SameTerm.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-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 functionName = Tags.tagSameTerm ;
-
-    public E_SameTerm(Expr left, Expr right)
-    {
-        super(left, right, functionName) ;
-    }
-    
-    @Override
-    public NodeValue eval(NodeValue x, NodeValue y)
-    {
-        return NodeFunctions.sameTerm(x, y) ;
-    }
-    
-    @Override
-    public Expr copy(Expr e1, Expr e2) {  return new E_SameTerm(e1 , e2 ) ; }
-}

http://git-wip-us.apache.org/repos/asf/jena/blob/56534eac/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_Str.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_Str.java b/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_Str.java
deleted file mode 100644
index 9f0204b..0000000
--- a/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_Str.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-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 = Tags.tagStr ;
-
-    public E_Str(Expr expr)
-    {
-        super(expr, symbol) ;
-    }
-    
-    @Override
-    public NodeValue eval(NodeValue v) { return NodeFunctions.str(v) ; }
-    
-    @Override
-    public Expr copy(Expr expr) { return new E_Str(expr) ; } 
-}

http://git-wip-us.apache.org/repos/asf/jena/blob/56534eac/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_StrAfter.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_StrAfter.java b/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_StrAfter.java
deleted file mode 100644
index 4e88210..0000000
--- a/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_StrAfter.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-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_StrAfter extends ExprFunction2
-{
-    private static final String symbol = Tags.tagStrAfter ;
-
-    public E_StrAfter(Expr expr1, Expr expr2)
-    {
-        super(expr1, expr2, symbol) ;
-    }
-    
-    @Override
-    public NodeValue eval(NodeValue v1, NodeValue v2) { return XSDFuncOp.strAfter(v1, v2) ; }
-    
-    @Override
-    public Expr copy(Expr expr1, Expr expr2) { return new E_StrAfter(expr1, expr2) ; } 
-}

http://git-wip-us.apache.org/repos/asf/jena/blob/56534eac/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_StrBefore.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_StrBefore.java b/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_StrBefore.java
deleted file mode 100644
index fd3b0aa..0000000
--- a/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_StrBefore.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-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_StrBefore extends ExprFunction2
-{
-    private static final String symbol = Tags.tagStrBefore ;
-
-    public E_StrBefore(Expr expr1, Expr expr2)
-    {
-        super(expr1, expr2, symbol) ;
-    }
-    
-    @Override
-    public NodeValue eval(NodeValue v1, NodeValue v2) { return XSDFuncOp.strBefore(v1, v2) ; } 
-    
-    @Override
-    public Expr copy(Expr expr1, Expr expr2) { return new E_StrBefore(expr1, expr2) ; } 
-}

http://git-wip-us.apache.org/repos/asf/jena/blob/56534eac/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_StrConcat.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_StrConcat.java b/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_StrConcat.java
deleted file mode 100644
index 996e387..0000000
--- a/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_StrConcat.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-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 = Tags.tagConcat ;
-    
-    public E_StrConcat(ExprList args)
-    {
-        super(name, args) ;
-    }
-
-    @Override
-    public Expr copy(ExprList newArgs)
-    {
-        return new E_StrConcat(newArgs) ;
-    }
-
-    @Override
-    public NodeValue eval(List<NodeValue> args)
-    { 
-        return XSDFuncOp.strConcat(args) ;
-    }
-}

http://git-wip-us.apache.org/repos/asf/jena/blob/56534eac/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_StrContains.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_StrContains.java b/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_StrContains.java
deleted file mode 100644
index bf6c2ea..0000000
--- a/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_StrContains.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-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_StrContains extends ExprFunction2
-{
-    private static final String symbol = Tags.tagStrContains ;
-
-    public E_StrContains(Expr expr1, Expr expr2)
-    {
-        super(expr1, expr2, symbol) ;
-    }
-    
-    @Override
-    public NodeValue eval(NodeValue v1, NodeValue v2) { return XSDFuncOp.strContains(v1, v2) ; }
-    
-    @Override
-    public Expr copy(Expr expr1, Expr expr2) { return new E_StrContains(expr1, expr2) ; } 
-}

http://git-wip-us.apache.org/repos/asf/jena/blob/56534eac/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_StrDatatype.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_StrDatatype.java b/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_StrDatatype.java
deleted file mode 100644
index fc597b8..0000000
--- a/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_StrDatatype.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-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 = Tags.tagStrDatatype ;
-
-    public E_StrDatatype(Expr expr1, Expr expr2)
-    {
-        super(expr1, expr2, symbol) ;
-    }
-    
-    @Override
-    public NodeValue eval(NodeValue v1, NodeValue v2)
-    { 
-        return NodeFunctions.strDatatype(v1, v2) ;
-    }
-    
-   
-    
-    @Override
-    public Expr copy(Expr expr1, Expr expr2) { return new E_StrDatatype(expr1, expr2) ; } 
-}

http://git-wip-us.apache.org/repos/asf/jena/blob/56534eac/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_StrEncodeForURI.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_StrEncodeForURI.java b/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_StrEncodeForURI.java
deleted file mode 100644
index 67672b8..0000000
--- a/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_StrEncodeForURI.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-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_StrEncodeForURI extends ExprFunction1
-{
-    private static final String symbol = Tags.tagStrEncodeForURI ;
-
-    public E_StrEncodeForURI(Expr expr)
-    {
-        super(expr, symbol) ;
-    }
-    
-    @Override
-    public NodeValue eval(NodeValue v)
-    { 
-        return XSDFuncOp.strEncodeForURI(v) ;
-    }
-        
-    @Override
-    public Expr copy(Expr expr) { return new E_StrEncodeForURI(expr) ; } 
-}

http://git-wip-us.apache.org/repos/asf/jena/blob/56534eac/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_StrEndsWith.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_StrEndsWith.java b/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_StrEndsWith.java
deleted file mode 100644
index dc6096b..0000000
--- a/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_StrEndsWith.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-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_StrEndsWith extends ExprFunction2
-{
-    private static final String symbol = Tags.tagStrEnds ;
-
-    public E_StrEndsWith(Expr expr1, Expr expr2)
-    {
-        super(expr1, expr2, symbol) ;
-    }
-    
-    @Override
-    public NodeValue eval(NodeValue v1, NodeValue v2) { return XSDFuncOp.strEndsWith(v1, v2) ; }
-    
-    @Override
-    public Expr copy(Expr expr1, Expr expr2) { return new E_StrEndsWith(expr1, expr2) ; } 
-}

http://git-wip-us.apache.org/repos/asf/jena/blob/56534eac/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_StrLang.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_StrLang.java b/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_StrLang.java
deleted file mode 100644
index fa42177..0000000
--- a/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_StrLang.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-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 = Tags.tagStrLang ;
-
-    public E_StrLang(Expr expr1, Expr expr2)
-    {
-        super(expr1, expr2, symbol) ;
-    }
-    
-    @Override
-    public NodeValue eval(NodeValue v1, NodeValue v2)
-    {
-        return NodeFunctions.strLang(v1, v2) ;
-    }
-    
-    
-    @Override
-    public Expr copy(Expr expr1, Expr expr2) { return new E_StrLang(expr1, expr2) ; } 
-}

http://git-wip-us.apache.org/repos/asf/jena/blob/56534eac/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_StrLength.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_StrLength.java b/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_StrLength.java
deleted file mode 100644
index 3161d7c..0000000
--- a/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_StrLength.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-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_StrLength extends ExprFunction1
-{
-    private static final String symbol = Tags.tagStrlen ;
-
-    public E_StrLength(Expr expr)
-    {
-        super(expr, symbol) ;
-    }
-    
-    @Override
-    public NodeValue eval(NodeValue v) { return XSDFuncOp.strlen(v) ; }
-    
-    @Override
-    public Expr copy(Expr expr) { return new E_StrLength(expr) ; } 
-}

http://git-wip-us.apache.org/repos/asf/jena/blob/56534eac/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_StrLowerCase.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_StrLowerCase.java b/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_StrLowerCase.java
deleted file mode 100644
index ac6db8a..0000000
--- a/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_StrLowerCase.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-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_StrLowerCase extends ExprFunction1
-{
-    private static final String symbol = Tags.tagStrLowercase ;
-
-    public E_StrLowerCase(Expr expr)
-    {
-        super(expr, symbol) ;
-    }
-    
-    @Override
-    public NodeValue eval(NodeValue v) { return XSDFuncOp.strLowerCase(v) ; }
-    
-    @Override
-    public Expr copy(Expr expr) { return new E_StrLowerCase(expr) ; } 
-}

http://git-wip-us.apache.org/repos/asf/jena/blob/56534eac/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_StrReplace.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_StrReplace.java b/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_StrReplace.java
deleted file mode 100644
index be64104..0000000
--- a/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_StrReplace.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.hp.hpl.jena.sparql.expr;
-
-import java.util.List ;
-import java.util.regex.Pattern ;
-
-import com.hp.hpl.jena.sparql.expr.nodevalue.XSDFuncOp ;
-import com.hp.hpl.jena.sparql.sse.Tags ;
-
-public class E_StrReplace extends ExprFunctionN
-{
-    private static final String symbol = Tags.tagReplace ;
-    private Pattern pattern = null ;
-
-    public E_StrReplace(Expr expr1, Expr expr2, Expr expr3, Expr expr4)
-    {
-        super(symbol, expr1, expr2, expr3, expr4) ;
-        
-        
-        if ( isString(expr2) && (expr4 == null || isString(expr4) ) )
-        {
-            int flags = 0 ;
-            if ( expr4 != null && expr4.isConstant() && expr4.getConstant().isString() )
-                flags = RegexJava.makeMask(expr4.getConstant().getString()) ;
-            pattern = Pattern.compile(expr2.getConstant().getString(), flags) ;
-        }
-    }
-
-    private static boolean isString(Expr expr) { return expr.isConstant() && expr.getConstant().isString() ; }
-    
-    @Override
-    public NodeValue eval(List<NodeValue> args)
-    {
-        if ( pattern != null )
-            return XSDFuncOp.strReplace(args.get(0), pattern, args.get(2)) ;
-
-        if ( args.size() == 3 )
-            return XSDFuncOp.strReplace(args.get(0), args.get(1), args.get(2)) ;
-        return XSDFuncOp.strReplace(args.get(0), args.get(1), args.get(2), args.get(3)) ;
-    }
-
-    @Override
-    public Expr copy(ExprList newArgs)
-    {
-        if ( newArgs.size() == 3 )
-            return new E_StrReplace(newArgs.get(0), newArgs.get(1), newArgs.get(2), null) ;
-        return new E_StrReplace(newArgs.get(0), newArgs.get(1), newArgs.get(2), newArgs.get(3)) ;
-    }
-    
-    
-    
-//    @Override
-//    public NodeValue eval(NodeValue x, NodeValue y, NodeValue z)
-//    {
-//        if ( pattern == null )
-//            return XSDFuncOp.strReplace(x, y, z) ;
-//        return XSDFuncOp.strReplace(x, pattern, z) ;
-//    }
-//
-//    @Override
-//    public Expr copy(Expr arg1, Expr arg2, Expr arg3)
-//    {
-//        return new E_StrReplace(arg1, arg2, arg3) ;   
-//    }
-}

http://git-wip-us.apache.org/repos/asf/jena/blob/56534eac/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_StrStartsWith.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_StrStartsWith.java b/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_StrStartsWith.java
deleted file mode 100644
index 7c005bb..0000000
--- a/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_StrStartsWith.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-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_StrStartsWith extends ExprFunction2
-{
-    private static final String symbol = Tags.tagStrStarts ;
-
-    public E_StrStartsWith(Expr expr1, Expr expr2)
-    {
-        super(expr1, expr2, symbol) ;
-    }
-    
-    @Override
-    public NodeValue eval(NodeValue v1, NodeValue v2) { return XSDFuncOp.strStartsWith(v1, v2) ; }
-    
-    @Override
-    public Expr copy(Expr expr1, Expr expr2) { return new E_StrStartsWith(expr1, expr2) ; } 
-}

http://git-wip-us.apache.org/repos/asf/jena/blob/56534eac/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_StrSubstring.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_StrSubstring.java b/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_StrSubstring.java
deleted file mode 100644
index e6cb068..0000000
--- a/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_StrSubstring.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-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 ;
-
-public class E_StrSubstring extends ExprFunctionN
-{
-    private static final String symbol = Tags.tagSubstr ;
-
-    public E_StrSubstring(Expr expr1, Expr expr2, Expr expr3)
-    {
-        super(symbol, expr1, expr2, expr3) ;
-    }
-    
-    @Override
-    public NodeValue eval(List<NodeValue> args)
-    { 
-        if ( args.size() == 2 )
-            return XSDFuncOp.substring(args.get(0), args.get(1)) ;
-        
-        //return NodeFunctions.substring(args.get(0), args.get(1), args.get(2)) ;
-        return XSDFuncOp.substring(args.get(0), args.get(1), args.get(2)) ;
-    }
-
-    @Override
-    public Expr copy(ExprList newArgs)
-    {
-        if ( newArgs.size() == 2 )
-            return new E_StrSubstring(newArgs.get(0), newArgs.get(1), null) ; 
-        return new E_StrSubstring(newArgs.get(0), newArgs.get(1), newArgs.get(2)) ;   
-    }
-}

http://git-wip-us.apache.org/repos/asf/jena/blob/56534eac/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_StrUUID.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_StrUUID.java b/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_StrUUID.java
deleted file mode 100644
index 9fd5b77..0000000
--- a/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_StrUUID.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.hp.hpl.jena.sparql.expr;
-
-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_StrUUID extends ExprFunction0
-{
-    static private String fName = Tags.tagStrUUID ;
-    
-    public E_StrUUID()
-    {
-        super(fName) ;
-    }
-
-    @Override
-    public Expr copy()
-    {
-        return new E_StrUUID() ;
-    }
-
-    @Override
-    public NodeValue eval(FunctionEnv env)
-    {
-        return NodeFunctions.struuid();
-    }
-}

http://git-wip-us.apache.org/repos/asf/jena/blob/56534eac/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_StrUpperCase.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_StrUpperCase.java b/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_StrUpperCase.java
deleted file mode 100644
index 5ad1033..0000000
--- a/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_StrUpperCase.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-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_StrUpperCase extends ExprFunction1
-{
-    private static final String symbol = Tags.tagStrUppercase ;
-
-    public E_StrUpperCase(Expr expr)
-    {
-        super(expr, symbol) ;
-    }
-    
-    @Override
-    public NodeValue eval(NodeValue v) { return XSDFuncOp.strUpperCase(v) ; }
-    
-    @Override
-    public Expr copy(Expr expr) { return new E_StrUpperCase(expr) ; } 
-}

http://git-wip-us.apache.org/repos/asf/jena/blob/56534eac/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_Subtract.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_Subtract.java b/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_Subtract.java
deleted file mode 100644
index f27eaa5..0000000
--- a/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_Subtract.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-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 functionName = Tags.tagSubtract ;
-    private static final String symbol = Tags.symMinus ;
-    
-    public E_Subtract(Expr left, Expr right)
-    {
-        super(left, right, functionName, symbol) ;
-    }
-
-    @Override
-    public NodeValue eval(NodeValue x, NodeValue y)
-    {
-        if ( ARQ.isStrictMode() )
-            return XSDFuncOp.numSubtract(x, y) ;
-
-        return NodeValueOps.subtractionNV(x, y) ;
-    }
-    
-    @Override
-    public Expr copy(Expr e1, Expr e2) {  return new E_Subtract(e1 , e2 ) ; }
-}

http://git-wip-us.apache.org/repos/asf/jena/blob/56534eac/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_URI.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_URI.java b/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_URI.java
deleted file mode 100644
index dcd186c..0000000
--- a/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_URI.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-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 = Tags.tagUri ;
-
-    public E_URI(Expr expr)
-    {
-        super(expr, symbol) ;
-    }
-
-    public E_URI(Expr expr, String altSymbol)
-    {
-        super(expr, altSymbol) ;
-    }
-    
-//    @Override
-//    public NodeValue eval(NodeValue v) { return super.eval(v) ; }
-    
-    @Override
-    public Expr copy(Expr expr) { return new E_URI(expr) ; } 
-}

http://git-wip-us.apache.org/repos/asf/jena/blob/56534eac/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_UUID.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_UUID.java b/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_UUID.java
deleted file mode 100644
index 29ccf95..0000000
--- a/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_UUID.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.hp.hpl.jena.sparql.expr;
-
-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_UUID extends ExprFunction0
-{
-    static private String fName = Tags.tagUUID ;
-    
-    public E_UUID()
-    {
-        super(fName) ;
-    }
-
-    @Override
-    public Expr copy()
-    {
-        return new E_UUID() ;
-    }
-
-    @Override
-    public NodeValue eval(FunctionEnv env)
-    {
-        return NodeFunctions.uuid();
-    }
-}

http://git-wip-us.apache.org/repos/asf/jena/blob/56534eac/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_UnaryMinus.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_UnaryMinus.java b/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_UnaryMinus.java
deleted file mode 100644
index 27992d4..0000000
--- a/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_UnaryMinus.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-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 functionName = Tags.tagUnaryMinus ;
-    private static final String symbol = Tags.symMinus ;
-
-    public E_UnaryMinus(Expr expr)
-    {
-        super(expr, functionName, symbol) ;
-    }
-    
-    @Override
-    public NodeValue eval(NodeValue v) { return XSDFuncOp.unaryMinus(v) ; }
-    
-    @Override
-    public Expr copy(Expr expr) { return new E_UnaryMinus(expr) ; } 
-}

http://git-wip-us.apache.org/repos/asf/jena/blob/56534eac/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_UnaryPlus.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_UnaryPlus.java b/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_UnaryPlus.java
deleted file mode 100644
index eed5805..0000000
--- a/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_UnaryPlus.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-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 functionName = Tags.tagUnaryPlus ;
-    private static final String symbol = Tags.symPlus ;
-
-    public E_UnaryPlus(Expr expr)
-    {
-        super(expr, functionName, symbol) ;
-    }
-    
-    @Override
-    public NodeValue eval(NodeValue v) { return XSDFuncOp.unaryPlus(v) ; }
-
-    @Override
-    public Expr copy(Expr expr) { return new E_UnaryPlus(expr) ; } 
-}

http://git-wip-us.apache.org/repos/asf/jena/blob/56534eac/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_Version.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_Version.java b/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_Version.java
deleted file mode 100644
index b3a2f5c..0000000
--- a/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_Version.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.hp.hpl.jena.sparql.expr;
-
-import com.hp.hpl.jena.query.ARQ ;
-import com.hp.hpl.jena.sparql.function.FunctionEnv ;
-import com.hp.hpl.jena.sparql.sse.Tags ;
-
-public class E_Version extends ExprFunction0
-{
-    static private String fName = Tags.tagVersion ;
-    
-    public E_Version()
-    {
-        super(fName) ;
-    }
-
-    @Override
-    public Expr copy()
-    {
-        return new E_Version() ;
-    }
-
-    @Override
-    public NodeValue eval(FunctionEnv env)
-    {
-        return NodeValue.makeString(ARQ.NAME+" "+ARQ.VERSION) ;
-    }
-}

http://git-wip-us.apache.org/repos/asf/jena/blob/56534eac/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/Expr.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/Expr.java b/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/Expr.java
deleted file mode 100644
index 31e0f92..0000000
--- a/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/Expr.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.hp.hpl.jena.sparql.expr;
-
-import java.util.Collection ;
-import java.util.Set ;
-
-import javax.xml.datatype.DatatypeConstants ;
-
-import com.hp.hpl.jena.sparql.core.Var ;
-import com.hp.hpl.jena.sparql.engine.binding.Binding ;
-import com.hp.hpl.jena.sparql.function.FunctionEnv ;
-import com.hp.hpl.jena.sparql.graph.NodeTransform ;
-
-public interface Expr
-{
-    public static final int CMP_GREATER  =  DatatypeConstants.GREATER ;
-    public static final int CMP_EQUAL    =  DatatypeConstants.EQUAL ;
-    public static final int CMP_LESS     =  DatatypeConstants.LESSER ;
-    
-    public static final int CMP_UNEQUAL  = -9 ;
-    public static final int CMP_INDETERMINATE  = DatatypeConstants.INDETERMINATE ;
-    
-    /** Test whether a Constraint is satisfied, given a set of bindings
-     *  Includes error propagtion and Effective Boolean Value rules.
-     * 
-     * @param binding   The bindings
-     * @param execCxt   FunctionEnv   
-     * @return  true or false
-     */ 
-    public boolean isSatisfied(Binding binding, FunctionEnv execCxt) ;
-  
-    /** Variables used by this expression - excludes variables scoped to (NOT)EXISTS */
-    public Set<Var>  getVarsMentioned() ;
-    /** Variables used by this expression - excludes variables scoped to (NOT)EXISTS */
-    public void varsMentioned(Collection<Var> acc) ;
-    
-    /** Evaluate this expression against the binding
-     * @param binding 
-     * @param env
-     */
-    public NodeValue eval(Binding binding, FunctionEnv env) ;
-    
-    /** Deep copy with substitution */
-    public Expr copySubstitute(Binding binding) ;
-
-    /**
-     * Rewrite, applying a node->node transformation
-     */
-    public Expr applyNodeTransform(NodeTransform transform) ;
-
-    /** Deep copy */
-    public Expr deepCopy() ;
-    
-    /** Answer whether this is a variable (in which case getVarName and getNodeVar can be called) */ 
-    public boolean isVariable() ;
-    /** Variable name (returns null if not a variable) */
-    public String  getVarName() ;
-    /** Variable (or null) */
-    public ExprVar getExprVar() ;
-    /** Convert to a Var variable.*/
-    public Var asVar() ;
-
-    /** Answer whether this is a constant expression - false includes "don't know"
-     *  No constant folding so "false" from an expression that evaluates to a constant
-     */  
-    public boolean   isConstant() ;
-    /** NodeValue constant (returns null if not a constant) */
-    public NodeValue getConstant() ;
-    
-    /** Answer wether this is a function. */
-    public boolean isFunction() ;
-    /** Get the function (returns null if not a function) */
-    public ExprFunction getFunction() ;
-    
-    public void visit(ExprVisitor visitor) ;
-}

http://git-wip-us.apache.org/repos/asf/jena/blob/56534eac/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/ExprAggregator.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/ExprAggregator.java b/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/ExprAggregator.java
deleted file mode 100644
index 0781477..0000000
--- a/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/ExprAggregator.java
+++ /dev/null
@@ -1,147 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.hp.hpl.jena.sparql.expr;
-
-import static org.apache.jena.atlas.lib.Lib.equal ;
-import org.apache.jena.atlas.logging.Log ;
-
-import com.hp.hpl.jena.graph.Node ;
-import com.hp.hpl.jena.sparql.ARQInternalErrorException ;
-import com.hp.hpl.jena.sparql.core.Var ;
-import com.hp.hpl.jena.sparql.engine.binding.Binding ;
-import com.hp.hpl.jena.sparql.expr.aggregate.Aggregator ;
-import com.hp.hpl.jena.sparql.function.FunctionEnv ;
-import com.hp.hpl.jena.sparql.graph.NodeTransform ;
-import com.hp.hpl.jena.sparql.serializer.SerializationContext ;
-import com.hp.hpl.jena.sparql.util.Utils ;
-
-/** Group aggregation functions calculated a value during grouping and
- *  placed in the output binding.  This class is relationship of 
- *  an aggregation expression and that variable.  Evaluation returns
- *  the variable's bound value. 
- */
-
-public class ExprAggregator extends ExprNode
-{
-    protected Aggregator aggregator ;
-    protected Var var ;
-    protected ExprVar exprVar = null ;
-    
-    public ExprAggregator(Var v, Aggregator agg)          { _setVar(v) ; aggregator = agg ; }
-    public Var getVar()                                 { return var ; }
-    
-    public void setVar(Var v)
-    {
-        if (this.var != null) 
-            throw new ARQInternalErrorException(Utils.className(this)+ ": Attempt to set variable to " + v + " when already set as " + this.var) ;
-        if (v == null) 
-            throw new ARQInternalErrorException(Utils.className(this)+ ": Attempt to set variable to null") ;
-        _setVar(v) ;
-    }
-
-    private void _setVar(Var v)
-    {
-        this.var = v ;
-        this.exprVar = new ExprVar(var) ;
-    }
-
-    public Aggregator getAggregator()   { return aggregator ; }
-    
-    @Override
-    public int hashCode()
-    { 
-        int x = aggregator.hashCode() ;
-        if ( var != null )
-            x ^= var.hashCode() ;
-        return x ;
-    }
-    
-    @Override
-    public boolean equals(Object other) 
-    {
-        if ( this == other ) return true ;
-        if ( ! ( other instanceof ExprAggregator ) )
-            return false ;
-        ExprAggregator agg = (ExprAggregator)other ;
-        if ( ! equal(var, agg.var) )
-            return false ;
-        return equal(aggregator, agg.aggregator) ;
-    }
-
-    // Ensure no confusion - in an old design, an ExprAggregator was a subclass of ExprVar. 
-    @Override
-    public ExprVar getExprVar()
-    { throw new ARQInternalErrorException() ; }
-    
-    @Override
-    public Var asVar()
-    { throw new ARQInternalErrorException() ; }
-    
-    public ExprVar getAggVar() { return exprVar ; }
-    
-    // As an expression suitable for outputting the calculation. 
-    public String asSparqlExpr(SerializationContext sCxt)        
-    { return aggregator.asSparqlExpr(sCxt) ; }
-    
-    @Override
-    public ExprAggregator copySubstitute(Binding binding)
-    {
-        Var v = var ;
-        Aggregator agg = aggregator ;
-        return new ExprAggregator(v, agg) ;
-    }
-    
-    @Override
-    public ExprAggregator applyNodeTransform(NodeTransform transform)
-    {
-        // Can't rewrite this to a non-variable.
-        Node node = transform.convert(var) ;
-        if ( ! Var.isVar(node) )
-        {
-            Log.warn(this, "Attempt to convert an aggregation variable to a non-variable: ignored") ;
-            node = var ;
-        }
-        
-        Var v = (Var)node ;
-        Aggregator agg = aggregator.copyTransform(transform) ;
-        return new ExprAggregator(Var.alloc(node), agg) ;
-    }
-    
-    // DEBUGGING
-    @Override
-    public String toString()
-    { return "(AGG "+
-                (var==null?"<>":"?"+var.getVarName())+
-                " "+aggregator.toString()+")"; }
-    
-    public Expr copy(Var v)  { return new ExprAggregator(v, aggregator.copy(aggregator.getExprList())) ; }
-    
-    @Override
-    public NodeValue eval(Binding binding, FunctionEnv env)
-    {
-       return ExprVar.eval(var, binding, env) ;
-    }
-    
-    public Expr apply(ExprTransform transform)  { return transform.transform(this) ; }
-    
-    @Override
-    public void visit(ExprVisitor visitor)
-    { visitor.visit(this) ; }
-    
-}

http://git-wip-us.apache.org/repos/asf/jena/blob/56534eac/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/ExprBuild.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/ExprBuild.java b/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/ExprBuild.java
deleted file mode 100644
index 532d1dc..0000000
--- a/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/ExprBuild.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.hp.hpl.jena.sparql.expr;
-
-import com.hp.hpl.jena.sparql.engine.OpEval ;
-import com.hp.hpl.jena.sparql.util.Context ;
-
-/** Visitor class to run over expressions and initialise them */
-public class ExprBuild extends ExprVisitorBase 
-{
-    private Context context ;
-    private OpEval opExec ;
-    public ExprBuild(Context context)
-    { 
-        this.context = context ;
-    }
-    
-    @Override
-    public void visit(ExprFunctionN func)
-    {
-        if ( func instanceof E_Function )
-        {
-            // Causes unbindable functions to complain now, not later.
-            E_Function f = (E_Function)func ;
-            f.buildFunction(context) ;
-        }
-    }
-}


Mime
View raw message