.

software/ors-amarisoft/config/enb.jinja2.cfg

@@ -8,7 +8,7 @@
 
 
 {# jref_of_shared returns original reference used to request shared instance.
-   it is extracted from slave_reference which is composed as `partition_id`+'_'+`reference` #}
+   it is extracted from slave_reference which is composed as <partition_id>_<reference>. #}
 {%- macro jref_of_shared(slave) %}
 {%-   set ref = slave['slave_reference']                %}
 {%-   set partition_id %}{{partition_id}}{%- endset     %}
@@ -44,16 +44,28 @@
 {# jcell_ru_ref returns RU reference linked from a cell.
    if the cell embeds RU definition, its reference comes as `_<cell_ref>_ru`. #}
 # XXX cycle protection
-{%- macro jcell_ru_ref(cell)                            %}
-{%-   set ru = cell['ru']                               %}
-{%-   if ru['ru_type'] == 'ru_ref'                      %}
-{{      ru['ru_ref'] | tojson                           }}
-{%-   elif ru['ru_type'] == 'ruincell_ref'              %}
-{{      jcell_ru_ref(ru['ruincell_ref'])                }}
-{%-   else                                              %}
-{#      ru definition is embedded into cell             #}
-{{      ('_%s_ru' % J(jref_of_shared(cell))) | tojson   }}
-{%-   endif                                             %}
+{%- macro jcell_ru_ref(cell)                                          %}
+{{    _jcell_ru_ref(cell, []) | tojson                                }}
+{%- endmacro                                                          %}
+{%- macro _jcell_ru_ref(cell, seen)                                   %}
+{%-   set cell_ref = J(jref_of_shared(cell))                          %}
+{%-   if cell_ref in seen                                             %}
+{%-     for x in seen                                                 %}
+{%-       do error(x, "%s form a cycle via RU references" % seen)     %}
+{%-     endfor                                                        %}
+{#      XXX what to return ?                                          #}
+{%-   else                                                            %}
+{%-     seen.append(cell_ref)                                         %}
+{%-     set ru = cell['ru']                                           %}
+{%-     if ru['ru_type'] == 'ru_ref'                                  %}
+{{        ru['ru_ref'] | tojson                                       }}
+{%-     elif ru['ru_type'] == 'ruincell_ref'                          %}
+{{        jcell_ru_ref(ru['ruincell_ref'])                            }}
+{%-     else                                                          %}
+{#        ru definition is embedded into cell                         #}
+{{        ('_%s_ru' % J(jref_of_shared(cell))) | tojson               }}
+{%-     endif                                                         %}
+{%-   endif                                                           %}
 {%- endmacro %}