X-Git-Url: https://dreyeck.freedombox.rocks/gitweb/topic-maps.git/blobdiff_plain/aeb017e4f4846f2e6a701e581d20eef84a8b83d9..d034a8deafa7cf74b2264ea8a7bd5cc0950806bf:/src/tmdm/associations.lisp diff --git a/src/tmdm/associations.lisp b/src/tmdm/associations.lisp index caaf021..48d8856 100644 --- a/src/tmdm/associations.lisp +++ b/src/tmdm/associations.lisp @@ -5,18 +5,22 @@ (eq (%association-role-player a) (%association-role-player b)))) (defun normalize-roles (association) - ;; TMDM 5.8/6.7: the compared Roles share this parent; other props are empty/null. - (loop for pair = (equal-pair (%association-roles association) #'same-role-signature-p) + ;; TMDM 5.8/6.7: shared parent; identifiers are metadata, not equality keys. + (loop for parent = (canonical-association association) + for pair = (equal-pair (%association-roles parent) #'same-role-signature-p) while pair do (let* ((a (first pair)) (b (second pair)) - (c (%make-association-role association (%association-role-type a) (%association-role-player a)))) - (setf (%association-roles association) (replace-pair (%association-roles association) a b c) - (%association-role-forward a) c (%association-role-forward b) c)))) + (c (%make-association-role parent (%association-role-type a) (%association-role-player a)))) + (setf (%association-role-item-identifiers c) + (set-union (%association-role-item-identifiers a) (%association-role-item-identifiers b) #'string=) + (%association-roles parent) (replace-pair (%association-roles parent) a b c) + (%association-role-forward a) c (%association-role-forward b) c) + (merge-item-reifiers c a b)))) (defun equal-associations-p (a b) ;; TMDM 5.7: compare role sets structurally, independent of role ordering. ;; Role parents are the associations being compared (the equality cycle). - ;; Scope sets are significant; reifier/II are absent in this subset. + ;; Scope sets are significant; identifiers do not participate in equality. (and (eq (%association-type a) (%association-type b)) (same-scope-p (%association-scope a) (%association-scope b)) (= (length (%association-roles a)) (length (%association-roles b))) @@ -24,18 +28,18 @@ (%association-roles a)))) (defun merge-two-associations (map a b) - ;; TMDM 6.6: C receives A's equal role set. Retarget parent and discarded - ;; equivalent B-role handles, so clients cannot observe stale live references. + ;; TMDM 6.6/6.7: retarget both equal role sets to C, then merge corresponding + ;; Roles. This preserves their identifiers AND every retained role handle. (let ((c (%make-association map (%association-type a)))) (setf (%association-scope c) (copy-list (%association-scope a)) - (%association-roles c) (copy-list (%association-roles a)) + (%association-item-identifiers c) + (set-union (%association-item-identifiers a) (%association-item-identifiers b) #'string=) + (%association-roles c) (set-union (%association-roles a) (%association-roles b) #'eq) (%topic-map-associations map) (replace-pair (%topic-map-associations map) a b c) (%association-forward a) c (%association-forward b) c) (dolist (role (%association-roles c)) (setf (%association-role-parent role) c)) - (dolist (role (%association-roles b)) - (setf (%association-role-forward role) - (find role (%association-roles c) :test #'same-role-signature-p))) - c)) + (normalize-roles c) + (merge-item-reifiers c a b))) (defun normalize-associations (map) (dolist (association (%topic-map-associations map)) (normalize-roles association))