X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fboot.lisp;h=10761131b13229d2bd612d5019ba55a8b6d694ee;hb=b2de12c4e1a6e77e7f3f22d056adcfeda79d085b;hp=dc9b45f4bbe65a29befdf35b6cabef776de1ac4b;hpb=162bfa35d0b1a8a698dc813f6bc0874a043a225c;p=jscl.git diff --git a/src/boot.lisp b/src/boot.lisp index dc9b45f..1076113 100644 --- a/src/boot.lisp +++ b/src/boot.lisp @@ -87,7 +87,7 @@ (defvar *gensym-counter* 0) (defun gensym (&optional (prefix "G")) (setq *gensym-counter* (+ *gensym-counter* 1)) - (make-symbol (concat-two prefix (integer-to-string *gensym-counter*)))) + (make-symbol (concat prefix (integer-to-string *gensym-counter*)))) (defun boundp (x) (boundp x)) @@ -333,9 +333,6 @@ ((listp seq) (list-length seq)))) -(defun concat-two (s1 s2) - (concat-two s1 s2)) - (defmacro with-collect (&body body) (let ((head (gensym)) (tail (gensym))) @@ -496,6 +493,8 @@ (integer 'integerp) (cons 'consp) (symbol 'symbolp) + (function 'functionp) + (float 'floatp) (array 'arrayp) (string 'stringp) (atom 'atom) @@ -510,7 +509,7 @@ `(let ((,g!x ,x)) (typecase ,g!x ,@clausules - (t (error "~X fell through etypeacase expression." ,g!x)))))) + (t (error "~X fell through etypecase expression." ,g!x)))))) (defun notany (fn seq) (not (some fn seq)))