branch: externals/sly
commit 3bd8696258fdc25e71792f9da86c272334a0987a
Author: Stas Boukarev <[email protected]>
Commit: João Távora <[email protected]>
Move *features* binding up
* slynk/slynk-source-path-parser.lisp
(read-source-form): Bind features here.
(read-and-record-source-map): Not here
Cherry-picked-from: SLIME commit f280f1b1e84db56e8cd5429ed80d98dc9b98479b.
Co-authored-by: João Távora <[email protected]>
---
slynk/slynk-source-path-parser.lisp | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/slynk/slynk-source-path-parser.lisp
b/slynk/slynk-source-path-parser.lisp
index da22610..8765426 100644
--- a/slynk/slynk-source-path-parser.lisp
+++ b/slynk/slynk-source-path-parser.lisp
@@ -112,9 +112,6 @@ subexpressions of the object to stream positions."
(let* ((source-map (make-hash-table :test #'eq))
(*readtable* (make-source-recording-readtable *readtable* source-map))
(*read-suppress* nil)
- #+sbcl
- (*features* (append *features*
- (symbol-value (find-symbol "+INTERNAL-FEATURES+"
'sb-impl))))
(start (file-position stream))
(form (ignore-errors (read stream)))
(end (file-position stream)))
@@ -186,8 +183,11 @@ subexpressions of the object to stream positions."
"Read the Nth toplevel form number with source location recording.
Return the form and the source-map."
(multiple-value-bind (*readtable* *package*) (guess-reader-state stream)
- (skip-toplevel-forms n stream)
- (read-and-record-source-map stream)))
+ (let (#+sbcl
+ (*features* (append *features*
+ (symbol-value (find-symbol "+INTERNAL-FEATURES+"
'sb-impl)))))
+ (skip-toplevel-forms n stream)
+ (read-and-record-source-map stream))))
(defun source-path-stream-position (path stream)
"Search the source-path PATH in STREAM and return its position."
