barectf/templates/metadata/*.j2: normalize

* Indent control structures.
* Do not use whitespace control when not needed.

Signed-off-by: Philippe Proulx <eeppeliteloop@gmail.com>

diff --git a/barectf/templates/metadata/enum-ft.j2 b/barectf/templates/metadata/enum-ft.j2
index 1dc27831b68617c3d3e1007414b4503e24cbd28e..9a67738435d5bbac05311ce8599d3da8f65dc969 100644 (file)
--- a/barectf/templates/metadata/enum-ft.j2
+++ b/barectf/templates/metadata/enum-ft.j2
@@ -1,12 +1,12 @@
 enum : {{ ft | int_ft_str }} {
 {% for label, mapping in ft.mappings.items() %}
-{% for rg in mapping.ranges %}
-       {% if rg.lower == rg.upper %}
-               {% set rg_str = rg.lower %}
-       {% else %}
-               {% set rg_str %}{{ rg.lower }} ... {{ rg.upper }}{% endset %}
-       {% endif %}
+       {% for rg in mapping.ranges %}
+               {% if rg.lower == rg.upper %}
+                       {% set rg_str = rg.lower %}
+               {% else %}
+                       {% set rg_str %}{{ rg.lower }} ... {{ rg.upper }}{% endset %}
+               {% endif %}
        "{{ label | escape_dq }}" = {{ rg_str }},
-{% endfor %}
+       {% endfor %}
 {% endfor %}
 }

diff --git a/barectf/templates/metadata/int-ft.j2 b/barectf/templates/metadata/int-ft.j2
index 50e6513e1b49049025ab5dece40b3cdf956fa00a..a172000d0ce57b6f4f64164b3f739bfd4b380d2d 100644 (file)
--- a/barectf/templates/metadata/int-ft.j2
+++ b/barectf/templates/metadata/int-ft.j2
@@ -4,7 +4,7 @@ integer {
        align = {{ ft.alignment }};
        byte_order = {{ ft.byte_order | bo_str }};
        base = {{ ft.preferred_display_base | disp_base_int }};
-       {% if ft._mapped_clk_type_name %}
+{% if ft._mapped_clk_type_name %}
        map = clock.{{ ft._mapped_clk_type_name }}.value;
-       {% endif %}
+{% endif %}
 }

diff --git a/barectf/templates/metadata/metadata.j2 b/barectf/templates/metadata/metadata.j2
index 068f4c26c780d27e3b26e410864fb62435dae046..be9d426835a802231b976f04994038dc94cbf55f 100644 (file)
--- a/barectf/templates/metadata/metadata.j2
+++ b/barectf/templates/metadata/metadata.j2
@@ -36,7 +36,7 @@
  # `rft` with all the lines except the first one indented with a single
  # tab.
  #}
-{% macro root_ft(name, rft) -%}
+{% macro root_ft(name, rft) %}
 {{ name }} := {{ rft | ft_str | indent_tab }};
 {%- endmacro %}
 
@@ -77,7 +77,7 @@ clock {
 
 {% endfor %}
 {# stream types and their event types #}
-{%- for stream_type in cfg.trace.type.stream_types | sort %}
+{% for stream_type in cfg.trace.type.stream_types | sort %}
 /* Stream type `{{ stream_type.name }}` */
 stream {
        id = {{ stream_type.id }};
@@ -93,8 +93,8 @@ stream {
        {# stream type's event types #}
        {% for ev_type in stream_type.event_types | sort %}
 event {
-       id = {{ ev_type.id }};
        stream_id = {{ stream_type.id }};
+       id = {{ ev_type.id }};
        name = "{{ ev_type.name }}";
                {% if ev_type.log_level %}
        loglevel = {{ ev_type.log_level }};

diff --git a/barectf/templates/metadata/struct-ft.j2 b/barectf/templates/metadata/struct-ft.j2
index 7c300357178290c010992a847cbf56a18d0e97c0..338d8e359a10cbd719df124b49cadd7f5a724cb9 100644 (file)
--- a/barectf/templates/metadata/struct-ft.j2
+++ b/barectf/templates/metadata/struct-ft.j2
@@ -1,11 +1,13 @@
 struct {
 {% for name, member in ft.members.items() %}
-{#
- # `chain` is a list of static array field types terminated with a
- # non-array field type (the most nested).
- #}
-{% set chain = ft_chain(member.field_type) %}
+       {#
+        # `chain` is a list of static array field types terminated with a
+        # non-array field type (the most nested).
+        #}
+       {% set chain = ft_chain(member.field_type) %}
        {{ chain[-1] | ft_str | indent_tab }} {{ name }}
-       {%- for array_ft in chain[:-1] %}[{{ array_ft.length }}]{% endfor %};
+       {%- for array_ft in chain[:-1] -%}
+               [{{ array_ft.length }}]
+       {%- endfor %};
 {% endfor %}
 } align({{ ft.minimum_alignment }})