X-Git-Url: https://git.distorted.org.uk/~mdw/sod/blobdiff_plain/3dca7758421664a838c54b273bd9221f02072045..74ca1bf50dae2ae7dfa61352d77a5edba9cc3db6:/src/sod.asd.in?ds=inline

diff --git a/src/sod.asd.in b/src/sod.asd.in
index d710fb1..4a1c341 100644
--- a/src/sod.asd.in
+++ b/src/sod.asd.in
@@ -7,7 +7,7 @@
 
 ;;;----- Licensing notice ---------------------------------------------------
 ;;;
-;;; This file is part of the Sensble Object Design, an object system for C.
+;;; This file is part of the Sensible Object Design, an object system for C.
 ;;;
 ;;; SOD is free software; you can redistribute it and/or modify
 ;;; it under the terms of the GNU General Public License as published by
@@ -29,7 +29,9 @@
 
 (cl:in-package #:sod-sysdef)
 
-#|@-auto-@|# (load "auto.lisp")
+#|@-auto-@|# (load (merge-pathnames "auto.lisp" *load-pathname*))
+
+#+cmu (require :gray-streams)
 
 ;;;--------------------------------------------------------------------------
 ;;; Definition.
@@ -110,12 +112,12 @@
 
    ;; C type representation protocol.
    (:file "c-types-proto" :depends-on ("package"))
-   (:file "c-types-impl" :depends-on ("c-types-proto"))
+   (:file "c-types-impl" :depends-on ("c-types-proto" "codegen-proto"))
    (:file "c-types-parse" :depends-on
 	  ("c-types-proto" "c-types-class-impl" "fragment-parse"))
 
    ;; Property set protocol.
-   (:file "pset-proto" :depends-on ("package"))
+   (:file "pset-proto" :depends-on ("package" "c-types-proto"))
    (:file "pset-impl" :depends-on ("pset-proto"))
    (:file "pset-parse" :depends-on ("pset-proto" "lexer-proto"))
 
@@ -129,7 +131,7 @@
 	  ("module-proto" "pset-proto" "c-types-class-impl" "builtin"))
    (:file "builtin" :depends-on
 	  ("module-proto" "pset-proto" "c-types-impl" "c-types-class-impl"
-	   "classes" "class-layout-proto"))
+	   "classes" "class-layout-proto" "method-proto"))
    (:file "module-parse" :depends-on
 	  ("class-make-proto" "class-finalize-proto"
 	   "fragment-parse" "lexer-proto" "module-impl"))
@@ -169,17 +171,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 --------------------------------------------------