Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix typo #592

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
+43 −13
Draft

Fix typo #592

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions slynk/slynk-backend.lisp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1487,9 +1487,11 @@ Return :interrupt if an interrupt occurs while waiting."
(error
"~s not implemented. Check if ~s = ~s is supported by the implementation."
'wait-for-input
(slynk-backend:find-symbol2 "SLYNK:*COMMUNICATION-STYLE*")
(slynk-backend:find-symbol2 #1=#.(if (eq :UPCASE (readtable-case *readtable*))
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can't we hide whatever logic we need to hide inside SLYNK-BACKEND:FIND-SYMBOL2?

"SLYNK:*COMMUNICATION-STYLE*"
"slynk:*communication-style*"))
(symbol-value
(slynk-backend:find-symbol2 "SLYNK:*COMMUNICATION-STYLE*"))))))
(slynk-backend:find-symbol2 #1#))))))


;;;; Locks
Expand Down
12 changes: 8 additions & 4 deletions slynk/slynk-completion.lisp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -402,7 +402,9 @@ Returns a list of (COMPLETIONS NIL). COMPLETIONS is a list of
(when (plusp (length pattern))
(list (loop
with package = (guess-buffer-package package-name)
with upcasepat = (string-upcase pattern)
with upcasepat = (if (eq :UPCASE (readtable-case *readtable*))
(string-upcase pattern)
pattern)
for (string symbol indexes score)
in
(loop with (external internal)
Expand All @@ -417,9 +419,11 @@ Returns a list of (COMPLETIONS NIL). COMPLETIONS is a list of
for i upto limit
collect e)
collect
(list (if (every #'common-lisp:upper-case-p pattern)
(string-upcase string)
(string-downcase string))
(list (case (readtable-case *readtable*)
(:UPCASE (string-upcase string))
(:downcase (string-downcase string))
(t string) ; FIXME: what about :invert mode?
)
score
(to-chunks string indexes)
(readably-classify symbol)))
Expand Down
38 changes: 31 additions & 7 deletions slynk/slynk.lisp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -902,7 +902,12 @@ keywords: :BOUNDP, :FBOUNDP, :CONSTANT, :GENERIC-FUNCTION,
(when (find-class symbol nil) (push :class result))
(when (macro-function symbol) (push :macro result))
(when (special-operator-p symbol) (push :special-operator result))
(when (find-package symbol) (push :package result))
(when #-allegro (find-package symbol)
#+allegro (handler-case (find-package symbol)
(error (e)
(log-event "classify-symbol: error raised in find-package (allegro)")
nil))
(push :package result))
(when (and (fboundp symbol)
(typep (ignore-errors (fdefinition symbol))
'generic-function))
Expand Down Expand Up @@ -1625,7 +1630,10 @@ converted to lower case."
(process-form-for-emacs (cdr form))))
(character (format nil "?~C" form))
(symbol (concatenate 'string (when (eq (symbol-package form)
#.(find-package "KEYWORD"))
macdavid313 marked this conversation as resolved.
Show resolved Hide resolved
#.(find-package
(if (eq :UPCASE (readtable-case *readtable*))
"KEYWORD"
"keyword")))
":")
(string-downcase (symbol-name form))))
(number (let ((*print-base* 10))
Expand Down Expand Up @@ -2966,11 +2974,19 @@ soon once non-ASDF loading is removed. (see github#134)")
Receives a module name as argument and should return non-nil if it
managed to load it.")
(:method ((method (eql :slynk-loader)) module)
(funcall (intern "REQUIRE-MODULE" :slynk-loader) module))
(funcall (intern #.(if (eq :UPCASE (readtable-case *readtable*))
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Here I think we can use uiop:intern*, which can take symbols as arguments, to get a simpler solution: (uiop:intern* '#:require-module '#:slynk-loader)

For that matter, one could even do:

(uiop:symbol-call '#:slynk-loader '#:require-module module)

Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is ASDF/UIOP already a dependency of this file? I don't think so (may be wrong) but I would avoid it. I know Allegro ships with it (in recent versions), but not necessarily all SLY backends do.

"REQUIRE-MODULE"
"require-module")
:slynk-loader)
module))
(:method ((method (eql :asdf)) module)
(unless *asdf-load-in-progress*
(let ((*asdf-load-in-progress* t))
(funcall (intern "LOAD-SYSTEM" :asdf) module)))))
(funcall (intern #.(if (eq :UPCASE (readtable-case *readtable*))
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

uiop:symbol-call here, too.

"LOAD-SYSTEM"
"load-system")
:asdf)
module)))))

(defun add-to-load-path-1 (path load-path-var)
(pushnew path (symbol-value load-path-var) :test #'equal))
Expand All @@ -2979,9 +2995,15 @@ managed to load it.")
(:documentation
"Using METHOD, consider PATH when searching for modules.")
(:method ((method (eql :slynk-loader)) path)
(add-to-load-path-1 path (intern "*LOAD-PATH*" :slynk-loader)))
(add-to-load-path-1 path (intern #.(if (eq :UPCASE (readtable-case *readtable*))
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more. 

(uiop:intern* '#:*load-path* '#:slynk-loader)

"*LOAD-PATH*"
"*load-path*")
:slynk-loader)))
(:method ((method (eql :asdf)) path)
(add-to-load-path-1 path (intern "*CENTRAL-REGISTRY*" :asdf))))
(add-to-load-path-1 path (intern #.(if (eq :UPCASE (readtable-case *readtable*))
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

see above

"*CENTRAL-REGISTRY*"
"*central-registry*")
:asdf))))

(defvar *slynk-require-hook* '()
"Functions run after SLYNK-REQUIRE. Called with new modules.")
Expand Down Expand Up @@ -3219,7 +3241,9 @@ QUALIFIERS and SPECIALIZERS are lists of strings."
(mapcar (lambda (specializer)
(if (typep specializer 'slynk-mop:eql-specializer)
(format nil "(eql ~A)"
(slynk-mop:eql-specializer-object specializer))
(funcall #+allegro 'mop:eql-specializer-object
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is it intended that this will only work on Allegro or SBCL? I don't know enough about the context.

#+sbcl 'sb-mop:eql-specializer-object
specializer))
(prin1-to-string (class-name specializer))))
(slynk-mop:method-specializers method))))
(slynk-mop:generic-function-methods (read-as-function generic-name))))
Expand Down