WIP - Fix string-like format

nac3artiq/src/codegen.rs

@@ -804,21 +804,29 @@ fn polymorphic_print<'ctx>(
         }
 
         match &*ctx.unifier.get_ty_immutable(ty) {
-            TypeEnum::TTuple { ty, is_vararg_ctx: false } => {
+            TypeEnum::TTuple { ty: tys, is_vararg_ctx: false } => {
+                debug_assert_eq!(
+                    tys.len() as u32,
+                    value.into_struct_value().count_fields(),
+                    "Expected {} types for {}, got [{}] ({} types) in corresponding LLVM type",
+                    tys.len(),
+                    ctx.unifier.stringify(ty),
+                    value.into_struct_value().get_fields().map(|field| field.get_type().to_string()).join(", "),
+                    value.into_struct_value().count_fields(),
+                );
+
                 fmt.push('(');
                 flush(ctx, generator, &mut fmt, &mut args);
 
-                let tuple_vals = ty
+                let tuple_vals = tys
                     .iter()
                     .enumerate()
                     .map(|(i, ty)| {
                         (
                             *ty,
-                            ValueEnum::from(ctx.build_in_bounds_gep_and_load(
+                            unsafe {
-                                value.into_pointer_value(),
+                                ValueEnum::from(value.into_struct_value().get_field_at_index_unchecked(i as u32))
-                                &[llvm_i32.const_int(i as u64, false)],
+                            },
-                                None,
-                            )),
                         )
                     })
                     .collect_vec();
@@ -841,18 +849,18 @@ fn polymorphic_print<'ctx>(
                 fmt.push_str("%.*s");
 
                 let true_str = ctx.gen_string(generator, "True");
+                let true_data = unsafe { true_str.get_field_at_index_unchecked(0) }.into_pointer_value();
+                let true_len = unsafe { true_str.get_field_at_index_unchecked(1) }.into_int_value();
                 let false_str = ctx.gen_string(generator, "False");
+                let false_data = unsafe { false_str.get_field_at_index_unchecked(0) }.into_pointer_value();
+                let false_len = unsafe { false_str.get_field_at_index_unchecked(1) }.into_int_value();
 
-                args.push(
+                let bool_val = generator.bool_to_i1(ctx, value.into_int_value());
-                    ctx.builder
+
-                        .build_select(
+                args.extend([
-                            generator.bool_to_i1(ctx, value.into_int_value()),
+                    ctx.builder.build_select(bool_val, true_len, false_len, "").unwrap(),
-                            true_str,
+                    ctx.builder.build_select(bool_val, true_data, false_data, "").unwrap(),
-                            false_str,
+                ]);
-                            "",
-                        )
-                        .unwrap(),
-                );
             }
 
             TypeEnum::TObj { obj_id, .. }
@@ -888,7 +896,12 @@ fn polymorphic_print<'ctx>(
                 } else {
                     fmt.push_str("%.*s");
                 }
-                args.push(value);
+
+                let str = value.into_struct_value();
+                let str_data = unsafe { str.get_field_at_index_unchecked(0) }.into_pointer_value();
+                let str_len = unsafe { str.get_field_at_index_unchecked(1) }.into_int_value();
+
+                args.extend(&[str_len.into(), str_data.into()]);
             }
 
             TypeEnum::TObj { obj_id, params, .. } if *obj_id == PrimDef::List.id() => {