Remove variable si::*not-compile-time* which was redundant with si::*compile-time-too*
PROCLAIM is no longer processed at compile time. Replace most uses of PROCLAIM with DECLAIM, so that it is taken into account at compile time.
This commit is contained in:
parent
d37bba1b7a
commit
b4a5edcce4
5 changed files with 17 additions and 26 deletions
|
|
@ -154,8 +154,7 @@
|
|||
((EVAL :EXECUTE))
|
||||
(otherwise (cmperr "The EVAL-WHEN situation ~s is illegal."
|
||||
situation))))
|
||||
(let ((*not-compile-time* (not compile-flag))
|
||||
(*compile-time-too* compile-flag))
|
||||
(let ((*compile-time-too* compile-flag))
|
||||
(cond (load-flag
|
||||
(t1progn (rest args)))
|
||||
(compile-flag
|
||||
|
|
@ -589,11 +588,7 @@
|
|||
)
|
||||
|
||||
(defun t1ordinary (form)
|
||||
(when (or *compile-time-too*
|
||||
(eq (car form) 'SYS:*MAKE-CONSTANT)
|
||||
(eq (car form) 'SYS:*MAKE-SPECIAL)
|
||||
(eq (car form) 'LISP:PROCLAIM))
|
||||
(cmp-eval form))
|
||||
(when *compile-time-too* (cmp-eval form))
|
||||
(setq *non-package-operation* t)
|
||||
(let ((*vars* nil) (*funs* nil) (*blocks* nil) (*tags* nil)
|
||||
(*sharp-commas* nil))
|
||||
|
|
|
|||
|
|
@ -91,17 +91,16 @@
|
|||
)
|
||||
|
||||
(defun cmp-eval (form &aux (throw-flag t))
|
||||
(unless *not-compile-time*
|
||||
(unwind-protect
|
||||
(prog1
|
||||
(cmp-toplevel-eval form)
|
||||
(setq throw-flag nil))
|
||||
(when throw-flag
|
||||
(let ((*print-case* :upcase))
|
||||
(print-current-form)
|
||||
(format t "~&;;; The form ~s was not evaluated successfully.~
|
||||
~%;;; You are recommended to compile again.~%"
|
||||
form))))))
|
||||
(unwind-protect
|
||||
(prog1
|
||||
(cmp-toplevel-eval form)
|
||||
(setq throw-flag nil))
|
||||
(when throw-flag
|
||||
(let ((*print-case* :upcase))
|
||||
(print-current-form)
|
||||
(format t "~&;;; The form ~s was not evaluated successfully.~
|
||||
~%;;; You are recommended to compile again.~%"
|
||||
form)))))
|
||||
|
||||
|
||||
(defun cmp-macroexpand (form &aux env (throw-flag t))
|
||||
|
|
|
|||
|
|
@ -181,11 +181,8 @@
|
|||
(return-from c1vref (list var))))) ; ccb
|
||||
(let ((var (sch-global name)))
|
||||
(unless var
|
||||
(if *compile-time-too*
|
||||
(unless (sys:specialp name) (undefined-variable name))
|
||||
(unless (or (sys:specialp name)
|
||||
(check-global name))
|
||||
(undefined-variable name)))
|
||||
(unless (or (sys:specialp name) (check-global name))
|
||||
(undefined-variable name))
|
||||
(setq var (make-var :name name
|
||||
:kind 'GLOBAL
|
||||
:loc (add-symbol name)
|
||||
|
|
|
|||
|
|
@ -247,8 +247,8 @@
|
|||
;; Declarations
|
||||
(defmacro declaim (&rest decl-specs)
|
||||
(if (cdr decl-specs)
|
||||
`(eval-when (compile load) (mapcar #'proclaim ',decl-specs))
|
||||
`(eval-when (compile load) (proclaim ',(car decl-specs)))))
|
||||
`(eval-when (compile load eval) (mapcar #'proclaim ',decl-specs))
|
||||
`(eval-when (compile load eval) (proclaim ',(car decl-specs)))))
|
||||
|
||||
(defmacro c-declaim (&rest decl-specs)
|
||||
(if (cdr decl-specs)
|
||||
|
|
|
|||
|
|
@ -274,7 +274,7 @@
|
|||
(unless (fboundp 'sys::fpp)
|
||||
(defun find-class (n &optional err env) (declare (ignore n err env)) nil))
|
||||
#+clos
|
||||
(proclaim '(NOTINLINE FIND-CLASS))
|
||||
(declaim (NOTINLINE FIND-CLASS))
|
||||
|
||||
;;; SUBTYPEP predicate.
|
||||
(defun subtypep (type1 type2 &aux t1 t2 i1 i2 ntp1 ntp2 c1 c2)
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue