Merge branch 'master' of github.com:eclipse/rdf4j into develop

Author: James Leigh

core/queryparser/sparql/src/main/java/org/eclipse/rdf4j/query/parser/sparql/TupleExprBuilder.java

@@ -21,6 +21,7 @@
 import org.eclipse.rdf4j.model.Literal;
 import org.eclipse.rdf4j.model.Value;
 import org.eclipse.rdf4j.model.ValueFactory;
+import org.eclipse.rdf4j.model.datatypes.XMLDatatypeUtil;
 import org.eclipse.rdf4j.model.impl.BooleanLiteral;
 import org.eclipse.rdf4j.model.vocabulary.FN;
 import org.eclipse.rdf4j.model.vocabulary.RDF;
@@ -2765,7 +2766,8 @@ public ValueConstant visit(ASTRDFLiteral node, Object data)
 				// invalid URI
 				throw new VisitorException(e.getMessage());
 			}
-			literal = valueFactory.createLiteral(label, datatype);
+			String normalized = XMLDatatypeUtil.normalize(label, datatype);
+			literal = valueFactory.createLiteral(normalized, datatype);
 		}
 		else if (lang != null) {
 			literal = valueFactory.createLiteral(label, lang);
@@ -2781,7 +2783,9 @@ else if (lang != null) {
 	public ValueConstant visit(ASTNumericLiteral node, Object data)
 		throws VisitorException
 	{
-		Literal literal = valueFactory.createLiteral(node.getValue(), node.getDatatype());
+		IRI datatype = node.getDatatype();
+		String label = XMLDatatypeUtil.normalize(node.getValue(), datatype);
+		Literal literal = valueFactory.createLiteral(label, datatype);
 		return new ValueConstant(literal);
 	}
 

core/queryparser/sparql/src/test/java/org/eclipse/rdf4j/query/parser/sparql/SPARQLParserTest.java

@@ -30,6 +30,8 @@
 import org.eclipse.rdf4j.query.algebra.StatementPattern;
 import org.eclipse.rdf4j.query.algebra.TupleExpr;
 import org.eclipse.rdf4j.query.algebra.UpdateExpr;
+import org.eclipse.rdf4j.query.algebra.ValueConstant;
+import org.eclipse.rdf4j.query.algebra.helpers.AbstractQueryModelVisitor;
 import org.eclipse.rdf4j.query.parser.ParsedBooleanQuery;
 import org.eclipse.rdf4j.query.parser.ParsedGraphQuery;
 import org.eclipse.rdf4j.query.parser.ParsedQuery;
@@ -310,4 +312,23 @@ public void testLongUnicode() throws Exception {
 		assertEquals("\uD83D\uDE1F", lines[lines.length -1].replaceAll(".*\"(.*)\".*", "$1"));
 	}
 
+	@Test
+	public void testAdditiveExpression()
+		throws Exception
+	{
+		String ask = "ASK { ?this <urn:test:score> ?score FILTER (!(?score+5 != 0)) }";
+
+		ParsedQuery q = parser.parseQuery(ask, null);
+		q.getTupleExpr().visit(new AbstractQueryModelVisitor<Exception>() {
+
+			public void meet(ValueConstant node)
+				throws Exception
+			{
+				String label = node.getValue().stringValue();
+				assertFalse(label, label.startsWith("+"));
+			}
+		});
+
+	}
+
 }