Pass 3

asarhaddon · Oct 10, 2024 · e2ef542 · e2ef542
1 parent 52190af
commit e2ef542
Show file tree

Hide file tree

Showing 6 changed files with 65 additions and 56 deletions.
diff --git a/impls/scala/step2_eval.scala b/impls/scala/step2_eval.scala
@@ -1,4 +1,4 @@
-import types.{MalList, _list_Q, MalVector, MalHashMap}
+import types.{MalList, _list_Q, MalVector, MalHashMap, MalFunction}
 
 object step2_eval {
   // read
@@ -23,23 +23,20 @@ object step2_eval {
     }
 
     // apply list
-
-    ast.asInstanceOf[MalList].value match {
-      case Nil => {
-        return ast
-      }
-      case first :: rest => {
-        // function call
-          EVAL(first, env) match {
-              case fn: (List[Any] => Any) => {
-                val el = rest.map(EVAL(_, env))
-                return fn(el)
-              }
-              case f => {
-                throw new Exception("attempt to call non-function: " + f)
-              }
-          }
+    if (ast.asInstanceOf[MalList].value.length == 0)
+      return ast
+    ast.asInstanceOf[MalList].map(EVAL(_, env)).value match {
+      case f :: el => {
+        var fn: List[Any] => Any = null
+        try {
+          fn = f.asInstanceOf[List[Any] => Any]
+        } catch {
+          case _: Throwable =>
+            throw new Exception("attempt to call non-function")
+        }
+        return fn(el)
       }
+      case _ => throw new Exception("invalid apply")
     }
   }
 

diff --git a/impls/scala/step3_env.scala b/impls/scala/step3_env.scala
@@ -1,4 +1,4 @@
-import types.{MalList, _list_Q, MalVector, MalHashMap}
+import types.{MalList, _list_Q, MalVector, MalHashMap, MalFunction}
 import env.Env
 
 object step3_env {
@@ -29,7 +29,6 @@ object step3_env {
     }
 
     // apply list
-
     ast.asInstanceOf[MalList].value match {
       case Nil => {
         return ast
@@ -44,17 +43,21 @@ object step3_env {
         }
         return EVAL(a2, let_env)
       }
-      case first :: rest => {
+      case _ => {
         // function call
-          EVAL(first, env) match {
-              case fn: (List[Any] => Any) => {
-                val el = rest.map(EVAL(_, env))
-                return fn(el)
-              }
-              case f => {
-                throw new Exception("attempt to call non-function: " + f)
-              }
+        ast.asInstanceOf[MalList].map(EVAL(_, env)).value match {
+          case f :: el => {
+            var fn: List[Any] => Any = null
+            try {
+              fn = f.asInstanceOf[(List[Any]) => Any]
+            } catch {
+              case _: Throwable =>
+                throw new Exception("attempt to call non-function")
+            }
+            return fn(el)
           }
+          case _ => throw new Exception("invalid apply")
+        }
       }
     }
   }

diff --git a/impls/scala/step4_if_fn_do.scala b/impls/scala/step4_if_fn_do.scala
@@ -30,7 +30,6 @@ object step4_if_fn_do {
     }
 
     // apply list
-
     ast.asInstanceOf[MalList].value match {
       case Nil => {
         return ast
@@ -63,17 +62,21 @@ object step4_if_fn_do {
           EVAL(a2, new Env(env, types._toIter(a1), args.iterator))
         })
       }
-      case first :: rest => {
+      case _ => {
         // function call
-          EVAL(first, env) match {
-              case fn: Func => {
-                val el = rest.map(EVAL(_, env))
-                return fn(el)
-              }
-              case f => {
-                throw new Exception("attempt to call non-function: " + f)
-              }
+        ast.asInstanceOf[MalList].map(EVAL(_, env)).value match {
+          case f :: el => {
+            var fn: Func = null
+            try {
+              fn = f.asInstanceOf[Func]
+            } catch {
+              case _: Throwable =>
+                throw new Exception("attempt to call non-function")
+            }
+            return fn(el)
           }
+          case _ => throw new Exception("invalid apply")
+        }
       }
     }
   }

diff --git a/impls/scala/step5_tco.scala b/impls/scala/step5_tco.scala
@@ -32,7 +32,6 @@ object step5_tco {
     }
 
     // apply list
-
     ast.asInstanceOf[MalList].value match {
       case Nil => {
         return ast
@@ -68,22 +67,25 @@ object step5_tco {
           }
         )
       }
-      case first :: rest => {
+      case _ => {
         // function call
-          EVAL(first, env) match {
+        ast.asInstanceOf[MalList].map(EVAL(_, env)).value match {
+          case f :: el => {
+            f match {
               case fn: MalFunction => {
-                val el = rest.map(EVAL(_, env))
                 env = fn.gen_env(el) 
                 ast = fn.ast  // continue loop (TCO)
               }
               case fn: Func => {
-                val el = rest.map(EVAL(_, env))
                 return fn(el)
               }
-              case f => {
+              case _ => {
                 throw new Exception("attempt to call non-function: " + f)
               }
+            }
           }
+          case _ => throw new Exception("invalid apply")
+        }
       }
     }
    }

diff --git a/impls/scala/step6_file.scala b/impls/scala/step6_file.scala
@@ -32,7 +32,6 @@ object step6_file {
     }
 
     // apply list
-
     ast.asInstanceOf[MalList].value match {
       case Nil => {
         return ast
@@ -68,22 +67,25 @@ object step6_file {
           }
         )
       }
-      case first :: rest => {
+      case _ => {
         // function call
-          EVAL(first, env) match {
+        ast.asInstanceOf[MalList].map(EVAL(_, env)).value match {
+          case f :: el => {
+            f match {
               case fn: MalFunction => {
-                val el = rest.map(EVAL(_, env))
                 env = fn.gen_env(el) 
                 ast = fn.ast  // continue loop (TCO)
               }
               case fn: Func => {
-                val el = rest.map(EVAL(_, env))
                 return fn(el)
               }
-              case f => {
+              case _ => {
                 throw new Exception("attempt to call non-function: " + f)
               }
+            }
           }
+          case _ => throw new Exception("invalid apply")
+        }
       }
     }
    }

diff --git a/impls/scala/step7_quote.scala b/impls/scala/step7_quote.scala
@@ -69,7 +69,6 @@ object step7_quote {
     }
 
     // apply list
-
     ast.asInstanceOf[MalList].value match {
       case Nil => {
         return ast
@@ -111,22 +110,25 @@ object step7_quote {
           }
         )
       }
-      case first :: rest => {
+      case _ => {
         // function call
-          EVAL(first, env) match {
+        ast.asInstanceOf[MalList].map(EVAL(_, env)).value match {
+          case f :: el => {
+            f match {
               case fn: MalFunction => {
-                val el = rest.map(EVAL(_, env))
                 env = fn.gen_env(el) 
                 ast = fn.ast  // continue loop (TCO)
               }
               case fn: Func => {
-                val el = rest.map(EVAL(_, env))
                 return fn(el)
               }
-              case f => {
+              case _ => {
                 throw new Exception("attempt to call non-function: " + f)
               }
+            }
           }
+          case _ => throw new Exception("invalid apply")
+        }
       }
     }
    }