Fix Clojure template bugs

Andriamanitra · Apr 28, 2024 · cdace3e · cdace3e
1 parent c3d4cd9
commit cdace3e
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/config/stub_templates/clojure/loopline.clj.jinja b/config/stub_templates/clojure/loopline.clj.jinja
@@ -1,3 +1,4 @@
+{%- set clj_split = '(filter #(not-empty %) (str/split (read-line) #" "))' -%}
 {%- set vars_length = vars | length -%}
 
 {# SINGLE_TYPE #}
@@ -6,11 +7,11 @@
 {%- if var.var_type == "String" or var.var_type == "Word" -%}
   {%- set fn = "" -%}
 {%- else -%}
-  {%- set fn = "(map# " ~ type_tokens[var.var_type] ~ ") " -%}
+  {%- set fn = "map #(" ~ type_tokens[var.var_type] ~ " %) " -%}
 {%- endif -%}
 
 (doseq
-  [{{ var.ident }} {{ fn }}(filter #(not-empty %) (str/split (read-line) #" "))]
+  [{{ var.ident }} ({{ fn }}{{ clj_split }})]
   ( ))
 {# MULTIPLE_TYPE #}
 {%- else -%}
@@ -29,7 +30,7 @@
 
 (doseq
   [{{ idents }} (map (fn [{{ idents }}] [{{ fns | join(sep=" ") }}])
-  (partition {{ vars_length }} (filter #(not-empty %) (str/split (read-line) #" ")))
+  (partition {{ vars_length }} {{ clj_split }}))
   ]
   ( ))
 

diff --git a/config/stub_templates/clojure/read_many.clj.jinja b/config/stub_templates/clojure/read_many.clj.jinja
@@ -11,17 +11,16 @@
 {%- if var.var_type == "String" or var.var_type == "Word" -%}
   {%- set fn = "" -%}
 {%- else -%}
-  {%- set fn = "(map #(" ~ type_tokens[var.var_type] ~ " %) " -%}
+  {%- set fn = "map #(" ~ type_tokens[var.var_type] ~ " %) " -%}
 {%- endif -%}
 
-{{ idents }} {{ fn }}{{ clj_split }}
+[{{ idents }}] ({{ fn }}{{ clj_split }})
 {% else -%}
 
-{{ idents }}] {{ clj_split }}
+[{{ idents }}] {{ clj_split }}
 {% for var in vars -%}
 {%- if var.var_type != "String" and var.var_type != "Word" -%}
-{{ var.ident }} ({{type_tokens[var.var_type]}} {{var.ident}}
+{{ var.ident }} ({{type_tokens[var.var_type]}} {{var.ident}})
 {% endif -%}
 {%- endfor -%}
-)
 {% endif %}
diff --git a/config/stub_templates/clojure/read_one.clj.jinja b/config/stub_templates/clojure/read_one.clj.jinja
@@ -7,4 +7,4 @@
 
 {%- if var.input_comment %}; {{ var.input_comment }}
 {% endif -%}
-{{ var.ident }} {{ fn }}]
+{{ var.ident }} {{ fn }}