[Fix] Issue #51

mccode_antlr/reader/registry.py

@@ -40,6 +40,7 @@ class Registry:
     name = None
     root = None
     pooch = None
+    version = None
 
     def __str__(self):
         from mccode_antlr.common import TextWrapper
@@ -256,6 +257,7 @@ class LocalRegistry(Registry):
     def __init__(self, name: str, root: str):
         self.name = name
         self.root = Path(root)
+        self.version = mccode_antlr_version()
 
     def to_file(self, output, wrapper):
         contents = '(' + ', '.join([
@@ -399,5 +401,6 @@ def _m_reg(name):
 #     'libc-registry.txt'
 # )
 
+
 MCSTAS_REGISTRY, MCXTRACE_REGISTRY, LIBC_REGISTRY = [_m_reg(name) for name in ('mcstas', 'mcxtrace', 'libc')]
 del _m_reg

mccode_antlr/translators/target.py

@@ -85,10 +85,11 @@ def configure_file(self, filename: str, flavor: str):
                 contents = file.read()
 
         # It's not great to do this here. TODO Find a better place for this
-        # FIXME we're (possibly) mixing up McStas/McXtrace and Lib-C versions
-        for reg in self.registries:
-            # updates mccode_antlr.config.config
-            registry_defaults(reg, [reg.name])
+        reg = [reg for reg in self.registries if reg.unique(filename)]
+        if len(reg) != 1:
+            raise RuntimeError(f"Expected exactly one registry for file {filename}")
+        # updates mccode_antlr.config.config
+        registry_defaults(reg[0], [reg[0].name])
 
         def replacement(match) -> str:
             name = match.group(1).lower()