Changeset 9744 for branches

Timestamp:

Jun 13, 2008, 5:18:51 AM (16 years ago)

Author:

marco baringer

Message:

Drop the form slot of the source-location slot.

It's unused and causing problems.

Location:

branches/working-0711/ccl/level-1

Files:

• l1-init.lisp (modified) (1 diff)
• l1-reader.lisp (modified) (5 diffs)

branches/working-0711/ccl/level-1/l1-init.lisp

@@ -260 +260 @@
 (defvar *save-definitions* nil)
 (defvar *save-local-symbols* t)
-(defvar *save-source-locations* #+gz t #-gz nil
+(defvar *save-source-locations* t
   "Controls whether complete source locations is stored.
 

branches/working-0711/ccl/level-1/l1-reader.lisp

@@ -2517 +2517 @@
                   t
                   (and start-pos
-                       (make-source-note :form form
-                                         :stream stream
+                       (make-source-note :stream stream
                                          :start-pos (1- start-pos)
                                          :end-pos end-pos
@@ -3007 +3006 @@
   ;; Code coverage state.  This MUST be the first slot - see nx2-code-coverage.
   code-coverage
-  ;; The actual form - useful during debugging, perhaps remove later.
-  #+(or debug gz) form
   ;; For the outermost source form, a string (the text of the form).
   ;; For an inner source form, the source-note of the outer source form.
@@ -3031 +3028 @@
 ;;; we don't actually store source-note structs in the fasl since that runs into problems dumping
 ;;; the struct.
-(defun source-note-for-%lfun-info (note &key (start t) (end t) (text t) (form nil) (parent-note nil) (file-name t))
+(defun source-note-for-%lfun-info (note &key (start t) (end t) (text t) (parent-note nil) (file-name t))
   (append (when start (list :start (source-note-start-pos note)))
           (when end   (list :end  (source-note-end-pos note)))
           (when text (list :%text (%fast-compact (source-note-text note))))
-          (when form  #+debug (list :form (source-note-form note)))
           (when parent-note (list :parent-note (source-note-parent-note note)))
           (when file-name (list :file-name (source-note-file-name note)))))
@@ -3136 +3132 @@
             (form (read-internal stream nil eofval nil)))
        (values form (and (neq form eofval)
-                         (%make-source-note #+debug :form #+debug form
-                                            :file-name file-name
+                         (%make-source-note :file-name file-name
                                             :start-pos (+ (or start-offset 0) start)
                                             :end-pos (+ (or start-offset 0) (file-position stream)))))))))
@@ -3146 +3141 @@
       (destructuring-bind (map file-name stream-offset) (cdr recording)
         (let* ((prev (gethash form map))
-               (note (%make-source-note #+debug :form #+debug form
-                                        :file-name file-name
+               (note (%make-source-note :file-name file-name
                                         :start-pos (+ stream-offset start-pos)
                                         :end-pos (+ stream-offset end-pos))))