sysmlpy 0.58.0__tar.gz → 0.59.0__tar.gz

{sysmlpy-0.58.0 → sysmlpy-0.59.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sysmlpy
-Version: 0.58.0
+Version: 0.59.0
 Summary: 
 License-File: LICENSE
 Author: Jon R. Fox (mycr0ft)

{sysmlpy-0.58.0 → sysmlpy-0.59.0}/pyproject.toml

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

{sysmlpy-0.58.0 → sysmlpy-0.59.0}/src/sysmlpy/__init__.py

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

{sysmlpy-0.58.0 → sysmlpy-0.59.0}/src/sysmlpy/antlr_visitor.py

@@ -7148,10 +7148,12 @@ def _extract_multiplicity_from_mp(mp_ctx):
         else:
             return None
         
+        is_ordered = bool(mp_ctx.ORDERED()) if hasattr(mp_ctx, 'ORDERED') else False
+        is_nonunique = bool(mp_ctx.NONUNIQUE()) if hasattr(mp_ctx, 'NONUNIQUE') else False
         return {
             "name": "MultiplicityPart",
-            "isOrdered": False,
-            "isNonunique": False,
+            "isOrdered": is_ordered,
+            "isNonunique": is_nonunique,
             "ownedRelationship": [
                 {
                     "name": "OwnedMultiplicity",
@@ -13597,11 +13599,18 @@ def _get_multiplicity_part(fsp_ctx):
             bound_dicts = [_make_bound(members[0].getText()), _make_bound(members[1].getText())]
         else:
             return None
-        
+
+        # ORDERED / NONUNIQUE indicators follow ownedMultiplicity in
+        # multiplicityPart (grammar: `ownedMultiplicity ( ORDERED ( NONUNIQUE )?
+        # | NONUNIQUE ( ORDERED )? )?`).  Previously hardcoded False, silently
+        # dropping the keywords on dump.
+        is_ordered = bool(mp_ctx.ORDERED()) if hasattr(mp_ctx, 'ORDERED') else False
+        is_nonunique = bool(mp_ctx.NONUNIQUE()) if hasattr(mp_ctx, 'NONUNIQUE') else False
+
         return {
             "name": "MultiplicityPart",
-            "isOrdered": False,
-            "isNonunique": False,
+            "isOrdered": is_ordered,
+            "isNonunique": is_nonunique,
             "ownedRelationship": [
                 {
                     "name": "OwnedMultiplicity",

{sysmlpy-0.58.0 → sysmlpy-0.59.0}/src/sysmlpy/grammar/classes.py

@@ -8380,15 +8380,16 @@ class MultiplicityPart:
     def dump(self):
         output = [child.dump() for child in self.children]
 
-        if self.isOrdered and not self.isOrdered2:
+        # isOrdered/isOrdered2 are populated from the same dict field during
+        # round-trip (the ANTLR dict carries a single isOrdered flag), so the
+        # X OR Y logic below never fired — silently dropping the keyword on
+        # `attribute x[3] ordered;`. Emit whichever flag is set (v0.59.0).
+        if self.isOrdered or self.isOrdered2:
             output.append("ordered")
 
         if self.isNonunique or self.isNonunique2:
             output.append("nonunique")
 
-        if self.isOrdered2 and not self.isOrdered:
-            output.append("ordered")
-
         return " ".join(output)
 
     def get_definition(self):