Merge pull request #1332 from pi-r-p/bigdecimalFix

Bigdecimal easier
senx · Nov 22, 2023 · 1e33949 · 1e33949
2 parents 6dc4c38 + b784b16
commit 1e33949
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 13 deletions.
diff --git a/warp10/src/main/java/io/warp10/script/functions/BDCOMP.java b/warp10/src/main/java/io/warp10/script/functions/BDCOMP.java
@@ -39,7 +39,7 @@ public Object apply(WarpScriptStack stack) throws WarpScriptException {
 
     BigDecimal bd2 = TOBD.toBigDecimal(getName(), o);
 
-    stack.push(bd1.compareTo(bd2));
+    stack.push(bd2.compareTo(bd1));
 
     return stack;
   }

diff --git a/warp10/src/main/java/io/warp10/script/functions/BDDIV.java b/warp10/src/main/java/io/warp10/script/functions/BDDIV.java
@@ -43,9 +43,9 @@ public Object apply(WarpScriptStack stack) throws WarpScriptException {
     BigDecimal bd2 = TOBD.toBigDecimal(getName(), o);
 
     if (this.integral) {
-      stack.push(bd1.divideToIntegralValue(bd2));
+      stack.push(bd2.divideToIntegralValue(bd1));
     } else {
-      stack.push(bd1.divide(bd2));
+      stack.push(bd2.divide(bd1));
     }
 
     return stack;

diff --git a/warp10/src/main/java/io/warp10/script/functions/BDREM.java b/warp10/src/main/java/io/warp10/script/functions/BDREM.java
@@ -39,7 +39,7 @@ public Object apply(WarpScriptStack stack) throws WarpScriptException {
 
     BigDecimal bd2 = TOBD.toBigDecimal(getName(), o);
 
-    stack.push(bd1.remainder(bd2));
+    stack.push(bd2.remainder(bd1));
 
     return stack;
   }

diff --git a/warp10/src/main/java/io/warp10/script/functions/BDSUB.java b/warp10/src/main/java/io/warp10/script/functions/BDSUB.java
@@ -39,7 +39,7 @@ public Object apply(WarpScriptStack stack) throws WarpScriptException {
 
     BigDecimal bd2 = TOBD.toBigDecimal(getName(), o);
 
-    stack.push(bd1.subtract(bd2));
+    stack.push(bd2.subtract(bd1));
 
     return stack;
   }

diff --git a/warp10/src/main/java/io/warp10/script/functions/TOBD.java b/warp10/src/main/java/io/warp10/script/functions/TOBD.java
@@ -16,14 +16,14 @@
 
 package io.warp10.script.functions;
 
-import java.math.BigDecimal;
-import java.math.BigInteger;
-
 import io.warp10.script.NamedWarpScriptFunction;
 import io.warp10.script.WarpScriptException;
 import io.warp10.script.WarpScriptStack;
 import io.warp10.script.WarpScriptStackFunction;
 
+import java.math.BigDecimal;
+import java.math.BigInteger;
+
 public class TOBD extends NamedWarpScriptFunction implements WarpScriptStackFunction {
 
   public TOBD(String name) {
@@ -45,7 +45,9 @@ public static BigDecimal toBigDecimal(String name, Object o) throws WarpScriptEx
 
     BigDecimal bd = null;
 
-    if (o instanceof String) {
+    if (o instanceof BigDecimal) {
+      bd = (BigDecimal) o; 
+    } else if (o instanceof String) {
       bd = new BigDecimal((String) o);
     } else if (o instanceof Long) {
       bd = BigDecimal.valueOf(((Long) o).longValue());
@@ -55,7 +57,7 @@ public static BigDecimal toBigDecimal(String name, Object o) throws WarpScriptEx
       BigInteger bi = new BigInteger((byte[]) o);
       bd = new BigDecimal(bi);
     } else {
-      throw new WarpScriptException(name + " can only be applied to a STRING, BYTES, LONG or DOUBLE argument.");
+      throw new WarpScriptException(name + " can only be applied to a BIGDECIMAL, STRING, BYTES, LONG or DOUBLE argument.");
     }
 
     return bd;

diff --git a/warp10/src/main/java/io/warp10/script/functions/TYPEOF.java b/warp10/src/main/java/io/warp10/script/functions/TYPEOF.java
@@ -1,5 +1,5 @@
 //
-//   Copyright 2018-2022  SenX S.A.S.
+//   Copyright 2018-2023  SenX S.A.S.
 //
 //   Licensed under the Apache License, Version 2.0 (the "License");
 //   you may not use this file except in compliance with the License.
@@ -92,6 +92,7 @@ public static interface TypeResolver {
   public static final String TYPE_KEY = "KEY";
   public static final String TYPE_CONTEXT = "CONTEXT";
   public static final String TYPE_FUNCTION = "FUNCTION";
+  public static final String TYPE_BIGDECIMAL = "BIGDECIMAL";
 
   /**
    * Interface to be used by extensions and plugins to define a new type.
@@ -128,8 +129,10 @@ public static String typeof(Class c) {
       return TYPE_STRING;
     } else if (Long.class.isAssignableFrom(c) || Integer.class.isAssignableFrom(c) || Short.class.isAssignableFrom(c) || Byte.class.isAssignableFrom(c) || BigInteger.class.isAssignableFrom(c)) {
       return TYPE_LONG;
-    } else if (Double.class.isAssignableFrom(c) || Float.class.isAssignableFrom(c) || BigDecimal.class.isAssignableFrom(c)) {
-      return TYPE_DOUBLE;
+    } else if (Double.class.isAssignableFrom(c) || Float.class.isAssignableFrom(c)) {
+      return TYPE_DOUBLE; 
+    } else if (BigDecimal.class.isAssignableFrom(c)) {
+      return TYPE_BIGDECIMAL;
     } else if (Boolean.class.isAssignableFrom(c)) {
       return TYPE_BOOLEAN;
     } else if (Vector.class.isAssignableFrom(c)) {  // place before List. Vector implements List.