fixed the tests with new args

bin/tests/class_macro.slime.expanded

@@ -1,14 +1,14 @@
-(import "oo.slime")
-
-(define-class (vector3 x y z) (define (set-x new-x) (mutate x new-x)) (define (set-y new-y) (mutate y new-y)) (define (set-z new-z) (mutate z new-z)) (define (length) (** (+ (* x x) (* y y) (* z z)) 0.500000)) (define (scale fac) (mutate x (* fac x)) (mutate y (* fac y)) (mutate z (* fac z)) fac) (define (add other) (make-vector3 (+ (-> other x) x) (+ (-> other y) y) (+ (-> other z) z))) (define (subtract other) (make-vector3 (- (-> other x) x) (- (-> other y) y) (- (-> other z) z))) (define (equal? other) (and (= (-> other x) x) (= (-> other y) y) (= (-> other z) z))) (define (scalar-product other) (+ (* (-> other x) x) (* (-> other y) y) (* (-> other z) z))) (define (cross-product other) (make-vector3 (- (* (-> other z) y) (* (-> other y) z)) (- (* (-> other x) z) (* (-> other z) x)) (- (* (-> other y) x) (* (-> other x) y)))) (define (print) (printf :sep " " "[vector3] (" x y z ")")))
-
-(define v1 (make-vector3 1 2 3))
-
-(define v2 (make-vector3 3 2 1))
-
-(assert (= (type v1) (type v2) :vector3))
-
-(assert (= (v1 'scalar-product v2) 10))
-
-(assert (-> (-> v1 cross-product v2) equal? (make-vector3 -4 8 -4)))
-
+(import "oo.slime")
+
+(define-class (vector3 x y z) (define (set-x new-x) (mutate x new-x)) (define (set-y new-y) (mutate y new-y)) (define (set-z new-z) (mutate z new-z)) (define (length) (** (+ (* x x) (* y y) (* z z)) 0.500000)) (define (scale fac) (mutate x (* fac x)) (mutate y (* fac y)) (mutate z (* fac z)) fac) (define (add other) (make-vector3 (+ (-> other x) x) (+ (-> other y) y) (+ (-> other z) z))) (define (subtract other) (make-vector3 (- (-> other x) x) (- (-> other y) y) (- (-> other z) z))) (define (equal? other) (and (= (-> other x) x) (= (-> other y) y) (= (-> other z) z))) (define (scalar-product other) (+ (* (-> other x) x) (* (-> other y) y) (* (-> other z) z))) (define (cross-product other) (make-vector3 (- (* (-> other z) y) (* (-> other y) z)) (- (* (-> other x) z) (* (-> other z) x)) (- (* (-> other y) x) (* (-> other x) y)))) (define (print) (printf :sep " " "[vector3] (" x y z ")")))
+
+(define v1 (make-vector3 1 2 3))
+
+(define v2 (make-vector3 3 2 1))
+
+(assert (= (type v1) (type v2) :vector3))
+
+(assert (= (v1 'scalar-product v2) 10))
+
+(assert (-> (-> v1 cross-product v2) equal? (make-vector3 -4 8 -4)))
+

bin/tests/evaluation_of_default_args.slime

@@ -1,7 +1,7 @@
-((lambda (:keys k1 :defaults-to (+ 1 2 3))
+((lambda ((:k1 (+ 1 2 3)))
    (assert (= k1 6))))
 
-((lambda (:keys k1 :defaults-to ())
+((lambda ((:k1 ()))
    (when k1
      (assert ()))
    (assert (= k1 ()))))

bin/tests/lexical_scope.slime

@@ -32,7 +32,7 @@
 ;; key arguments
 
 (define (make-key-counter)
-  ((lambda (:keys var)
+  ((lambda (:var)
      (lambda ()
        (mutate var (+ 1 var))
        var))

bin/tests/lexical_scope.slime.expanded

@@ -1,54 +1,54 @@
-(define (make-counter) (let ((var 0)) (lambda () (set! var (+ 1 var)))))
-
-(define counter1 (make-counter))
-
-(assert (= (counter1) 1))
-
-(define counter2 (make-counter))
-
-(assert (= (counter2) 1))
-
-(assert (= (counter2) 2))
-
-(assert (= (counter1) 2))
-
-(assert (= (counter1) 3))
-
-(assert (= (counter2) 3))
-
-(assert (= (counter2) 4))
-
-(assert (= (counter2) 5))
-
-(assert (= (counter1) 4))
-
-(assert (= (counter1) 5))
-
-(define (g) (define x 0) (lambda () (define temp x) (mutate x (+ x 1)) temp))
-
-(define (make-key-counter) ((lambda (:keys var) (lambda () (mutate var (+ 1 var)) var)) :var 0))
-
-(define key-counter1 (make-key-counter))
-
-(assert (= (key-counter1) 1))
-
-(define key-counter2 (make-key-counter))
-
-(assert (= (key-counter2) 1))
-
-(assert (= (key-counter2) 2))
-
-(assert (= (key-counter1) 2))
-
-(assert (= (key-counter1) 3))
-
-(assert (= (key-counter2) 3))
-
-(assert (= (key-counter2) 4))
-
-(assert (= (key-counter2) 5))
-
-(assert (= (key-counter1) 4))
-
-(assert (= (key-counter1) 5))
-
+(define (make-counter) (let ((var 0)) (lambda () (set! var (+ 1 var)))))
+
+(define counter1 (make-counter))
+
+(assert (= (counter1) 1))
+
+(define counter2 (make-counter))
+
+(assert (= (counter2) 1))
+
+(assert (= (counter2) 2))
+
+(assert (= (counter1) 2))
+
+(assert (= (counter1) 3))
+
+(assert (= (counter2) 3))
+
+(assert (= (counter2) 4))
+
+(assert (= (counter2) 5))
+
+(assert (= (counter1) 4))
+
+(assert (= (counter1) 5))
+
+(define (g) (define x 0) (lambda () (define temp x) (mutate x (+ x 1)) temp))
+
+(define (make-key-counter) ((lambda (:var) (lambda () (mutate var (+ 1 var)) var)) :var 0))
+
+(define key-counter1 (make-key-counter))
+
+(assert (= (key-counter1) 1))
+
+(define key-counter2 (make-key-counter))
+
+(assert (= (key-counter2) 1))
+
+(assert (= (key-counter2) 2))
+
+(assert (= (key-counter1) 2))
+
+(assert (= (key-counter1) 3))
+
+(assert (= (key-counter2) 3))
+
+(assert (= (key-counter2) 4))
+
+(assert (= (key-counter2) 5))
+
+(assert (= (key-counter1) 4))
+
+(assert (= (key-counter1) 5))
+