whitespace control improvements

hiddewie · Apr 27, 2024 · d657ec3 · d657ec3
1 parent 8c7841f
commit d657ec3
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 13 deletions.
diff --git a/src/evaluate.rs b/src/evaluate.rs
@@ -258,8 +258,10 @@ fn evaluate_template(data: &Value, record: Pair<Rule>) -> Result<String, Templat
             }
 
             // Provide the looped results
-            iterables_results.iter().for_each(|iterable_result|
+            iterables_results.iter().for_each(|iterable_result| {
+                // eprintln!("{}", iterable_result.take().as_str());
                 result.push_str(iterable_result.take().as_str())
+            }
             )
         }
         Rule::with_template => {

diff --git a/src/grammar/template.pest b/src/grammar/template.pest
@@ -47,7 +47,7 @@ end_template = { linear_whitespace* ~ start_marker ~ whitespace* ~ keyword_end ~
 if_elif_else_template = { if_template ~ sub_template ~ (elif_template ~ sub_template)* ~ (else_template ~ sub_template)? ~ end_template }
 for_template = { linear_whitespace* ~ start_marker ~ whitespace* ~ keyword_for ~ whitespace+ ~ property ~ whitespace+ ~ "in" ~ whitespace+ ~ expression ~ whitespace* ~ end_marker ~ vertical_whitespace? }
 with_template = { linear_whitespace* ~ start_marker ~ whitespace* ~ keyword_with ~ whitespace+ ~ property ~ whitespace+ ~ "=" ~ whitespace+ ~ expression ~ whitespace* ~ end_marker ~ vertical_whitespace? ~ sub_template ~ end_template }
-for_else_template = { for_template ~ sub_template ~ else_template? ~ sub_template ~ end_template }
+for_else_template = { for_template ~ sub_template ~ (else_template ~ sub_template)? ~ end_template }
 comment = { comment_start_marker ~ (!comment_end_marker ~ ANY)+ ~ comment_end_marker ~ vertical_whitespace? }
 debug_template = { start_marker ~ whitespace* ~ keyword_debug ~ whitespace+ ~ expression ~ whitespace* ~ end_marker ~ vertical_whitespace? }
 template = { comment | debug_template | if_elif_else_template | for_else_template | with_template | expression_template }

diff --git a/tests/configuration/vlan.yml b/tests/configuration/vlan.yml
@@ -1,4 +1,8 @@
 vlans:
   - id: 10
   - id: 20
-    name: printer
+    name: printer
+  - id: 30
+    name: pc
+  - id: 40
+    name: tablet
diff --git a/tests/integration_tests.rs b/tests/integration_tests.rs
@@ -1064,12 +1064,17 @@ fn vlan_test() {
 
     assert
         .success()
-        .stdout(r#"vlan 10
-vlan 20
-  name printer
+        .stdout(r#"vlans
+  vlan 10
+  vlan 20
+    name printer
+  vlan 30
+    name pc
+  vlan 40
+    name tablet
 "#)
         .stderr(is_match(r#"^\[\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}Z INFO  template\] Using template file 'tests/template/vlan.template'
 \[\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}Z INFO  template\] Using configuration file 'tests/configuration/vlan.yml'
 \[\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}Z INFO  template\] Parsing configuration using YAML format
 $"#).unwrap());
-}
+}
diff --git a/tests/template/vlan.template b/tests/template/vlan.template
@@ -1,6 +1,7 @@
-{% for vlan in vlans %}
-vlan {% vlan.id %}
-  {% if vlan.name %}
-  name {% vlan.name %}
-  {% end %}
-{% end %}
+vlans
+  {% for vlan in vlans %}
+  vlan {% vlan.id %}
+    {% if vlan.name %}
+    name {% vlan.name %}
+    {% end %}
+{% end %}