Permalink
Browse files

Remove stupid conflicts.

  • Loading branch information...
1 parent 68767bf commit 437f909e33ef28cbb702688401dfa12345cd8a4a Helmut Eller committed Mar 9, 2004
Showing with 5 additions and 240 deletions.
  1. +0 −89 ChangeLog
  2. +3 −71 swank-allegro.lisp
  3. +2 −52 swank-cmucl.lisp
  4. +0 −28 swank-lispworks.lisp
View
@@ -92,95 +92,6 @@
2004-03-09 Helmut Eller <e9626484@stud3.tuwien.ac.at>
-=======
-=======
->>>>>>> 1.286
- Merge package-split branch into main trunk.
-
- * swank-clisp.lisp (find-fspec-location): Handle "No such file"
- errors.
-
- * swank-openmcl.lisp (preferred-communication-style): Implemented.
- (call-without-interrupts, getpid): Use defimplementation.
- (arglist, swank-compile-file, swank-compile-string)
- (swank-compile-system, backtrace): Renamed.
- (print-frame): New function.
- (frame-catch-tags): Don't exclude nil source location.
- (format-restarts-for-emacs, debugger-info-for-emacs,
- inspect-in-frame). deleted
- (frame-arguments): Don't use to-string.
- (find-source-locations, find-function-locations
- (method-source-location): Deleted.
- (canonicalize-location, find-definitions,
- function-source-location, list-callers): Use
- ccl::edit-definition-p and
- ccl::get-source-files-with-types&classes. Makes things easier.
- (return-from-frame): Take a sexp not a string.
- (describe-definition): Describe more types.
-
- * swank-loader.lisp: Change load order. swank.lisp is now the last
- file.
-
- * swank-allegro.lisp, swank-clisp.lisp, swank-cmucl.lisp,
- swank-gray.lisp, swank-lispworks.lisp, swank-sbcl.lisp,
- swank-source-path-parser.lisp: Implement changed backend interface
- and remove references to frontend symbols.
-
- * swank-backend.lisp (:swank-backend): New package.
- (definterface): Export the symbol.
- (:location, :error, :position, :buffer): Define structure of
- source locations here.
- (preferred-communication-style, compute-backtrace, print-frame):
- New functions.
- (debugger-info-for-emacs): Deleted.
-
- Renaming:
-
- compile-file-for-emacs -> swank-compile-file
- compile-string-for-emacs -> swank-compile-string
- compile-system-for-emacs -> swank-compile-stystem
- arglist-string -> arglist
- backrace -> compute-backtrace
- find-function-locations -> find-definitions
-
- * swank.lisp (:swank): Create the package here.
- (*swank-in-background*): Call the backend function
- preferred-communication-style to for the initial value.
- (find-symbol-designator): Handle NIL properly.
- (arglist-string): Renamed from format-arglist. Call backend
- function directly.
- (*sldb-restarts*, swank-debugger-hook, format-restarts-for-emacs)
- (nth-restart, invoke-nth-restart, sldb-abort): Handle restarts in
- the front end.
- (frame-for-emacs): Renamed from print-with-frame-label.
- (backtrace, debugger-info-for-emacs, pprint-eval-string-in-frame)
- (set-default-directory): Now in the front end.
- (frame-locals-for-emacs): Use print not princ for variable names.
- (compile-file-for-emacs, compile-string-for-emacs): Small wrappers
- around backend functions.
- (describe-definition-for-emacs): Handle unknown symbols before
- calling the backend.
- (find-function-locations): Wrapper for new backend function
- find-definitions.
- (group-xrefs, partition, location-valid-p, xref-buffer, xref):
- Updated for the new backend functions.
-
- * slime.el:
- (slime-symbol-at-point, slime-symbol-name-at-point):
- slime-symbol-at-point calls slime-symbol-name-at-point not the
- other way around. This avoids the mess if the symbol at point is
- NIL.
- (slime-compile-file, slime-load-system, slime-compile-region)
- (slime-call-describer, slime-who-calls, sldb-catch-tags): Updates
- for renamed lisp functions.
- (slime-list-callers, slime-list-callees): Unified with other xref
- commands.
- (sldb-show-frame-details): Catch tags no longer include the source
- location.
- (sldb-insert-locals): Simplified.
-
-2004-03-09 Helmut Eller <e9626484@stud3.tuwien.ac.at>
-
* swank-cmucl.lisp (read-into-simple-string): Use the correct fix.
Reported by H�kon Alstadheim.
View
@@ -15,11 +15,6 @@
(require :sock)
(require :process))
-<<<<<<< swank-allegro.lisp
-=======
-(in-package :swank-backend)
-
->>>>>>> 1.20
(import
'(excl:fundamental-character-output-stream
excl:stream-write-char
@@ -35,13 +30,9 @@
;;;; TCP Server
-<<<<<<< swank-allegro.lisp
+
(defimplementation preferred-communication-style ()
:spawn)
-=======
-(defimplementation preferred-communication-style ()
- :spawn)
->>>>>>> 1.20
(defimplementation create-socket (host port)
(socket:make-socket :connect :passive :local-port port
@@ -71,16 +62,11 @@
;;;; Misc
-<<<<<<< swank-allegro.lisp
(defimplementation arglist (symbol)
(excl:arglist symbol))
(defimplementation macroexpand-all (form)
(excl::walk form))
-=======
-(defimplementation arglist (symbol)
- (excl:arglist symbol))
->>>>>>> 1.20
(defimplementation describe-symbol-for-emacs (symbol)
(let ((result '()))
@@ -100,7 +86,7 @@
(doc 'class)))
result)))
-<<<<<<< swank-allegro.lisp
+
(defimplementation describe-definition (symbol namespace)
(ecase namespace
(:variable
@@ -109,9 +95,6 @@
(describe (symbol-function symbol)))
(:class
(describe (find-class symbol)))))
-=======
-(defimplementation macroexpand-all (form)
- (excl::walk form))
(defimplementation describe-definition (symbol namespace)
(ecase namespace
@@ -121,7 +104,6 @@
(describe (symbol-function symbol)))
(:class
(describe (find-class symbol)))))
->>>>>>> 1.20
;;;; Debugger
@@ -225,23 +207,7 @@
;;;; Definition Finding
-<<<<<<< swank-allegro.lisp
-(defun find-fspec-location (fspec type)
- (let ((file (excl::fspec-pathname fspec type)))
- (etypecase file
- (pathname
- (let ((start (scm:find-definition-in-file fspec type file)))
- (make-location (list :file (namestring (truename file)))
- (if start
- (list :position (1+ start))
- (list :function-name (string fspec))))))
- ((member :top-level)
- (list :error (format nil "Defined at toplevel: ~A" fspec)))
- (null
- (list :error (format nil "Unkown source location for ~A" fspec))))))
-(defun fspec-definition-locations (fspec)
-=======
(defun find-fspec-location (fspec type)
(let ((file (excl::fspec-pathname fspec type)))
(etypecase file
@@ -256,26 +222,16 @@
(null
(list :error (format nil "Unkown source location for ~A" fspec))))))
-(defun fspec-source-locations (fspec)
->>>>>>> 1.20
+(defun fspec-definition-locations (fspec)
(let ((defs (excl::find-multiple-definitions fspec)))
-<<<<<<< swank-allegro.lisp
(loop for (fspec type) in defs
collect (list fspec (find-fspec-location fspec type)))))
(defimplementation find-definitions (symbol)
(fspec-definition-locations symbol))
-=======
- (loop for (fspec type) in defs
- collect (list fspec (find-fspec-location fspec type)))))
-
-(defimplementation find-definitions (symbol)
- (fspec-source-locations symbol))
->>>>>>> 1.20
;;;; XREF
-<<<<<<< swank-allegro.lisp
(defmacro defxref (name relation name1 name2)
`(defimplementation ,name (x)
(xref-result (xref:get-relation ,relation ,name1 ,name2))))
@@ -290,30 +246,6 @@
(defun xref-result (fspecs)
(loop for fspec in fspecs
append (fspec-definition-locations fspec)))
-=======
-(defun xrefs (fspecs)
- (loop for fspec in fspecs
- nconc (loop for (ref location) in (fspec-source-locations fspec)
- collect (list ref location))))
-
-(defimplementation who-calls (name)
- (xrefs (xref:get-relation :calls :wild name)))
-
-(defimplementation who-references (name)
- (xrefs (xref:get-relation :uses :wild name)))
-
-(defimplementation who-binds (name)
- (xrefs (xref:get-relation :binds :wild name)))
-
-(defimplementation who-macroexpands (name)
- (xrefs (xref:get-relation :macro-calls :wild name)))
-
-(defimplementation who-sets (name)
- (xrefs (xref:get-relation :sets :wild name)))
-
-(defimplementation list-callees (name)
- (xrefs (xref:get-relation :calls name :wild)))
->>>>>>> 1.20
;;;; Inspecting
View
@@ -372,61 +372,29 @@ the error-context redundant."
;;;; XREF
-<<<<<<< swank-cmucl.lisp
(defmacro defxref (name function)
`(defimplementation ,name (name)
- (xref-results (,function ,name))))
+ (xref-results (,function name))))
(defxref who-calls xref:who-calls)
(defxref who-references xref:who-references)
(defxref who-binds xref:who-binds)
(defxref who-sets xref:who-sets)
-=======
-(defimplementation who-calls (symbol)
- (xrefs (xref:who-calls symbol)))
-
-(defimplementation who-references (symbol)
- (xrefs (xref:who-references symbol)))
-
-(defimplementation who-binds (symbol)
- (xrefs (xref:who-binds symbol)))
-
-(defimplementation who-sets (symbol)
- (xrefs (xref:who-sets symbol)))
->>>>>>> 1.80
#+cmu19
(progn
-<<<<<<< swank-cmucl.lisp
(defxref who-macroexpands xref:who-macroexpands)
;; XXX
(defimplementation who-specializes (symbol)
(let* ((methods (xref::who-specializes (find-class symbol)))
-=======
- (defimplementation who-macroexpands (macro)
- (xrefs (xref:who-macroexpands macro)))
- ;; XXX
- (defimplementation who-specializes (symbol)
- (let* ((methods (xref::who-specializes (find-class symbol)))
->>>>>>> 1.80
(locations (mapcar #'method-source-location methods)))
-<<<<<<< swank-cmucl.lisp
(mapcar #'list methods locations))))
(defun xref-results (contexts)
(mapcar (lambda (xref)
(list (xref:xref-context-name xref)
(resolve-xref-location xref)))
contexts))
-=======
- (mapcar #'list methods locations))))
-
-(defun xrefs (contexts)
- (mapcar (lambda (xref)
- (list (xref:xref-context-name xref)
- (resolve-xref-location xref)))
- contexts))
->>>>>>> 1.80
(defun resolve-xref-location (xref)
(let ((name (xref:xref-context-name xref))
@@ -1062,7 +1030,7 @@ OCFP = ~X
LRA = ~X~%" (mapcar #'fixnum
(multiple-value-list (frame-registers frame)))))))
-<<<<<<< swank-cmucl.lisp
+
(defimplementation disassemble-frame (frame-number)
"Return a string with the disassembly of frames code."
(print-frame-registers frame-number)
@@ -1078,24 +1046,6 @@ LRA = ~X~%" (mapcar #'fixnum
(disassem:disassemble-code-component component))))
(di::bogus-debug-function
(format t "~%[Disassembling bogus frames not implemented]")))))
-=======
-;; (defslimefun sldb-disassemble (frame-number)
-;; "Return a string with the disassembly of frames code."
-;; (with-output-to-string (*standard-output*)
-;; (print-frame-registers frame-number)
-;; (terpri)
-;; (let* ((frame (di::frame-real-frame (nth-frame frame-number)))
-;; (debug-fun (di::frame-debug-function frame)))
-;; (etypecase debug-fun
-;; (di::compiled-debug-function
-;; (let* ((component (di::compiled-debug-function-component debug-fun))
-;; (fun (di:debug-function-function debug-fun)))
-;; (if fun
-;; (disassemble fun)
-;; (disassem:disassemble-code-component component))))
-;; (di::bogus-debug-function
-;; (format t "~%[Disassembling bogus frames not implemented]"))))))
->>>>>>> 1.80
#+(or)
(defun print-binding-stack ()
View
@@ -356,7 +356,6 @@ Return NIL if the symbol is unbound."
;;; xref
-<<<<<<< swank-lispworks.lisp
(defmacro defxref (name function)
`(defimplementation ,name (name)
(xref-results (,function name))))
@@ -373,33 +372,6 @@ Return NIL if the symbol is unbound."
(dspec:dspec-definition-locations dspec)
collect (list dspec
(make-dspec-location dspec location)))))
-=======
-(defun xrefs (dspecs)
- (loop for dspec in dspecs
- nconc (loop for (dspec location) in
- (dspec:dspec-definition-locations dspec)
- collect (list dspec
- (make-dspec-location dspec location)))))
-
-(defimplementation who-calls (name)
- (xrefs (hcl:who-calls name)))
-
-(defimplementation who-references (name)
- (xrefs (hcl:who-references name)))
-
-(defimplementation who-binds (name)
- (xrefs (hcl:who-binds name)))
-
-(defimplementation who-sets (name)
- (xrefs (hcl:who-sets name)))
-
-(defimplementation list-callers (name)
- (xrefs (hcl:who-calls name)))
-
-(defimplementation list-callees (name)
- (xrefs (hcl:calls-who name)))
->>>>>>> 1.30
-
;;; Inspector
(defmethod inspected-parts (o)

0 comments on commit 437f909

Please sign in to comment.