From 3fc4b561752c5ad4519b882a3b9bdfe7a8207532 Mon Sep 17 00:00:00 2001 From: Juho Snellman Date: Thu, 27 Apr 2006 13:15:21 +0000 Subject: [PATCH] 0.9.12.2: Generate source path information for macro-expansion errors (patch by Helmut Eller on slime-devel) --- NEWS | 4 ++++ src/compiler/main.lisp | 4 +++- version.lisp-expr | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/NEWS b/NEWS index a60e559..487e684 100644 --- a/NEWS +++ b/NEWS @@ -1,4 +1,8 @@ ;;;; -*- coding: utf-8; -*- +changes in sbcl-0.9.13 relative to sbcl-0.9.12: + * new feature: source path information is generated for macro-expansion + errors for use in IDE's like Slime (thanks to Helmut Eller) + changes in sbcl-0.9.12 relative to sbcl-0.9.11: * minor incompatible change: in sbcl-0.9.11 (but not earlier versions) SB-MOP:FINALIZE-INHERITANCE would recursively descend diff --git a/src/compiler/main.lisp b/src/compiler/main.lisp index 6629735..6ed7cb3 100644 --- a/src/compiler/main.lisp +++ b/src/compiler/main.lisp @@ -1185,7 +1185,9 @@ ;; sequence of steps in ANSI's "3.2.3.1 Processing of ;; Top Level Forms". #-sb-xc-host - (let ((expanded (preprocessor-macroexpand-1 form))) + (let ((expanded + (let ((*current-path* path)) + (preprocessor-macroexpand-1 form)))) (cond ((eq expanded form) (when compile-time-too (eval-in-lexenv form *lexenv*)) diff --git a/version.lisp-expr b/version.lisp-expr index 8100c6f..70626aa 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".) -"0.9.12.1" +"0.9.12.2" -- 1.7.10.4