X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Fearly-extensions.lisp;h=323982d5ed5b9b9b201ca8690f6eb3f941a451fb;hb=0f2ae6ebc3520494b665a9dbf32c36c671334d36;hp=cb48d4e202e5fc36c8d89068d85e86ce790aa7e4;hpb=d75b4eb603f1e9e366997c8e378fe0ae0d79b5d9;p=sbcl.git

diff --git a/src/code/early-extensions.lisp b/src/code/early-extensions.lisp
index cb48d4e..323982d 100644
--- a/src/code/early-extensions.lisp
+++ b/src/code/early-extensions.lisp
@@ -40,11 +40,20 @@
 ;;; alpha platform. -- CSR, 2002-06-24
 (def!type unsigned-byte-with-a-bite-out (s bite)
   (cond ((eq s '*) 'integer)
-        ((and (integerp s) (> s 1))
+        ((and (integerp s) (> s 0))
          (let ((bound (ash 1 s)))
            `(integer 0 ,(- bound bite 1))))
         (t
-         (error "Bad size specified for SIGNED-BYTE type specifier: ~S." s))))
+         (error "Bad size specified for UNSIGNED-BYTE type specifier: ~S." s))))
+
+;;; Motivated by the mips port. -- CSR, 2002-08-22
+(def!type signed-byte-with-a-bite-out (s bite)
+  (cond ((eq s '*) 'integer)
+	((and (integerp s) (> s 1))
+	 (let ((bound (ash 1 (1- s))))
+	   `(integer ,(- bound) ,(- bound bite 1))))
+	(t
+	 (error "Bad size specified for SIGNED-BYTE type specifier: ~S." s))))
 
 (def!type load/store-index (scale lowtag min-offset
 				 &optional (max-offset min-offset))
@@ -551,6 +560,40 @@
 			     ,@(values-names))
 			    (values ,@(values-names)))
 			  (values ,@(values-names))))))))))))
+
+(defmacro define-cached-synonym
+    (name &optional (original (symbolicate "%" name)))
+  (let ((cached-name (symbolicate "%%" name "-cached")))
+    `(progn
+       (defun-cached (,cached-name :hash-bits 8
+                                   :hash-function (lambda (x)
+                                                    (logand (sxhash x) #xff)))
+           ((args equal))
+         (apply #',original args))
+       (defun ,name (&rest args)
+         (,cached-name args)))))
+
+;;; FIXME: maybe not the best place
+;;;
+;;; FIXME: think of a better name -- not only does this not have the
+;;; CAR recursion of EQUAL, it also doesn't have the special treatment
+;;; of pathnames, bit-vectors and strings.
+;;;
+;;; KLUDGE: This means that we will no longer cache specifiers of the
+;;; form '(INTEGER (0) 4).  This is probably not a disaster.
+;;;
+;;; A helper function for the type system, which is the main user of
+;;; these caches: we must be more conservative than EQUAL for some of
+;;; our equality tests, because MEMBER and friends refer to EQLity.
+;;; So:
+(defun equal-but-no-car-recursion (x y)
+  (cond
+    ((eql x y) t)
+    ((consp x)
+     (and (consp y)
+	  (eql (car x) (car y))
+	  (equal-but-no-car-recursion (cdr x) (cdr y))))
+    (t nil)))
 
 ;;;; package idioms
 
@@ -583,21 +626,51 @@
 (defun legal-fun-name-p (name)
   (or (symbolp name)
       (and (consp name)
-           (eq (car name) 'setf)
-           (consp (cdr name))
-           (symbolp (cadr name))
-           (null (cddr name)))))
-
-;;; Given a function name, return the name for the BLOCK which
-;;; encloses its body (e.g. in DEFUN, DEFINE-COMPILER-MACRO, or FLET).
+	   ;; (SETF FOO)
+	   ;; (CLASS-PREDICATE FOO)
+           (or (and (or (eq (car name) 'setf)
+			(eq (car name) 'sb!pcl::class-predicate))
+		    (consp (cdr name))
+		    (symbolp (cadr name))
+		    (null (cddr name)))
+	       ;; (SLOT-ACCESSOR <CLASSNAME-OR-:GLOBAL>
+	       ;;  <SLOT-NAME> [READER|WRITER|BOUNDP])
+	       (and (eq (car name) 'sb!pcl::slot-accessor)
+		    (consp (cdr name))
+		    (symbolp (cadr name))
+		    (consp (cddr name))
+		    (symbolp (caddr name))
+		    (consp (cdddr name))
+		    (member
+		     (cadddr name)
+		     '(sb!pcl::reader sb!pcl::writer sb!pcl::boundp)))))))
+
+;;; Signal an error unless NAME is a legal function name.
+(defun legal-fun-name-or-type-error (name)
+  (unless (legal-fun-name-p name)
+    (error 'simple-type-error
+	   :datum name
+	   :expected-type '(or symbol list)
+	   :format-control "invalid function name: ~S"
+	   :format-arguments (list name))))
+
+;;; Given a function name, return the symbol embedded in it.
+;;;
+;;; The ordinary use for this operator (and the motivation for the
+;;; name of this operator) is to convert from a function name to the
+;;; name of the BLOCK which encloses its body.
+;;;
+;;; Occasionally the operator is useful elsewhere, where the operator
+;;; name is less mnemonic. (Maybe it should be changed?)
 (declaim (ftype (function ((or symbol cons)) symbol) fun-name-block-name))
 (defun fun-name-block-name (fun-name)
   (cond ((symbolp fun-name)
 	 fun-name)
 	((and (consp fun-name)
-	      (= (length fun-name) 2)
-	      (eq (first fun-name) 'setf))
-	 (second fun-name))
+	      (legal-fun-name-p fun-name))
+	 (case (car fun-name)
+	   ((setf sb!pcl::class-predicate) (second fun-name))
+	   ((sb!pcl::slot-accessor) (third fun-name))))
 	(t
 	 (error "not legal as a function name: ~S" fun-name))))
 
@@ -997,3 +1070,17 @@ which can be found at <http://sbcl.sourceforge.net/>.~:@>"
   (warn "using deprecated ~S~@[, should use ~S instead~]"
 	bad-name
 	good-name))
+
+;;; Anaphoric macros
+(defmacro awhen (test &body body)
+  `(let ((it ,test))
+     (when it ,@body)))
+
+(defmacro acond (&rest clauses)
+  (if (null clauses)
+      `()
+      (destructuring-bind ((test &body body) &rest rest) clauses
+        (once-only ((test test))
+          `(if ,test
+               (let ((it ,test)) (declare (ignorable it)),@body)
+               (acond ,@rest))))))