diff options
| author | Hugo Hörnquist <hugo@lysator.liu.se> | 2023-10-21 16:58:44 +0200 |
|---|---|---|
| committer | Hugo Hörnquist <hugo@lysator.liu.se> | 2023-10-21 16:58:44 +0200 |
| commit | 3513efa939a3811f221ea82ff8d91467c9aea6c1 (patch) | |
| tree | e6f1c6b26aafad94f651cbe84b707f644093ebc5 /module/sxml/namespaced/util.scm | |
| parent | Change namespaced sxml to use new object system. (diff) | |
| download | calp-3513efa939a3811f221ea82ff8d91467c9aea6c1.tar.gz calp-3513efa939a3811f221ea82ff8d91467c9aea6c1.tar.xz | |
Add tests for sxml namespaced + fix 'root-element'.
* Removes on-root-element since it was never used
* Handle the case of root-elemnt with no *TOP*
Diffstat (limited to 'module/sxml/namespaced/util.scm')
| -rw-r--r-- | module/sxml/namespaced/util.scm | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/module/sxml/namespaced/util.scm b/module/sxml/namespaced/util.scm index 6f93e362..e05f2fa1 100644 --- a/module/sxml/namespaced/util.scm +++ b/module/sxml/namespaced/util.scm @@ -5,7 +5,6 @@ :export (xml-element-hash-key find-element element-matches? - on-root-element root-element )) @@ -30,16 +29,10 @@ (xml-element-hash-key (car tree))))) -(define (on-root-element proc tree) +(define (root-element tree) (cond ((and (eq? '*TOP* (car tree)) (pi-element? (cadr tree))) - (cons* (car tree) (cadr tree) - (proc (caddr tree)))) + (caddr tree)) ((eq? '*TOP* (car tree)) - (cons (car tree) - (proc (cadr tree)))) - (else (proc (car tree))))) - -(define (root-element tree) - (call/ec (lambda (return) - (on-root-element return tree)))) + (cadr tree)) + (else tree))) |