misc. and cleanup

Author: Hugobros3

src/shady/passes/infer.c

@@ -686,7 +686,7 @@ static const Node* _infer_control(Context* ctx, const Node* node, const Type* ex
     });
     jpt = qualified_type(a, (QualifiedType) { .is_uniform = true, .type = jpt });
     const Node* jp = var(a, jpt, ojp->payload.var.name);
-    register_processed(&ctx->rewriter, ojp, jp);
+    register_processed(&joinable_ctx.rewriter, ojp, jp);
 
     const Node* nlam = case_(a, singleton(jp), infer(&joinable_ctx, get_abstraction_body(olam), NULL));
 

src/shady/print.c

@@ -414,9 +414,8 @@ static void print_value(PrinterCtx* ctx, const Node* node) {
                 printf(YELLOW);
             String name = get_value_name(node);
             if (name && strlen(name) > 0)
-                printf("%s", name);
-            else
-                printf("%%%d", node->id);
+                printf("%s_", name);
+            printf("%%%d", node->id);
             printf(RESET);
             break;
         case UntypedNumber_TAG:

src/shady/rewrite.c

@@ -214,12 +214,6 @@ Nodes recreate_variables(Rewriter* rewriter, Nodes old) {
     return nodes(rewriter->dst_arena, old.count, nvars);
 }
 
-Node* clone_bb_head(Rewriter* r, const Node* bb) {
-    assert(bb && bb->tag == BasicBlock_TAG);
-    Nodes nparams = recreate_variables(r, get_abstraction_params(bb));
-    return basic_block(r->dst_arena, (Node*) bb->payload.basic_block.fn, nparams, get_abstraction_name(bb));
-}
-
 Node* recreate_decl_header_identity(Rewriter* rewriter, const Node* old) {
     Node* new = NULL;
     switch (is_declaration(old)) {