Merge pull request #121 from Ferada/small-fixes

Fix OSET, TYPECASE.

diff --combined src/boot.lisp
index d7141f6,484429e..874d7a5
--- 1/src/boot.lisp
--- 2/src/boot.lisp
+++ b/src/boot.lisp
@@@ -291,9 -291,7 +291,9 @@@
  
  (defmacro do (varlist endlist &body body)
    `(block nil
 -     (let ,(mapcar (lambda (x) (list (first x) (second x))) varlist)
 +     (let ,(mapcar (lambda (x) (if (symbolp x)
 +                                   (list x nil)
 +                                 (list (first x) (second x)))) varlist)
         (while t
           (when ,(car endlist)
             (return (progn ,@(cdr endlist))))
@@@ -301,16 -299,13 +301,16 @@@
           (psetq
            ,@(apply #'append
                     (mapcar (lambda (v)
 -                             (and (consp (cddr v))
 +                             (and (listp v)
 +                                  (consp (cddr v))
                                    (list (first v) (third v))))
                             varlist)))))))
  
  (defmacro do* (varlist endlist &body body)
    `(block nil
 -     (let* ,(mapcar (lambda (x) (list (first x) (second x))) varlist)
 +     (let* ,(mapcar (lambda (x1) (if (symbolp x1)
 +                                     (list x1 nil)
 +                                   (list (first x1) (second x1)))) varlist)
         (while t
           (when ,(car endlist)
             (return (progn ,@(cdr endlist))))
@@@ -318,8 -313,7 +318,8 @@@
           (setq
            ,@(apply #'append
                     (mapcar (lambda (v)
 -                             (and (consp (cddr v))
 +                             (and (listp v)
 +                                  (consp (cddr v))
                                    (list (first v) (third v))))
                             varlist)))))))
  
@@@ -494,7 -488,7 +494,7 @@@
         (cond
           ,@(mapcar (lambda (c)
                       (if (eq (car c) t)
-                          `((t ,@(rest c)))
+                          `(t ,@(rest c))
                           `((,(ecase (car c)
                                      (integer 'integerp)
                                      (cons 'consp)