From 97c58e37478a7097b77bb9b1f011483a99bb6cf0 Mon Sep 17 00:00:00 2001
From: Ryan Fleury <ryan.j.fleury@gmail.com>
Date: Tue, 13 May 2025 11:55:06 -0700
Subject: [PATCH] start sketching out pieces for flattened expansions in
 rows(...)

---
 src/eval/eval_types.c    | 28 +++++++++++++++++++++-------
 src/mule/mule_main.cpp   |  2 +-
 src/raddbg/raddbg_core.c |  1 +
 3 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/src/eval/eval_types.c b/src/eval/eval_types.c
index 2f8675b5..4db6fab9 100644
--- a/src/eval/eval_types.c
+++ b/src/eval/eval_types.c
@@ -2409,24 +2409,38 @@ E_TYPE_EXPAND_NUM_FROM_ID_FUNCTION_DEF(identity)
 ////////////////////////////////
 //~ rjf: (Built-In Type Hooks) `rows` lens
 
+typedef struct E_RowsAccel E_RowsAccel;
+struct E_RowsAccel
+{
+  E_Eval *root_evals;
+  Rng1U64 *root_evals_ranges;
+};
+
 E_TYPE_EXPAND_INFO_FUNCTION_DEF(rows)
 {
   E_Type *type = e_type_from_key(eval.irtree.type_key);
-  E_TypeExpandInfo info = {0, type->count};
+  E_RowsAccel *accel = push_array(arena, E_RowsAccel, 1);
+  accel->root_evals = push_array(arena, E_Eval, type->count);
+  accel->root_evals_ranges = push_array(arena, Rng1U64, type->count);
+  E_ParentKey(eval.key)
+  {
+    for EachIndex(idx, type->count)
+    {
+      accel->root_evals[idx] = e_eval_from_expr(type->args[idx]);
+      accel->root_evals_ranges[idx] = r1u64(idx, idx+1);
+    }
+  }
+  E_TypeExpandInfo info = {accel, type->count};
   return info;
 }
 
 E_TYPE_EXPAND_RANGE_FUNCTION_DEF(rows)
 {
-  E_Type *type = e_type_from_key(eval.irtree.type_key);
+  E_RowsAccel *accel = (E_RowsAccel *)user_data;
   U64 out_idx = 0;
   for(U64 idx = idx_range.min; idx < idx_range.max; idx += 1, out_idx += 1)
   {
-    E_Expr *arg = type->args[idx];
-    Temp scratch = scratch_begin(&arena, 1);
-    String8 string = e_string_from_expr(scratch.arena, arg, str8_zero());
-    evals_out[out_idx] = e_eval_wrap(eval, string);
-    scratch_end(scratch);
+    evals_out[out_idx] = accel->root_evals[idx];
   }
 }
 
diff --git a/src/mule/mule_main.cpp b/src/mule/mule_main.cpp
index ef7b19f8..72136675 100644
--- a/src/mule/mule_main.cpp
+++ b/src/mule/mule_main.cpp
@@ -1785,7 +1785,7 @@ struct Bitmap
   int width;
   int height;
 };
-raddbg_type_view(Bitmap, lens:bitmap(base, width, height));
+raddbg_type_view(Bitmap, bitmap(base, width, height));
 
 static unsigned int
 mule_bswap_u32(unsigned int x)
diff --git a/src/raddbg/raddbg_core.c b/src/raddbg/raddbg_core.c
index 8ffe4fb1..d682bba0 100644
--- a/src/raddbg/raddbg_core.c
+++ b/src/raddbg/raddbg_core.c
@@ -12259,6 +12259,7 @@ rd_frame(void)
         {str8_lit("sequence"),    0, 0, 1,        0, 0, {E_TYPE_EXPAND_INFO_FUNCTION_NAME(sequence), E_TYPE_EXPAND_RANGE_FUNCTION_NAME(sequence)}},
         {str8_lit("rows"),        0, 0, 0,        0, 0, {E_TYPE_EXPAND_INFO_FUNCTION_NAME(rows), E_TYPE_EXPAND_RANGE_FUNCTION_NAME(rows)}},
         {str8_lit("columns"),     0, 0, 0,        0, 0, {0}},
+        {str8_lit("flatten"),     0, 0, 0,        0, 0, {0}},
         {str8_lit("omit"),        0, 0, 0,        0, 0, {E_TYPE_EXPAND_INFO_FUNCTION_NAME(omit), E_TYPE_EXPAND_RANGE_FUNCTION_NAME(omit)}},
         {str8_lit("range1"),      0, 0, 0,        0, 0, {0}},
         {str8_lit("array"),       0, 0, 1,        0, 0, {E_TYPE_EXPAND_INFO_FUNCTION_NAME(array), E_TYPE_EXPAND_RANGE_FUNCTION_NAME(array)}},