From ba6905ab90df87657db0f907fec6185983a67be3 Mon Sep 17 00:00:00 2001
From: Philippe Proulx <eeppeliteloop@gmail.com>
Date: Thu, 3 Sep 2020 00:32:20 -0400
Subject: [PATCH] barectf/templates/metadata/*.j2: normalize

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

Signed-off-by: Philippe Proulx <eeppeliteloop@gmail.com>
---
 barectf/templates/metadata/enum-ft.j2   | 14 +++++++-------
 barectf/templates/metadata/int-ft.j2    |  4 ++--
 barectf/templates/metadata/metadata.j2  |  6 +++---
 barectf/templates/metadata/struct-ft.j2 | 14 ++++++++------
 4 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/barectf/templates/metadata/enum-ft.j2 b/barectf/templates/metadata/enum-ft.j2
index 1dc2783..9a67738 100644
--- 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 50e6513..a172000 100644
--- 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 068f4c2..be9d426 100644
--- 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 7c30035..338d8e3 100644
--- 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 }})
-- 
2.34.1