Skip to content

Commit

Permalink
0.8alpha.0.15:
Browse files Browse the repository at this point in the history
	broke some long lines
	merged Matthew Danish's slam-on-clisp patch from sbcl-devel
  • Loading branch information
William Harold Newman committed May 7, 2003
1 parent 0e2c926 commit 78164d7
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 6 deletions.
6 changes: 5 additions & 1 deletion slam.sh
Original file line number Diff line number Diff line change
Expand Up @@ -82,8 +82,12 @@ case "$HOST_TYPE" in
INIT="--sysinit /dev/null --userinit /dev/null"
CORE="--core"
;;
clisp) LISP="clisp"
INIT="-norc"
CORE="-M"
;;
*) echo unknown host type: "$HOST_TYPE"
echo should be one of "sbcl" or "cmucl"
echo should be one of "sbcl", "cmucl", or "clisp"
exit 1
esac

Expand Down
15 changes: 11 additions & 4 deletions src/compiler/ir1-translators.lisp
Original file line number Diff line number Diff line change
Expand Up @@ -270,12 +270,16 @@
:format-arguments (list ,@args))))))
`(lambda (definition)
(unless (list-of-length-at-least-p definition 2)
,(make-error-form "The list ~S is too short to be a legal local macro definition." 'definition))
,(make-error-form
"The list ~S is too short to be a legal local macro definition."
'definition))
(destructuring-bind (name arglist &body body) definition
(unless (symbolp name)
,(make-error-form "The local macro name ~S is not a symbol." 'name))
(unless (listp arglist)
,(make-error-form "The local macro argument list ~S is not a list." 'arglist))
,(make-error-form
"The local macro argument list ~S is not a list."
'arglist))
(with-unique-names (whole environment)
(multiple-value-bind (body local-decls)
(parse-defmacro arglist whole body name 'macrolet
Expand Down Expand Up @@ -706,15 +710,18 @@
;;; many branches there are going to be.
(defun ir1ize-the-or-values (type cont lexenv place)
(declare (type continuation cont) (type lexenv lexenv))
(let* ((atype (if (typep type 'ctype) type (compiler-values-specifier-type type)))
(let* ((atype (if (typep type 'ctype)
type
(compiler-values-specifier-type type)))
(old-atype (or (lexenv-find cont type-restrictions)
*wild-type*))
(old-ctype (or (lexenv-find cont weakend-type-restrictions)
*wild-type*))
(intersects (values-types-equal-or-intersect old-atype atype))
(new-atype (values-type-intersection old-atype atype))
(new-ctype (values-type-intersection
old-ctype (maybe-weaken-check atype (lexenv-policy lexenv)))))
old-ctype
(maybe-weaken-check atype (lexenv-policy lexenv)))))
(when (null (find-uses cont))
(setf (continuation-asserted-type cont) new-atype)
(setf (continuation-type-to-check cont) new-ctype))
Expand Down
2 changes: 1 addition & 1 deletion version.lisp-expr
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@
;;; checkins which aren't released. (And occasionally for internal
;;; versions, especially for internal versions off the main CVS
;;; branch, it gets hairier, e.g. "0.pre7.14.flaky4.13".)
"0.8alpha.0.14"
"0.8alpha.0.15"

0 comments on commit 78164d7

Please sign in to comment.