on second thought... merging both view rule expansion *header* info generation, and windowed range queries into an expanded block, into the same hook, is really limiting & wrong - so split back to two hooks, one stage is just informing the expansion space, the next provides per-row information within an expanded block with range-based queries

src/eval/eval_ir.c

@@ -1272,7 +1272,7 @@ e_irtree_and_type_from_expr(Arena *arena, E_Expr *expr)
     //- rjf: leaf identifiers
     case E_ExprKind_LeafIdent:
     {
-      E_Expr *macro_expr = e_expr_from_string(e_ir_ctx->macro_map, expr->string);
+      E_Expr *macro_expr = e_string2expr_lookup(e_ir_ctx->macro_map, expr->string);
       if(macro_expr == &e_expr_nil)
       {
         e_msgf(arena, &result.msgs, E_MsgKind_ResolutionFailure, expr->location, "`%S` could not be found.", expr->string);

src/eval/eval_parse.c

@@ -190,7 +190,7 @@ e_string2expr_map_dec_poison(E_String2ExprMap *map, String8 string)
 }
 
 internal E_Expr *
-e_expr_from_string(E_String2ExprMap *map, String8 string)
+e_string2expr_lookup(E_String2ExprMap *map, String8 string)
 {
   E_Expr *expr = &e_expr_nil;
   if(map->slots_count != 0)
@@ -2066,3 +2066,13 @@ e_parse_expr_from_text_tokens(Arena *arena, String8 text, E_TokenArray *tokens)
   E_Parse parse = e_parse_expr_from_text_tokens__prec(arena, text, tokens, e_max_precedence);
   return parse;
 }
+
+internal E_Expr *
+e_parse_expr_from_text(Arena *arena, String8 text)
+{
+  Temp scratch = scratch_begin(&arena, 1);
+  E_TokenArray tokens = e_token_array_from_text(scratch.arena, text);
+  E_Parse parse = e_parse_expr_from_text_tokens(arena, text, &tokens);
+  scratch_end(scratch);
+  return parse.expr;
+}

src/eval/eval_parse.h

@@ -185,7 +185,7 @@ internal E_String2ExprMap e_string2expr_map_make(Arena *arena, U64 slot_count);
 internal void e_string2expr_map_insert(Arena *arena, E_String2ExprMap *map, String8 string, E_Expr *expr);
 internal void e_string2expr_map_inc_poison(E_String2ExprMap *map, String8 string);
 internal void e_string2expr_map_dec_poison(E_String2ExprMap *map, String8 string);
-internal E_Expr *e_expr_from_string(E_String2ExprMap *map, String8 string);
+internal E_Expr *e_string2expr_lookup(E_String2ExprMap *map, String8 string);
 
 ////////////////////////////////
 //~ rjf: Debug-Info-Driven Map Building Functions
@@ -239,5 +239,6 @@ internal void e_push_leaf_ident_exprs_from_expr__in_place(Arena *arena, E_String
 internal E_Parse e_parse_type_from_text_tokens(Arena *arena, String8 text, E_TokenArray *tokens);
 internal E_Parse e_parse_expr_from_text_tokens__prec(Arena *arena, String8 text, E_TokenArray *tokens, S64 max_precedence);
 internal E_Parse e_parse_expr_from_text_tokens(Arena *arena, String8 text, E_TokenArray *tokens);
+internal E_Expr *e_parse_expr_from_text(Arena *arena, String8 text);
 
 #endif // EVAL_PARSE_H