- Moved utility functions from the "runes" package to the "cxml" package to

avoid name conflicts with functions from "glisp" of the same name.
- Renamed defsubst to definline for the same reason.

(This is a commit to the cxml repository, not the main closure repository.
If you don't want cxml commit messages on the closure list, please complain
to me and I'll change it.)

cxml.asd

@@ -1,58 +1,112 @@
+;;; XXX Die vielen verschiedenen Systeme hier sollten vielleicht
+;;; Module eines grossen Systems CXML werden?
+
 (defpackage :cxml-system
   (:use :asdf :cl))
 (in-package :cxml-system)
 
+;; XXX das sollte natuerlich erst beim laden stattfinden
+#+cmu
+(require :gray-streams)
+
 (defclass closure-source-file (cl-source-file) ())
 
 #+sbcl
 (defmethod perform :around ((o compile-op) (s closure-source-file))
   ;; shut up already.  Correctness first.
   (handler-bind ((sb-ext:compiler-note #'muffle-warning))
-    (call-next-method)))
+    (let (#+sbcl (*compile-print* nil))
+      (call-next-method))))
 
-(unless (find-package :glisp)
-  (defpackage :glisp))
+#-(or rune-is-character rune-is-octet)
+(progn
+  (format t "~&;;; Checking for wide character support...")
+  (force-output)
+  (pushnew (dotimes (x 65536
+                      (progn
+                        (format t " ok, characters have at least 16 bits.~%")
+                        :rune-is-character))
+             (unless (and (< x char-code-limit) (code-char x))
+               (format t " no, reverting to octet strings.~%")
+               (return :rune-is-octet)))
+           *features*))
 
-(defsystem glisp
+#-rune-is-character
+(format t "~&;;; Building cxml with (UNSIGNED-BYTE 16) RUNES~%")
+
+#+rune-is-character
+(format t "~&;;; Building cxml with CHARACTER RUNES~%") 
+
+(defsystem runes
     :default-component-class closure-source-file
     :pathname (merge-pathnames
-               "glisp/"
+               "runes/"
                (make-pathname :name nil :type nil :defaults *load-truename*))
     :components
-    ((:file dependent
+    ((:file "package")
+     (:file dependent
 	    :pathname
 	    #+CLISP                             "dep-clisp"
 	    #+(AND :CMU (NOT :PTHREAD))         "dep-cmucl"
 	    #+sbcl                              "dep-sbcl"
 	    #+(AND :CMU :PTHREAD)               "dep-cmucl-dtc"
-	    #+(and allegro allegro-v5.0)        "dep-acl5"
-	    #+(and allegro (not allegro-v5.0))  "dep-acl"
-	    #+GCL                               "dep-gcl"
-	    #-(or sbcl CLISP CMU allegro GCL) #.(error "Configure!"))
-     (:file "package"
-	    :depends-on (dependent))
-     (:file "runes"
+	    #+(and allegro-version>= (version>= 5.0)) "dep-acl5"
+	    #+(and allegro-version>= (not (version>= 5.0))) "dep-acl"
+            #+openmcl                           "dep-openmcl"
+	    #-(or sbcl CLISP CMU allegro openmcl) #.(error "Configure!")
+            :depends-on ("package"))
+     (:file runes
+            :pathname
+             #-rune-is-character "runes"
+             #+rune-is-character "characters"
 	    :depends-on ("package" dependent))
-     (:file "util"
-	    :depends-on ("package" dependent "runes"))
-     (:file "match"
-	    :depends-on ("package" dependent "runes" "util"))))
+     (:file "syntax" :depends-on ("package" dependent runes))
+     (:file "encodings" :depends-on ("package"))
+     (:file "encodings-data" :depends-on ("package" "encodings"))
+     (:file "xstream"
+            :depends-on ("package" dependent "syntax" "encodings-data"))))
 
-(asdf:defsystem :cxml
+(asdf:defsystem :xml
     :default-component-class closure-source-file
     :pathname (merge-pathnames
-               "cxml/"
+               "xml/"
                (make-pathname :name nil :type nil :defaults *load-truename*))
     :components
     ((:file "package")
-     (:file "encodings"       :depends-on ("package"))
-     (:file "encodings-data"  :depends-on ("package" "encodings"))
+     (:file "util"            :depends-on ("package"))
      (:file "sax-handler")
-     (:file "dompack")
-     (:file "dom-impl"        :depends-on ("dompack"))
-     (:file "dom-builder"     :depends-on ("dom-impl" "sax-handler"))
-     (:file "xml-stream"      :depends-on ("package"))
+     (:file "characters"      :depends-on ("package"))
      (:file "xml-name-rune-p" :depends-on ("package"))
-     (:file "xml-parse"       :depends-on ("package" "dompack" "sax-handler"))
-     (:file "xml-canonic"     :depends-on ("package" "dompack" "xml-parse")))
-    :depends-on (:glisp))
+     (:file "split-sequence"  :depends-on ("package"))
+     (:file "xml-parse"       :depends-on ("package" "util" "sax-handler" "split-sequence" "xml-name-rune-p" "characters"))
+     (:file "characters"      :depends-on ("package"))
+     (:file "unparse"         :depends-on ("xml-parse"))
+     (:file "xmls-compat"     :depends-on ("xml-parse"))
+     (:file "recoder"         :depends-on ("xml-parse"))
+     (:file "catalog"         :depends-on ("xml-parse"))
+     (:file "sax-proxy"       :depends-on ("xml-parse")))
+    :depends-on (:runes :puri))
+
+(asdf:defsystem :dom
+    :default-component-class closure-source-file
+    :pathname (merge-pathnames
+               "dom/"
+               (make-pathname :name nil :type nil :defaults *load-truename*))
+    :components
+    ((:file "package")
+     (:file "dom-impl"        :depends-on ("package"))
+     (:file "dom-builder"     :depends-on ("dom-impl"))
+     (:file "unparse"         :depends-on ("package"))
+     (:file "simple-dom"      :depends-on ("package"))
+     (:file "dom-sax"         :depends-on ("package")))
+    :depends-on (:xml))
+
+(asdf:defsystem :cxml-test
+    :default-component-class closure-source-file
+    :pathname (merge-pathnames
+               "test/"
+               (make-pathname :name nil :type nil :defaults *load-truename*))
+    :components ((:file "domtest") (:file "xmlconf"))
+    :depends-on (:xml :dom))
+
+(asdf:defsystem :cxml :components () :depends-on (:dom :cxml-test))