armodel 1.7.1__py3-none-any.whl → 1.7.3__py3-none-any.whl

armodel/parser/abstract_arxml_parser.py

@@ -1,4 +1,3 @@
-
 from abc import ABCMeta
 from typing import List
 from colorama import Fore
@@ -8,15 +7,12 @@ import logging
 import xml.etree.ElementTree as ET
 
 from ..models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
-
-from ..models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import ARFloat, ARLiteral, ARNumerical, Boolean, Integer, TimeValue
-
+from ..models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import AREnum, ARFloat, ARLiteral, ARNumerical, Boolean, Integer, PositiveInteger, TimeValue
 from ..models.M2.AUTOSARTemplates.AutosarTopLevelStructure import AUTOSAR
 from ..models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import RefType
 from ..models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import ARBoolean
 from ..models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import Limit
 
-
 class AbstractARXMLParser:
     __metaclass__ = ABCMeta
      
@@ -49,6 +45,12 @@ class AbstractARXMLParser:
         else:
             raise ValueError(error_msg)
         
+    def notImplemented(self, error_msg):
+        if (self.options['warning'] == True):
+            self.logger.error(Fore.RED + error_msg + Fore.WHITE)
+        else:
+            raise NotImplementedError(error_msg)
+        
     def _raiseWarning(self, error_msg):
         self.logger.warning(error_msg)
         
@@ -76,7 +78,7 @@ class AbstractARXMLParser:
         child_element = self.find(element, key)
         if (child_element is not None):
             literal = ARLiteral()
-            self.readElementAttributes(child_element, literal)
+            self.readARObjectAttributes(child_element, literal)
             literal._value = child_element.text
             return literal
         self._raiseError("The attribute %s of <%s> has not been defined" % (key, short_name))
@@ -96,7 +98,7 @@ class AbstractARXMLParser:
         if (child_element is not None):
             self.logger.debug("getChildElementOptionalLiteral : %s" % child_element.text)
             literal = ARLiteral()
-            self.readElementAttributes(child_element, literal)
+            self.readARObjectAttributes(child_element, literal)
             # Patch for empty element <USED-CODE-GENERATOR></USED-CODE-GENERATOR>
             if child_element.text is None:      
                 literal.setValue("")
@@ -113,14 +115,14 @@ class AbstractARXMLParser:
             if not m:
                 raise ValueError("Invalid RevisionLabelString <%s>" % child_element.text)
             literal = ARLiteral()
-            self.readElementAttributes(child_element, literal)
+            self.readARObjectAttributes(child_element, literal)
             # Patch for empty element <USED-CODE-GENERATOR></USED-CODE-GENERATOR>
             if child_element.text is None:      
                 literal.setValue("")
             else:
                 literal.setValue(child_element.text)
         return literal
-
+    
     def _convertStringToBooleanValue(self, value: str) -> bool:
         if (value == "true"):
             return True
@@ -131,6 +133,7 @@ class AbstractARXMLParser:
         float_value = None
         if (child_element is not None) and (child_element.text is not None):
             float_value = ARFloat()
+            self.readARObjectAttributes(child_element, float_value)
             float_value.setValue(child_element.text)
         return float_value
     
@@ -160,7 +163,9 @@ class AbstractARXMLParser:
 
     def getChildElementOptionalBooleanValue(self, element: ET.Element, key: str) -> Boolean:
         literal = self.getChildElementOptionalLiteral(element, key)
-        if (literal == None):
+        if literal == None:
+            return None
+        if literal.getText() == "":
             return None
         bool_value = Boolean()
         bool_value.timestamp = literal.timestamp
@@ -173,25 +178,12 @@ class AbstractARXMLParser:
             return int(m.group(1), 16)
         return int(value)
 
-    '''
-    def getChildElementNumberValue(self, short_name: str, element: ET.Element, key: str) -> int:
-        value = self.getChildElement(short_name, element, key)
-        return self._convertStringToNumberValue(value)
-    
-
-    def getChildElementOptionalNumberValue(self, element: ET.Element, key: str) -> int:
-        value = self.getChildElementOptionalValue(element, key)
-        if (value == None):
-            return None
-        return self._convertStringToNumberValue(value)
-    '''
-    
     def getChildElementOptionalNumericalValue(self, element: ET.Element, key: str) -> ARNumerical:
         child_element = self.find(element, key)
         if child_element == None:
             return None
         numerical = ARNumerical()
-        self.readElementAttributes(child_element, numerical)
+        self.readARObjectAttributes(child_element, numerical)
         numerical.setValue(child_element.text)
         return numerical
     
@@ -200,8 +192,19 @@ class AbstractARXMLParser:
         if child_element == None:
             return None
         numerical = Integer()
-        self.readElementAttributes(child_element, numerical)
+        self.readARObjectAttributes(child_element, numerical)
+        numerical.setValue(child_element.text)
+        return numerical
+    
+    def getChildElementOptionalPositiveInteger(self, element: ET.Element, key: str) -> PositiveInteger:
+        child_element = self.find(element, key)
+        if child_element == None:
+            return None
+        numerical = PositiveInteger()
+        self.readARObjectAttributes(child_element, numerical)
         numerical.setValue(child_element.text)
+        if numerical.getValue() < 0:
+            raise ValueError("Invalid PositiveInteger <%s>" % child_element.text)
         return numerical
         
     def getChildElementNumericalValueList(self, element: ET.Element, key: str) -> List[ARNumerical]:
@@ -217,7 +220,7 @@ class AbstractARXMLParser:
         child_element = self.find(element, key)
         if (child_element is not None):
             limit = Limit()
-            self.readElementAttributes(child_element, limit)
+            self.readARObjectAttributes(child_element, limit)
             if ('INTERVAL-TYPE' in child_element.attrib):
                 limit.intervalType = child_element.attrib['INTERVAL-TYPE']
             else:
@@ -262,7 +265,7 @@ class AbstractARXMLParser:
             return element.attrib[key]
         return None
     
-    def readElementAttributes(self, element: ET.Element, ar_object: ARObject):
+    def readARObjectAttributes(self, element: ET.Element, ar_object: ARObject):
         ar_object.timestamp = self.readElementOptionalAttrib(element, "T")             # read the timestamp
         ar_object.uuid      = self.readElementOptionalAttrib(element, "UUID")          # read the uuid