make config.c way more readable, jnthn++

MoarVM · Oct 23, 2013 · f27a098 · f27a098
1 parent 35e64be
commit f27a098
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 12 deletions.
diff --git a/Configure.pl b/Configure.pl
@@ -504,12 +504,7 @@ sub write_backend_config {
         if (ref($v) eq 'ARRAY') {
             my $i = 0;
             for (@$v) {
-                $config{backendconfig} .= <<END;
-        MVM_repr_bind_key_boxed(tc, config,
-            MVM_string_ascii_decode_nt(tc, tc->instance->VMString, \"$k\[$i]\"),
-            MVM_repr_box_str(tc, MVM_hll_current(tc)->str_box_type,
-                MVM_string_ascii_decode_nt(tc, tc->instance->VMString, \"$_\")));
-END
+                $config{backendconfig} .= qq/        add_entry(tc, config, "$k\[$i]", "$_");\n/;
                 $i++;
             }
         }
@@ -520,12 +515,7 @@ END
             $v //= '';
             $v   =~ s/"/\\"/g;
             $v   =~ s/\n/\\\n/g;
-            $config{backendconfig} .= <<END;
-        MVM_repr_bind_key_boxed(tc, config,
-            MVM_string_ascii_decode_nt(tc, tc->instance->VMString, \"$k\"),
-            MVM_repr_box_str(tc, MVM_hll_current(tc)->str_box_type,
-                MVM_string_ascii_decode_nt(tc, tc->instance->VMString, \"$v\")));
-END
+            $config{backendconfig} .= qq/        add_entry(tc, config, "$k", "$v");\n/;
         }
     }
 }

diff --git a/build/config.c.in b/build/config.c.in
@@ -9,6 +9,12 @@
 #include "moar.h"
 #include "gen/config.h"
 
+#define add_entry(tc, hash, name, value) \
+    MVM_repr_bind_key_boxed(tc, hash, \
+        MVM_string_ascii_decode_nt(tc, tc->instance->VMString, name), \
+        MVM_repr_box_str(tc, MVM_hll_current(tc)->str_box_type, \
+            MVM_string_ascii_decode_nt(tc, tc->instance->VMString, value)))
+
 MVMObject *MVM_backend_config(MVMThreadContext *tc) {
     MVMObject *config = MVM_repr_alloc_init(tc, tc->instance->boot_types.BOOTHash);
     MVMROOT(tc, config, {