X-Git-Url: https://git.distorted.org.uk/~mdw/sod/blobdiff_plain/d75ba5e3b7263a6d7527348a6f76007a91f55a30..259726f3c3f1d40c56b0d24c370fca4290f49e06:/src/sod.asd

diff --git a/src/sod.asd b/src/sod.asd
index d1791a3..aae3be1 100644
--- a/src/sod.asd
+++ b/src/sod.asd
@@ -34,7 +34,7 @@
 (defsystem sod
 
   ;; Boring copyright stuff.
-  :version "1.0.0"
+  :version "0.2.0"
   :author "Mark Wooding"
   :license "GNU General Public License, version 2 or later"
 
@@ -63,7 +63,6 @@
 
   :components
   ((:file "utilities")
-   (:file "optparse" :depends-on ("utilities"))
 
    ;; 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
@@ -98,7 +97,7 @@
      (:file "scanner-context-impl" :depends-on
 	    ("parser-proto" "scanner-proto"))))
 
-   (:file "package" :depends-on ("utilities" "optparse" "parser"))
+   (:file "package" :depends-on ("utilities" "parser"))
 
    ;; Lexical analysis.
    (:file "lexer-proto" :depends-on ("package" "parser"))
@@ -157,23 +156,26 @@
    (:file "class-finalize-impl" :depends-on ("class-finalize-proto"))
 
    ;; Method generation.
-   (:file "method-proto" :depends-on ("class-utilities"))
+   (:file "method-proto" :depends-on ("class-make-proto"))
    (:file "method-impl" :depends-on ("method-proto"))
+   (:file "method-aggregate" :depends-on ("method-impl"))
 
    ;; Class output.
    (:file "class-output" :depends-on
-	  ("classes" "class-layout-proto" "class-layout-impl"
-	   "method-proto" "method-impl" "output-proto"))
+	  ("classes" "class-layout-impl" "method-impl" "output-proto"))
 
-   ;; User interface.
-   (:file "frontend" :depends-on
-	  ("optparse" "module-proto" "module-parse"))))
+   ;; Debugging and interactive testing.
+   (:file "debug" :depends-on ("builtin" "module-output"))))
 
 ;;;--------------------------------------------------------------------------
 ;;; Testing.
 
 (defmethod perform ((op test-op) (component (eql (find-system "sod"))))
   (declare (ignore op component))
-  (operate 'test-op "sod-test" :force t))
+  (handler-bind (((or warning style-warning)
+		  (lambda (cond)
+		    (declare (ignore cond))
+		    (invoke-restart 'muffle-warning))))
+    (operate 'test-op "sod-test")))
 
 ;;;----- That's all, folks --------------------------------------------------