Changeset 14914 for trunk/abcl/src/org/armedbear/lisp/gray-streams.lisp

Timestamp:

11/24/16 10:31:17 (7 years ago)

Author:

Mark Evenson

Message:

Dramatically improve source recording on SYS::SOURCE plist for a symbol (Alan Ruttenberg)

The interface to recording information on the SYS:%SOURCE plist for a
symbol is now deprecated and will be removed with abcl-1.7.

Implementation

---

Source information for ABCL is now recorded on the SYS::SOURCE
property. The appropiate information for type is recorded by the
SYS::RECORD-SOURCE-INFORMATION-BY-TYPE function:

record-source-information-by-type (name type &optional source-pathname source-position)

TYPE is either a symbol or list.

Source information for functions, methods, and generic functions are
represented as lists of the following form:

(:generic-function function-name)
(:function function-name)
(:method method-name qualifiers specializers)

Where FUNCTION-NAME or METHOD-NAME can be a either be of the form
'symbol or '(setf symbol).

Source information for all other forms have a symbol for TYPE which is
one of the following:

:class, :variable, :condition, :constant, :compiler-macro, :macro
:package, :structure, :type, :setf-expander, :source-transform

These values follow SBCL'S implemenation in SLIME
c.f. <​https://github.com/slime/slime/blob/bad2acf672c33b913aabc1a7facb9c3c16a4afe9/swank/sbcl.lisp#L748>

Modifications are in two places, one at the definitions, calling
record-source-information-by-type and then again in the file-compiler,
which writes forms like

(put 'source name (cons (list type pathname position) (get 'source name)))

In theory this can lead to redundancy if a fasl is loaded again and
again. I'm not sure how to fix this yet. Forms in the loader get
called early in build when many of the sequence functions aren't
present. Will probably just filter when presenting in slime.

<> :closes <​http://abcl.org/trac/ticket/421> .
<> :merges <​https://github.com/armedbear/abcl/pull/5> .

File:

• trunk/abcl/src/org/armedbear/lisp/gray-streams.lisp (modified) (1 diff)

trunk/abcl/src/org/armedbear/lisp/gray-streams.lisp

@@ -655 +655 @@
 (setf (symbol-function 'common-lisp::file-position) #'gray-file-position)
 (setf (symbol-function 'common-lisp::listen) #'gray-listen)
+
+(dolist (e '((common-lisp::read-char gray-read-char)
+       (common-lisp::peek-char gray-peek-char)
+       (common-lisp::unread-char gray-unread-char)
+       (common-lisp::read-line gray-read-line)
+       (common-lisp::clear-input gray-clear-input)
+       (common-lisp::read-char-no-hang gray-read-char-no-hang)
+       (common-lisp::write-char gray-write-char)
+       (common-lisp::fresh-line gray-fresh-line)
+       (common-lisp::terpri gray-terpri)
+       (common-lisp::write-string gray-write-string)
+       (common-lisp::write-line gray-write-line)
+       (sys::%force-output gray-force-output)
+       (sys::%finish-output gray-finish-output)
+       (sys::%clear-output gray-clear-output)
+       (sys::%output-object gray-output-object)
+       (common-lisp::read-byte gray-read-byte)
+       (common-lisp::write-byte gray-write-byte)
+       (common-lisp::stream-column gray-stream-column)
+       (common-lisp::stream-element-type gray-stream-element-type)
+       (common-lisp::close gray-close)
+       (common-lisp::input-stream-p gray-input-stream-p)
+       (common-lisp::input-character-stream-p gray-input-character-stream-p) ;; # fb 1.01
+       (common-lisp::output-stream-p gray-output-stream-p)
+       (common-lisp::open-stream-p gray-open-stream-p)
+       (common-lisp::streamp gray-streamp)
+       (common-lisp::read-sequence gray-read-sequence)
+       (common-lisp::write-sequence gray-write-sequence)
+       (common-lisp::file-position gray-file-position)
+       (common-lisp::listen gray-listen)))
+  (sys::put (car e) 'sys::source (cl:get (second e) 'sys::source)))
+
 #|
 (setf (symbol-function 'common-lisp::make-two-way-stream) #'gray-make-two-way-stream)