fix dyadic pervasive function recursive cases

kspalaiologos · Jun 27, 2023 · c94eabf · c94eabf
1 parent 22ce2ee
commit c94eabf
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 12 deletions.
diff --git a/src/main/java/palaiologos/kamilalisp/runtime/flt64/Cmplx64PervasiveDyadicFunction.java b/src/main/java/palaiologos/kamilalisp/runtime/flt64/Cmplx64PervasiveDyadicFunction.java
@@ -27,21 +27,21 @@ public Atom apply(Environment env, List<Atom> args) {
             for(int i = 0; i < Math.min(args.get(0).getList().size(), args.get(1).getList().size()); i++) {
                 Atom a = args.get(0).getList().get(i);
                 Atom b = args.get(1).getList().get(i);
-                result.add(new Atom(apply(env, List.of(a, b)).getList()));
+                result.add(apply(env, List.of(a, b)));
             }
             return new Atom(result);
         } else if(args.get(0).getType() == Type.LIST) {
             List<Atom> result = new ArrayList<>();
             for(int i = 0; i < args.get(0).getList().size(); i++) {
                 Atom a = args.get(0).getList().get(i);
-                result.add(new Atom(apply(env, List.of(a, args.get(1))).getList()));
+                result.add(apply(env, List.of(a, args.get(1))));
             }
             return new Atom(result);
         } else if(args.get(1).getType() == Type.LIST) {
             List<Atom> result = new ArrayList<>();
             for(int i = 0; i < args.get(1).getList().size(); i++) {
                 Atom b = args.get(1).getList().get(i);
-                result.add(new Atom(apply(env, List.of(args.get(0), b)).getList()));
+                result.add(apply(env, List.of(args.get(0), b)));
             }
             return new Atom(result);
         }

diff --git a/src/main/java/palaiologos/kamilalisp/runtime/flt64/Flt64PervasiveDyadicComparator.java b/src/main/java/palaiologos/kamilalisp/runtime/flt64/Flt64PervasiveDyadicComparator.java
@@ -26,21 +26,21 @@ public Atom apply(Environment env, List<Atom> args) {
             for(int i = 0; i < Math.min(args.get(0).getList().size(), args.get(1).getList().size()); i++) {
                 Atom a = args.get(0).getList().get(i);
                 Atom b = args.get(1).getList().get(i);
-                result.add(new Atom(apply(env, List.of(a, b)).getList()));
+                result.add(apply(env, List.of(a, b)));
             }
             return new Atom(result);
         } else if(args.get(0).getType() == Type.LIST) {
             List<Atom> result = new ArrayList<>();
             for(int i = 0; i < args.get(0).getList().size(); i++) {
                 Atom a = args.get(0).getList().get(i);
-                result.add(new Atom(apply(env, List.of(a, args.get(1))).getList()));
+                result.add(apply(env, List.of(a, args.get(1))));
             }
             return new Atom(result);
         } else if(args.get(1).getType() == Type.LIST) {
             List<Atom> result = new ArrayList<>();
             for(int i = 0; i < args.get(1).getList().size(); i++) {
                 Atom b = args.get(1).getList().get(i);
-                result.add(new Atom(apply(env, List.of(args.get(0), b)).getList()));
+                result.add(apply(env, List.of(args.get(0), b)));
             }
             return new Atom(result);
         }

diff --git a/src/main/java/palaiologos/kamilalisp/runtime/flt64/Flt64PervasiveDyadicFunction.java b/src/main/java/palaiologos/kamilalisp/runtime/flt64/Flt64PervasiveDyadicFunction.java
@@ -26,21 +26,21 @@ public Atom apply(Environment env, List<Atom> args) {
             for(int i = 0; i < Math.min(args.get(0).getList().size(), args.get(1).getList().size()); i++) {
                 Atom a = args.get(0).getList().get(i);
                 Atom b = args.get(1).getList().get(i);
-                result.add(new Atom(apply(env, List.of(a, b)).getList()));
+                result.add(apply(env, List.of(a, b)));
             }
             return new Atom(result);
         } else if(args.get(0).getType() == Type.LIST) {
             List<Atom> result = new ArrayList<>();
             for(int i = 0; i < args.get(0).getList().size(); i++) {
                 Atom a = args.get(0).getList().get(i);
-                result.add(new Atom(apply(env, List.of(a, args.get(1))).getList()));
+                result.add(apply(env, List.of(a, args.get(1))));
             }
             return new Atom(result);
         } else if(args.get(1).getType() == Type.LIST) {
             List<Atom> result = new ArrayList<>();
             for(int i = 0; i < args.get(1).getList().size(); i++) {
                 Atom b = args.get(1).getList().get(i);
-                result.add(new Atom(apply(env, List.of(args.get(0), b)).getList()));
+                result.add(apply(env, List.of(args.get(0), b)));
             }
             return new Atom(result);
         }

diff --git a/src/main/java/palaiologos/kamilalisp/runtime/flt64/Flt64PervasiveDyadicIntFunction.java b/src/main/java/palaiologos/kamilalisp/runtime/flt64/Flt64PervasiveDyadicIntFunction.java
@@ -26,21 +26,21 @@ public Atom apply(Environment env, List<Atom> args) {
             for(int i = 0; i < Math.min(args.get(0).getList().size(), args.get(1).getList().size()); i++) {
                 Atom a = args.get(0).getList().get(i);
                 Atom b = args.get(1).getList().get(i);
-                result.add(new Atom(apply(env, List.of(a, b)).getList()));
+                result.add(apply(env, List.of(a, b)));
             }
             return new Atom(result);
         } else if(args.get(0).getType() == Type.LIST) {
             List<Atom> result = new ArrayList<>();
             for(int i = 0; i < args.get(0).getList().size(); i++) {
                 Atom a = args.get(0).getList().get(i);
-                result.add(new Atom(apply(env, List.of(a, args.get(1))).getList()));
+                result.add(apply(env, List.of(a, args.get(1))));
             }
             return new Atom(result);
         } else if(args.get(1).getType() == Type.LIST) {
             List<Atom> result = new ArrayList<>();
             for(int i = 0; i < args.get(1).getList().size(); i++) {
                 Atom b = args.get(1).getList().get(i);
-                result.add(new Atom(apply(env, List.of(args.get(0), b)).getList()));
+                result.add(apply(env, List.of(args.get(0), b)));
             }
             return new Atom(result);
         }