From b085acbc32c681d88a763a4bf00a99292b108087 Mon Sep 17 00:00:00 2001
From: Ryan Fleury <ryan.j.fleury@gmail.com>
Date: Mon, 27 Jan 2025 11:02:49 -0800
Subject: [PATCH] strip out collection type - instead we will implement
 collections via arrays of exprs which map to meta evals

---
 src/eval/eval.mdesk            |  1 -
 src/eval/generated/eval.meta.c |  6 ++----
 src/eval/generated/eval.meta.h |  5 ++---
 src/raddbg/raddbg_core.c       | 15 +++------------
 4 files changed, 7 insertions(+), 20 deletions(-)

diff --git a/src/eval/eval.mdesk b/src/eval/eval.mdesk
index 0c7aba70..135213cb 100644
--- a/src/eval/eval.mdesk
+++ b/src/eval/eval.mdesk
@@ -71,7 +71,6 @@ E_TypeKindTable:
   {IncompleteEnum            "enum"                0    }
   {Bitfield                  "bitfield"            0    }
   {Variadic                  "variadic"            0    }
-  {Collection                "collection"          0    }
 }
 
 @table(name  op_kind  precedence  string  op_pre  op_sep  op_pos)
diff --git a/src/eval/generated/eval.meta.c b/src/eval/generated/eval.meta.c
index dd52f65a..228ef2fd 100644
--- a/src/eval/generated/eval.meta.c
+++ b/src/eval/generated/eval.meta.c
@@ -135,7 +135,7 @@ E_OpInfo e_expr_kind_op_info_table[49] =
 { E_OpKind_Binary, 13, str8_lit_comp(""), str8_lit_comp("="), str8_lit_comp("") },
 };
 
-U8 e_kind_basic_byte_size_table[56] =
+U8 e_kind_basic_byte_size_table[55] =
 {
 0,
 0,
@@ -192,10 +192,9 @@ U8 e_kind_basic_byte_size_table[56] =
 0,
 0,
 0,
-0,
 };
 
-String8 e_kind_basic_string_table[56] =
+String8 e_kind_basic_string_table[55] =
 {
 str8_lit_comp(""),
 str8_lit_comp("void"),
@@ -252,7 +251,6 @@ str8_lit_comp("class"),
 str8_lit_comp("enum"),
 str8_lit_comp("bitfield"),
 str8_lit_comp("variadic"),
-str8_lit_comp("collection"),
 };
 
 C_LINKAGE_END
diff --git a/src/eval/generated/eval.meta.h b/src/eval/generated/eval.meta.h
index c4dc0adc..2dc6342f 100644
--- a/src/eval/generated/eval.meta.h
+++ b/src/eval/generated/eval.meta.h
@@ -74,7 +74,6 @@ E_TypeKind_IncompleteClass,
 E_TypeKind_IncompleteEnum,
 E_TypeKind_Bitfield,
 E_TypeKind_Variadic,
-E_TypeKind_Collection,
 E_TypeKind_COUNT,
 E_TypeKind_FirstBasic      = E_TypeKind_Void,
 E_TypeKind_LastBasic       = E_TypeKind_ComplexF128,
@@ -164,8 +163,8 @@ extern String8 e_token_kind_strings[6];
 extern String8 e_expr_kind_strings[49];
 extern String8 e_interpretation_code_display_strings[11];
 extern E_OpInfo e_expr_kind_op_info_table[49];
-extern U8 e_kind_basic_byte_size_table[56];
-extern String8 e_kind_basic_string_table[56];
+extern U8 e_kind_basic_byte_size_table[55];
+extern String8 e_kind_basic_string_table[55];
 
 C_LINKAGE_END
 
diff --git a/src/raddbg/raddbg_core.c b/src/raddbg/raddbg_core.c
index a292cddd..857fb023 100644
--- a/src/raddbg/raddbg_core.c
+++ b/src/raddbg/raddbg_core.c
@@ -2868,14 +2868,13 @@ rd_eval_space_write(void *u, E_Space space, void *in, Rng1U64 range)
           Rng1U64 string_range = r1u64(string_off, string_opl);
           if(contains_1u64(string_range, range.min))
           {
-            String8 pre_edit_string = push_str8_copy(scratch.arena, str8(eval_blob.str + member->off, child->first->string.size));
-            String8 post_edit_string = ui_push_string_replace_range(scratch.arena, pre_edit_string, r1s64(range.min-string_range.min+1, range.max-string_range.min+1), str8_cstring_capped(in, (U8 *)in + dim_1u64(range)));
+            String8 new_string = str8_cstring_capped(in, (U8 *)in + dim_1u64(range));
             if(child == &rd_nil_cfg)
             {
               child = rd_cfg_new(cfg, child_name);
             }
             rd_cfg_release_all_children(child);
-            rd_cfg_new(child, post_edit_string);
+            rd_cfg_new(child, new_string);
             result = 1;
             break;
           }
@@ -9796,14 +9795,6 @@ rd_append_value_strings_from_eval(Arena *arena, EV_StringFlags flags, U32 defaul
         space_taken += fnt_dim_from_tag_size_string(font, font_size, 0, 0, brace).x;
       }
     }break;
-    
-    //- rjf: collections
-    case E_TypeKind_Collection:
-    {
-      String8 placeholder = str8_lit("{...}");
-      str8_list_push(arena, out, placeholder);
-      space_taken += fnt_dim_from_tag_size_string(font, font_size, 0, 0, placeholder).x;
-    }break;
   }
   
   scratch_end(scratch);
@@ -12924,7 +12915,7 @@ rd_frame(void)
     E_TypeKey collection_type_keys[ArrayCount(rd_collection_name_table)] = {0};
     for EachElement(idx, rd_collection_name_table)
     {
-      collection_type_keys[idx] = e_type_key_cons(.kind = E_TypeKind_Collection, .name = rd_collection_name_table[idx]);
+      collection_type_keys[idx] = e_type_key_cons(.kind = E_TypeKind_Array, .name = rd_collection_name_table[idx]);
     }
     
     ////////////////////////////