branch: elpa/sly
commit 45b4cf50d0666621519f746c7ce622cb9f860095
Author: meister <meis...@zeus.thirdlaw.tech>
Commit: João Távora <joaotav...@gmail.com>
Change va-list to vaslist and renamed core package
The name 'va-list' was changed to 'vaslist' within clasp
and slime/swank/clasp.lisp referenced 'va-list'.
The CORE package name in clasp is going to be removed
and replaced with SYS. So all references to the package
'core' have been changed to 'sys'.
Cherry-picked-from: SLIME commit 9005cdaac4c0adaa8e26ee5285c7b155762c0ce5
---
slynk/backend/clasp.lisp | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/slynk/backend/clasp.lisp b/slynk/backend/clasp.lisp
index 733e67730b..661884958e 100644
--- a/slynk/backend/clasp.lisp
+++ b/slynk/backend/clasp.lisp
@@ -171,7 +171,7 @@
(namestring (ext:getcwd)))
(defimplementation quit-lisp ()
- (core:quit))
+ (sys:quit))
@@ -235,9 +235,9 @@
;; due to the :source-debug parameters from
;; swank-compile-string (below).
(make-file-location
- (core:file-scope-pathname
- (core:file-scope origin))
- (core:source-pos-info-filepos origin)))
+ (sys:file-scope-pathname
+ (sys:file-scope origin))
+ (sys:source-pos-info-filepos origin)))
(defun condition-location (origin)
(typecase origin
@@ -326,7 +326,7 @@
(defimplementation arglist (name)
(multiple-value-bind (arglist foundp)
- (core:function-lambda-list name) ;; Uses bc-split
+ (sys:function-lambda-list name) ;; Uses bc-split
(if foundp arglist :not-available)))
(defimplementation function-name (f)
@@ -355,7 +355,7 @@
nil)
((macro-function (car form) environment)
(push form macro-forms))
- ((not (eq form (core:compiler-macroexpand-1 form environment)))
+ ((not (eq form (sys:compiler-macroexpand-1 form environment)))
(push form compiler-macro-forms))))
form)
form environment)
@@ -707,15 +707,15 @@
(sly-dbg "receive-if condition-variable-timedwait")
(mp:condition-variable-wait (mailbox.cvar mbox) mutex) ; timedwait
0.2
(sly-dbg "came out of condition-variable-timedwait")
- (core:check-pending-interrupts)))))
+ (sys:check-pending-interrupts)))))
) ; #+threads (progn ...
-(defmethod emacs-inspect ((object core:cxx-object))
- (let ((encoded (core:encode object)))
+(defmethod emacs-inspect ((object sys:cxx-object))
+ (let ((encoded (sys: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)))
+(defmethod emacs-inspect ((object sys:vaslist))
+ (emacs-inspect (sys:list-from-vaslist object)))
