From: David Lichteblau <david@lichteblau.com>
Date: Sun, 18 Oct 2009 09:13:25 +0000 (+0200)
Subject: move defstructs around, patch by Raymond Wiker
X-Git-Url: https://repo.or.cz/w/xuriella.git/commitdiff_plain/2553eeab5397ac543b5fa41f14bbeae53e6756c5

move defstructs around, patch by Raymond Wiker
---

diff --git a/unparse.lisp b/unparse.lisp
index f36acb1..b572245 100644
--- a/unparse.lisp
+++ b/unparse.lisp
@@ -78,6 +78,22 @@
     (sax:unparsed-internal-subset *sink* internal-subset))
   (sax:end-dtd *sink*))
 
+(defstruct sink-element
+  local-name
+  uri
+  suggested-prefix
+  all-namespaces
+  new-namespaces
+  used-prefixes
+  attributes
+  actual-qname)
+
+(defstruct sink-attribute
+  local-name
+  uri
+  suggested-prefix
+  value)
+
 (defun maybe-emit-start-tag ()
   (let ((elt *current-element*))
     (when (and elt (not *start-tag-written-p*))
@@ -176,22 +192,6 @@
               (concatenate 'string "xmlns:" prefix))
    :value uri))
 
-(defstruct sink-element
-  local-name
-  uri
-  suggested-prefix
-  all-namespaces
-  new-namespaces
-  used-prefixes
-  attributes
-  actual-qname)
-
-(defstruct sink-attribute
-  local-name
-  uri
-  suggested-prefix
-  value)
-
 (defparameter *initial-unparse-namespaces*
   '(("" . "")
     ("xmlns" . #"http://www.w3.org/2000/xmlns/")
diff --git a/xslt.lisp b/xslt.lisp
index 7baff23..28b8ed2 100644
--- a/xslt.lisp
+++ b/xslt.lisp
@@ -1210,6 +1210,25 @@
                   (funcall (variable-value-thunk-setter var))))
               chains)))))
 
+
+(defstruct template
+  match-expression
+  compiled-pattern
+  name
+  import-priority
+  apply-imports-limit
+  priority
+  position
+  mode
+  mode-qname
+  params
+  body
+  n-variables
+  ;; for profiling output only:
+  unparsed-qname
+  stylesheet
+  base-uri)
+
 (defun parse-templates! (stylesheet <transform> env)
   (let ((i 0))
     (do-toplevel (<template> "template" <transform>)
@@ -1860,24 +1879,6 @@
           (t
            (make-auto-detect-sink (make-combi-sink) method-key)))))))
 
-(defstruct template
-  match-expression
-  compiled-pattern
-  name
-  import-priority
-  apply-imports-limit
-  priority
-  position
-  mode
-  mode-qname
-  params
-  body
-  n-variables
-  ;; for profiling output only:
-  unparsed-qname
-  stylesheet
-  base-uri)
-
 (defun expression-priority (form)
   (let ((step (second form)))
     (if (and (null (cddr form))