Ticket #575: dsssl-check.patch

expand.scm

@@ -386 +386 @@
                                [(1) (loop 1 req (cons (list var #f) opt) '() r)]
                                [(2) (err "invalid lambda list syntax after `#!rest' marker")]
                                [else (loop 3 req opt (cons (list var) key) r)] ) ]
-                            [(and (list? var) (eq? 2 (length var)))
+                            [(and (list? var) (eq? 2 (length var)) (symbol? (car var)))
                              (case mode
                                [(0) (err "invalid required argument syntax")]
                                [(1) (loop 1 req (cons var opt) '() r)]

tests/syntax-tests.scm

@@ -440 +440 @@
   (import scheme chicken)
   ((lambda (#!key string) (assert (not string))))) ; refered to R5RS `string'
 
+;;; Missing check for keyword and optional variable types in DSSSL llists
+
+(f (eval '(lambda (foo #!key (0 1)) x)))
+(f (eval '(lambda (foo #!optional (0 1)) x)))
 
 ;;; compiler didn't resolve expansion into local variable
 ;;; (reported by Alex Shinn, #15)