sysmlpy 0.36.2__tar.gz → 0.37.0__tar.gz

{sysmlpy-0.36.2 → sysmlpy-0.37.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sysmlpy
-Version: 0.36.2
+Version: 0.37.0
 Summary: 
 License-File: LICENSE
 Author: Jon R. Fox (mycr0ft)
@@ -39,6 +39,8 @@ The project had diverged so much from sysml2py that a new name, sysmlpy, was sel
 
 ![Lines of Code Over Time](loc_history.svg)
 
+**v0.37.0:** Round-trip / corpus-load fixes surfaced by benchmarking against gosysml (the Go port — `github.com/mycr0ft/gosysml`). Implicit-package wrap could swallow its own closing brace when the source ended with a line comment and no trailing newline (e.g. `Subsetting_OwningType.sysml`); `AnnotatingElement` now dispatches `MetadataFeature` and `TextualRepresentation` (they were crashing on `NoneType`); three missing grammar classes (`InitialNodeMember`, `ActionTargetSuccessionMember`, `GuardedSuccessionMember`) now match the visitor's emitted dicts and round-trip `first X; then Y;` / `if c then X else Y;` / `succession S first A1 if c then A2;` chains inside action bodies; `TriggerExpression` now extracts the `WHEN argumentExpressionMember` branch and degrades gracefully on empty arguments; control-node names (`merge m`, `decide`, etc.) flow through; nested `ref action a : A;` usages keep their `ref` prefix; `BinaryInterfacePart.dump()` degrades gracefully on 0/1-end interface parts (graceful-fallback contract). Corpus parity with gosysml: **122/123** files round-trip cleanly (the lone remaining failure, `Import_Visibility_Valid.sysml`, has an XPECT header that *expects* its syntax error). Grammar round-trip suite: **96/96 passing**.
+
 **v0.36.0:** Boxes-backed state-machine visualizer — `as_state_transition_view_boxes()`, `render_state_transition_view()`, `render_state_transition_view_svg()` produce native UML `«state»` shapes, initial pseudostate, final bullseye, and orthogonal routing via the optional [`boxes`](https://github.com/mycr0ft/boxes) package. Handles `done`, guards, shorthand `accept X then Y`, dotted feature chains (`S2.S3`), composite states, `parallel` regions, entry/do/exit attributes. 19 new boxes_view tests. Also fixes the INCOSE flashlight `interface … connect … { perform …; }` parse crash in `grammar/classes.py`.
 
 **v0.31.0:** Documentation overhaul — all docs rewritten to showcase the modern public API. New Model Parsing and Model Navigation sections. Semantic Analysis updated with `AnalysisResult`. Grammar round-trip: 77/77 (100%). 211 core tests passing.
@@ -327,7 +329,7 @@ tree = classtree(model)
 print(tree.dump())
 ```
 
-**All 77 grammar round-trip tests pass** (100%). Covered categories: packages, parts, items, ports, interfaces, binding connectors, flow connections, all action forms (definition, shorthand, succession, decomposition), expressions, calculations, constraints, state definitions, requirements, analysis cases, control flow (if/else, while, loop, fork, join, decision, send, accept, terminate), and trade studies.
+**All 96 grammar round-trip tests pass** (100%). Covered categories: packages, parts, items, ports, interfaces, binding connectors, flow connections, all action forms (definition, shorthand, succession, decomposition), expressions, calculations, constraints, state definitions, requirements, analysis cases, control flow (if/else, while, loop, fork, join, decision, send, accept, terminate), trade studies, views, viewpoints, render states, portion usages, and annotations.
 
 ## Semantic Analysis
 
@@ -770,6 +772,36 @@ See [`docs/plantuml-examples/`](docs/plantuml-examples/) for all rendered exampl
 
 ## Changelog
 
+- **v0.36.3** — Fix view (and other prefixed-usage) body children being
+  dropped from the public API tree. `Package.load_from_grammar` built
+  `View` objects manually without calling `load_from_grammar`, so
+  `view.attributes` (and all other typed accessors) returned `[]` even
+  when the view body contained attributes, parts, etc. Now calls
+  `View().load_from_grammar(...)` matching `Part` and other usages.
+  Also fixes `Usage.load_from_grammar` (declaration branch) and
+  `Usage._ensure_body` to handle prefixed usages whose body lives on
+  `grammar.body` rather than `grammar.usage.completion.body.body`.
+
+- **v0.36.2** — Preserve short name, doc, and nested children in
+  `Requirement.dump()`/`load_from_grammar`. Three gaps in the public
+  `Requirement` class were dropping data the parser had captured:
+  `declaredShortName` was never propagated, `doc /* … */` nodes were
+  walked past, and `dump()` never iterated `self.children` so nested
+  `requirement` usages were omitted from output.
+
+- **v0.36.1** — Populate nested requirement children in
+  `Requirement.load_from_grammar`. Previously the body walk stubbed out
+  `DefinitionBodyItem` with `pass`, so nested requirements were parsed
+  by the grammar but dropped from the public object tree.
+
+- **v0.36.0** — Boxes-backed state-machine visualizer:
+  `as_state_transition_view_boxes()`, `render_state_transition_view()`,
+  `render_state_transition_view_svg()` produce native UML `«state»`
+  shapes, initial pseudostate, final bullseye, and orthogonal routing
+  via the optional [`boxes`](https://github.com/mycr0ft/boxes) package.
+  19 new boxes_view tests. Also fixes the INCOSE flashlight
+  `interface … connect … { perform …; }` parse crash.
+
 - **v0.32.5** — Fix double-space in dump output when `:>>` (redefinition) or
   `: ` (typing) appears after `attribute`, `part`, or other usage keywords.
   Root cause: `Redefinitions.keyword` and `TypedBy.keyword` had leading spaces

{sysmlpy-0.36.2 → sysmlpy-0.37.0}/README.md

@@ -14,6 +14,8 @@ The project had diverged so much from sysml2py that a new name, sysmlpy, was sel
 
 ![Lines of Code Over Time](loc_history.svg)
 
+**v0.37.0:** Round-trip / corpus-load fixes surfaced by benchmarking against gosysml (the Go port — `github.com/mycr0ft/gosysml`). Implicit-package wrap could swallow its own closing brace when the source ended with a line comment and no trailing newline (e.g. `Subsetting_OwningType.sysml`); `AnnotatingElement` now dispatches `MetadataFeature` and `TextualRepresentation` (they were crashing on `NoneType`); three missing grammar classes (`InitialNodeMember`, `ActionTargetSuccessionMember`, `GuardedSuccessionMember`) now match the visitor's emitted dicts and round-trip `first X; then Y;` / `if c then X else Y;` / `succession S first A1 if c then A2;` chains inside action bodies; `TriggerExpression` now extracts the `WHEN argumentExpressionMember` branch and degrades gracefully on empty arguments; control-node names (`merge m`, `decide`, etc.) flow through; nested `ref action a : A;` usages keep their `ref` prefix; `BinaryInterfacePart.dump()` degrades gracefully on 0/1-end interface parts (graceful-fallback contract). Corpus parity with gosysml: **122/123** files round-trip cleanly (the lone remaining failure, `Import_Visibility_Valid.sysml`, has an XPECT header that *expects* its syntax error). Grammar round-trip suite: **96/96 passing**.
+
 **v0.36.0:** Boxes-backed state-machine visualizer — `as_state_transition_view_boxes()`, `render_state_transition_view()`, `render_state_transition_view_svg()` produce native UML `«state»` shapes, initial pseudostate, final bullseye, and orthogonal routing via the optional [`boxes`](https://github.com/mycr0ft/boxes) package. Handles `done`, guards, shorthand `accept X then Y`, dotted feature chains (`S2.S3`), composite states, `parallel` regions, entry/do/exit attributes. 19 new boxes_view tests. Also fixes the INCOSE flashlight `interface … connect … { perform …; }` parse crash in `grammar/classes.py`.
 
 **v0.31.0:** Documentation overhaul — all docs rewritten to showcase the modern public API. New Model Parsing and Model Navigation sections. Semantic Analysis updated with `AnalysisResult`. Grammar round-trip: 77/77 (100%). 211 core tests passing.
@@ -302,7 +304,7 @@ tree = classtree(model)
 print(tree.dump())
 ```
 
-**All 77 grammar round-trip tests pass** (100%). Covered categories: packages, parts, items, ports, interfaces, binding connectors, flow connections, all action forms (definition, shorthand, succession, decomposition), expressions, calculations, constraints, state definitions, requirements, analysis cases, control flow (if/else, while, loop, fork, join, decision, send, accept, terminate), and trade studies.
+**All 96 grammar round-trip tests pass** (100%). Covered categories: packages, parts, items, ports, interfaces, binding connectors, flow connections, all action forms (definition, shorthand, succession, decomposition), expressions, calculations, constraints, state definitions, requirements, analysis cases, control flow (if/else, while, loop, fork, join, decision, send, accept, terminate), trade studies, views, viewpoints, render states, portion usages, and annotations.
 
 ## Semantic Analysis
 
@@ -745,6 +747,36 @@ See [`docs/plantuml-examples/`](docs/plantuml-examples/) for all rendered exampl
 
 ## Changelog
 
+- **v0.36.3** — Fix view (and other prefixed-usage) body children being
+  dropped from the public API tree. `Package.load_from_grammar` built
+  `View` objects manually without calling `load_from_grammar`, so
+  `view.attributes` (and all other typed accessors) returned `[]` even
+  when the view body contained attributes, parts, etc. Now calls
+  `View().load_from_grammar(...)` matching `Part` and other usages.
+  Also fixes `Usage.load_from_grammar` (declaration branch) and
+  `Usage._ensure_body` to handle prefixed usages whose body lives on
+  `grammar.body` rather than `grammar.usage.completion.body.body`.
+
+- **v0.36.2** — Preserve short name, doc, and nested children in
+  `Requirement.dump()`/`load_from_grammar`. Three gaps in the public
+  `Requirement` class were dropping data the parser had captured:
+  `declaredShortName` was never propagated, `doc /* … */` nodes were
+  walked past, and `dump()` never iterated `self.children` so nested
+  `requirement` usages were omitted from output.
+
+- **v0.36.1** — Populate nested requirement children in
+  `Requirement.load_from_grammar`. Previously the body walk stubbed out
+  `DefinitionBodyItem` with `pass`, so nested requirements were parsed
+  by the grammar but dropped from the public object tree.
+
+- **v0.36.0** — Boxes-backed state-machine visualizer:
+  `as_state_transition_view_boxes()`, `render_state_transition_view()`,
+  `render_state_transition_view_svg()` produce native UML `«state»`
+  shapes, initial pseudostate, final bullseye, and orthogonal routing
+  via the optional [`boxes`](https://github.com/mycr0ft/boxes) package.
+  19 new boxes_view tests. Also fixes the INCOSE flashlight
+  `interface … connect … { perform …; }` parse crash.
+
 - **v0.32.5** — Fix double-space in dump output when `:>>` (redefinition) or
   `: ` (typing) appears after `attribute`, `part`, or other usage keywords.
   Root cause: `Redefinitions.keyword` and `TypedBy.keyword` had leading spaces

{sysmlpy-0.36.2 → sysmlpy-0.37.0}/pyproject.toml

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

{sysmlpy-0.36.2 → sysmlpy-0.37.0}/src/sysmlpy/__init__.py

@@ -24,7 +24,7 @@ __all__ = [
     "render_state_transition_view_svg", "boxes_view",
 ]
 __author__ = "Jon Fox"
-__version__ = "0.36.2"
+__version__ = "0.37.0"
 
 from sysmlpy.usage import (
     Item, Attribute, Part, Port, Action, Reference, UseCase, Requirement, Interface, Message,
@@ -78,6 +78,10 @@ def load_grammar(s, debug=False):
     s_stripped = s.strip()
     needs_unwrap = not s_stripped.startswith('package')
     if needs_unwrap:
+        # Ensure the implicit closing brace cannot be swallowed by a
+        # trailing line comment without a terminating newline.
+        if not s_stripped.endswith('\n'):
+            s_stripped += '\n'
         s = f'package __implicit__ {{ {s_stripped} }}'
 
     try:

{sysmlpy-0.36.2 → sysmlpy-0.37.0}/src/sysmlpy/antlr_visitor.py

@@ -1907,13 +1907,22 @@ def _visit_initial_node_member(inm_ctx):
     name = None
     if hasattr(inm_ctx, 'qualifiedName') and inm_ctx.qualifiedName():
         name = inm_ctx.qualifiedName().getText()
-    
+
+    # relationshipBody may carry its own ";" (e.g. `first A3;` followed by
+    # further succession members in the same actionBodyItem).
+    has_semi = False
+    if hasattr(inm_ctx, 'relationshipBody') and inm_ctx.relationshipBody():
+        rb = inm_ctx.relationshipBody()
+        if rb.SEMI() is not None:
+            has_semi = True
+
     return {
         "name": "InitialNodeMember",
         "prefix": prefix,
         "ownedRelatedElement": {
             "name": "InitialNode",
             "declaredName": name,
+            "hasSemi": has_semi,
             "ownedRelationship": []
         }
     }
@@ -1921,14 +1930,15 @@ def _visit_initial_node_member(inm_ctx):
 
 def _visit_action_target_succession_member(atsm_ctx):
     """Visit an actionTargetSuccessionMember context and return an ActionTargetSuccessionMember dict.
-    
+
     actionTargetSuccessionMember: memberPrefix actionTargetSuccession
     actionTargetSuccession: (targetSuccession | guardedTargetSuccession | defaultTargetSuccession) usageBody
     targetSuccession: sourceEndMember THEN connectorEndMember
+    defaultTargetSuccession: ELSE transitionSuccessionMember
     """
     if atsm_ctx is None:
         return None
-    
+
     prefix = None
     if hasattr(atsm_ctx, 'memberPrefix') and atsm_ctx.memberPrefix():
         mp = atsm_ctx.memberPrefix()
@@ -1937,31 +1947,99 @@ def _visit_action_target_succession_member(atsm_ctx):
                 "name": "MemberPrefix",
                 "visibility": _visit_visibility_indicator_dict(mp.visibilityIndicator())
             }
-    
+
+    keyword = "then"
     name = None
+    condition = None
+    has_semi = False
     if hasattr(atsm_ctx, 'actionTargetSuccession') and atsm_ctx.actionTargetSuccession():
         ats = atsm_ctx.actionTargetSuccession()
-        # Try targetSuccession path
-        if hasattr(ats, 'targetSuccession') and ats.targetSuccession():
+
+        def _usage_body_has_semi(ats):
+            ub = ats.usageBody() if hasattr(ats, 'usageBody') else None
+            if ub is not None:
+                db = ub.definitionBody() if hasattr(ub, 'definitionBody') else None
+                if db is not None and hasattr(db, 'SEMI') and db.SEMI():
+                    return True
+            return False
+
+        # `else done` form (defaultTargetSuccession)
+        if hasattr(ats, 'defaultTargetSuccession') and ats.defaultTargetSuccession():
+            keyword = "else"
+            dts = ats.defaultTargetSuccession()
+            has_semi = _usage_body_has_semi(ats)
+            if hasattr(dts, 'transitionSuccessionMember') and dts.transitionSuccessionMember():
+                tsm2 = dts.transitionSuccessionMember()
+                if hasattr(tsm2, 'transitionSuccession') and tsm2.transitionSuccession():
+                    ts2 = tsm2.transitionSuccession()
+                    if hasattr(ts2, 'connectorEndMember') and ts2.connectorEndMember():
+                        cem2 = ts2.connectorEndMember()
+                        if cem2 is not None:
+                            name = _extract_connector_end_name(cem2)
+        # `if <cond> then X` form (guardedTargetSuccession)
+        elif hasattr(ats, 'guardedTargetSuccession') and ats.guardedTargetSuccession():
+            gts = ats.guardedTargetSuccession()
+            has_semi = _usage_body_has_semi(ats)
+            if hasattr(gts, 'guardExpressionMember') and gts.guardExpressionMember():
+                gem = gts.guardExpressionMember()
+                if hasattr(gem, 'ownedExpression') and gem.ownedExpression():
+                    condition = gem.ownedExpression().getText()
+            if hasattr(gts, 'transitionSuccessionMember') and gts.transitionSuccessionMember():
+                tsm3 = gts.transitionSuccessionMember()
+                if hasattr(tsm3, 'transitionSuccession') and tsm3.transitionSuccession():
+                    ts3 = tsm3.transitionSuccession()
+                    if hasattr(ts3, 'connectorEndMember') and ts3.connectorEndMember():
+                        cem3 = ts3.connectorEndMember()
+                        if cem3 is not None:
+                            name = _extract_connector_end_name(cem3)
+        # Standard `then X` form (targetSuccession)
+        elif hasattr(ats, 'targetSuccession') and ats.targetSuccession():
             ts = ats.targetSuccession()
+            has_semi = _usage_body_has_semi(ats)
             if hasattr(ts, 'connectorEndMember') and ts.connectorEndMember():
                 cem = ts.connectorEndMember()
-                if hasattr(cem, 'connectorEnd') and cem.connectorEnd():
-                    ce = cem.connectorEnd()
-                    if hasattr(ce, 'name') and ce.name():
-                        name = ce.name().getText()
-    
+                if cem is not None:
+                    name = _extract_connector_end_name(cem)
+
     return {
         "name": "ActionTargetSuccessionMember",
         "prefix": prefix,
         "ownedRelatedElement": {
             "name": "ActionTargetSuccession",
+            "keyword": keyword,
             "declaredName": name,
+            "condition": condition,
+            "hasSemi": has_semi,
             "ownedRelationship": []
         }
     }
 
 
+def _extract_connector_end_name(ce_member_ctx):
+    """Extract the target feature text from a connectorEndMember.
+
+    Handles plain names (connectorEnd.name), qualified references via
+    ownedReferenceSubsetting, and feature chains.
+    """
+    if ce_member_ctx is None:
+        return None
+    ce = None
+    if hasattr(ce_member_ctx, 'connectorEnd'):
+        ce = ce_member_ctx.connectorEnd()
+    if ce is None:
+        return None
+
+    if hasattr(ce, 'name') and ce.name():
+        return ce.name().getText()
+
+    # `then m` / `then some.chain` carry an ownedReferenceSubsetting whose
+    # qualifiedName holds the target (possibly dotted).
+    if hasattr(ce, 'ownedReferenceSubsetting') and ce.ownedReferenceSubsetting():
+        return ce.ownedReferenceSubsetting().getText()
+
+    return None
+
+
 def _visit_guarded_succession_member(gsm_ctx):
     """Visit a guardedSuccessionMember context and return a GuardedSuccessionMember dict.
     
@@ -1980,6 +2058,9 @@ def _visit_guarded_succession_member(gsm_ctx):
                 "visibility": _visit_visibility_indicator_dict(mp.visibilityIndicator())
             }
     
+    keyword = "succession"
+    declared_name = None
+    has_semi = False
     source_name = None
     condition = None
     target_name = None
@@ -1997,27 +2078,40 @@ def _visit_guarded_succession_member(gsm_ctx):
             if hasattr(gem, 'ownedExpression') and gem.ownedExpression():
                 condition = gem.ownedExpression().getText()
         
+        # Extract declared name from optional usageDeclaration (`succession S ...`)
+        if hasattr(gs, 'usageDeclaration') and gs.usageDeclaration():
+            ud = gs.usageDeclaration()
+            if hasattr(ud, 'identification') and ud.identification():
+                ident = ud.identification()
+                if hasattr(ident, 'name') and ident.name():
+                    declared_name = ident.name()[-1].getText()
+
         # Extract target name from transitionSuccessionMember
         if hasattr(gs, 'transitionSuccessionMember') and gs.transitionSuccessionMember():
             tsm = gs.transitionSuccessionMember()
             if hasattr(tsm, 'transitionSuccession') and tsm.transitionSuccession():
                 ts = tsm.transitionSuccession()
                 if hasattr(ts, 'connectorEndMember') and ts.connectorEndMember():
-                    cem = ts.connectorEndMember()
-                    if hasattr(cem, 'connectorEnd') and cem.connectorEnd():
-                        ce = cem.connectorEnd()
-                        if hasattr(ce, 'name') and ce.name():
-                            target_name = ce.name().getText()
-    
+                    target_name = _extract_connector_end_name(ts.connectorEndMember())
+
+        # Whether the trailing usageBody carries its own ";"
+        ub = gs.usageBody() if hasattr(gs, 'usageBody') else None
+        if ub is not None:
+            db = ub.definitionBody() if hasattr(ub, 'definitionBody') else None
+            if db is not None and hasattr(db, 'SEMI') and db.SEMI():
+                has_semi = True
+
     return {
         "name": "GuardedSuccessionMember",
         "prefix": prefix,
         "ownedRelatedElement": {
             "name": "GuardedSuccession",
-            "keyword": "succession",
+            "keyword": keyword,
+            "declaredName": declared_name,
             "sourceName": source_name,
             "condition": condition,
             "targetName": target_name,
+            "hasSemi": has_semi,
             "ownedRelationship": []
         }
     }
@@ -2627,9 +2721,10 @@ def _visit_control_node(ctx):
         "name": "ControlNode",
         "prefix": None,
         "keyword": None,
+        "declaredName": None,
         "body": None
     }
-    
+
     sub = None
     if hasattr(ctx, 'mergeNode') and ctx.mergeNode():
         sub = ctx.mergeNode()
@@ -2643,13 +2738,20 @@ def _visit_control_node(ctx):
     elif hasattr(ctx, 'forkNode') and ctx.forkNode():
         sub = ctx.forkNode()
         result["keyword"] = "fork"
-    
+
     if sub is not None:
         if hasattr(sub, 'controlNodePrefix') and sub.controlNodePrefix():
             result["prefix"] = _get_occurrence_usage_prefix(sub.controlNodePrefix())
+        if hasattr(sub, 'usageDeclaration') and sub.usageDeclaration():
+            ud = sub.usageDeclaration()
+            if hasattr(ud, 'identification') and ud.identification():
+                ident = ud.identification()
+                if hasattr(ident, 'name') and ident.name():
+                    name_list = ident.name()
+                    result["declaredName"] = name_list[-1].getText()
         if hasattr(sub, 'actionBody') and sub.actionBody():
             result["body"] = _visit_action_body(sub.actionBody())
-    
+
     return result
 
 
@@ -2861,17 +2963,17 @@ def _visit_succession(succ_ctx):
 
 def _make_action_usage_element(ctx, member_prefix=None):
     """Create an action usage element dictionary from an actionUsage context.
-    
+
     This is used for nested action usages inside action bodies.
     """
     if ctx is None:
         return None
-    
+
+    occ_prefix = _get_occurrence_usage_prefix(ctx)
     name = None
     shortname = None
     typed_by = None
-    occ_prefix = None
-    
+
     # Get name from actionUsageDeclaration -> usageDeclaration -> identification
     if ctx.actionUsageDeclaration():
         aud = ctx.actionUsageDeclaration()
@@ -5361,13 +5463,15 @@ def _visit_trigger_feature_value(ctx):
         # Determine trigger keyword
         is_at = te.AT() is not None
         is_after = te.AFTER() is not None
+        is_when = getattr(te, 'WHEN', lambda: None)() is not None
         trigger_kind = {
             "name": "TimeTriggerKind",
             "isAt": is_at,
-            "isAfter": is_after
+            "isAfter": is_after,
+            "isWhen": is_when
         }
-        
-        # Extract expression from argumentMember
+
+        # Extract expression: (AT|AFTER) argumentMember | WHEN argumentExpressionMember
         owned_expr_member = None
         if hasattr(te, 'argumentMember') and te.argumentMember():
             am = te.argumentMember()
@@ -5378,7 +5482,16 @@ def _visit_trigger_feature_value(ctx):
                     "name": "OwnedExpressionMember",
                     "ownedRelatedElement": owned_expr
                 }
-        
+        elif hasattr(te, 'argumentExpressionMember') and te.argumentExpressionMember():
+            aem = te.argumentExpressionMember()
+            if hasattr(aem, 'ownedExpression') and aem.ownedExpression():
+                oe = aem.ownedExpression()
+                owned_expr = _visit_owned_expression(oe)
+                owned_expr_member = {
+                    "name": "OwnedExpressionMember",
+                    "ownedRelatedElement": owned_expr
+                }
+
         trigger_expr = {
             "name": "TriggerExpression",
             "kind": trigger_kind,

{sysmlpy-0.36.2 → sysmlpy-0.37.0}/src/sysmlpy/definition.py

@@ -1168,23 +1168,11 @@ class Package(Searchable):
                 f.parent = self
                 self.children.append(f)
             elif inner_class == "ViewDefinition":
-                v = View(definition=True)
-                v.grammar = inner_element
-                if hasattr(inner_element, 'declaration') and inner_element.declaration:
-                    decl = inner_element.declaration
-                    if hasattr(decl, 'identification') and decl.identification:
-                        v.name = decl.identification.declaredName
+                v = View(definition=True).load_from_grammar(inner_element)
                 v.parent = self
                 self.children.append(v)
             elif inner_class == "ViewUsage":
-                v = View()
-                v.grammar = inner_element
-                if hasattr(inner_element, 'declaration') and inner_element.declaration:
-                    decl = inner_element.declaration
-                    if hasattr(decl, 'declaration') and decl.declaration:
-                        feat_decl = decl.declaration
-                        if hasattr(feat_decl, 'identification') and feat_decl.identification:
-                            v.name = feat_decl.identification.declaredName
+                v = View().load_from_grammar(inner_element)
                 v.parent = self
                 self.children.append(v)
             elif inner_class == "ViewpointDefinition":