branch: externals/sly
commit 7ea4480fc55423c59bed9eec928d8ad779b199fb
Author: Chris Schafmeister <meis...@temple.edu>
Commit: João Távora <joaotav...@gmail.com>
Clasp changes to use the new line keyword arg
For slynk-compile-string clasp uses the line information
to setup DWARF debug info.
* slynk/backend/clasp.lisp (slynk-compile-string): Use LINE.
Co-authored-by: João Távora <joaotav...@gmail.com>
Cherry-picked-from: SLIME commit 0bd5891373adf44ab453880dc5549ef53ffc9dba
---
slynk/backend/clasp.lisp | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/slynk/backend/clasp.lisp b/slynk/backend/clasp.lisp
index 55d402b..ce27a5f 100644
--- a/slynk/backend/clasp.lisp
+++ b/slynk/backend/clasp.lisp
@@ -286,7 +286,7 @@
(gethash tmp-file *tmpfile-map*))
(defimplementation slynk-compile-string (string &key buffer position filename
line column policy)
- (declare (ignore line column policy)) ;; We will use line and column in the
future
+ (declare (ignore column policy)) ;; We may use column in the future
(with-compilation-hooks ()
(let ((*buffer-name* buffer) ; for compilation hooks
(*buffer-start-position* position))
@@ -303,6 +303,9 @@
(let ((truename (or filename (note-buffer-tmpfile tmp-file
buffer))))
(compile-file tmp-file
:source-debug-pathname (pathname truename)
+ ;; emacs numbers are 1-based instead of
0-based,
+ ;; so we have to subtract
+ :source-debug-lineno (1- line)
:source-debug-offset (1- position)))))
(when fasl-file (load fasl-file))
(when (probe-file tmp-file)
@@ -797,3 +800,6 @@
(let ((encoded (core:encode object)))
(loop for (key . value) in encoded
append (list (string key) ": " (list :value value) (list :newline)))))
+
+(defmethod emacs-inspect ((object core:va-list))
+ (emacs-inspect (core:list-from-va-list object)))
