From: Christophe Rhodes <csr21@cantab.net>
Date: Sat, 2 Apr 2011 14:19:36 +0000 (+0000)
Subject: 1.0.47.8: No more INSTANCE-LAMBDA
X-Git-Url: http://repo.macrolet.net/gitweb/?a=commitdiff_plain;h=709547dfb0905983f23bf131c43affe7788a7e9f;p=sbcl.git

1.0.47.8: No more INSTANCE-LAMBDA

So long!  Farewell!  It's time to say goodbye!
---

diff --git a/package-data-list.lisp-expr b/package-data-list.lisp-expr
index 67d7d15..16ddd97 100644
--- a/package-data-list.lisp-expr
+++ b/package-data-list.lisp-expr
@@ -1818,7 +1818,7 @@ is a good idea, but see SB-SYS re. blurring of boundaries."
                "BASIC-STRUCTURE-CLASSOID"
                "REGISTER-LAYOUT"
                "FUNCALLABLE-INSTANCE" "RANDOM-FIXNUM-MAX"
-               "MAKE-STATIC-CLASSOID" "INSTANCE-LAMBDA"
+               "MAKE-STATIC-CLASSOID"
                "%MAKE-SYMBOL"
                "%FUNCALLABLE-INSTANCE-FUNCTION" "SYMBOL-HASH"
 
diff --git a/src/code/coerce.lisp b/src/code/coerce.lisp
index 928f24b..2fc9ff1 100644
--- a/src/code/coerce.lisp
+++ b/src/code/coerce.lisp
@@ -80,8 +80,6 @@
         ;; FIXME: If we go to a compiler-only implementation, this can
         ;; become COMPILE instead of EVAL, which seems nicer to me.
         (eval `(function ,object)))
-       ((instance-lambda)
-        (deprecation-error "0.9.3.32" 'instance-lambda 'lambda))
        (t
         (error 'simple-type-error
                :datum object
diff --git a/src/code/full-eval.lisp b/src/code/full-eval.lisp
index 5079abc..718f5f1 100644
--- a/src/code/full-eval.lisp
+++ b/src/code/full-eval.lisp
@@ -544,10 +544,8 @@
 
 ;;; Return true if EXP is a lambda form.
 (defun lambdap (exp)
-  (case (car exp) ((lambda
-                    sb!int:named-lambda
-                    sb!kernel:instance-lambda)
-                   t)))
+  (case (car exp)
+    ((lambda sb!int:named-lambda) t)))
 
 ;;; Split off the declarations (and the docstring, if
 ;;; DOC-STRING-ALLOWED is true) from the actual forms of BODY.
@@ -577,7 +575,7 @@
 ;;; in the environment ENV.
 (defun eval-lambda (exp env)
   (case (car exp)
-    ((lambda sb!kernel:instance-lambda)
+    ((lambda)
      (multiple-value-bind (body documentation declarations)
          (parse-lambda-headers (cddr exp) :doc-string-allowed t)
        (make-interpreted-function :lambda-list (second exp)
diff --git a/src/compiler/fopcompile.lisp b/src/compiler/fopcompile.lisp
index 266bcc6..7a4c332 100644
--- a/src/compiler/fopcompile.lisp
+++ b/src/compiler/fopcompile.lisp
@@ -172,7 +172,7 @@
 (defun lambda-form-p (form)
   (and (consp form)
        (member (car form)
-               '(lambda named-lambda instance-lambda lambda-with-lexenv))))
+               '(lambda named-lambda lambda-with-lexenv))))
 
 ;;; Check that a literal form is fopcompilable. It would not for example
 ;;; when the form contains structures with funny MAKE-LOAD-FORMS.
diff --git a/src/compiler/ir1-translators.lisp b/src/compiler/ir1-translators.lisp
index b33d94a..238d04e 100644
--- a/src/compiler/ir1-translators.lisp
+++ b/src/compiler/ir1-translators.lisp
@@ -477,7 +477,7 @@ Return VALUE without evaluating it."
     ((named-lambda)
      (or (second thing)
          `(lambda ,(third thing))))
-    ((lambda instance-lambda)
+    ((lambda)
      `(lambda ,(second thing)))
     ((lambda-with-lexenv)
      `(lambda ,(fifth thing)))
@@ -489,7 +489,7 @@ Return VALUE without evaluating it."
   (if (consp thing)
       (cond
         ((member (car thing)
-                 '(lambda named-lambda instance-lambda lambda-with-lexenv))
+                 '(lambda named-lambda lambda-with-lexenv))
          (values (ir1-convert-lambdalike
                   thing
                   :debug-name (name-lambdalike thing))
diff --git a/src/compiler/ir1tran-lambda.lisp b/src/compiler/ir1tran-lambda.lisp
index 63b14da..3374deb 100644
--- a/src/compiler/ir1tran-lambda.lisp
+++ b/src/compiler/ir1tran-lambda.lisp
@@ -1012,13 +1012,6 @@
                          :maybe-add-debug-catch t
                          :source-name source-name
                          :debug-name debug-name))
-    ((instance-lambda)
-     (deprecation-warning :final "0.9.3.32" 'instance-lambda 'lambda)
-     (ir1-convert-lambda `(lambda (&rest args)
-                            (declare (ignore args))
-                            (deprecation-error "0.9.3.32" 'instance-lambda 'lambda))
-                         :source-name source-name
-                         :debug-name debug-name))
     ((named-lambda)
      (let ((name (cadr thing))
            (lambda-expression `(lambda ,@(cddr thing))))