projects
/
sbcl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
1.0.35.6: Fix typo in make-config.sh
[sbcl.git]
/
src
/
code
/
full-eval.lisp
diff --git
a/src/code/full-eval.lisp
b/src/code/full-eval.lisp
index
6f6a88f
..
5079abc
100644
(file)
--- a/
src/code/full-eval.lisp
+++ b/
src/code/full-eval.lisp
@@
-104,7
+104,8
@@
nil nil nil nil nil
(sb!c::lexenv-handled-conditions old-lexenv)
(sb!c::lexenv-disabled-package-locks old-lexenv)
nil nil nil nil nil
(sb!c::lexenv-handled-conditions old-lexenv)
(sb!c::lexenv-disabled-package-locks old-lexenv)
- (sb!c::lexenv-policy old-lexenv))))
+ (sb!c::lexenv-policy old-lexenv)
+ (sb!c::lexenv-user-data old-lexenv))))
(dolist (declaration declarations)
(unless (consp declaration)
(ip-error "malformed declaration specifier ~S in ~S"
(dolist (declaration declarations)
(unless (consp declaration)
(ip-error "malformed declaration specifier ~S in ~S"
@@
-175,7
+176,8
@@
(sb!c::internal-make-lexenv
nil nil
nil nil nil nil nil nil nil
(sb!c::internal-make-lexenv
nil nil
nil nil nil nil nil nil nil
- sb!c::*policy*)))
+ sb!c::*policy*
+ nil)))
;;; Augment ENV with a special or lexical variable binding
(declaim (inline push-var))
;;; Augment ENV with a special or lexical variable binding
(declaim (inline push-var))
@@
-236,7
+238,10
@@
(cond
((eq type :constant)
;; Horrible place for this, but it works.
(cond
((eq type :constant)
;; Horrible place for this, but it works.
- (ip-error "Can't bind constant symbol ~S" symbol))
+ (ip-error "Can't bind constant symbol: ~S" symbol))
+ ((eq type :global)
+ ;; Ditto...
+ (ip-error "Can't bind a global variable: ~S" symbol))
((eq type :special) t)
((member symbol declared-specials :test #'eq)
t)
((eq type :special) t)
((member symbol declared-specials :test #'eq)
t)