Commit 12019f41 authored by Matthew Steele's avatar Matthew Steele

Commented out huge swaths of no-longer-needed code.

parent f19e3ef5
......@@ -29,24 +29,24 @@ to the base of the system."
;; Used only by with-dependency-tracking.
(defun call-with-dependency-tracking (comp thunk)
(if *using-constituents*
;; (if *using-constituents*
(if *current-constituent*
(operating-on-asdf-component-constituent (comp)
;((merge-pathnames (asdf:component-pathname comp)))
(with-groveling-macroexpand-hook
(funcall thunk)))
(funcall thunk))
(if *current-dependency-state*
(operating-on-component (comp)
(let ((file (namestring (merge-pathnames
(asdf:component-pathname comp))))
(*readtable* (make-instrumented-readtable)))
(signal-user file 'file-component)
(noticing-*feature*-changes
(multiple-value-prog1
(funcall thunk)
(signal-new-internal-symbols)))))
(funcall thunk))))
(funcall thunk)))
;; (if *current-dependency-state*
;; (operating-on-component (comp)
;; (let ((file (namestring (merge-pathnames
;; (asdf:component-pathname comp))))
;; (*readtable* (make-instrumented-readtable)))
;; (signal-user file 'file-component)
;; (noticing-*feature*-changes
;; (multiple-value-prog1
;; (funcall thunk)
;; (signal-new-internal-symbols)))))
;; (funcall thunk))))
;; Used only by emit-perform-method.
(defmacro with-dependency-tracking (comp &body body)
......@@ -70,11 +70,11 @@ to the base of the system."
((last-grovel-state :initform nil)
(load-system :initarg :load-systems)
(merge-systems :initarg :merge-systems)
(cull-redundant :initarg :cull-redundant :initform nil)
;; (cull-redundant :initarg :cull-redundant :initform nil)
(verbose :initarg :verbose :initform t)
(output-file :initarg :output-file)
(base-pathname :initarg :base-pathname)
(debug-object-types :initarg :debug-object-types :initform nil)
;; (debug-object-types :initarg :debug-object-types :initform nil)
(base-asd-file :initarg :base-asd-file :initform nil)
(additional-initargs
:initarg :additional-initargs :initform nil
......@@ -164,7 +164,7 @@ to the base of the system."
:if-does-not-exist :create
:if-exists :supersede)
(with-slots (load-system merge-systems
component-name-translation cull-redundant verbose
component-name-translation verbose ;cull-redundant
additional-initargs base-pathname debug-object-types) c
(let ((base-pathname
(or (and (slot-boundp c 'base-pathname)
......@@ -196,8 +196,8 @@ to the base of the system."
component-stream
(mapcar #'asdf:find-system merge-systems)
:verbose verbose
:cull-redundant cull-redundant
:debug-object-types debug-object-types
;; :cull-redundant cull-redundant
;; :debug-object-types debug-object-types
:base-pathname base-pathname))))))
(rename-file tmp-file-name (first (asdf:output-files op c)))))
......
This diff is collapsed.
......@@ -50,8 +50,8 @@
(define-macroexpand-handlers (form)
(defvar defparameter)
(signal-provider (second form) 'defvar)
(unless *using-constituents*
(setf (gethash (second form) *suspected-variables*) t))
;; (unless *using-constituents*
;; (setf (gethash (second form) *suspected-variables*) t))
(does-not-macroexpand))
......
......@@ -3,21 +3,27 @@
(cl:defpackage #:asdf-dependency-grovel
(:use #:cl)
(:export #:reload
#:component-file #:dependency-op ;#:compare-dependency-op
#:component-file
#:dependency-op
;;#:compare-dependency-op
#:instrumented-cl-source-file
#:instrumented-module
#:instrumented-component #:additional-initargs
#:read-component-file #:systems-in-configuration
#:handle-macroexpansion #:define-macroexpand-handlers
#:define-simple-macroexpand-handlers
#:signal-user #:signal-provider
;#:with-dependency-tracking
;; feature set when groveling:
#:groveling
;; Added by msteele:
;#:with-non-asdf-groveling
#:instrumented-load #:instrumented-compile-file
#:print-big-ol-dependency-report))
#:instrumented-component
#:additional-initargs
#:read-component-file
#:systems-in-configuration
#:handle-macroexpansion
#:define-macroexpand-handlers
#:signal-user
#:signal-provider
#:components-in-traverse-order
;;#:with-dependency-tracking
#:with-constituent-groveling
#:instrumented-load
#:instrumented-compile-file
#:print-big-ol-dependency-report
;; Feature set when groveling:
#:groveling))
(cl:defpackage #:asdf-dependency-grovel.packages
(:use))
......
......@@ -17,6 +17,6 @@
:merge-systems (:test-serial-system)
:output-file "groveled-components.lisp"
:base-asd-file "groveled-components.output.asd"
:cull-redundant t
;; :cull-redundant t
:verbose t)))
......@@ -19,8 +19,8 @@
"Hash table containing the symbols that should be treated as if they were
variables when used in forms.")
(defvar *current-dependency-state* nil
"The state of dependency information for the current groveling run.")
;; (defvar *current-dependency-state* nil
;; "The state of dependency information for the current groveling run.")
(defvar *grovel-dir-suffix* nil
"Bound to a value that is unique once per operating on each
......@@ -100,13 +100,13 @@
;; Added by msteele:
(defvar *non-asdf-p* nil
"When nil, assumes we're groveling ASDF-based code.
When non-nil, assumes we're groveling non-ASDF-based code.")
;; (defvar *non-asdf-p* nil
;; "When nil, assumes we're groveling ASDF-based code.
;; When non-nil, assumes we're groveling non-ASDF-based code.")
(defvar *using-constituents* nil
"When nil, assumes we're using the old representations.
When non-nil, assumes we're using constituents.")
;; (defvar *using-constituents* nil
;; "When nil, assumes we're using the old representations.
;; When non-nil, assumes we're using constituents.")
(defvar *current-constituent* nil
"The lowest-level constituent that we are currently inside.")
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment