bulk of package system, reader, and other refactoring

[clinton/parenscript.git] / parenscript.asd

diff --git a/parenscript.asd b/parenscript.asd
index 56f0168..cf03a86 100644 (file)
--- a/parenscript.asd
+++ b/parenscript.asd
@@ -13,19 +13,29 @@
   :version "0"
   :maintainer "Vladimir Sedach <vsedach@gmail.com>"
   :licence "BSD"
-  :description "js - javascript compiler"
+  :description "Parenscript is a lispy language that compiles to Javascript."
   :components ((:static-file "parenscript.asd")
                (:module :src
                 :components ((:file "package")
                              (:file "utils" :depends-on ("package"))
-                             (:file "defgenerics" :depends-on ("package"))
-                             (:file "js" :depends-on ("package" "utils" "defgenerics"))
-                             (:file "js-html" :depends-on ("package" "js" "utils"))
-                             (:file "css" :depends-on ("package" "utils"))
-                             (:file "compile-js" :depends-on ("package" "js"))
-                             (:file "js-utils" :depends-on ("package" "js"))
+                            (:file "js-source-model" :depends-on ("package" "utils"))
+                            (:file "ps-source-model" :depends-on ("js-source-model"))
+                            (:file "parser" :depends-on ("js-source-model" "ps-source-model"))
+                            (:file "deprecated-interface" :depends-on ("parser"))
+                            (:file "js-macrology" :depends-on ("deprecated-interface"))
+                            (:file "ps-macrology" :depends-on ("js-macrology"))
+                            (:file "js-translation" :depends-on ("ps-macrology"))
+;                           (:file "js-ugly-translation" :depends-on ("js-translation"))
+                            (:file "reader" :depends-on ("parser"))
+                            (:file "compilation-interface" :depends-on ("package" "reader" "js-translation")); "js-ugly-translation"))
+                            ;; standard library
                              (:module :lib
-                                      :components ((:static-file "functional.lisp")))))))
+                                      :components ((:static-file "functional.lisp")
+                                                  (:file "js-html")
+                                                  (:file "css"    )
+                                                  (:file "js-utils"))
+                                     :depends-on ("compilation-interface")))))
+  :depends-on ())
 
 (defmethod asdf:perform :after ((op asdf:load-op) (system (eql (asdf:find-system :parenscript)))) 
   (pushnew :parenscript cl:*features*))
@@ -39,7 +49,8 @@
                 :components ((:file "test-package")
                              (:file "test" :depends-on ("test-package"))
                              (:file "ref2test" :depends-on ("test"))
-                             (:file "reference-tests" :depends-on ("test"))))))
+                             (:file "reference-tests" :depends-on ("test"))
+                             (:file "ps-tests" :depends-on ("test"))))))
 
 (defmethod asdf:perform ((o test-op) (c (eql (find-system :parenscript.test))))
   (asdf:operate 'asdf:load-op :parenscript.test)