Small fixes

Author: jbussemaker

sysmlv2_units/compound_units.py

@@ -174,7 +174,8 @@ def _parse_units_attr(self, units_attr: syside.AttributeUsage, raise_if_unknown_
             if units_attr.feature_value is not None:
                 parsed_units, value_units_attr = self._parse_units_feature(
                     units_attr.feature_value.value, raise_if_unknown_unit=False)
-                if parsed_units is not None:
+
+                if parsed_units is not None and isinstance(parsed_units, Unit):
                     return parsed_units, value_units_attr
 
             # Try to parse a unit by subsetting

sysmlv2_units/units_helper.py

@@ -34,7 +34,7 @@ class SysMLUnitsHelper(SysMLCompoundUnitsHelper):
         syside.Operator.ExponentCaret: '^',
     }
 
-    _units_doc_name = 'units'
+    _units_doc_name = '_units'
 
     ###################################################################
     ### SysML to Python (pint) conversion functions (SysML getters) ###
@@ -102,7 +102,7 @@ def get_units(self, feature: Union[syside.Feature, syside.Expression], raise_if_
                 feature_value_error = e
 
             # Parse units from doc
-            doc_units, has_units_doc = self._get_units_from_doc(feature, raise_if_unknown_unit=raise_if_unknown_unit)
+            doc_units, has_units_doc = self.get_units_from_doc(feature, raise_if_unknown_unit=raise_if_unknown_unit)
             if has_units_doc:
                 return doc_units, None
 
@@ -168,14 +168,14 @@ def _get_feature_value_units(self, feature: Union[syside.Feature, syside.Express
 
         # If no units were found, try to parse from units doc
         if units is None and units_attr is None and isinstance(feature, syside.Feature):
-            units_from_docs, has_docs = self._get_units_from_doc(feature, raise_if_unknown_unit=raise_if_unknown_unit)
+            units_from_docs, has_docs = self.get_units_from_doc(feature, raise_if_unknown_unit=raise_if_unknown_unit)
             if has_docs:
                 units = units_from_docs
 
         return value_expression, is_negation, units, units_attr
 
     @classmethod
-    def _get_units_from_doc(cls, feature: syside.Feature, raise_if_unknown_unit=True) -> Tuple[Optional[Unit], bool]:
+    def get_units_from_doc(cls, feature: syside.Feature, raise_if_unknown_unit=True) -> Tuple[Optional[Unit], bool]:
         """Parse units from the units doc. Also returns if the docs were set."""
 
         # Get units doc

tests/units_tests.sysml

@@ -73,7 +73,7 @@ package AttrUnits {
     attribute tsfc = 5 [SI::g / (SIPrefixes::kilo * SI::N * SI::s)]; // https://en.wikipedia.org/wiki/Thrust-specific_fuel_consumption
 
     attribute strUnits = "pixel";
-    attribute docUnits { doc units /* pixel */ }
+    attribute docUnits { doc _units /* pixel */ }
     attribute strQuantity = 3.14 ["pixel"];
-    attribute docQuantity = 96 { doc units /* pixel */ }
+    attribute docQuantity = 96 { doc _units /* pixel */ }
 }