X-Git-Url: https://git.distorted.org.uk/~mdw/sod/blobdiff_plain/f64eb323a5798e155cc494043f5f750abf50a482..fddbedf7b1b4b19add30eeb62281748cc77e6955:/src/sod.asd.in

diff --git a/src/sod.asd.in b/src/sod.asd.in
index 9f36e1c..eabc504 100644
--- a/src/sod.asd.in
+++ b/src/sod.asd.in
@@ -69,6 +69,7 @@
 
   :components
   ((:file "utilities")
+   (:file "optparse")
 
    ;; Parser equipment.  This is way more elaborate than it needs to be, but
    ;; it was interesting, and it may well get split off into a separate
@@ -118,7 +119,7 @@
 
    ;; Property set protocol.
    (:file "pset-proto" :depends-on ("package" "c-types-proto"))
-   (:file "pset-impl" :depends-on ("pset-proto"))
+   (:file "pset-impl" :depends-on ("pset-proto" "module-proto"))
    (:file "pset-parse" :depends-on ("pset-proto" "lexer-proto"))
 
    ;; Code generation protocol.
@@ -126,7 +127,7 @@
    (:file "codegen-impl" :depends-on ("codegen-proto"))
 
    ;; Modules.
-   (:file "module-proto" :depends-on ("package"))
+   (:file "module-proto" :depends-on ("pset-proto" "package"))
    (:file "module-impl" :depends-on
 	  ("module-proto" "pset-proto" "c-types-class-impl" "builtin"))
    (:file "builtin" :depends-on
@@ -171,17 +172,14 @@
 	  ("classes" "class-layout-impl" "method-impl" "output-proto"))
 
    ;; Finishing touches of various kinds.
-   (:file "final" :depends-on ("builtin" "module-output"))))
+   (:file "final" :depends-on ("builtin" "module-output" "class-output"))))
 
 ;;;--------------------------------------------------------------------------
 ;;; Testing.
 
 (defmethod perform ((op test-op) (component (eql (find-system "sod"))))
   (declare (ignore op component))
-  (handler-bind (((or warning style-warning)
-		  (lambda (cond)
-		    (declare (ignore cond))
-		    (invoke-restart 'muffle-warning))))
+  (handler-bind (((or warning style-warning) #'muffle-warning))
     (operate 'test-op "sod-test")))
 
 ;;;----- That's all, folks --------------------------------------------------