X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Fearly-c.lisp;h=b6d0803a07d6a3c190b4e6bb34d528f51d7ce1c5;hb=5d04a95274c9ddaebbcd6ddffc5d646e2c25598c;hp=3ec37984cdb0fe5b20e91378dd1ed0a7c7e60959;hpb=30479182014bc1e02f54d330643ca45605e3530d;p=sbcl.git

diff --git a/src/compiler/early-c.lisp b/src/compiler/early-c.lisp
index 3ec3798..b6d0803 100644
--- a/src/compiler/early-c.lisp
+++ b/src/compiler/early-c.lisp
@@ -29,20 +29,6 @@
   #!+sb-doc
   "The exclusive upper bound on the number of multiple VALUES that you can
   return.")
-
-(defconstant-eqx sb!xc:lambda-list-keywords
-  '(&allow-other-keys
-    &aux
-    &body
-    &environment
-    &key
-    &more
-    &optional
-    &rest
-    &whole)
-  #'equal
-  #!+sb-doc
-  "symbols which are magical in a lambda list")
 
 ;;;; cross-compiler-only versions of CL special variables, so that we
 ;;;; don't have weird interactions with the host compiler
@@ -123,12 +109,16 @@
 (defvar *trace-table*)
 (defvar *undefined-warnings*)
 (defvar *warnings-p*)
+(defvar *lambda-conversions*)
 
 ;;; This lock is seized in the compiler, and related areas: the
 ;;; compiler is not presently thread-safe
 (defvar *big-compiler-lock*
   (sb!thread:make-mutex :name "big compiler lock"))
 
+(declaim (type fixnum *compiler-sset-counter*))
+(defvar *compiler-sset-counter* 0)
+
 ;;; unique ID for the next object created (to let us track object
 ;;; identity even across GC, useful for understanding weird compiler
 ;;; bugs where something is supposed to be unique but is instead
@@ -174,29 +164,78 @@
     ;; and then we happen to compile bar.lisp before foo.lisp.
   (when (looks-like-name-of-special-var-p symbol)
     ;; FIXME: should be COMPILER-STYLE-WARNING?
-    (style-warn "using the lexical binding of the symbol ~S, not the~@
-dynamic binding, even though the symbol name follows the usual naming~@
-convention (names like *FOO*) for special variables" symbol))
+    (style-warn 'sb!kernel:ignoring-asterisks-in-lexical-variable-name
+                :format-control
+                "using the lexical binding of the symbol ~S, not the~@
+                 dynamic binding"
+                :format-arguments (list symbol)))
   (values))
 
-(defvar *debug-name-level* 6)
+(def!struct (debug-name-marker (:make-load-form-fun dump-debug-name-marker)
+                               (:print-function print-debug-name-marker)))
+
+(defvar *debug-name-level* 4)
+(defvar *debug-name-length* 12)
+(defvar *debug-name-punt*)
+(defvar *debug-name-sharp*)
+(defvar *debug-name-ellipsis*)
+
+(eval-when (:compile-toplevel :load-toplevel :execute)
+  (defun dump-debug-name-marker (marker &optional env)
+    (declare (ignore env))
+    (cond ((eq marker *debug-name-sharp*)
+           `(if (boundp '*debug-name-sharp*)
+                *debug-name-sharp*
+                (make-debug-name-marker)))
+          ((eq marker *debug-name-ellipsis*)
+           `(if (boundp '*debug-name-ellipsis*)
+                *debug-name-ellipsis*
+                (make-debug-name-marker)))
+          (t
+           (warn "Dumping unknown debug-name marker.")
+           '(make-debug-name-marker)))))
+
+(defun print-debug-name-marker (marker stream level)
+  (declare (ignore level))
+  (cond ((eq marker *debug-name-sharp*)
+         (write-char #\# stream))
+        ((eq marker *debug-name-ellipsis*)
+         (write-string "..." stream))
+        (t
+         (write-string "???" stream))))
+
+(setf *debug-name-sharp* (make-debug-name-marker)
+      *debug-name-ellipsis* (make-debug-name-marker))
 
 (defun debug-name (type thing)
-  (labels ((walk (x level)
-             (if (> *debug-name-level* (incf level))
-                 (typecase x
-                   (cons
-                    (cons (walk (car x) level) (walk (cdr x) level)))
-                   ((or symbol number string)
-                    x)
-                   (t
-                    (list 'of-type (type-of x))))
-                 "#<...>")))
-    ;; FIXME: It might be nice to put markers in the tree instead of
-    ;; this #<...> business, so that they would evantually be printed
-    ;; without the quotes.
-    (let ((name (list type (walk thing 0))))
-      (when (legal-fun-name-p name)
-        (bug "~S is a legal function name, and cannot be used as a ~
-              debug name." name))
-      name)))
+  (let ((*debug-name-punt* nil))
+    (labels ((walk (x)
+               (typecase x
+                 (cons
+                  (if (plusp *debug-name-level*)
+                      (let ((*debug-name-level* (1- *debug-name-level*)))
+                        (do ((tail (cdr x) (cdr tail))
+                             (name (cons (walk (car x)) nil)
+                                   (cons (walk (car tail)) name))
+                             (n (1- *debug-name-length*) (1- n)))
+                            ((or (not (consp tail))
+                                 (not (plusp n))
+                                 *debug-name-punt*)
+                             (cond (*debug-name-punt*
+                                    (setf *debug-name-punt* nil)
+                                    (nreverse name))
+                                   ((atom tail)
+                                    (nconc (nreverse name) (walk tail)))
+                                   (t
+                                    (setf *debug-name-punt* t)
+                                    (nconc (nreverse name) (list *debug-name-ellipsis*)))))))
+                      *debug-name-sharp*))
+                 ((or symbol number string)
+                  x)
+                 (t
+                  (type-of x)))))
+      (let ((name (list type (walk thing))))
+        (when (legal-fun-name-p name)
+          (bug "~S is a legal function name, and cannot be used as a ~
+                debug name." name))
+        name))))