FunRound fixes/improvements

FunRound should use subclass eval method in FunRoundBase.

Tests for -ve 0 (not working yet)

Author: alanpaxton

exist-core/src/main/java/org/exist/xquery/functions/fn/FunRound.java

@@ -94,37 +94,4 @@ public int returnsType() {
 			return RoundingMode.HALF_UP;
 		}
 	}
-
-	@Override
-	public Sequence eval(final Sequence[] args, final Sequence contextSequence) throws XPathException {
-
-		if (args[0].isEmpty()) {
-			return Sequence.EMPTY_SEQUENCE;
-		}
-
-		final Item item = args[0].itemAt(0);
-		final NumericValue value;
-		if (item instanceof NumericValue) {
-			value = (NumericValue) item;
-		} else {
-			value = (NumericValue) item.convertTo(Type.NUMBER);
-		}
-
-		final RoundingMode roundingMode;
-		if (value.isNegative()) {
-			roundingMode = RoundingMode.HALF_DOWN;
-		} else {
-			roundingMode = RoundingMode.HALF_UP;
-		}
-
-		if (args.length > 1) {
-			final Item precisionItem = args[1].itemAt(0);
-			if (precisionItem instanceof IntegerValue) {
-				final IntegerValue precision = (IntegerValue) precisionItem;
-				return value.round(precision, roundingMode);
-			}
-		}
-
-		return value.round(IntegerValue.ZERO, roundingMode);
-	}
 }

exist-core/src/main/java/org/exist/xquery/functions/fn/FunRoundBase.java

@@ -63,7 +63,7 @@ public Sequence eval(final Sequence[] args, final Sequence contextSequence) thro
         }
 
         final RoundingMode roundingMode = getFunctionRoundingMode(value);
-
+        
         if (args.length > 1) {
             final Item precisionItem = args[1].itemAt(0);
             if (precisionItem instanceof IntegerValue) {

exist-core/src/test/xquery/numbers/fn-round.xqm

@@ -112,4 +112,23 @@ declare
     %test:assertEquals(2.0)
 function fr:round-half-to-even($number as xs:double) {
     fn:round-half-to-even($number)
+};
+
+declare
+    %test:args("-0.41",1)
+    %test:assertEquals("-0.4")
+    %test:args("-0.41",0)
+    %test:assertEquals("-0")
+function fr:round-negative-zero($number as xs:decimal, $precision as xs:integer) {
+    fn:round($number, $precision)
+};
+
+
+declare
+    %test:args("-0.41",1)
+    %test:assertEquals("-0.4")
+    %test:args("-0.41",0)
+    %test:assertEquals("-0")
+function fr:round-negative-zero-double($number as xs:double, $precision as xs:integer) {
+    fn:round($number, $precision)
 };