Merge pull request #28 from PetrPytelka/extensible_numeric_types

AbstractNumericRightValue can be parametrized with different inner type

Author: verhas

src/main/java/com/scriptbasic/executors/operators/AbstractBinaryFullCircuitNumericOperator.java

@@ -39,8 +39,8 @@ protected final RightValue evaluateOn(final RightValue leftOperand,
                     "Can not execute the operation on undefined value.");
         }
         if (leftOperand.isNumeric() && rightOperand.isNumeric()) {
-            a = ((AbstractNumericRightValue<Number>) leftOperand).getValue();
-            b = ((AbstractNumericRightValue<Number>) rightOperand).getValue();
+            a = ((AbstractNumericRightValue<Number, Object>) leftOperand).getNumericValue();
+            b = ((AbstractNumericRightValue<Number, Object>) rightOperand).getNumericValue();
             if (leftOperand.isDouble()) {
                 if (rightOperand.isDouble()) {
                     result = operateOnDoubleDouble((Double) a, (Double) b);

src/main/java/com/scriptbasic/executors/rightvalues/AbstractNumericRightValue.java

@@ -1,5 +1,13 @@
 package com.scriptbasic.executors.rightvalues;
 
-public abstract class AbstractNumericRightValue<T extends Number> extends
+public abstract class AbstractNumericRightValue<N extends Number, T> extends
         AbstractPrimitiveRightValue<T> {
+
+    /**
+     * Return numeric value representing this right value
+     * 
+     * @return numeric value
+     */
+    public abstract N getNumericValue();
+
 }

src/main/java/com/scriptbasic/executors/rightvalues/BasicBooleanValue.java

@@ -9,7 +9,7 @@ public BasicBooleanValue(final Boolean b) {
     }
 
     private static Boolean convertNumeric(
-            final AbstractNumericRightValue<Number> originalValue) {
+            final AbstractNumericRightValue<Number, Object> originalValue) {
         final Boolean convertedValue;
         if (originalValue.isLong()) {
             final var l = (Long) originalValue.getValue();

src/main/java/com/scriptbasic/executors/rightvalues/BasicDoubleValue.java

@@ -3,7 +3,7 @@
 import com.scriptbasic.interfaces.BasicRuntimeException;
 import com.scriptbasic.spi.RightValue;
 
-public class BasicDoubleValue extends AbstractNumericRightValue<Double> {
+public class BasicDoubleValue extends AbstractNumericRightValue<Double, Double> {
 
     public BasicDoubleValue(final Double d) {
         setValue(d);
@@ -59,4 +59,9 @@ public String toString() {
             return super.toString();
         }
     }
+
+    @Override
+    public Double getNumericValue() {
+        return getValue();
+    }
 }

src/main/java/com/scriptbasic/executors/rightvalues/BasicLongValue.java

@@ -3,7 +3,7 @@
 import com.scriptbasic.interfaces.BasicRuntimeException;
 import com.scriptbasic.spi.RightValue;
 
-public class BasicLongValue extends AbstractNumericRightValue<Long> {
+public class BasicLongValue extends AbstractNumericRightValue<Long, Long> {
 
     public BasicLongValue(final Long i) {
         setValue(i);
@@ -55,4 +55,9 @@ public String toString() {
             return super.toString();
         }
     }
+
+    @Override
+    public Long getNumericValue() {
+        return getValue();
+    }
 }

src/main/java/com/scriptbasic/utility/RightValueUtility.java

@@ -37,7 +37,7 @@ public static Object getValueObject(final RightValue arg) {
     public static Integer convert2Integer(final RightValue index)
             throws ScriptBasicException {
         if (index.isNumeric()) {
-            return ((AbstractNumericRightValue<Number>) index).getValue().intValue();
+            return ((AbstractNumericRightValue<Number, Object>) index).getNumericValue().intValue();
         } else {
             throw new BasicRuntimeException(
                     index.toString()