70e5783e22
This one requires a bit of jumping through hoops. Patching the dtd / catalog lookup is quite straightforward and similar to cxml, but the CLOSURE-HTML:*html-dtd* variable gives us a bit of trouble: It is defined quite late in `html-parser.lisp`, but files that need to be built first already reference it. SBCL has apparently decided to be particular about this and emits a `WARNING` (!) condition for this which is also worthy of `failure-p` of `compile-file` being true, so that `buildLisp` will abort compilation. We workaround this issue by injecting an extra source file which `defvar`s the desired symbol. A similar issue exists with `dump-dtd` which references `CL-USER:*HTML-DTD*` for some reason. Since this is a helper intended for development (?) and not exported we just throw it away via a patch. Change-Id: Ic0f92815a21f3793925c49a70a72f4a86791efe4 Reviewed-on: https://cl.tvl.fyi/c/depot/+/3263 Tested-by: BuildkiteCI Reviewed-by: grfn <grfn@gws.fyi>
78 lines
3 KiB
Diff
78 lines
3 KiB
Diff
diff --git a/src/parse/sgml-dtd.lisp b/src/parse/sgml-dtd.lisp
|
|
index de774c0..dbee852 100644
|
|
--- a/src/parse/sgml-dtd.lisp
|
|
+++ b/src/parse/sgml-dtd.lisp
|
|
@@ -624,73 +624,6 @@
|
|
(return))))
|
|
classes))
|
|
|
|
-;;;; ----------------------------------------------------------------------------------------------------
|
|
-;;;; Compiled DTDs
|
|
-;;;;
|
|
-
|
|
-;; Since parsing and 'compiling' DTDs is slow, I'll provide for a way
|
|
-;; to (un)dump compiled DTD to stream.
|
|
-
|
|
-(defun dump-dtd (dtd sink)
|
|
- (let ((*print-pretty* nil)
|
|
- (*print-readably* t)
|
|
- (*print-circle* t))
|
|
- (princ "#." sink)
|
|
- (prin1
|
|
- `(MAKE-DTD :NAME ',(dtd-name dtd)
|
|
- :ELEMENTS (LET ((R (MAKE-HASH-TABLE :TEST #'EQ)))
|
|
- (SETF ,@(let ((q nil))
|
|
- (maphash (lambda (key value)
|
|
- (push `',value q)
|
|
- (push `(GETHASH ',key R) q))
|
|
- (dtd-elements dtd))
|
|
- q))
|
|
- R)
|
|
- :ENTITIES ',(dtd-entities dtd)
|
|
- :RESOLVE-INFO (LET ((R (MAKE-HASH-TABLE :TEST #'EQUAL)))
|
|
- (SETF ,@(let ((q nil))
|
|
- (maphash (lambda (key value)
|
|
- (push `',value q)
|
|
- (push `(GETHASH ',key R) q))
|
|
- (dtd-resolve-info dtd))
|
|
- q))
|
|
- R)
|
|
- ;; XXX surclusion-cache fehlt
|
|
- )
|
|
- sink)))
|
|
-
|
|
-;;XXX
|
|
-(defun save-html-dtd ()
|
|
- (with-open-file (sink "html-dtd.lisp" :direction :output :if-exists :new-version)
|
|
- (print `(in-package :sgml) sink)
|
|
- (let ((*package* (find-package :sgml)))
|
|
- (princ "(SETQ " sink)
|
|
- (prin1 'cl-user::*html-dtd* sink)
|
|
- (princ " '" sink)
|
|
- (dump-dtd cl-user::*html-dtd* sink)
|
|
- (princ ")" sink))))
|
|
-
|
|
-;;; --------------------------------------------------------------------------------
|
|
-;;; dumping DTDs
|
|
-
|
|
-
|
|
-(defun dump-dtd (dtd filename)
|
|
- (let ((*foo* dtd))
|
|
- (declare (special *foo*))
|
|
- (with-open-file (sink (merge-pathnames filename "*.lisp")
|
|
- :direction :output
|
|
- :if-exists :new-version)
|
|
- (format sink "(in-package :sgml)(locally (declare (special *foo*))(setq *foo* '#.*foo*))"))
|
|
- (compile-file (merge-pathnames filename "*.lisp"))))
|
|
-
|
|
-(defun undump-dtd (filename)
|
|
- (let (*foo*)
|
|
- (declare (special *foo*))
|
|
- (load (compile-file-pathname (merge-pathnames filename "*.lisp"))
|
|
- :verbose nil
|
|
- :print nil)
|
|
- *foo*))
|
|
-
|
|
(defmethod make-load-form ((self dtd) &optional env)
|
|
(declare (ignore env))
|
|
`(make-dtd :name ',(dtd-name self)
|