scala: prevent defmacro! from mutating its argument

asarhaddon · Oct 10, 2024 · e2fe85e · e2fe85e
1 parent 17193d3
commit e2fe85e
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/impls/scala/step8_macros.scala b/impls/scala/step8_macros.scala
@@ -91,8 +91,8 @@ object step8_macros {
         ast = quasiquote(a1)  // continue loop (TCO)
       }
       case Symbol("defmacro!") :: a1 :: a2 :: Nil => {
-        val f = EVAL(a2, env)
-        f.asInstanceOf[MalFunction].ismacro = true
+        val f = EVAL(a2, env).asInstanceOf[MalFunction].clone()
+        f.ismacro = true
         return env.set(a1.asInstanceOf[Symbol], f)
       }
       case Symbol("do") :: rest => {

diff --git a/impls/scala/step9_try.scala b/impls/scala/step9_try.scala
@@ -91,8 +91,8 @@ object step9_try {
         ast = quasiquote(a1)  // continue loop (TCO)
       }
       case Symbol("defmacro!") :: a1 :: a2 :: Nil => {
-        val f = EVAL(a2, env)
-        f.asInstanceOf[MalFunction].ismacro = true
+        val f = EVAL(a2, env).asInstanceOf[MalFunction].clone()
+        f.ismacro = true
         return env.set(a1.asInstanceOf[Symbol], f)
       }
       case Symbol("try*") :: a1 :: rest => {

diff --git a/impls/scala/stepA_mal.scala b/impls/scala/stepA_mal.scala
@@ -91,8 +91,8 @@ object stepA_mal {
         ast = quasiquote(a1)  // continue loop (TCO)
       }
       case Symbol("defmacro!") :: a1 :: a2 :: Nil => {
-        val f = EVAL(a2, env)
-        f.asInstanceOf[MalFunction].ismacro = true
+        val f = EVAL(a2, env).asInstanceOf[MalFunction].clone()
+        f.ismacro = true
         return env.set(a1.asInstanceOf[Symbol], f)
       }
       case Symbol("try*") :: a1 :: rest => {