Skip to content

Commit

Permalink
0.8.2.50:
Browse files Browse the repository at this point in the history 
        * Partially enable VALUES declaration:
        ... PROCESS-DECLS does not accept continuation; instead it
            returns the asserted type as the second result;
        ... new macro: PROCESSING-DECLS, rebinds *LEXENV* and puts THE
            on the result, if needed;
        * IR1-CONVERT-LAMBDA-BODY and similar do not accept/pass the
          result continuation;
        * remove obsolete LEXENV-WEAKEND-TYPE-RESTRICTIONS.
  • Loading branch information
Alexey Dejneka committed Aug 20, 2003
1 parent d7a65ed commit 28ce7a0
Show file tree
Hide file tree
Showing 9 changed files with 158 additions and 143 deletions.
1 change: 1 addition & 0 deletions NEWS
View file
Expand Up @@ -1980,6 +1980,7 @@ changes in sbcl-0.8.3 relative to sbcl-0.8.2:
* new optimization on x86: logical functions and + now have
optimized (UNSIGNED-BYTE 32) versions, which are automatically
used when the result is truncated to 32 bits.
* VALUES declaration is partially enabled.
* fixed some bugs revealed by Paul Dietz' test suite:
** The system now obeys the constraint imposed by
UPGRADED-ARRAY-ELEMENT-TYPE that the upgraded array element
Expand Down
2 changes: 1 addition & 1 deletion src/code/eval.lisp
View file
Expand Up @@ -65,10 +65,10 @@
(sb!c::*free-funs* (make-hash-table :test 'equal))
(sb!c::*free-vars* (make-hash-table :test 'eq))
(sb!c::*undefined-warnings* nil))
;; FIXME: VALUES declaration
(sb!c::process-decls decls
vars
nil
(sb!c::make-continuation)
lexenv))))
(eval-progn-body body lexenv))))

Expand Down
62 changes: 31 additions & 31 deletions src/compiler/ir1-translators.lisp
View file
Expand Up @@ -522,8 +522,7 @@

(values (vars) (vals))))

(def-ir1-translator let ((bindings &body body)
start cont)
(def-ir1-translator let ((bindings &body body) start cont)
#!+sb-doc
"LET ({(Var [Value]) | Var}*) Declaration* Form*
During evaluation of the Forms, bind the Vars to the result of evaluating the
Expand All @@ -533,12 +532,14 @@
(ir1-translate-locally body start cont)
(multiple-value-bind (forms decls) (parse-body body nil)
(multiple-value-bind (vars values) (extract-let-vars bindings 'let)
(let ((fun-cont (make-continuation)))
(let* ((*lexenv* (process-decls decls vars nil cont))
(fun (ir1-convert-lambda-body
forms vars
:debug-name (debug-namify "LET ~S" bindings))))
(reference-leaf start fun-cont fun))
(let* ((fun-cont (make-continuation))
(cont (processing-decls (decls vars nil cont)
(let ((fun (ir1-convert-lambda-body
forms vars
:debug-name (debug-namify "LET ~S"
bindings))))
(reference-leaf start fun-cont fun))
cont)))
(ir1-convert-combination-args fun-cont cont values))))))

(def-ir1-translator let* ((bindings &body body)
Expand All @@ -549,8 +550,8 @@
form to reference any of the previous Vars."
(multiple-value-bind (forms decls) (parse-body body nil)
(multiple-value-bind (vars values) (extract-let-vars bindings 'let*)
(let ((*lexenv* (process-decls decls vars nil cont)))
(ir1-convert-aux-bindings start cont forms vars values)))))
(processing-decls (decls vars nil cont)
(ir1-convert-aux-bindings start cont forms vars values)))))

;;; logic shared between IR1 translators for LOCALLY, MACROLET,
;;; and SYMBOL-MACROLET
Expand All @@ -562,7 +563,7 @@
(defun ir1-translate-locally (body start cont &key vars funs)
(declare (type list body) (type continuation start cont))
(multiple-value-bind (forms decls) (parse-body body nil)
(let ((*lexenv* (process-decls decls vars funs cont)))
(processing-decls (decls vars funs cont)
(ir1-convert-progn-body start cont forms))))

(def-ir1-translator locally ((&body body) start cont)
Expand Down Expand Up @@ -609,17 +610,16 @@
(multiple-value-bind (forms decls) (parse-body body nil)
(multiple-value-bind (names defs)
(extract-flet-vars definitions 'flet)
(let* ((fvars (mapcar (lambda (n d)
(ir1-convert-lambda d
:source-name n
:debug-name (debug-namify
"FLET ~S" n)
:allow-debug-catch-tag t))
names defs))
(*lexenv* (make-lexenv
:default (process-decls decls nil fvars cont)
:funs (pairlis names fvars))))
(ir1-convert-progn-body start cont forms)))))
(let ((fvars (mapcar (lambda (n d)
(ir1-convert-lambda d
:source-name n
:debug-name (debug-namify
"FLET ~S" n)
:allow-debug-catch-tag t))
names defs)))
(processing-decls (decls nil fvars cont)
(let ((*lexenv* (make-lexenv :funs (pairlis names fvars))))
(ir1-convert-progn-body start cont forms)))))))

(def-ir1-translator labels ((definitions &body body) start cont)
#!+sb-doc
Expand All @@ -630,7 +630,7 @@
(multiple-value-bind (forms decls) (parse-body body nil)
(multiple-value-bind (names defs)
(extract-flet-vars definitions 'labels)
(let* (;; dummy LABELS functions, to be used as placeholders
(let* ( ;; dummy LABELS functions, to be used as placeholders
;; during construction of real LABELS functions
(placeholder-funs (mapcar (lambda (name)
(make-functional
Expand Down Expand Up @@ -661,14 +661,14 @@
(setf (cdr placeholder-cons) real-fun))

;; Voila.
(let ((*lexenv* (make-lexenv
:default (process-decls decls nil real-funs cont)
;; Use a proper FENV here (not the
;; placeholder used earlier) so that if the
;; lexical environment is used for inline
;; expansion we'll get the right functions.
:funs (pairlis names real-funs))))
(ir1-convert-progn-body start cont forms))))))
(processing-decls (decls nil real-funs cont)
(let ((*lexenv* (make-lexenv
;; Use a proper FENV here (not the
;; placeholder used earlier) so that if the
;; lexical environment is used for inline
;; expansion we'll get the right functions.
:funs (pairlis names real-funs))))
(ir1-convert-progn-body start cont forms)))))))

;;;; the THE special operator, and friends

Expand Down
91 changes: 41 additions & 50 deletions src/compiler/ir1tran-lambda.lisp
View file
Expand Up @@ -273,12 +273,10 @@
&key
aux-vars
aux-vals
result
(source-name '.anonymous.)
debug-name
(note-lexical-bindings t))
(declare (list body vars aux-vars aux-vals)
(type (or continuation null) result))
(declare (list body vars aux-vars aux-vals))

;; We're about to try to put new blocks into *CURRENT-COMPONENT*.
(aver-live-component *current-component*)
Expand All @@ -288,7 +286,7 @@
:bind bind
:%source-name source-name
:%debug-name debug-name))
(result (or result (make-continuation))))
(result (make-continuation)))

;; just to check: This function should fail internal assertions if
;; we didn't set up a valid debug name above.
Expand Down Expand Up @@ -411,13 +409,12 @@
(defun generate-optional-default-entry (res default-vars default-vals
entry-vars entry-vals
vars supplied-p-p body
aux-vars aux-vals cont
aux-vars aux-vals
source-name debug-name
force)
(declare (type optional-dispatch res)
(list default-vars default-vals entry-vars entry-vals vars body
aux-vars aux-vals)
(type (or continuation null) cont))
aux-vars aux-vals))
(let* ((arg (first vars))
(arg-name (leaf-source-name arg))
(info (lambda-var-arg-info arg))
Expand All @@ -432,7 +429,7 @@
(list* (leaf-source-name supplied-p) arg-name default-vals)
(cons arg entry-vars)
(list* t arg-name entry-vals)
(rest vars) t body aux-vars aux-vals cont
(rest vars) t body aux-vars aux-vals
source-name debug-name
force)
(ir1-convert-hairy-args
Expand All @@ -441,7 +438,7 @@
(cons arg-name default-vals)
(cons arg entry-vars)
(cons arg-name entry-vals)
(rest vars) supplied-p-p body aux-vars aux-vals cont
(rest vars) supplied-p-p body aux-vars aux-vals
source-name debug-name
force))))

Expand Down Expand Up @@ -614,12 +611,11 @@
;;; type when computing the type for the main entry's argument.
(defun ir1-convert-more (res default-vars default-vals entry-vars entry-vals
rest more-context more-count keys supplied-p-p
body aux-vars aux-vals cont
body aux-vars aux-vals
source-name debug-name)
(declare (type optional-dispatch res)
(list default-vars default-vals entry-vars entry-vals keys body
aux-vars aux-vals)
(type (or continuation null) cont))
aux-vars aux-vals))
(collect ((main-vars (reverse default-vars))
(main-vals default-vals cons)
(bind-vars)
Expand Down Expand Up @@ -675,7 +671,6 @@
body (main-vars)
:aux-vars (append (bind-vars) aux-vars)
:aux-vals (append (bind-vals) aux-vals)
:result cont
:debug-name (debug-namify "varargs entry for ~A"
(as-debug-name source-name
debug-name))))
Expand Down Expand Up @@ -728,25 +723,23 @@
(defun ir1-convert-hairy-args (res default-vars default-vals
entry-vars entry-vals
vars supplied-p-p body aux-vars
aux-vals cont
aux-vals
source-name debug-name
force)
(declare (type optional-dispatch res)
(list default-vars default-vals entry-vars entry-vals vars body
aux-vars aux-vals)
(type (or continuation null) cont))
aux-vars aux-vals))
(cond ((not vars)
(if (optional-dispatch-keyp res)
;; Handle &KEY with no keys...
(ir1-convert-more res default-vars default-vals
entry-vars entry-vals
nil nil nil vars supplied-p-p body aux-vars
aux-vals cont source-name debug-name)
aux-vals source-name debug-name)
(let ((fun (ir1-convert-lambda-body
body (reverse default-vars)
:aux-vars aux-vars
:aux-vals aux-vals
:result cont
:debug-name (debug-namify
"hairy arg processor for ~A"
(as-debug-name source-name
Expand All @@ -766,7 +759,6 @@
(nvals (cons (leaf-source-name arg) default-vals)))
(ir1-convert-hairy-args res nvars nvals nvars nvals
(rest vars) nil body aux-vars aux-vals
cont
source-name debug-name
nil)))
(t
Expand All @@ -778,7 +770,7 @@
(let ((ep (generate-optional-default-entry
res default-vars default-vals
entry-vars entry-vals vars supplied-p-p body
aux-vars aux-vals cont
aux-vars aux-vals
source-name debug-name
force)))
;; See GENERATE-OPTIONAL-DEFAULT-ENTRY.
Expand All @@ -796,31 +788,31 @@
(ir1-convert-more res default-vars default-vals
entry-vars entry-vals
arg nil nil (rest vars) supplied-p-p body
aux-vars aux-vals cont
aux-vars aux-vals
source-name debug-name))
(:more-context
(ir1-convert-more res default-vars default-vals
entry-vars entry-vals
nil arg (second vars) (cddr vars) supplied-p-p
body aux-vars aux-vals cont
body aux-vars aux-vals
source-name debug-name))
(:keyword
(ir1-convert-more res default-vars default-vals
entry-vars entry-vals
nil nil nil vars supplied-p-p body aux-vars
aux-vals cont source-name debug-name)))))))
aux-vals source-name debug-name)))))))

;;; This function deals with the case where we have to make an
;;; OPTIONAL-DISPATCH to represent a LAMBDA. We cons up the result and
;;; call IR1-CONVERT-HAIRY-ARGS to do the work. When it is done, we
;;; figure out the MIN-ARGS and MAX-ARGS.
(defun ir1-convert-hairy-lambda (body vars keyp allowp aux-vars aux-vals cont
(defun ir1-convert-hairy-lambda (body vars keyp allowp aux-vars aux-vals
&key
(source-name '.anonymous.)
(debug-name (debug-namify
"OPTIONAL-DISPATCH ~S"
vars)))
(declare (list body vars aux-vars aux-vals) (type continuation cont))
(declare (list body vars aux-vars aux-vals))
(let ((res (make-optional-dispatch :arglist vars
:allowp allowp
:keyp keyp
Expand All @@ -833,7 +825,7 @@
(aver-live-component *current-component*)
(push res (component-new-functionals *current-component*))
(ir1-convert-hairy-args res () () () () vars nil body aux-vars aux-vals
cont source-name debug-name nil)
source-name debug-name nil)
(setf (optional-dispatch-min-args res) min)
(setf (optional-dispatch-max-args res)
(+ (1- (length (optional-dispatch-entry-points res))) min))
Expand All @@ -842,8 +834,8 @@

;;; Convert a LAMBDA form into a LAMBDA leaf or an OPTIONAL-DISPATCH leaf.
(defun ir1-convert-lambda (form &key (source-name '.anonymous.)
debug-name
allow-debug-catch-tag)
debug-name
allow-debug-catch-tag)

(unless (consp form)
(compiler-error "A ~S was found when expecting a lambda expression:~% ~S"
Expand All @@ -863,27 +855,27 @@
(multiple-value-bind (vars keyp allow-other-keys aux-vars aux-vals)
(make-lambda-vars (cadr form))
(multiple-value-bind (forms decls) (parse-body (cddr form))
(let* ((result-cont (make-continuation))
(*lexenv* (process-decls decls
(append aux-vars vars)
nil result-cont))
(forms (if (and *allow-debug-catch-tag*
(policy *lexenv* (= insert-debug-catch 3)))
`((catch (make-symbol "SB-DEBUG-CATCH-TAG")
,@forms))
forms))
(res (if (or (find-if #'lambda-var-arg-info vars) keyp)
(ir1-convert-hairy-lambda forms vars keyp
allow-other-keys
aux-vars aux-vals result-cont
:source-name source-name
:debug-name debug-name)
(ir1-convert-lambda-body forms vars
:aux-vars aux-vars
:aux-vals aux-vals
:result result-cont
:source-name source-name
:debug-name debug-name))))
(binding* (((*lexenv* result-type)
(process-decls decls (append aux-vars vars) nil))
(forms (if (and *allow-debug-catch-tag*
(policy *lexenv* (>= insert-debug-catch 2)))
`((catch (make-symbol "SB-DEBUG-CATCH-TAG")
,@forms))
forms))
(forms (if (eq result-type *wild-type*)
forms
`((the ,result-type (progn ,@forms)))))
(res (if (or (find-if #'lambda-var-arg-info vars) keyp)
(ir1-convert-hairy-lambda forms vars keyp
allow-other-keys
aux-vars aux-vals
:source-name source-name
:debug-name debug-name)
(ir1-convert-lambda-body forms vars
:aux-vars aux-vars
:aux-vals aux-vals
:source-name source-name
:debug-name debug-name))))
(setf (functional-inline-expansion res) form)
(setf (functional-arg-documentation res) (cadr form))
res)))))
Expand Down Expand Up @@ -944,7 +936,6 @@
`(() () () . ,(cdr fun)))
(let ((*lexenv* (make-lexenv
:default (process-decls decls nil nil
(make-continuation)
(make-null-lexenv))
:vars (copy-list symbol-macros)
:funs (mapcar (lambda (x)
Expand Down

0 comments on commit 28ce7a0

Please sign in to comment.