From 5bfb6bccfb90d02c7fbf9b4b0b84a893d4b87af7 Mon Sep 17 00:00:00 2001 From: daxida Date: Sun, 28 Apr 2024 16:54:16 +0200 Subject: [PATCH] Template bugfixing --- config/stub_templates/clojure/loopline.clj.jinja | 7 ++++--- config/stub_templates/clojure/read_many.clj.jinja | 4 ++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/config/stub_templates/clojure/loopline.clj.jinja b/config/stub_templates/clojure/loopline.clj.jinja index 7e47f74..37cce8d 100644 --- 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 index a71a612..1ae7ef6 100644 --- a/config/stub_templates/clojure/read_many.clj.jinja +++ b/config/stub_templates/clojure/read_many.clj.jinja @@ -11,10 +11,10 @@ {%- 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 }}