sysmlpy 0.40.0__tar.gz → 0.42.0__tar.gz

{sysmlpy-0.40.0 → sysmlpy-0.42.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sysmlpy
-Version: 0.40.0
+Version: 0.42.0
 Summary: 
 License-File: LICENSE
 Author: Jon R. Fox (mycr0ft)
@@ -39,6 +39,10 @@ The project had diverged so much from sysml2py that a new name, sysmlpy, was sel
 
 ![Lines of Code Over Time](loc_history.svg)
 
+**v0.42.0:** Two deep fixes in the specialization layer. (1) `satisfy R : T by p;` and `assert someConstraint : CType;` crashed with `NameError` — the makers called a helper that was never defined; all three sites now use `_build_full_specialization_from_fsp`. (2) Chained re-declarations (`attribute :> base.x;`) dropped every segment after the first, at both visitor and grammar layers — new visitor helpers emit one Owned* dict per source chain (head + `OwnedFeatureChain`), grammar classes keep both parts, `redefined_name` resolves to the leaf segment, and the semantic analyzer now reports/resolves full dotted names (`Undefined symbol 'missing.chain'`). 14 tests in `tests/redefined_name_test.py`.
+
+**v0.41.0:** Full-specialization capture across all usage kinds — v0.40.0 fixed `attributeUsage` only; actions, calculations, constraints, requirements, use cases, interfaces and nested occurrences still dropped `:>`, `:>>`, `::>` specializations. New `_full_specialization_for_ctx` helper walks any usage-like context to its featureSpecializationPart; twelve visitor sites now use it (typed-by kept as fallback). `Action.load_from_grammar` captures all four kinds and the hand-rolled dumps on Action/Interface/UseCase/Requirement render them (`action a2 ::> RefType;`). `Usage.redefined_name` now works on deeper declaration nestings too. 10 tests in `tests/redefined_name_test.py`.
+
 **v0.40.0:** `References` (`::>` / `references` keyword) implemented end-to-end — previously the grammar-side `FeatureSpecialization` had a silent "not yet implemented" stub and the visitor never emitted dicts for it, so `ref attribute ::> X;` lost its specialization on round-trip (dump emitted `attribute ;`). New `References` grammar class mirrors `Redefinitions`; visitor branches in both full-specialization builders now cover the operator and keyword forms. The top-level `attributeUsage` path was the only one still using the typed-by-only helper; it now uses `_build_full_specialization_from_ctx` so all four kinds (Typings, Subsettings, Redefinitions, References) round-trip. `redefined_name` / `display_name` already handled this case. New `test_attribute_ref_references_operator_roundtrip` in `tests/grammar_test.py`; two new cases in `tests/redefined_name_test.py`. 97/97 grammar round-trip tests pass.
 
 **v0.39.0:** Redefined-Usage name resolution — `attribute :>> exampleAttribute = ...;` previously dumped the name correctly but exposed a UUID sentinel via `attribute.name`. Two new helpers surface the user-visible identifier without changing the historical `self.name` semantics: `Usage.redefined_name` (last identifier segment of the first re-declaration chain — `Redefinitions` / `Subsettings` / `References`) and `Usage.display_name` (UUID-aware user-meaningful name). `get_value()`, `dump()`, and `get_child()` continue to work unchanged. New `tests/redefined_name_test.py` (6 tests) — the original two-package `DummyDefinitionModel` / `DummyUsageModel` round-trips and the helper properties are exercised.

{sysmlpy-0.40.0 → sysmlpy-0.42.0}/README.md

@@ -14,6 +14,10 @@ The project had diverged so much from sysml2py that a new name, sysmlpy, was sel
 
 ![Lines of Code Over Time](loc_history.svg)
 
+**v0.42.0:** Two deep fixes in the specialization layer. (1) `satisfy R : T by p;` and `assert someConstraint : CType;` crashed with `NameError` — the makers called a helper that was never defined; all three sites now use `_build_full_specialization_from_fsp`. (2) Chained re-declarations (`attribute :> base.x;`) dropped every segment after the first, at both visitor and grammar layers — new visitor helpers emit one Owned* dict per source chain (head + `OwnedFeatureChain`), grammar classes keep both parts, `redefined_name` resolves to the leaf segment, and the semantic analyzer now reports/resolves full dotted names (`Undefined symbol 'missing.chain'`). 14 tests in `tests/redefined_name_test.py`.
+
+**v0.41.0:** Full-specialization capture across all usage kinds — v0.40.0 fixed `attributeUsage` only; actions, calculations, constraints, requirements, use cases, interfaces and nested occurrences still dropped `:>`, `:>>`, `::>` specializations. New `_full_specialization_for_ctx` helper walks any usage-like context to its featureSpecializationPart; twelve visitor sites now use it (typed-by kept as fallback). `Action.load_from_grammar` captures all four kinds and the hand-rolled dumps on Action/Interface/UseCase/Requirement render them (`action a2 ::> RefType;`). `Usage.redefined_name` now works on deeper declaration nestings too. 10 tests in `tests/redefined_name_test.py`.
+
 **v0.40.0:** `References` (`::>` / `references` keyword) implemented end-to-end — previously the grammar-side `FeatureSpecialization` had a silent "not yet implemented" stub and the visitor never emitted dicts for it, so `ref attribute ::> X;` lost its specialization on round-trip (dump emitted `attribute ;`). New `References` grammar class mirrors `Redefinitions`; visitor branches in both full-specialization builders now cover the operator and keyword forms. The top-level `attributeUsage` path was the only one still using the typed-by-only helper; it now uses `_build_full_specialization_from_ctx` so all four kinds (Typings, Subsettings, Redefinitions, References) round-trip. `redefined_name` / `display_name` already handled this case. New `test_attribute_ref_references_operator_roundtrip` in `tests/grammar_test.py`; two new cases in `tests/redefined_name_test.py`. 97/97 grammar round-trip tests pass.
 
 **v0.39.0:** Redefined-Usage name resolution — `attribute :>> exampleAttribute = ...;` previously dumped the name correctly but exposed a UUID sentinel via `attribute.name`. Two new helpers surface the user-visible identifier without changing the historical `self.name` semantics: `Usage.redefined_name` (last identifier segment of the first re-declaration chain — `Redefinitions` / `Subsettings` / `References`) and `Usage.display_name` (UUID-aware user-meaningful name). `get_value()`, `dump()`, and `get_child()` continue to work unchanged. New `tests/redefined_name_test.py` (6 tests) — the original two-package `DummyDefinitionModel` / `DummyUsageModel` round-trips and the helper properties are exercised.

{sysmlpy-0.40.0 → sysmlpy-0.42.0}/pyproject.toml

@@ -6,7 +6,7 @@ build-backend = "poetry.core.masonry.api"
 
 [project]
 name = "sysmlpy"
-version = "0.40.0"
+version = "0.42.0"
 description = ""
 authors = [{ name = "Jon R. Fox (mycr0ft)", email = "jon.fox@drfox.com" }]
 readme = "README.md"

{sysmlpy-0.40.0 → sysmlpy-0.42.0}/src/sysmlpy/__init__.py

@@ -25,7 +25,7 @@ __all__ = [
     "render_state_transition_view_svg", "boxes_view",
 ]
 __author__ = "Jon Fox"
-__version__ = "0.40.0"
+__version__ = "0.42.0"
 
 from sysmlpy.usage import (
     Item, Attribute, Part, Port, Action, Reference, UseCase, Requirement, Interface, Message,

{sysmlpy-0.40.0 → sysmlpy-0.42.0}/src/sysmlpy/antlr_visitor.py

@@ -1432,7 +1432,11 @@ def _make_use_case_usage_dict(ctx, prefix=None):
     if typed_by is None:
         typed_by = _get_action_usage_subsetted_by(ctx)
     
-    specialization = _build_specialization(typed_by) if typed_by else None
+    spec_full = _full_specialization_for_ctx(ctx)
+    if spec_full is not None:
+        specialization = spec_full
+    else:
+        specialization = _build_specialization(typed_by) if typed_by else None
     occ_prefix = _get_occurrence_usage_prefix(ctx) if ctx else None
     
     # Get case body items
@@ -2208,7 +2212,7 @@ def _make_assert_constraint_usage_dict(acu_ctx, prefix=None):
         
         if hasattr(acu_ctx, 'featureSpecializationPart') and acu_ctx.featureSpecializationPart():
             fsp_ctx = acu_ctx.featureSpecializationPart()
-            fsp = _build_feature_specialization_part(fsp_ctx)
+            fsp = _build_full_specialization_from_fsp(fsp_ctx)
     
     declaration = None
     if hasattr(acu_ctx, 'constraintUsageDeclaration') and acu_ctx.constraintUsageDeclaration():
@@ -2311,7 +2315,7 @@ def _make_satisfy_requirement_usage_dict(sru_ctx, prefix=None):
         
         if hasattr(sru_ctx, 'featureSpecializationPart') and sru_ctx.featureSpecializationPart():
             fsp_ctx = sru_ctx.featureSpecializationPart()
-            fsp = _build_feature_specialization_part(fsp_ctx)
+            fsp = _build_full_specialization_from_fsp(fsp_ctx)
     elif hasattr(sru_ctx, 'REQUIREMENT') and sru_ctx.REQUIREMENT():
         if hasattr(sru_ctx, 'usageDeclaration') and sru_ctx.usageDeclaration():
             ud = sru_ctx.usageDeclaration()
@@ -3000,8 +3004,13 @@ def _make_action_usage_element(ctx, member_prefix=None):
     # Get body items
     action_items = _visit_action_body_items(ctx)
     
-    # Build specialization if typed_by is present
-    specialization = _build_specialization(typed_by) if typed_by else None
+    # Full specialization (Typings + Subsettings + Redefinitions +
+    # References); typed-by fallback for odd contexts.
+    spec_full = _full_specialization_for_ctx(ctx)
+    if spec_full is not None:
+        specialization = spec_full
+    else:
+        specialization = _build_specialization(typed_by) if typed_by else None
     
     return {
         "name": "BehaviorUsageMember",
@@ -6143,7 +6152,11 @@ def _make_calculation_usage_dict(ctx, prefix=None):
         if typed_by is None:
             typed_by = _get_action_usage_subsetted_by(ctx)
     
-    specialization = _build_specialization(typed_by) if typed_by else None
+    spec_full = _full_specialization_for_ctx(ctx)
+    if spec_full is not None:
+        specialization = spec_full
+    else:
+        specialization = _build_specialization(typed_by) if typed_by else None
     body_parts = _visit_calculation_body_items(ctx)
     occ_prefix = _get_occurrence_usage_prefix(ctx) if ctx else None
     
@@ -6253,7 +6266,11 @@ def _make_constraint_usage_dict(ctx, prefix=None):
         if typed_by is None:
             typed_by = _get_action_usage_subsetted_by(ctx)
     
-    specialization = _build_specialization(typed_by) if typed_by else None
+    spec_full = _full_specialization_for_ctx(ctx)
+    if spec_full is not None:
+        specialization = spec_full
+    else:
+        specialization = _build_specialization(typed_by) if typed_by else None
     body_parts = _visit_calculation_body_items(ctx)
     occ_prefix = _get_occurrence_usage_prefix(ctx) if ctx else None
     
@@ -6336,7 +6353,11 @@ def _make_requirement_usage_dict(ctx, prefix=None):
     if typed_by is None:
         typed_by = _get_action_usage_subsetted_by(ctx)
     
-    specialization = _build_specialization(typed_by) if typed_by else None
+    spec_full = _full_specialization_for_ctx(ctx)
+    if spec_full is not None:
+        specialization = spec_full
+    else:
+        specialization = _build_specialization(typed_by) if typed_by else None
     occ_prefix = _get_occurrence_usage_prefix(ctx) if ctx else None
     
     # Get requirement body items
@@ -6505,7 +6526,11 @@ def _make_interface_usage_dict(ctx, prefix=None):
                 if item_dict:
                     body_items.append(item_dict)
     
-    specialization = _build_specialization(typed_by) if typed_by else None
+    spec_full = _full_specialization_for_ctx(ctx)
+    if spec_full is not None:
+        specialization = spec_full
+    else:
+        specialization = _build_specialization(typed_by) if typed_by else None
     
     interface_end_members = []
     if interface_part:
@@ -9086,7 +9111,7 @@ def _visit_requirement_constraint_usage(rcu_ctx):
         fs = []
         if hasattr(rcu_ctx, 'featureSpecializationPart') and rcu_ctx.featureSpecializationPart():
             fsp_ctx = rcu_ctx.featureSpecializationPart()
-            fsp = _build_feature_specialization_part(fsp_ctx)
+            fsp = _build_full_specialization_from_fsp(fsp_ctx)
             if fsp and "specialization" in fsp:
                 fs = fsp["specialization"]
         
@@ -9705,7 +9730,11 @@ def _visit_nested_occurrence_usage(occ_elem):
             typed_by = _get_action_usage_typed_by(ctx)
             if typed_by is None:
                 typed_by = _get_action_usage_subsetted_by(ctx)
-            specialization = _build_specialization(typed_by) if typed_by else None
+            spec_full = _full_specialization_for_ctx(ctx)
+            if spec_full is not None:
+                specialization = spec_full
+            else:
+                specialization = _build_specialization(typed_by) if typed_by else None
             
             occ_prefix = _get_occurrence_usage_prefix(ctx)
             
@@ -11225,8 +11254,13 @@ def _visit_usage_element_dict(usage_elem_ctx, prefix=None):
                 # Get body items
                 action_items = _visit_action_body_items(ctx)
                 
-                # Build specialization if typed_by is present
-                specialization = _build_specialization(typed_by) if typed_by else None
+                # Full specialization (Typings + Subsettings + Redefinitions +
+                # References); typed-by fallback for odd contexts.
+                spec_full = _full_specialization_for_ctx(ctx)
+                if spec_full is not None:
+                    specialization = spec_full
+                else:
+                    specialization = _build_specialization(typed_by) if typed_by else None
                 
                 return {
                     "name": "PackageMember",
@@ -11527,6 +11561,137 @@ def _get_action_usage_subsetted_by(ctx):
     return None
 
 
+def _dotted_segments(owned_ctx):
+    """Segments of an ownedSubsetting / ownedRedefinition /
+    ownedReferenceSubsetting context.
+
+    Grammar: qualifiedName (DOT qualifiedName)* — e.g. ``base.x`` yields
+    ``['base', 'x']``. Each segment may itself be '::'-qualified.
+    """
+    segs = []
+    if owned_ctx is None:
+        return segs
+    for c2 in owned_ctx.children:
+        if type(c2).__name__ == 'QualifiedNameContext':
+            segs.append(c2.getText())
+    return segs
+
+
+def _emit_owned_chain(dict_name, feature_key, segs):
+    """Build an Owned{Subsetting,Redefinition,ReferenceSubsetting} dict
+    from dotted segments: first segment becomes the direct feature, the
+    remainder become an OwnedFeatureChain so chained forms like
+    ``:> base.x`` survive round-trip."""
+    head = {
+        "name": "QualifiedName",
+        "names": segs[0].split("::"),
+    }
+    owned_related = []
+    if len(segs) > 1:
+        chain_elements = [
+            {
+                "name": "OwnedFeatureChaining",
+                "chainingFeature": {"name": "QualifiedName", "names": s.split("::")},
+            }
+            for s in segs[1:]
+        ]
+        owned_related.append({
+            "name": "OwnedFeatureChain",
+            "feature": {
+                "name": "FeatureChain",
+                "ownedRelationship": chain_elements,
+            },
+        })
+    return {
+        "name": dict_name,
+        feature_key: head,
+        "ownedRelatedElement": owned_related,
+    }
+
+
+def _collect_owned_contexts(wrapper_children, direct_type, wrapper_types):
+    """Yield each Owned*Context found under a Subsettings/Redefinitions/
+    References rule context. Handles both direct children and one of the
+    keyword-wrapper contexts (SubsetsContext, RedefinesContext, …)."""
+    for child in wrapper_children:
+        child_name = type(child).__name__
+        if child_name == direct_type:
+            yield child
+        elif child_name in wrapper_types:
+            for c3 in child.children:
+                if type(c3).__name__ == direct_type:
+                    yield c3
+
+
+def _full_specialization_for_ctx(ctx):
+    """Best-effort full specialization for any usage-like context.
+
+    Tries, in order:
+      1. ctx.usage().usageDeclaration().featureSpecializationPart()
+         (whole-usage contexts: attributeUsage, partUsage, …)
+      2. ctx.usageDeclaration().featureSpecializationPart()
+      3. ctx.<x>UsageDeclaration().usageDeclaration().featureSpecializationPart()
+         for any ``*UsageDeclaration`` accessor on ctx
+         (actionUsageDeclaration, constraintUsageDeclaration, …)
+
+    Returns None when no path yields a featureSpecializationPart. Callers
+    that previously did ``_build_specialization(typed_by)`` can call this
+    instead to also capture Redefinitions / Subsettings / References.
+    """
+    if ctx is None:
+        return None
+
+    def _fsp_from_ud(ud):
+        if ud is None:
+            return None
+        if isinstance(ud, list):
+            ud = ud[0] if ud else None
+        if ud is None:
+            return None
+        fsp_getter = getattr(ud, "featureSpecializationPart", None)
+        if callable(fsp_getter) and fsp_getter():
+            return _build_full_specialization_from_fsp(fsp_getter())
+        return None
+
+    # 1) whole-usage context
+    usage = getattr(ctx, "usage", None)
+    if callable(usage):
+        u = usage()
+        if u is not None and hasattr(u, "usageDeclaration"):
+            spec = _fsp_from_ud(u.usageDeclaration())
+            if spec is not None:
+                return spec
+
+    # 2) direct usageDeclaration on ctx
+    ud_getter = getattr(ctx, "usageDeclaration", None)
+    if callable(ud_getter):
+        spec = _fsp_from_ud(ud_getter())
+        if spec is not None:
+            return spec
+
+    # 3) any *UsageDeclaration holder (actionUsageDeclaration, …)
+    for attr in sorted(dir(ctx)):
+        if not attr.endswith("UsageDeclaration") or attr == "usageDeclaration":
+            continue
+        getter = getattr(ctx, attr, None)
+        if callable(getter):
+            try:
+                holder = getter()
+            except Exception:
+                continue
+            if holder is None:
+                continue
+            if callable(getattr(holder, "usageDeclaration", None)):
+                spec = _fsp_from_ud(holder.usageDeclaration())
+                if spec is not None:
+                    return spec
+            spec = _fsp_from_ud(holder)
+            if spec is not None:
+                return spec
+
+    return None
+
+
 def _build_specialization(typed_by):
     """Build the specialization dictionary structure for a typed-by reference."""
     if not typed_by:
@@ -11745,30 +11910,19 @@ def _build_full_specialization_from_ctx(ctx):
             # redef_ctx can be a single RedefinitionsContext or a list
             if not isinstance(redef_ctx, list):
                 redef_ctx = [redef_ctx]
-            redef_names = []
+            owned = []
             for rc in redef_ctx:
-                # RedefinitionsContext → [RedefinesContext, ...] → [OwnedRedefinitionContext, ...] → QualifiedNameContext
-                for child in rc.children:
-                    child_name = type(child).__name__
-                    if child_name == 'OwnedRedefinitionContext':
-                        for c2 in child.children:
-                            if type(c2).__name__ == 'QualifiedNameContext':
-                                redef_names.append(c2.getText())
-                    elif child_name == 'RedefinesContext':
-                        for c2 in child.children:
-                            if type(c2).__name__ == 'OwnedRedefinitionContext':
-                                for c3 in c2.children:
-                                    if type(c3).__name__ == 'QualifiedNameContext':
-                                        redef_names.append(c3.getText())
-            if redef_names:
-                owned = [
-                    {
-                        "name": "OwnedRedefinition",
-                        "redefinedFeature": {"name": "QualifiedName", "names": n.split("::")},
-                        "ownedRelatedElement": []
-                    }
-                    for n in redef_names
-                ]
+                # OwnedRedefinitionContext may be a dotted chain
+                # (qualifiedName (DOT qualifiedName)*).
+                for or_ctx in _collect_owned_contexts(
+                    rc.children, 'OwnedRedefinitionContext',
+                    ('RedefinesContext',),
+                ):
+                    segs = _dotted_segments(or_ctx)
+                    if segs:
+                        owned.append(_emit_owned_chain(
+                            'OwnedRedefinition', 'redefinedFeature', segs))
+            if owned:
                 specialization_list.append({
                     "name": "FeatureSpecialization",
                     "ownedRelationship": {
@@ -11783,36 +11937,19 @@ def _build_full_specialization_from_ctx(ctx):
             # sub_ctx can be a single SubsettingsContext or a list
             if not isinstance(sub_ctx, list):
                 sub_ctx = [sub_ctx]
-            sub_names = []
+            owned = []
             for sc in sub_ctx:
-                # SubsettingsContext → [SubsetsContext, ...] → [OwnedSubsettingContext] → QualifiedNameContext
-                for child in sc.children:
-                    child_name = type(child).__name__
-                    if child_name == 'OwnedSubsettingContext':
-                        for c2 in child.children:
-                            if type(c2).__name__ == 'QualifiedNameContext':
-                                sub_names.append(c2.getText())
-                    elif child_name == 'SubsetsContext':
-                        for c2 in child.children:
-                            if type(c2).__name__ == 'OwnedSubsettingContext':
-                                for c3 in c2.children:
-                                    if type(c3).__name__ == 'QualifiedNameContext':
-                                        sub_names.append(c3.getText())
-                    elif child_name == 'SpecializesContext':
-                        for c2 in child.children:
-                            if type(c2).__name__ == 'OwnedSubsettingContext':
-                                for c3 in c2.children:
-                                    if type(c3).__name__ == 'QualifiedNameContext':
-                                        sub_names.append(c3.getText())
-            if sub_names:
-                owned = [
-                    {
-                        "name": "OwnedSubsetting",
-                        "subsettedFeature": {"name": "QualifiedName", "names": n.split("::")},
-                        "ownedRelatedElement": []
-                    }
-                    for n in sub_names
-                ]
+                # Each Owned*Context may be a dotted chain
+                # (qualifiedName (DOT qualifiedName)*).
+                for os_ctx in _collect_owned_contexts(
+                    sc.children, 'OwnedSubsettingContext',
+                    ('SubsetsContext', 'SpecializesContext'),
+                ):
+                    segs = _dotted_segments(os_ctx)
+                    if segs:
+                        owned.append(_emit_owned_chain(
+                            'OwnedSubsetting', 'subsettedFeature', segs))
+            if owned:
                 specialization_list.append({
                     "name": "FeatureSpecialization",
                     "ownedRelationship": {
@@ -11826,29 +11963,18 @@ def _build_full_specialization_from_ctx(ctx):
             ref_ctx = spec.references()
             if not isinstance(ref_ctx, list):
                 ref_ctx = [ref_ctx]
-            ref_names = []
+            owned = []
             for rc in ref_ctx:
-                for child in rc.children:
-                    child_name = type(child).__name__
-                    if child_name == 'OwnedReferenceSubsettingContext':
-                        for c2 in child.children:
-                            if type(c2).__name__ == 'QualifiedNameContext':
-                                ref_names.append(c2.getText())
-                    elif child_name == 'ReferencesContext':
-                        for c2 in child.children:
-                            if type(c2).__name__ == 'OwnedReferenceSubsettingContext':
-                                for c3 in c2.children:
-                                    if type(c3).__name__ == 'QualifiedNameContext':
-                                        ref_names.append(c3.getText())
-            if ref_names:
-                owned = [
-                    {
-                        "name": "OwnedReferenceSubsetting",
-                        "referencedFeature": {"name": "QualifiedName", "names": n.split("::")},
-                        "ownedRelatedElement": []
-                    }
-                    for n in ref_names
-                ]
+                # OwnedReferenceSubsettingContext may be a dotted chain.
+                for ors_ctx in _collect_owned_contexts(
+                    rc.children, 'OwnedReferenceSubsettingContext',
+                    ('ReferencesContext',),
+                ):
+                    segs = _dotted_segments(ors_ctx)
+                    if segs:
+                        owned.append(_emit_owned_chain(
+                            'OwnedReferenceSubsetting', 'referencedFeature', segs))
+            if owned:
                 specialization_list.append({
                     "name": "FeatureSpecialization",
                     "ownedRelationship": {
@@ -12139,29 +12265,19 @@ def _build_full_specialization_from_fsp(fsp):
             redef_ctx = spec.redefinitions()
             if not isinstance(redef_ctx, list):
                 redef_ctx = [redef_ctx]
-            redef_names = []
+            owned = []
             for rc in redef_ctx:
-                for child in rc.children:
-                    child_name = type(child).__name__
-                    if child_name == 'OwnedRedefinitionContext':
-                        for c2 in child.children:
-                            if type(c2).__name__ == 'QualifiedNameContext':
-                                redef_names.append(c2.getText())
-                    elif child_name == 'RedefinesContext':
-                        for c2 in child.children:
-                            if type(c2).__name__ == 'OwnedRedefinitionContext':
-                                for c3 in c2.children:
-                                    if type(c3).__name__ == 'QualifiedNameContext':
-                                        redef_names.append(c3.getText())
-            if redef_names:
-                owned = [
-                    {
-                        "name": "OwnedRedefinition",
-                        "redefinedFeature": {"name": "QualifiedName", "names": n.split("::")},
-                        "ownedRelatedElement": []
-                    }
-                    for n in redef_names
-                ]
+                # OwnedRedefinitionContext may be a dotted chain
+                # (qualifiedName (DOT qualifiedName)*).
+                for or_ctx in _collect_owned_contexts(
+                    rc.children, 'OwnedRedefinitionContext',
+                    ('RedefinesContext',),
+                ):
+                    segs = _dotted_segments(or_ctx)
+                    if segs:
+                        owned.append(_emit_owned_chain(
+                            'OwnedRedefinition', 'redefinedFeature', segs))
+            if owned:
                 specialization_list.append({
                     "name": "FeatureSpecialization",
                     "ownedRelationship": {
@@ -12175,35 +12291,19 @@ def _build_full_specialization_from_fsp(fsp):
             sub_ctx = spec.subsettings()
             if not isinstance(sub_ctx, list):
                 sub_ctx = [sub_ctx]
-            sub_names = []
+            owned = []
             for sc in sub_ctx:
-                for child in sc.children:
-                    child_name = type(child).__name__
-                    if child_name == 'OwnedSubsettingContext':
-                        for c2 in child.children:
-                            if type(c2).__name__ == 'QualifiedNameContext':
-                                sub_names.append(c2.getText())
-                    elif child_name == 'SubsetsContext':
-                        for c2 in child.children:
-                            if type(c2).__name__ == 'OwnedSubsettingContext':
-                                for c3 in c2.children:
-                                    if type(c3).__name__ == 'QualifiedNameContext':
-                                        sub_names.append(c3.getText())
-                    elif child_name == 'SpecializesContext':
-                        for c2 in child.children:
-                            if type(c2).__name__ == 'OwnedSubsettingContext':
-                                for c3 in c2.children:
-                                    if type(c3).__name__ == 'QualifiedNameContext':
-                                        sub_names.append(c3.getText())
-            if sub_names:
-                owned = [
-                    {
-                        "name": "OwnedSubsetting",
-                        "subsettedFeature": {"name": "QualifiedName", "names": n.split("::")},
-                        "ownedRelatedElement": []
-                    }
-                    for n in sub_names
-                ]
+                # Each Owned*Context may be a dotted chain
+                # (qualifiedName (DOT qualifiedName)*).
+                for os_ctx in _collect_owned_contexts(
+                    sc.children, 'OwnedSubsettingContext',
+                    ('SubsetsContext', 'SpecializesContext'),
+                ):
+                    segs = _dotted_segments(os_ctx)
+                    if segs:
+                        owned.append(_emit_owned_chain(
+                            'OwnedSubsetting', 'subsettedFeature', segs))
+            if owned:
                 specialization_list.append({
                     "name": "FeatureSpecialization",
                     "ownedRelationship": {
@@ -12217,29 +12317,18 @@ def _build_full_specialization_from_fsp(fsp):
             ref_ctx = spec.references()
             if not isinstance(ref_ctx, list):
                 ref_ctx = [ref_ctx]
-            ref_names = []
+            owned = []
             for rc in ref_ctx:
-                for child in rc.children:
-                    child_name = type(child).__name__
-                    if child_name == 'OwnedReferenceSubsettingContext':
-                        for c2 in child.children:
-                            if type(c2).__name__ == 'QualifiedNameContext':
-                                ref_names.append(c2.getText())
-                    elif child_name == 'ReferencesContext':
-                        for c2 in child.children:
-                            if type(c2).__name__ == 'OwnedReferenceSubsettingContext':
-                                for c3 in c2.children:
-                                    if type(c3).__name__ == 'QualifiedNameContext':
-                                        ref_names.append(c3.getText())
-            if ref_names:
-                owned = [
-                    {
-                        "name": "OwnedReferenceSubsetting",
-                        "referencedFeature": {"name": "QualifiedName", "names": n.split("::")},
-                        "ownedRelatedElement": []
-                    }
-                    for n in ref_names
-                ]
+                # OwnedReferenceSubsettingContext may be a dotted chain.
+                for ors_ctx in _collect_owned_contexts(
+                    rc.children, 'OwnedReferenceSubsettingContext',
+                    ('ReferencesContext',),
+                ):
+                    segs = _dotted_segments(ors_ctx)
+                    if segs:
+                        owned.append(_emit_owned_chain(
+                            'OwnedReferenceSubsetting', 'referencedFeature', segs))
+            if owned:
                 specialization_list.append({
                     "name": "FeatureSpecialization",
                     "ownedRelationship": {