Work in progress. Mostly bug fixing.

[sod] / src / sod.asd

diff --git a/src/sod.asd b/src/sod.asd
index 6c6d4fe354ccd867babf081e72094bd3229a1a05..33b54c6449fcbfda23f4a2885c39a8b18776f17c 100644 (file)
--- a/src/sod.asd
+++ b/src/sod.asd
@@ -99,18 +99,20 @@
 
    (:file "package" :depends-on ("parser"))
 
+   ;; Lexical analysis.
+   (:file "lexer-proto" :depends-on ("package" "parser"))
+   (:file "lexer-impl" :depends-on ("lexer-proto"))
+   (:file "fragment-parse" :depends-on ("lexer-proto"))
+
    ;; C type representation protocol.
    (:file "c-types-proto" :depends-on ("package"))
    (:file "c-types-impl" :depends-on ("c-types-proto"))
+   (:file "c-types-parse" :depends-on ("c-types-proto" "fragment-parse"))
 
    ;; Property set protocol.
    (:file "pset-proto" :depends-on ("package"))
    (:file "pset-impl" :depends-on ("pset-proto"))
-   (:file "pset-parse" :depends-on ("pset-proto" "lexical-parse"))
-
-   ;; Lexical analysis.
-   (:file "lexical-parse" :depends-on ("parser"))
-   (:file "fragment-parse" :depends-on ("lexical-parse"))
+   (:file "pset-parse" :depends-on ("pset-proto" "lexer-proto"))
 
    ;; Code generation protocol.
    (:file "codegen-proto" :depends-on ("package"))
@@ -122,8 +124,9 @@
          ("module-proto" "pset-proto" "c-types-class-impl" "builtin"))
    (:file "builtin" :depends-on ("module-proto" "pset-proto" "classes"
                                 "c-types-impl" "c-types-class-impl"))
+   #+no
    (:file "module-parse" :depends-on ("module-impl"
-                                     "lexical-parse" "fragment-parse"))
+                                     "lexer-proto" "fragment-parse"))
 
    ;; Output.
    (:file "output-proto" :depends-on ("package"))