From 34c2e4824a6ef0f30e0645303a894da562ebdacc Mon Sep 17 00:00:00 2001 From: Nikodemus Siivola Date: Thu, 23 Apr 2009 14:19:09 +0000 Subject: [PATCH] 1.0.27.28: better source paths for malformed declaration errors * For Slime and their ilk, thanks to Tobias Rittweiler. * Sort NEWS with "more important" items on top. --- NEWS | 18 ++++++++++-------- src/compiler/ir1tran.lisp | 22 ++++++++++++++-------- version.lisp-expr | 2 +- 3 files changed, 25 insertions(+), 17 deletions(-) diff --git a/NEWS b/NEWS index 2b85056..2e581a6 100644 --- a/NEWS +++ b/NEWS @@ -1,5 +1,15 @@ ;;;; -*- coding: utf-8; fill-column: 78 -*- changes in sbcl-1.0.28 relative to 1.0.27: + * minor incompatible changes: echo-streams now propagate unread-char to the + underlying input stream, and no longer permit unreading more than one + character. + * improvement: on x86/x86-64 Lisp call frames now have the same layout as C + frames, allowing for instance more reliable backtraces. + * improvement: the debugger REPL can now reference lexical variables + by name directly for code compiled with (DEBUG 3). + * improvement: errors from malformed declarations now have better source + paths associated with them. (thanks to Tobias Rittweiler) + * optimization: faster local calls on x86/x86-64 * bug fix: some error messages for out-of-bound array indexes confused the index and the bound. (thanks to Stas Boukarev) * bug fix: pretty printing malformed DEFPACKAGE forms (thanks to Sidney @@ -16,14 +26,6 @@ changes in sbcl-1.0.28 relative to 1.0.27: * bug fix: RESTART-FRAME and RETURN-FROM-FRAME stack corruption * bug fix: the discriminating function for PRINT-OBJECT no longer preserves potentially-invalid effective methods in its cache. - * improvement: on x86/x86-64 Lisp call frames now have the same layout as C - frames, allowing for instance more reliable backtraces. - * optimization: faster local calls on x86/x86-64 - * minor incompatible changes: echo-streams now propagate unread-char to the - underlying input stream, and no longer permit unreading more than one - character. - * improvement: the debugger REPL can now reference lexical variables - by name directly for code compiled with (DEBUG 3). changes in sbcl-1.0.27 relative to 1.0.26: * new port: support added for x86-64 OpenBSD. (thanks to Josh Elsasser) diff --git a/src/compiler/ir1tran.lisp b/src/compiler/ir1tran.lisp index 0839501..998cd23 100644 --- a/src/compiler/ir1tran.lisp +++ b/src/compiler/ir1tran.lisp @@ -1470,14 +1470,20 @@ (*post-binding-variable-lexenv* nil)) (dolist (decl decls) (dolist (spec (rest decl)) - (unless (consp spec) - (compiler-error "malformed declaration specifier ~S in ~S" spec decl)) - (multiple-value-bind (new-env new-result-type) - (process-1-decl spec lexenv vars fvars binding-form-p context) - (setq lexenv new-env) - (unless (eq new-result-type *wild-type*) - (setq result-type - (values-type-intersection result-type new-result-type)))))) + (progv + ;; Kludge: EVAL calls this function to deal with LOCALLY. + (when (eq context :compile) (list '*current-path*)) + (when (eq context :compile) (list (or (get-source-path spec) + (get-source-path decl) + *current-path*))) + (unless (consp spec) + (compiler-error "malformed declaration specifier ~S in ~S" spec decl)) + (multiple-value-bind (new-env new-result-type) + (process-1-decl spec lexenv vars fvars binding-form-p context) + (setq lexenv new-env) + (unless (eq new-result-type *wild-type*) + (setq result-type + (values-type-intersection result-type new-result-type))))))) (values lexenv result-type *post-binding-variable-lexenv*))) (defun %processing-decls (decls vars fvars ctran lvar binding-form-p fun) diff --git a/version.lisp-expr b/version.lisp-expr index 1bf4112..258e0a2 100644 --- a/version.lisp-expr +++ b/version.lisp-expr @@ -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".) -"1.0.27.27" +"1.0.27.28" -- 1.7.10.4