added mod and modF

INTO-CPS-Association · Sep 17, 2024 · 7844cd1 · 7844cd1
1 parent a3e221c
commit 7844cd1
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 0 deletions.
diff --git a/interpreter/src/main/java/org/intocps/maestro/interpreter/values/MathValue.java b/interpreter/src/main/java/org/intocps/maestro/interpreter/values/MathValue.java
@@ -32,6 +32,26 @@ private static Map<String, Value> createMembers() {
             }
 
         }));
+        componentMembers.put("mod", new FunctionValue.ExternalFunctionValue(args -> {
+
+            if (args.size() == 2 && args.get(0).deref().isNumeric() && args.get(1).deref().isNumeric()) {
+                NumericValue a = (NumericValue) args.get(0).deref();
+                NumericValue b = (NumericValue) args.get(1).deref();
+                return NumericValue.valueOf(a.doubleValue() % b.doubleValue());
+            }
+
+            throw new InterpreterException("Wrong arguments for mod:" + args);
+        }));
+        componentMembers.put("modF", new FunctionValue.ExternalFunctionValue(args -> {
+
+            if (args.size() == 2 && args.get(0).deref().isNumeric() && args.get(1).deref().isNumeric()) {
+                NumericValue a = (NumericValue) args.get(0).deref();
+                NumericValue b = (NumericValue) args.get(1).deref();
+                return NumericValue.valueOf(a.floatValue() % b.floatValue());
+            }
+
+            throw new InterpreterException("Wrong arguments for mod:" + args);
+        }));
         componentMembers.put("minRealFromArray", new FunctionValue.ExternalFunctionValue(args -> {
 
             if (args.get(0).deref() instanceof ArrayValue) {

diff --git a/typechecker/src/main/resources/org/intocps/maestro/typechecker/Math.mabl b/typechecker/src/main/resources/org/intocps/maestro/typechecker/Math.mabl
@@ -2,4 +2,6 @@ module Math {
     bool isClose(real a, real b, real absoluteTolerance, real relativeTolerance);
     real min(real a, real b);
     real minRealFromArray(real realArray[]);
+    real mod(real a, real b);
+    real modF(float a, float b);
 }