Merge branch 'ImprovePySideMapper'

.gitignore

@@ -7,3 +7,5 @@ tests-coverage/datatypessimulink.cat
 tests-coverage/datatypessimulink.pkg
 tests-coverage/Simulink_DataView_asn.m
 *swp
+antlr-2.7.7
+asn1scc

dmt/A_mappers/module_protos.py

+from types import ModuleType
+from typing import List, Union
+
+from ..commonPy.asnAST import AsnNode  # NOQA pylint: disable=unused-import
+from ..commonPy.asnParser import Filename, Typename, AST_Lookup, AST_TypesOfFile, AST_Leaftypes  # NOQA pylint: disable=unused-import
+from ..commonPy.cleanupNodes import SetOfBadTypenames
+
+
+Filename_Or_ListOfFilenames = Union[str, List[str]]  # pylint: disable=invalid-sequence-index
+
+
+class A_Mapper(ModuleType):
+    def OnStartup(
+            self, modelingLanguage: str, asnFile: Filename_Or_ListOfFilenames,
+            outputDir: str, badTypes: SetOfBadTypenames) -> None:
+        pass
+
+    def OnBasic(self, nodeTypename: str, node: AsnNode, leafTypeDict: AST_Leaftypes) -> None:
+        pass
+
+    def OnSequence(self, nodeTypename: str, node: AsnNode, leafTypeDict: AST_Leaftypes) -> None:
+        pass
+
+    def OnSet(self, nodeTypename: str, node: AsnNode, leafTypeDict: AST_Leaftypes) -> None:
+        pass
+
+    def OnChoice(self, nodeTypename: str, node: AsnNode, leafTypeDict: AST_Leaftypes) -> None:
+        pass
+
+    def OnSequenceOf(self, nodeTypename: str, node: AsnNode, leafTypeDict: AST_Leaftypes) -> None:
+        pass
+
+    def OnSetOf(self, nodeTypename: str, node: AsnNode, leafTypeDict: AST_Leaftypes) -> None:
+        pass
+
+    def OnEnumerated(self, nodeTypename: str, node: AsnNode, leafTypeDict: AST_Leaftypes) -> None:
+        pass
+
+    def OnShutdown(self, badTypes: SetOfBadTypenames) -> None:
+        pass

dmt/B_mappers/ada_B_mapper.py

@@ -48,10 +48,6 @@ isAsynchronous = True
 cBackend = None
 
 
-def Version() -> None:
-    print("Code generator: " + "$Id: ada_B_mapper.py 2382 2012-06-22 08:35:33Z ttsiodras $")  # pragma: no cover
-
-
 def OnStartup(unused_modelingLanguage: str, asnFile: str, outputDir: str, maybeFVname: str, useOSS: bool) -> None:
     global cBackend
     # 2009-02-10: Since we now use ASN1SCC structures as dumpables (even for Ada)

dmt/B_mappers/c_B_mapper.py

@@ -51,10 +51,6 @@ isAsynchronous = True
 cBackend = None
 
 
-def Version() -> None:
-    print("Code generator: " + "$Id: c_B_mapper.py 2390 2012-07-19 12:39:17Z ttsiodras $")
-
-
 # noinspection PyListCreation
 # pylint: disable=no-self-use
 class FromCtoOSS(RecursiveMapper):

dmt/B_mappers/module_protos.py

+from types import ModuleType
+
+from ..commonPy.asnAST import AsnNode  # NOQA pylint: disable=unused-import
+from ..commonPy.aadlAST import ApLevelContainer, Param  # NOQA pylint: disable=unused-import
+from ..commonPy.asnParser import Filename, Typename, AST_Lookup, AST_TypesOfFile, AST_Leaftypes  # NOQA pylint: disable=unused-import
+
+
+class Sync_B_Mapper(ModuleType):
+    def OnStartup(
+            self, modelingLanguage: str, asnFile: str, sp: ApLevelContainer,
+            sp_impl: str, outputDir: str, maybeFVname: str, useOSS: bool) -> None:
+        pass
+
+    def OnBasic(
+            self, nodeTypename: str, node: AsnNode, sp: ApLevelContainer,
+            sp_impl: str, param: Param, leafTypeDict: AST_Leaftypes,
+            names: AST_Lookup) -> None:
+        pass
+
+    def OnSequence(
+            self, nodeTypename: str, node: AsnNode, sp: ApLevelContainer,
+            sp_impl: str, param: Param, leafTypeDict: AST_Leaftypes,
+            names: AST_Lookup) -> None:
+        pass
+
+    def OnSet(
+            self, nodeTypename: str, node: AsnNode, sp: ApLevelContainer,
+            sp_impl: str, param: Param, leafTypeDict: AST_Leaftypes,
+            names: AST_Lookup) -> None:
+        pass
+
+    def OnChoice(
+            self, nodeTypename: str, node: AsnNode, sp: ApLevelContainer,
+            sp_impl: str, param: Param, leafTypeDict: AST_Leaftypes,
+            names: AST_Lookup) -> None:
+        pass
+
+    def OnSequenceOf(
+            self, nodeTypename: str, node: AsnNode, sp: ApLevelContainer,
+            sp_impl: str, param: Param, leafTypeDict: AST_Leaftypes,
+            names: AST_Lookup) -> None:
+        pass
+
+    def OnSetOf(
+            self, nodeTypename: str, node: AsnNode, sp: ApLevelContainer,
+            sp_impl: str, param: Param, leafTypeDict: AST_Leaftypes,
+            names: AST_Lookup) -> None:
+        pass
+
+    def OnEnumerated(
+            self, nodeTypename: str, node: AsnNode, sp: ApLevelContainer,
+            sp_impl: str, param: Param, leafTypeDict: AST_Leaftypes,
+            names: AST_Lookup) -> None:
+        pass
+
+    def OnShutdown(
+            self, modelingLanguage: str, asnFile: str, sp: ApLevelContainer,
+            sp_impl: str, maybeFVname: str) -> None:
+        pass
+
+    def OnFinal(
+            self) -> None:
+        pass
+
+
+class Async_B_Mapper(ModuleType):
+    def OnStartup(
+            self, modelingLanguage: str, asnFile: str, outputDir: str,
+            maybeFVname: str, useOSS: bool) -> None:
+        pass
+
+    def OnBasic(
+            self, nodeTypename: str, node: AsnNode,
+            leafTypeDict: AST_Leaftypes, names: AST_Lookup) -> None:
+        pass
+
+    def OnSequence(
+            self, nodeTypename: str, node: AsnNode,
+            leafTypeDict: AST_Leaftypes, names: AST_Lookup) -> None:
+        pass
+
+    def OnSet(
+            self, nodeTypename: str, node: AsnNode,
+            leafTypeDict: AST_Leaftypes, names: AST_Lookup) -> None:
+        pass
+
+    def OnChoice(
+            self, nodeTypename: str, node: AsnNode,
+            leafTypeDict: AST_Leaftypes, names: AST_Lookup) -> None:
+        pass
+
+    def OnSequenceOf(
+            self, nodeTypename: str, node: AsnNode,
+            leafTypeDict: AST_Leaftypes, names: AST_Lookup) -> None:
+        pass
+
+    def OnSetOf(
+            self, nodeTypename: str, node: AsnNode,
+            leafTypeDict: AST_Leaftypes, names: AST_Lookup) -> None:
+        pass
+
+    def OnEnumerated(
+            self, nodeTypename: str, node: AsnNode,
+            leafTypeDict: AST_Leaftypes, names: AST_Lookup) -> None:
+        pass
+
+    def OnShutdown(
+            self, modelingLanguage: str, asnFile: str, maybeFVname: str) -> None:
+        pass

dmt/B_mappers/og_B_mapper.py

@@ -103,10 +103,6 @@ isAsynchronous = True
 ogBackend = None
 
 
-def Version() -> None:
-    print("Code generator: " + "$Id: og_B_mapper.py 2390 2012-07-19 12:39:17Z ttsiodras $")
-
-
 # noinspection PyListCreation
 # pylint: disable=no-self-use
 class FromObjectGeodeToASN1SCC(RecursiveMapper):

dmt/B_mappers/qgenada_B_mapper.py

@@ -51,9 +51,6 @@ isAsynchronous = True
 cBackend = None
 
 
-def Version() -> None:
-    print("Code generator: " + "$Id: qgenada_B_mapper.py $")  # pragma: no cover
-
 # All the ada B mapper is now Obsolete, we are using ASN1SCC for Dumpables
 
 

dmt/B_mappers/qgenc_B_mapper.py

@@ -53,10 +53,6 @@ isAsynchronous = False
 qgencBackend = None
 
 
-def Version() -> None:
-    print("Code generator: " + "$Id: qgenc_B_mapper.py $")
-
-
 def IsElementMappedToPrimitive(node: AsnSequenceOrSetOf, names: AST_Lookup) -> bool:
     contained = node._containedType
     while isinstance(contained, str):

dmt/B_mappers/rtds_B_mapper.py

@@ -46,10 +46,6 @@ rtdsBackend = None
 cBackend = None
 
 
-def Version() -> None:
-    print("Code generator: " + "$Id: rtds_B_mapper.py 2390 2012-07-19 12:39:17Z ttsiodras $")
-
-
 # noinspection PyListCreation
 # pylint: disable=no-self-use
 class FromRTDSToASN1SCC(RecursiveMapper):

dmt/B_mappers/scade6_B_mapper.py

@@ -52,11 +52,6 @@ isAsynchronous = False
 scadeBackend = None
 
 
-def Version() -> None:
-    print("Code generator: " +
-          "$Id: scade6_B_mapper.py 2390 2012-07-19 12:39:17Z ttsiodras $")
-
-
 # noinspection PyListCreation
 # pylint: disable=no-self-use
 class FromSCADEtoASN1SCC(RecursiveMapper):

dmt/B_mappers/sdl_B_mapper.py

@@ -104,10 +104,6 @@ isAsynchronous = True
 ogBackend = None
 
 
-def Version() -> None:
-    print(("Code generator: " + "$Id: og_B_mapper.py 2390 2012-07-19 12:39:17Z ttsiodras $"))
-
-
 # noinspection PyListCreation
 # pylint: disable=no-self-use
 class FromObjectGeodeToASN1SCC(RecursiveMapper):

dmt/B_mappers/simulink_B_mapper.py

@@ -51,10 +51,6 @@ isAsynchronous = False
 simulinkBackend = None
 
 
-def Version() -> None:
-    print("Code generator: " + "$Id: simulink_B_mapper.py 2390 2012-07-19 12:39:17Z ttsiodras $")
-
-
 def IsElementMappedToPrimitive(node: AsnSequenceOrSetOf, names: AST_Lookup) -> bool:
     contained = node._containedType
     while isinstance(contained, str):

dmt/B_mappers/vhdl_B_mapper.py

@@ -66,10 +66,6 @@ vhdlBackend = None
 g_octStr = []  # type: List[int]
 
 
-def Version() -> None:
-    print("Code generator: " + "$Id: vhdl_B_mapper.py 2390 2012-07-19 12:39:17Z ttsiodras $")  # pragma: no cover
-
-
 def CleanName(name: str) -> str:
     return re.sub(r'[^a-zA-Z0-9_]', '_', name)
 

dmt/asn2dataModel.py

@@ -37,9 +37,8 @@ declarations (e.g. SCADE/Lustre, Matlab/Simulink statements, etc).
 import os
 import sys
 import copy
-from importlib import import_module
 
-from typing import Dict, Tuple, Any  # NOQA pylint: disable=unused-import
+from typing import cast, Dict, Tuple, Any  # NOQA pylint: disable=unused-import
 
 from .commonPy import configMT, asnParser, cleanupNodes, verify
 from .commonPy.utility import inform, panic
@@ -48,6 +47,22 @@ from .commonPy.asnAST import AsnNode  # NOQA pylint: disable=unused-import
 
 from . import A_mappers  # NOQA pylint:disable=unused-import
 
+from .A_mappers import ada_A_mapper
+from .A_mappers import c_A_mapper
+from .A_mappers import og_A_mapper
+from .A_mappers import python_A_mapper
+from .A_mappers import qgenada_A_mapper
+from .A_mappers import qgenc_A_mapper
+from .A_mappers import rtds_A_mapper
+from .A_mappers import scade6_A_mapper
+from .A_mappers import simulink_A_mapper
+from .A_mappers import smp2_A_mapper
+from .A_mappers import sqlalchemy_A_mapper
+from .A_mappers import sql_A_mapper
+from .A_mappers import vdm_A_mapper
+
+from .A_mappers.module_protos import A_Mapper
+
 
 def usage(argsToTools: Dict[str, str]) -> None:
     '''Print usage instructions.'''
@@ -59,6 +74,28 @@ def usage(argsToTools: Dict[str, str]) -> None:
     panic(msg % sys.argv[0])
 
 
+def getBackend(modelingLanguage: str) -> A_Mapper:
+    backends = {
+        'OG': og_A_mapper,
+        'SCADE5': scade6_A_mapper,
+        'SCADE6': scade6_A_mapper,
+        'Simulink': simulink_A_mapper,
+        'C': c_A_mapper,
+        'RTDS': rtds_A_mapper,
+        'ada': ada_A_mapper,
+        'python': python_A_mapper,
+        'smp2': smp2_A_mapper,
+        'qgenada': qgenada_A_mapper,
+        'qgenc': qgenc_A_mapper,
+        'sql': sql_A_mapper,
+        'sqlalchemy': sqlalchemy_A_mapper,
+        'vdm': vdm_A_mapper,
+    }
+    if modelingLanguage not in backends:
+        panic("Modeling language '%s' not supported" % modelingLanguage)  # pragma: no cover
+    return cast(A_Mapper, backends[modelingLanguage])
+
+
 def main() -> None:
     if "-v" in sys.argv:
         import pkg_resources  # pragma: no cover
@@ -142,8 +179,6 @@ def main() -> None:
     if configMT.debugParser:
         sys.exit(0)  # pragma: no cover
 
-    loadedBackends = {}  # type: Dict[Filename, Any]
-
     # If some AST nodes must be skipped (for any reason), go learn about them
     badTypes = cleanupNodes.DiscoverBadTypes()
 
@@ -151,24 +186,13 @@ def main() -> None:
     for arg, modelingLanguage in argsToTools.items():
         if not toolSelected[arg]:
             continue
-        backendFilename = "." + modelingLanguage.lower() + "_A_mapper.py"
-        inform("Parsing %s...", backendFilename)
-        try:
-            backend = import_module(backendFilename[:-3], 'dmt.A_mappers')  # pragma: no cover
-            if backendFilename[:-3] not in loadedBackends:
-                loadedBackends[backendFilename[:-3]] = 1
-                if configMT.verbose:
-                    backend.Version()
-        except ImportError as err:  # pragma: no cover
-            panic("Failed to load backend (%s): %s" % (backendFilename, str(err)))  # pragma: no cover
-
-        # Esp. for C, we want to pass the complete list of ASN.1 files to ASN1SCC,
+        backend = getBackend(modelingLanguage)
+
+        # For some languages we want to pass the complete list of ASN.1 files to ASN1SCC,
         # instead of working per type:
         if modelingLanguage.lower() in ["c", "ada", "smp2", "qgenc", "qgenada"]:
-            if 'OnStartup' in dir(backend):
-                backend.OnStartup(modelingLanguage, list(uniqueASNfiles.keys()), configMT.outputDir, badTypes)
-            if 'OnShutdown' in dir(backend):
-                backend.OnShutdown(badTypes)
+            backend.OnStartup(modelingLanguage, list(uniqueASNfiles.keys()), configMT.outputDir, badTypes)
+            backend.OnShutdown(badTypes)
             continue  # bug in coverage.py...  # pragma: no cover
 
         # Work on each ASN.1 file's types
@@ -191,30 +215,23 @@ def main() -> None:
                 assert nodeTypename in leafTypeDict
 
                 leafType = leafTypeDict[nodeTypename]
-                # If it is a base type,
                 if leafType in ['BOOLEAN', 'INTEGER', 'REAL', 'OCTET STRING']:
-                    # make sure we have mapping instructions for BASE elements
-                    if 'OnBasic' not in dir(backend):
-                        panic("ASN.1 grammar contains literal(%s) but no BASE section found in the mapping grammar (%s)" % (nodeTypename, sys.argv[2]))  # pragma: no cover
-                    backend.OnBasic(nodeTypename, node, leafTypeDict)
-                # if it is a complex type
-                elif leafType in ['SEQUENCE', 'SET', 'CHOICE', 'SEQUENCEOF', 'SETOF', 'ENUMERATED']:
-                    # make sure we have mapping instructions for the element
-                    mappedName = {
-                        'SEQUENCE': 'OnSequence',
-                        'SET': 'OnSet',
-                        'CHOICE': 'OnChoice',
-                        'SEQUENCEOF': 'OnSequenceOf',
-                        'SETOF': 'OnSetOf',
-                        'ENUMERATED': 'OnEnumerated'
-                    }
-                    if mappedName[leafType] not in dir(backend):
-                        panic("ASN.1 grammar contains %s but no %s section found in the mapping grammar (%s)" % (nodeTypename, mappedName[leafType], backendFilename))  # pragma: no cover
-                    processor = backend.__dict__[mappedName[leafType]]
-                    processor(nodeTypename, node, leafTypeDict)
-                # what type is it?
+                    processor = backend.OnBasic
+                elif leafType == 'SEQUENCE':
+                    processor = backend.OnSequence
+                elif leafType == 'SET':
+                    processor = backend.OnSet  # pragma: no cover
+                elif leafType == 'CHOICE':
+                    processor = backend.OnChoice
+                elif leafType == 'SEQUENCEOF':
+                    processor = backend.OnSequenceOf
+                elif leafType == 'SETOF':
+                    processor = backend.OnSetOf  # pragma: no cover
+                elif leafType == 'ENUMERATED':
+                    processor = backend.OnEnumerated
                 else:  # pragma: no cover
-                    panic("Unexpected type of element: %s" % leafTypeDict[nodeTypename])  # pragma: no cover
+                    panic("Unexpected type of element: %s" % leafType)  # pragma: no cover
+                processor(nodeTypename, node, leafTypeDict)
 
             if 'OnShutdown' in dir(backend):
                 backend.OnShutdown(badTypes)

dmt/commonPy/asnParser.py

@@ -834,12 +834,9 @@ def ParseASN1SCC_AST(filename: str) -> None:
     global g_xmlASTrootNode
     g_xmlASTrootNode = handler._root
 
-    global g_names
-    g_names = {}
-    global g_checkedSoFarForKeywords
-    g_checkedSoFarForKeywords = {}
-    global g_leafTypeDict
-    g_leafTypeDict = {}
+    g_names.clear()
+    g_checkedSoFarForKeywords.clear()
+    g_leafTypeDict.clear()
 
     for m in modules:
         # print "Module", m._id