Apply works as expected.

lib/baselib.scm

@@ -26,8 +26,12 @@
 ;; For cond
 (define else #t)
 
-(define (apply proc . args)
-    (asm (args) (proc) tail_call_in ))
+(define (apply proc l . args)
+    (define new-args
+        (if (null? args)
+            l
+            (asm (args) (l) cons (append) call_in))) 
+    (asm (new-args) (proc) tail_call_in))
 
 (include "dynamic.scm")
 

lib/loop.scm

@@ -52,7 +52,7 @@
     (if (or (null? val-list) (null? (car val-list)))
 	'()
 	(begin
-	  (apply proc (car val-list))
+	  (apply proc (list (car val-list)))
 	  (inner (cdr val-list)))))
 
   (inner (prep-args val-list)))
@@ -66,7 +66,7 @@
 	(reverse result)
 	(inner (cdr val-list)
 	       (cons
-		(apply proc (car val-list))
+		(apply proc (list (car val-list)))
 		result))))
 
   (inner (prep-args val-list) '()))

test/test_apply.scm

@@ -4,14 +4,32 @@
 
 (include "expect.scm")
 
+(expect "Verify that apply appends to the list of args"
+    (lambda ()
+        (apply list (list 1 2 3) (list 4 5 6)))
+    (list 1 2 3 4 5 6))
+
 (expect "Verify that apply feeds a list to the proc as expected"
     (lambda ()
         (apply list (list 1 2 3)))
 
     (list 1 2 3))
 
-(expect "Verify that apply appends to the list of args"
+(expect "That a simple apply works"
+    (lambda ()
+        (apply (lambda (x y ) (+ x y)) (list 1 2)))
+    3)
+
+(define (div30 x) (/ x 30))
+(define (mul x y) (* x y ))
+
+(define compose
+    (lambda (f g)
+        (lambda args
+            (f (apply g args)))))
+
+(expect "Check a more complex example"
     (lambda ()
-        (apply list (list 1 2 3) 4 5 6)
-    (list 1 2 3 4 5 6)))
+        ((compose div30 mul) 12 75))
+    30)