Fix bug in map: should pass args as list

This appeared only for variadic function which is used in EVAL. Added a test to step 9 to catch this earlier.
Aegwenia · Dec 21, 2017 · e2ada64 · e2ada64
1 parent 7f5572b
commit e2ada64
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/nasm/core.asm b/nasm/core.asm
@@ -2211,14 +2211,16 @@ core_map:
         
         mov cl, BYTE [r9]
         and cl, content_mask
-
+        mov ch, cl
+        or cl, container_list
+        
         call alloc_cons
         mov [rax], BYTE cl      ; set content type
         mov rbx, [r9 + Cons.car]
         mov [rax + Cons.car], rbx ; Copy content
         mov rsi, rax
 
-        cmp cl, content_pointer
+        cmp ch, content_pointer
         jne .run
 
         ; A pointer, so increment ref count

diff --git a/tests/step9_try.mal b/tests/step9_try.mal
@@ -139,6 +139,9 @@
 (map (fn* (a) (* 2 a)) [1 2 3])
 ;=>(2 4 6)
 
+(map (fn* [& args] (list? args)) [1 2])
+;=>(true true)
+
 ;; Testing vector functions
 
 (vector? [10 11])