[OMParser] use a single entry point for OMParser

Author: syntron

OMPython/OMCSession.py

@@ -52,7 +52,7 @@
 
 # TODO: replace this with the new parser
 from OMPython import OMTypedParser
-from OMPython import OMParser
+from OMPython.OMParser import om_parser_basic
 
 
 # define logger using the current module name as ID
@@ -81,9 +81,6 @@ def __init__(self, readonly=False):
         self._readonly = readonly
         self._omc_cache = {}
 
-    def clearOMParserResult(self):
-        OMParser.result = {}
-
     def execute(self, command):
         warnings.warn("This function is depreciated and will be removed in future versions; "
                       "please use sendExpression() instead", DeprecationWarning, stacklevel=1)
@@ -246,8 +243,7 @@ def getComponentModifierValue(self, className, componentName):
             logger.warning('OMTypedParser error: %s', ex.message)
             result = self.ask('getComponentModifierValue', f'{className}, {componentName}', parsed=False)
             try:
-                answer = OMParser.check_for_values(result)
-                OMParser.result = {}
+                answer = om_parser_basic(result)
                 return answer[2:]
             except (TypeError, UnboundLocalError) as ex:
                 logger.warning('OMParser error: %s', ex)
@@ -264,8 +260,7 @@ def getExtendsModifierValue(self, className, extendsName, modifierName):
             logger.warning('OMTypedParser error: %s', ex.message)
             result = self.ask('getExtendsModifierValue', f'{className}, {extendsName}, {modifierName}', parsed=False)
             try:
-                answer = OMParser.check_for_values(result)
-                OMParser.result = {}
+                answer = om_parser_basic(result)
                 return answer[2:]
             except (TypeError, UnboundLocalError) as ex:
                 logger.warning('OMParser error: %s', ex)

OMPython/OMParser.py

@@ -892,3 +892,15 @@ def check_for_values(string):
             check_for_values(next_set)
 
     return result
+
+
+# TODO: hack to be able to use one entry point wich also resets the (global) variable results
+#       this should be checked such that the content of this file can be used as class with correct handling of
+#       variable usage
+def om_parser_basic(string: str):
+    result_return = check_for_values(string=string)
+
+    global result
+    result = {}
+
+    return result_return