thecl10: elide sigils for type 'H'

Author: DankRank

thecl/ecsparse.y

@@ -1508,6 +1508,24 @@ instr_set_types(
         else
             new_type = *format;
 
+        // automatically add sigils to S and f for format H
+        if (new_type == 'H' && (param->type == 'S' || param->type == 'f')) {
+            value_t new_value;
+            new_value.type = 'm';
+            new_value.val.m.length = sizeof(thecl_sub_param_t);
+            new_value.val.m.data = malloc(sizeof(thecl_sub_param_t));
+            thecl_sub_param_t* D = (thecl_sub_param_t*)new_value.val.m.data;
+            D->zero = 0;
+            D->from = D->to = param->type == 'f' ? 'f' : 'i';
+            if (param->type == 'f') {
+                D->val.f = param->value.val.f;
+            } else {
+                D->val.S = param->value.val.S;
+            }
+            param->type = new_type;
+            param->value = new_value;
+        }
+
         if (new_type != param->type &&
             !(param->type == 'D' && new_type == 'H') &&
             !(param->type == 'z' && (new_type == 'm' || new_type == 'x' || new_type == 'N' || new_type == 'n')) &&

thecl/thecl10.c

@@ -1623,19 +1623,19 @@ th10_stringify_param(
 
         if (D->from == 'f' && D->to == 'f') {
             new_value.val.f = D->val.f;
-            sprintf(temp, "_ff");
+            sprintf(temp, "_ff ");
             new_value.type = 'f';
         } else if (D->from == 'i' && D->to == 'f') {
             new_value.val.f = D->val.f;
-            sprintf(temp, "_fS");
+            sprintf(temp, "_fS ");
             new_value.type = 'S';
         } else if (D->from == 'f' && D->to == 'i') {
             new_value.val.S = D->val.S;
-            sprintf(temp, "_Sf");
+            sprintf(temp, "_Sf ");
             new_value.type = 'f';
         } else if (D->from == 'i' && D->to == 'i') {
             new_value.val.S = D->val.S;
-            sprintf(temp, "_SS");
+            sprintf(temp, "_SS ");
             new_value.type = 'S';
         } else {
             fprintf(stderr, "%s: bad ECL file - invalid types in 'D' param\n", argv0);
@@ -1645,8 +1645,9 @@ th10_stringify_param(
         thecl_param_t temp_param = *param;
         temp_param.type = new_value.type;
         temp_param.value = new_value;
-        strcat(temp, " ");
         char* str_temp = th10_stringify_param(version, sub, node, 0, &temp_param, removed, 0);
+        if (param->type == 'H') /* no sigil for H */
+            return str_temp;
         strcat(temp, str_temp);
         free(str_temp);