]> dreyeck.freedombox.rocks Git - topic-maps.git/blobdiff - tests/cxtm.lisp
Implement unreified Variants with Scope and canonical merging
[topic-maps.git] / tests / cxtm.lisp
index 9edc6288ce035399bc04dfdb2c44c7eef2652eed..5240356ef01d0c5e1e7f0d6a8ba003ac66e8a661 100644 (file)
                 (topic-item-identifiers topic) (topic-subject-identifiers topic) (topic-subject-locators topic)
                 (loop for n in (topic-names topic) collect
                   (list n (topic-maps.tmdm::%topic-name-forward n) (topic-name-parent n)
-                        (topic-name-type n) (topic-name-value n)))
+                        (topic-name-type n) (topic-name-value n) (copy-list (topic-maps.tmdm::%topic-name-scope n))
+                        (loop for v in (topic-maps.tmdm::%topic-name-variants n) collect
+                          (list v (topic-maps.tmdm::%variant-forward v) (topic-maps.tmdm::%variant-parent v)
+                                (topic-maps.tmdm::%variant-value v) (topic-maps.tmdm::%variant-datatype v)
+                                (copy-list (topic-maps.tmdm::%variant-scope v))))))
                 (loop for o in (topic-maps.tmdm:topic-occurrences topic) collect
                   (list o (topic-maps.tmdm::%occurrence-forward o) (topic-maps.tmdm:occurrence-parent o)
                         (topic-maps.tmdm:occurrence-type o) (topic-maps.tmdm:occurrence-value o)
-                        (topic-maps.tmdm:occurrence-datatype o) (topic-maps.tmdm:occurrence-item-identifiers o)))))
+                        (topic-maps.tmdm:occurrence-datatype o) (topic-maps.tmdm:occurrence-item-identifiers o)
+                        (copy-list (topic-maps.tmdm::%occurrence-scope o))))))
         (loop for a in (topic-maps.tmdm:topic-map-associations map) collect
           (list a (topic-maps.tmdm::%association-forward a) (topic-maps.tmdm:association-type a)
-                (topic-maps.tmdm:association-parent a)
+                (topic-maps.tmdm:association-parent a) (copy-list (topic-maps.tmdm::%association-scope a))
                 (loop for r in (topic-maps.tmdm:association-roles a) collect
                   (list r (topic-maps.tmdm::%association-role-forward r)
                         (topic-maps.tmdm:association-role-type r) (topic-maps.tmdm:association-role-player r)