src/rougail/annotator/variable.py

@@ -138,6 +138,8 @@ class Annotator(Walk):  # pylint: disable=R0903
         calculated_variable, suffix = self.objectspace.paths.get_with_dynamic(
             calculated_variable_path, variable.default.path_prefix, variable.path, variable.version, variable.namespace, variable.xmlfiles
         )
+        if calculated_variable is None:
+            return
         variable.type = calculated_variable.type
         if variable.params is None and calculated_variable.params is not None:
             variable.params = calculated_variable.params

src/rougail/object_model.py

@@ -606,6 +606,9 @@ class SuffixCalculation(_SuffixCalculation):
         self,
         objectspace,
     ) -> dict:
+        suffix = {"type": "suffix"}
+        if self.suffix is not None:
+            suffix["suffix"] = self.suffix
         return {
             "function": "calc_value",
             "params": {None: [self.get_suffix()]},

tests/dictionaries/00_2default_calculated_variable_transitive/tiramisu/base.py

@@ -1,5 +1,6 @@
 from tiramisu import *
 from tiramisu.setting import ALLOWED_LEADER_PROPERTIES
+from re import compile as re_compile
 from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription
 load_functions('tests/dictionaries/../eosfunc/test.py')
 ALLOWED_LEADER_PROPERTIES.add("basic")

tests/dictionaries/00_2default_calculated_variable_transitive/tiramisu/multi.py

@@ -1,5 +1,6 @@
 from tiramisu import *
 from tiramisu.setting import ALLOWED_LEADER_PROPERTIES
+from re import compile as re_compile
 from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription
 load_functions('tests/dictionaries/../eosfunc/test.py')
 ALLOWED_LEADER_PROPERTIES.add("basic")

tests/dictionaries/00_2default_calculated_variable_transitive/tiramisu/no_namespace.py

@@ -1,5 +1,6 @@
 from tiramisu import *
 from tiramisu.setting import ALLOWED_LEADER_PROPERTIES
+from re import compile as re_compile
 from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription
 load_functions('tests/dictionaries/../eosfunc/test.py')
 ALLOWED_LEADER_PROPERTIES.add("basic")

tests/dictionaries/00_6port/tiramisu/base.py

@@ -1,5 +1,6 @@
 from tiramisu import *
 from tiramisu.setting import ALLOWED_LEADER_PROPERTIES
+from re import compile as re_compile
 from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription
 load_functions('tests/dictionaries/../eosfunc/test.py')
 ALLOWED_LEADER_PROPERTIES.add("basic")

tests/dictionaries/00_6port/tiramisu/multi.py

@@ -1,5 +1,6 @@
 from tiramisu import *
 from tiramisu.setting import ALLOWED_LEADER_PROPERTIES
+from re import compile as re_compile
 from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription
 load_functions('tests/dictionaries/../eosfunc/test.py')
 ALLOWED_LEADER_PROPERTIES.add("basic")

tests/dictionaries/00_6port/tiramisu/no_namespace.py

@@ -1,5 +1,6 @@
 from tiramisu import *
 from tiramisu.setting import ALLOWED_LEADER_PROPERTIES
+from re import compile as re_compile
 from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription
 load_functions('tests/dictionaries/../eosfunc/test.py')
 ALLOWED_LEADER_PROPERTIES.add("basic")

tests/dictionaries/80family_dynamic_optional/dictionaries/rougail/00-base.yml

@@ -5,6 +5,7 @@ varname:
     - val1
 dyn{{ suffix }}:
   dynamic:
+    type: variable
     variable: _.varname
     optional: true
   vardyn: