/[slime]/slime/swank.lisp
ViewVC logotype

Diff of /slime/swank.lisp

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.245 by heller, Fri Oct 1 12:02:29 2004 UTC revision 1.246 by lgorrie, Tue Oct 5 21:37:36 2004 UTC
# Line 992  Emacs buffer." Line 992  Emacs buffer."
992    "Find the symbol named STRING.    "Find the symbol named STRING.
993  Return the symbol and a flag indicateing if the symbols was found."  Return the symbol and a flag indicateing if the symbols was found."
994    (multiple-value-bind (sname pname) (tokenize-symbol string)    (multiple-value-bind (sname pname) (tokenize-symbol string)
995      (find-symbol (casify sname) (if pname (casify pname) package))))      (find-symbol (casify sname)
996                     (cond ((string= pname "") "KEYWORD")
997                           (pname              (casify pname))
998                           (t                  package)))))
999    
1000  (defun parse-symbol-or-lose (string &optional (package *package*))  (defun parse-symbol-or-lose (string &optional (package *package*))
1001    (multiple-value-bind (symbol status) (parse-symbol string package)    (multiple-value-bind (symbol status) (parse-symbol string package)
# Line 1045  Return the package or nil." Line 1048  Return the package or nil."
1048    
1049  (defslimefun arglist-for-echo-area (names)  (defslimefun arglist-for-echo-area (names)
1050    "Return the arglist for the first function, macro, or special-op in NAMES."    "Return the arglist for the first function, macro, or special-op in NAMES."
1051    (with-buffer-syntax ()    (handler-case
1052      (let ((name (find-if #'valid-operator-name-p names)))        (with-buffer-syntax ()
1053        (if name (format-arglist-for-echo-area (parse-symbol name) name)))))          (let ((name (find-if #'valid-operator-name-p names)))
1054              (if name (format-arglist-for-echo-area (parse-symbol name) name))))
1055        (error (cond)
1056          (format nil "ARGLIST: ~A" cond))))
1057    
1058  (defun format-arglist-for-echo-area (symbol name)  (defun format-arglist-for-echo-area (symbol name)
1059    "Return SYMBOL's arglist as string for display in the echo area.    "Return SYMBOL's arglist as string for display in the echo area.
# Line 2540  The result is a list of the form ((LOCAT Line 2546  The result is a list of the form ((LOCAT
2546    
2547  (defmethod inspect-for-emacs ((object cons) (inspector t))  (defmethod inspect-for-emacs ((object cons) (inspector t))
2548    (declare (ignore inspector))    (declare (ignore inspector))
2549    (if (or (consp (cdr object))    (if (listp object)
2550            (null (cdr object)))        (inspect-for-emacs-list object)
       (inspect-for-emacs-nontrivial-list object)  
2551        (inspect-for-emacs-simple-cons object)))        (inspect-for-emacs-simple-cons object)))
2552    
2553  (defun inspect-for-emacs-simple-cons (cons)  (defun inspect-for-emacs-simple-cons (cons)
# Line 2551  The result is a list of the form ((LOCAT Line 2556  The result is a list of the form ((LOCAT
2556              (:newline)              (:newline)
2557              "Cdr: " (:value ,(cdr cons)))))              "Cdr: " (:value ,(cdr cons)))))
2558    
2559  (defun inspect-for-emacs-nontrivial-list (list)  (defun inspect-for-emacs-list (list)
2560    (let ((circularp nil)    (let ((circularp nil)
2561          (length 0)          (length 0)
2562          (seen (make-hash-table :test 'eq))          (seen (make-hash-table :test 'eq))

Legend:
Removed from v.1.245  
changed lines
  Added in v.1.246

  ViewVC Help
Powered by ViewVC 1.1.5