highlighting for views; view doc / autocompletion coverage

src/base/base_core.h

@@ -207,7 +207,6 @@
 #define MemoryCopy(dst, src, size)    memmove((dst), (src), (size))
 #define MemorySet(dst, byte, size)    memset((dst), (byte), (size))
 #define MemoryCompare(a, b, size)     memcmp((a), (b), (size))
-#define MemoryStrlen(ptr)             strlen(ptr)
 
 #define MemoryCopyStruct(d,s)  MemoryCopy((d),(s),sizeof(*(d)))
 #define MemoryCopyArray(d,s)   MemoryCopy((d),(s),sizeof(d))
@@ -225,9 +224,6 @@
 
 #define MemoryIsZeroStruct(ptr) memory_is_zero((ptr), sizeof(*(ptr)))
 
-#define MemoryRead(T,p,e)    ( ((p)+sizeof(T)<=(e))?(*(T*)(p)):(0) )
-#define MemoryConsume(T,p,e) ( ((p)+sizeof(T)<=(e))?((p)+=sizeof(T),*(T*)((p)-sizeof(T))):((p)=(e),0) )
-
 ////////////////////////////////
 //~ rjf: Asserts
 
@@ -502,29 +498,29 @@ union U512
 typedef struct U16Array U16Array;
 struct U16Array
 {
-  U64  count;
   U16 *v;
+  U64 count;
 };
 
 typedef struct U32Array U32Array;
 struct U32Array
 {
-  U64  count;
   U32 *v;
+  U64 count;
 };
 
 typedef struct U64Array U64Array;
 struct U64Array
 {
-  U64  count;
   U64 *v;
+  U64 count;
 };
 
 typedef struct U128Array U128Array;
 struct U128Array
 {
-  U64   count;
   U128 *v;
+  U64 count;
 };
 
 ////////////////////////////////

src/raddbg/generated/raddbg.meta.c

@@ -426,23 +426,37 @@ RD_VocabInfo rd_vocab_info_table[360] =
 {str8_lit_comp("geo3d"), str8_lit_comp(""), str8_lit_comp("Geometry (3D)"), str8_lit_comp(""), RD_IconKind_Cube},
 };
 
-RD_NameSchemaInfo rd_name_schema_info_table[26] =
+RD_NameSchemaInfo rd_name_schema_info_table[40] =
 {
-{str8_lit_comp("user"), str8_lit_comp("@expand_commands(edit_user_theme) x:\n{\n  //- rjf: animations\n  @display_name('Animations') @description(\"Enables animations.\")\n  @default(1) 'animations': bool,\n  @display_name('Scrolling Animations') @description(\"Enables scrolling animations.\")\n  @expand_if(\"$.animations\") @default(1) 'scrolling_animations': bool,\n  @display_name('Tooltip Animations') @description(\"Enables tooltip animations.\")\n  @expand_if(\"$.animations\") @default(1) 'tooltip_animations': bool,\n  @display_name('Menu Animations') @description(\"Enables menu animations.\")\n  @expand_if(\"$.animations\") @default(1) 'menu_animations': bool,\n\n  //- rjf: fonts\n  @display_name('UI Font') @description(\"The name of, or path to, the font used when displaying non-code UI elements.\")\n  @default('') 'main_font': string,\n  @display_name('Code Font') @description(\"The name of, or path to, the font used when displaying code.\")\n  @default('') 'code_font': string,\n\n  //- rjf: theme\n  @default(\"Default (Dark)\") @display_name('User Theme')\n  @description(\"The user's theme, which describes all colors used throughout the UI.\")\n  'theme': string,\n  @no_expand @display_name('User Theme')\n  'theme_colors': query,\n\n  //- rjf: autocompletion\n  @display_name('Autocompletion Lister') @description(\"Enables the autocompletion lister while typing expressions.\") @default(1)\n  'autocompletion_lister': bool,\n  @display_name('View Call Argument Helper') @description(\"Enables the view call argument helper, which shows view arguments and documentation, while typing expressions.\") @default(1)\n  'view_call_argument_helper': bool,\n\n  //- rjf: scope decorations\n  @default(1) @display_name('Cursor Scope Lines') @description(\"Controls whether or not scopes containing the cursor in text views are drawn.\")\n  'cursor_scope_lines': bool,\n\n  //- rjf: cursor decorations\n  @default(1) @display_name('Cursor Trail') @description(\"Controls whether or not a movement trail of the cursor is drawn.\")\n  'cursor_trail': bool,\n\n  //- rjf: thread & breakpoint decorations\n  @default(1) @display_name('Thread Lines') @description(\"Controls whether or not a long horizontal line is drawn before the next line or instruction that the selected thread will execute in source and disassembly views.\")\n  'thread_lines': bool,\n  @default(1) @display_name('Thread Glow') @description(\"Controls whether or not a glowing effect is drawn on the selected thread in source and disassembly views.\")\n  'thread_glow': bool,\n  @default(1) @display_name('Breakpoint Lines') @description(\"Controls whether or not a long horizontal line is drawn before the line or instruction at which a breakpoint is placed, in source and disassembly views.\")\n  'breakpoint_lines': bool,\n  @default(1) @display_name('Breakpoint Glow') @description(\"Controls whether or not a glowing effect is drawn on breakpoints in source and disassembly views.\")\n  'breakpoint_glow': bool,\n\n  //- rjf: occluding background settings\n  @default(0) @display_name('Opaque Backgrounds') @description(\"Controls whether or not all floating background colors are forced to be fully opaque.\")\n  'opaque_backgrounds': bool,\n  @default(1) @display_name('Background Blur') @description(\"Controls whether or not occluded regions behind floating elements are blurred.\")\n  'background_blur': bool,\n\n  //- rjf: appearance settings\n  @default(1) @display_name('Drop Shadows') @description(\"Controls whether or not drop shadows are drawn.\")\n  'drop_shadows': bool,\n  @default(1.f) @display_name('Rounded Corner Amount') @description(\"Controls the degree to which UI corners are rounded.\")\n  'rounded_corner_amount': @range[0, 1] f32,\n\n  //- rjf: code formatting settings\n  @default(2) @display_name('User Tab Width') 'tab_width': @range[1, 32] u64,\n\n  //- rjf: windows style menu bar\n  @default(1) @display_name('Focus Menu Bar With Alt') @description(\"Mimics standard Windows behavior of focusing the menu bar using the Alt key.\")\n  'focus_menu_bar_with_alt': bool,\n\n  //- rjf: native filesystem dialogues\n  @default(0) @display_name('Use Native File System Dialog') @description(\"Uses the operating system's file system dialog box, rather than the debugger's built-in UI.\")\n  'use_native_file_system_dialog': bool,\n}\n")},
+{str8_lit_comp("user"), str8_lit_comp("@expand_commands(edit_user_theme) x:\n{\n  //- rjf: animations\n  @display_name('Animations') @description(\"Enables animations.\")\n  @default(1) 'animations': bool,\n  @display_name('Scrolling Animations') @description(\"Enables scrolling animations.\")\n  @expand_if(\"$.animations\") @default(1) 'scrolling_animations': bool,\n  @display_name('Tooltip Animations') @description(\"Enables tooltip animations.\")\n  @expand_if(\"$.animations\") @default(1) 'tooltip_animations': bool,\n  @display_name('Menu Animations') @description(\"Enables menu animations.\")\n  @expand_if(\"$.animations\") @default(1) 'menu_animations': bool,\n\n  //- rjf: fonts\n  @display_name('UI Font') @description(\"The name of, or path to, the font used when displaying non-code UI elements.\")\n  @default('') 'main_font': string,\n  @display_name('Code Font') @description(\"The name of, or path to, the font used when displaying code.\")\n  @default('') 'code_font': string,\n\n  //- rjf: theme\n  @default(\"Default (Dark)\") @display_name('User Theme')\n  @description(\"The user's theme, which describes all colors used throughout the UI.\")\n  'theme': string,\n  @no_expand @display_name('User Theme')\n  'theme_colors': set,\n\n  //- rjf: autocompletion\n  @display_name('Autocompletion Lister') @description(\"Enables the autocompletion lister while typing expressions.\") @default(1)\n  'autocompletion_lister': bool,\n  @display_name('View Call Argument Helper') @description(\"Enables the view call argument helper, which shows view arguments and documentation, while typing expressions.\") @default(1)\n  'view_call_argument_helper': bool,\n\n  //- rjf: scope decorations\n  @default(1) @display_name('Cursor Scope Lines') @description(\"Controls whether or not scopes containing the cursor in text views are drawn.\")\n  'cursor_scope_lines': bool,\n\n  //- rjf: cursor decorations\n  @default(1) @display_name('Cursor Trail') @description(\"Controls whether or not a movement trail of the cursor is drawn.\")\n  'cursor_trail': bool,\n\n  //- rjf: thread & breakpoint decorations\n  @default(1) @display_name('Thread Lines') @description(\"Controls whether or not a long horizontal line is drawn before the next line or instruction that the selected thread will execute in source and disassembly views.\")\n  'thread_lines': bool,\n  @default(1) @display_name('Thread Glow') @description(\"Controls whether or not a glowing effect is drawn on the selected thread in source and disassembly views.\")\n  'thread_glow': bool,\n  @default(1) @display_name('Breakpoint Lines') @description(\"Controls whether or not a long horizontal line is drawn before the line or instruction at which a breakpoint is placed, in source and disassembly views.\")\n  'breakpoint_lines': bool,\n  @default(1) @display_name('Breakpoint Glow') @description(\"Controls whether or not a glowing effect is drawn on breakpoints in source and disassembly views.\")\n  'breakpoint_glow': bool,\n\n  //- rjf: occluding background settings\n  @default(0) @display_name('Opaque Backgrounds') @description(\"Controls whether or not all floating background colors are forced to be fully opaque.\")\n  'opaque_backgrounds': bool,\n  @default(1) @display_name('Background Blur') @description(\"Controls whether or not occluded regions behind floating elements are blurred.\")\n  'background_blur': bool,\n\n  //- rjf: appearance settings\n  @default(1) @display_name('Drop Shadows') @description(\"Controls whether or not drop shadows are drawn.\")\n  'drop_shadows': bool,\n  @default(1.f) @display_name('Rounded Corner Amount') @description(\"Controls the degree to which UI corners are rounded.\")\n  'rounded_corner_amount': @range[0, 1] f32,\n\n  //- rjf: code formatting settings\n  @default(2) @display_name('User Tab Width') 'tab_width': @range[1, 32] u64,\n\n  //- rjf: windows style menu bar\n  @default(1) @display_name('Focus Menu Bar With Alt') @description(\"Mimics standard Windows behavior of focusing the menu bar using the Alt key.\")\n  'focus_menu_bar_with_alt': bool,\n\n  //- rjf: native filesystem dialogues\n  @default(0) @display_name('Use Native File System Dialog') @description(\"Uses the operating system's file system dialog box, rather than the debugger's built-in UI.\")\n  'use_native_file_system_dialog': bool,\n}\n")},
-{str8_lit_comp("project"), str8_lit_comp("@expand_commands(edit_project_theme) x:\n{\n  @display_name('Project Name') 'name': string,\n  @default(2) @display_name('Project Tab Width') 'tab_width': @range[1, 32] u64,\n\n  //- rjf: visualizers\n  @display_name('Display Pointer Addresses Before Contents') @description(\"When visualizing pointers, always shows the address first, before showing contents at the pointer's address.\")\n  @default(0) display_pointer_addresses_before_contents: bool,\n  @display_name('Use Default C++ STL Type Visualizers') @description(\"Enables the built-in type views for C++ STL types.\")\n  @default(1) use_default_stl_type_views: bool,\n  @display_name('Use Default Unreal Engine Type Visualizers') @description(\"Enables the built-in type views for Unreal Engine types.\")\n  @default(1) use_default_ue_type_views: bool,\n\n  //- rjf: theme\n  @default(\"None\") @display_name('Project Theme') @description(\"The project's theme, which describes all colors used throughout the UI, and can override the user's theme.\")\n  'theme': string,\n  @no_expand @display_name('Project Theme') @description(\"The project's theme, which describes all colors used throughout the UI, and can override the user's theme.\")\n  'theme_colors': query,\n\n  //- rjf: exception settings\n  @default(1) @display_name(\"Break On Win32 Control-C Exceptions\") @description(\"Code: 0x40010005\")\n  win32_ctrl_c: bool;\n  @default(1) @display_name(\"Break On Win32 Control-Break Exceptions\") @description(\"Code: 0x40010008\")\n  win32_ctrl_break: bool;\n  @default(0) @display_name(\"Break On Win32 WinRT Originate Error Exceptions\") @description(\"Code: 0x40080201\")\n  win32_win_rt_originate_error: bool;\n  @default(0) @display_name(\"Break On Win32 WinRT Transform Error Exceptions\") @description(\"Code: 0x40080202\")\n  win32_win_rt_transform_error: bool;\n  @default(0) @display_name(\"Break On Win32 RPC Call Cancelled Exceptions\") @description(\"Code: 0x0000071a\")\n  win32_rpc_call_cancelled: bool;\n  @default(0) @display_name(\"Break On Win32 Data Type Misalignment Exceptions\") @description(\"Code: 0x80000002\")\n  win32_datatype_misalignment: bool;\n  @default(1) @display_name(\"Break On Win32 Access Violation Exceptions\") @description(\"Code: 0xc0000005\")\n  win32_access_violation: bool;\n  @default(0) @display_name(\"Break On Win32 In Page Error Exceptions\") @description(\"Code: 0xc0000006\")\n  win32_in_page_error: bool;\n  @default(1) @display_name(\"Break On Win32 Invalid Handle Specified Exceptions\") @description(\"Code: 0xc0000008\")\n  win32_invalid_handle: bool;\n  @default(0) @display_name(\"Break On Win32 Not Enough Quota Exceptions\") @description(\"Code: 0xc0000017\")\n  win32_not_enough_quota: bool;\n  @default(0) @display_name(\"Break On Win32 Illegal Instruction Exceptions\") @description(\"Code: 0xc000001d\")\n  win32_illegal_instruction: bool;\n  @default(0) @display_name(\"Break On Win32 Cannot Continue From Exception Exceptions\") @description(\"Code: 0xc0000025\")\n  win32_cannot_continue_exception: bool;\n  @default(0) @display_name(\"Break On Win32 Invalid Exception Disposition Returned By Handler Exceptions\") @description(\"Code: 0xc0000026\")\n  win32_invalid_exception_disposition: bool;\n  @default(0) @display_name(\"Break On Win32 Array Bounds Exceeded Exceptions\") @description(\"Code: 0xc000008c\")\n  win32_array_bounds_exceeded: bool;\n  @default(0) @display_name(\"Break On Win32 Floating-Point Denormal Operand Exceptions\") @description(\"Code: 0xc000008d\")\n  win32_floating_point_denormal_operand: bool;\n  @default(0) @display_name(\"Break On Win32 Floating-Point Division By Zero Exceptions\") @description(\"Code: 0xc000008e\")\n  win32_floating_point_division_by_zero: bool;\n  @default(0) @display_name(\"Break On Win32 Floating-Point Inexact Result Exceptions\") @description(\"Code: 0xc000008f\")\n  win32_floating_point_inexact_result: bool;\n  @default(0) @display_name(\"Break On Win32 Floating-Point Invalid Operation Exceptions\") @description(\"Code: 0xc0000090\")\n  win32_floating_point_invalid_operation: bool;\n  @default(0) @display_name(\"Break On Win32 Floating-Point Overflow Exceptions\") @description(\"Code: 0xc0000091\")\n  win32_floating_point_overflow: bool;\n  @default(0) @display_name(\"Break On Win32 Floating-Point Stack Check Exceptions\") @description(\"Code: 0xc0000092\")\n  win32_floating_point_stack_check: bool;\n  @default(0) @display_name(\"Break On Win32 Floating-Point Underflow Exceptions\") @description(\"Code: 0xc0000093\")\n  win32_floating_point_underflow: bool;\n  @default(0) @display_name(\"Break On Win32 Integer Division By Zero Exceptions\") @description(\"Code: 0xc0000094\")\n  win32_integer_division_by_zero: bool;\n  @default(0) @display_name(\"Break On Win32 Integer Overflow Exceptions\") @description(\"Code: 0xc0000095\")\n  win32_integer_overflow: bool;\n  @default(0) @display_name(\"Break On Win32 Privileged Instruction Exceptions\"Line truncated
+{str8_lit_comp("project"), str8_lit_comp("@expand_commands(edit_project_theme) x:\n{\n  @display_name('Project Name') 'name': string,\n  @default(2) @display_name('Project Tab Width') 'tab_width': @range[1, 32] u64,\n\n  //- rjf: visualizers\n  @display_name('Display Pointer Addresses Before Contents') @description(\"When visualizing pointers, always shows the address first, before showing contents at the pointer's address.\")\n  @default(0) display_pointer_addresses_before_contents: bool,\n  @display_name('Use Default C++ STL Type Visualizers') @description(\"Enables the built-in type views for C++ STL types.\")\n  @default(1) use_default_stl_type_views: bool,\n  @display_name('Use Default Unreal Engine Type Visualizers') @description(\"Enables the built-in type views for Unreal Engine types.\")\n  @default(1) use_default_ue_type_views: bool,\n\n  //- rjf: theme\n  @default(\"None\") @display_name('Project Theme') @description(\"The project's theme, which describes all colors used throughout the UI, and can override the user's theme.\")\n  'theme': string,\n  @no_expand @display_name('Project Theme') @description(\"The project's theme, which describes all colors used throughout the UI, and can override the user's theme.\")\n  'theme_colors': set,\n\n  //- rjf: exception settings\n  @default(1) @display_name(\"Break On Win32 Control-C Exceptions\") @description(\"Code: 0x40010005\")\n  win32_ctrl_c: bool;\n  @default(1) @display_name(\"Break On Win32 Control-Break Exceptions\") @description(\"Code: 0x40010008\")\n  win32_ctrl_break: bool;\n  @default(0) @display_name(\"Break On Win32 WinRT Originate Error Exceptions\") @description(\"Code: 0x40080201\")\n  win32_win_rt_originate_error: bool;\n  @default(0) @display_name(\"Break On Win32 WinRT Transform Error Exceptions\") @description(\"Code: 0x40080202\")\n  win32_win_rt_transform_error: bool;\n  @default(0) @display_name(\"Break On Win32 RPC Call Cancelled Exceptions\") @description(\"Code: 0x0000071a\")\n  win32_rpc_call_cancelled: bool;\n  @default(0) @display_name(\"Break On Win32 Data Type Misalignment Exceptions\") @description(\"Code: 0x80000002\")\n  win32_datatype_misalignment: bool;\n  @default(1) @display_name(\"Break On Win32 Access Violation Exceptions\") @description(\"Code: 0xc0000005\")\n  win32_access_violation: bool;\n  @default(0) @display_name(\"Break On Win32 In Page Error Exceptions\") @description(\"Code: 0xc0000006\")\n  win32_in_page_error: bool;\n  @default(1) @display_name(\"Break On Win32 Invalid Handle Specified Exceptions\") @description(\"Code: 0xc0000008\")\n  win32_invalid_handle: bool;\n  @default(0) @display_name(\"Break On Win32 Not Enough Quota Exceptions\") @description(\"Code: 0xc0000017\")\n  win32_not_enough_quota: bool;\n  @default(0) @display_name(\"Break On Win32 Illegal Instruction Exceptions\") @description(\"Code: 0xc000001d\")\n  win32_illegal_instruction: bool;\n  @default(0) @display_name(\"Break On Win32 Cannot Continue From Exception Exceptions\") @description(\"Code: 0xc0000025\")\n  win32_cannot_continue_exception: bool;\n  @default(0) @display_name(\"Break On Win32 Invalid Exception Disposition Returned By Handler Exceptions\") @description(\"Code: 0xc0000026\")\n  win32_invalid_exception_disposition: bool;\n  @default(0) @display_name(\"Break On Win32 Array Bounds Exceeded Exceptions\") @description(\"Code: 0xc000008c\")\n  win32_array_bounds_exceeded: bool;\n  @default(0) @display_name(\"Break On Win32 Floating-Point Denormal Operand Exceptions\") @description(\"Code: 0xc000008d\")\n  win32_floating_point_denormal_operand: bool;\n  @default(0) @display_name(\"Break On Win32 Floating-Point Division By Zero Exceptions\") @description(\"Code: 0xc000008e\")\n  win32_floating_point_division_by_zero: bool;\n  @default(0) @display_name(\"Break On Win32 Floating-Point Inexact Result Exceptions\") @description(\"Code: 0xc000008f\")\n  win32_floating_point_inexact_result: bool;\n  @default(0) @display_name(\"Break On Win32 Floating-Point Invalid Operation Exceptions\") @description(\"Code: 0xc0000090\")\n  win32_floating_point_invalid_operation: bool;\n  @default(0) @display_name(\"Break On Win32 Floating-Point Overflow Exceptions\") @description(\"Code: 0xc0000091\")\n  win32_floating_point_overflow: bool;\n  @default(0) @display_name(\"Break On Win32 Floating-Point Stack Check Exceptions\") @description(\"Code: 0xc0000092\")\n  win32_floating_point_stack_check: bool;\n  @default(0) @display_name(\"Break On Win32 Floating-Point Underflow Exceptions\") @description(\"Code: 0xc0000093\")\n  win32_floating_point_underflow: bool;\n  @default(0) @display_name(\"Break On Win32 Integer Division By Zero Exceptions\") @description(\"Code: 0xc0000094\")\n  win32_integer_division_by_zero: bool;\n  @default(0) @display_name(\"Break On Win32 Integer Overflow Exceptions\") @description(\"Code: 0xc0000095\")\n  win32_integer_overflow: bool;\n  @default(0) @display_name(\"Break On Win32 Privileged Instruction Exceptions\") Line truncated
 {str8_lit_comp("theme_color"), str8_lit_comp("@collection_commands(add_theme_color, fork_theme, save_theme, save_and_set_theme)\n@row_commands(duplicate_cfg, remove_cfg)\nx:\n{\n  @display_name('Tags') tags: string,\n  @display_name('Value') value: @color @hex u32,\n}\n")},
 {str8_lit_comp("window"), str8_lit_comp("x:\n{\n  //- rjf: text rasterization settings\n  @default(1) @display_name('Smooth UI Text') @description(\"Controls whether or not UI text is fully anti-aliased, for a smoother appearance.\")\n  'smooth_ui_text': bool,\n  @default(1) @display_name('Hint UI Text') @description(\"Controls whether or not UI text is hinted, for better text readability at small sizes.\")\n  'hint_ui_text': bool,\n  @default(0) @display_name('Smooth Code Text') @description(\"Controls whether or not code text is fully anti-aliased, for a smoother appearance.\")\n  'smooth_code_text': bool,\n  @default(1) @display_name('Hint Code Text') @description(\"Controls whether or not code text is hinted, for better text readability at small sizes.\")\n  'hint_code_text': bool,\n  @default(11) @display_name('Window Font Size') @description(\"Controls the window's default font size. Does not apply to tabs with their own font size set.\")\n  'font_size': @range[6, 72] u64,\n\n  //- rjf: size settings\n  @default(3.f) @display_name('Window Row Height') @description(\"Controls the window's default row height, in multiples of the font size. Does not apply to tabs with their own row height set.\")\n  'row_height': @range[1.75f, 5.f] f32,\n  @default(3.f) @description(\"Controls the height of tabs, in multiples of the font size.\")\n  'tab_height': @range[1.75f, 5.f] f32,\n\n  //- rjf: theme settings\n  @default(1) @display_name('Use Project Theme') @description(\"Prefer using the project theme for this window, if any. If off, only the user's theme settings will be used.\")\n  'use_project_theme': bool,\n}\n")},
 {str8_lit_comp("tab"), str8_lit_comp("@row_commands(@file copy_tab_full_path, @file show_file_in_explorer, duplicate_tab, close_tab)\nx:\n{\n  @override @display_name('Tab Font Size') @description(\"Controls the tab's font size.\") @no_callee_helper\n  'font_size': @range[6, 72] u64,\n}\n")},
-{str8_lit_comp("watch"), str8_lit_comp("@inherit(tab) x:\n{\n  @override @display_name('Tab Row Height') @description(\"Controls the tab's row height, in multiples of the font size.\")\n  'row_height': @range[1.75f, 5.f] f32,\n  'label': code_string,\n  @description(\"The root expression which is evaluated to produce the watch window.\")\n  'expression': expr_string,\n  @no_expand 'watches': query,\n}\n")},
+{str8_lit_comp("bin"), str8_lit_comp("x:{ @description('An expression to which the 2-radix display should apply.') 'expression': expr_string }")},
+{str8_lit_comp("oct"), str8_lit_comp("x:{ @description('An expression to which the 8-radix display should apply.') 'expression': expr_string }")},
+{str8_lit_comp("hex"), str8_lit_comp("x:{ @description('An expression to which the 16-radix display should apply.') 'expression': expr_string }")},
+{str8_lit_comp("digits"), str8_lit_comp("x:{ @description('An expression to which the digit display should apply.') 'expression': expr_string, @description('The minimum number of digits to display.') 'digit_count': u64 }")},
+{str8_lit_comp("no_string"), str8_lit_comp("x:{ @description('The expression for which string visualization should be disabled.') 'expression': expr_string}")},
+{str8_lit_comp("no_char"), str8_lit_comp("x:{ @description('The expression for which character visualization should be disabled.') 'expression': expr_string}")},
+{str8_lit_comp("no_addr"), str8_lit_comp("x:{ @description('The expression for which address visualization should be disabled.') 'expression': expr_string}")},
+{str8_lit_comp("sequence"), str8_lit_comp("x:{ @description('The number of expansions to generate.') 'count': expr_string}")},
+{str8_lit_comp("rows"), str8_lit_comp("x:{ @description('The expression for which rows should be generated.') 'expression': expr_string, @description('A list of expressions which will be used to generate rows.') '...'}")},
+{str8_lit_comp("columns"), str8_lit_comp("x:{ @description('The expression for whose expansions columns should be generated.') 'expression': expr_string, @description('A list of expressions which will be used to generate columns for each expansion from `expression`.') '...'}")},
+{str8_lit_comp("omit"), str8_lit_comp("x:{ @description('The expression for which certain members should be omitted.') 'expression': expr_string, @description('A list of member names to omit from the expansion.') '...'}")},
+{str8_lit_comp("range1"), str8_lit_comp("x:{ @description('The expression which should be bounded by `min` and `max`.') 'expression': expr_string, @description('The lower bound.') min, @description('The upper bound.') max}")},
+{str8_lit_comp("array"), str8_lit_comp("x:{ @description('An expression of the base address of the array.') 'base_address': expr_string, @description('The number of elements in the array.') count}")},
+{str8_lit_comp("slice"), str8_lit_comp("x:{ @description('An expression of a structure that is to be interpreted as a slice.') 'expression': expr_string}")},
 {str8_lit_comp("list"), str8_lit_comp("x:\n{\n  @description(\"An expression describing the first node in the list.\")\n  'expression': expr_string,\n  @order(0) @description(\"The name of the member which encodes the link to the next node.\")\n  'member_name': code_string,\n}\n")},
+{str8_lit_comp("watch"), str8_lit_comp("@inherit(tab) x:\n{\n  @override @display_name('Tab Row Height') @description(\"Controls the tab's row height, in multiples of the font size.\")\n  'row_height': @range[1.75f, 5.f] f32,\n  'label': code_string,\n  @description(\"The root expression which is evaluated to produce the watch window.\")\n  'expression': expr_string,\n  @no_expand 'watches': set,\n}\n")},
 {str8_lit_comp("text"), str8_lit_comp("@inherit(tab) @expand_commands(@output clear_output) x:\n{\n  @description(\"An expression to describe data which should be viewed as text or code.\")\n  'expression': expr_string,\n  @description(\"The language that the text should be interpreted as being within. Used for syntax highlighting and other parsing features.\")\n  'lang': code_string,\n  @default(1) @description(\"Controls whether or not line numbers are shown.\")\n  'show_line_numbers':bool,\n  @no_callee_helper @default(1) @display_name('Line Wrapping') @description(\"Splits textual lines into multiple visual lines, so that all text is within the visible area.\")\n  'line_wrapping': bool,\n  @no_callee_helper @default(0) @display_name('Scroll To Bottom On Change') @description(\"Scrolls to the bottom if the text is changed.\")\n  'scroll_to_bottom_on_change': bool,\n  @no_callee_helper @no_revert @default(0) @display_name('Transient') @description(\"Controls whether or not this tab will be automatically replaced by the debugger when it snaps to new source code locations.\")\n  'auto': bool,\n}\n")},
 {str8_lit_comp("disasm"), str8_lit_comp("@inherit(tab) x:\n{\n  @description(\"An expression to describe the base address or offset of the disassembly.\")\n  'expression': expr_string,\n  'arch':        code_string,\n  'syntax':      code_string,\n  'size':        expr_string,\n  @no_callee_helper @default(1) @description(\"Controls whether or not addresses are shown in the disassembly text.\")\n  'show_addresses':    bool,\n  @no_callee_helper @default(0) @description(\"Controls whether or not code bytes are shown in the disassembly text.\")\n  'show_code_bytes':   bool,\n  @no_callee_helper @default(1) @description(\"Controls whether or not source lines, corresponding to disassembly instruction ranges, are shown in the disassembly text.\")\n  'show_source_lines': bool,\n  @no_callee_helper @default(1) @description(\"Controls whether or not disassembly text is decorated with symbol names.\")\n  'show_symbol_names': bool,\n  @no_callee_helper @default(1) @description(\"Controls whether or not line numbers are shown.\")\n  'show_line_numbers': bool,\n}\n")},
-{str8_lit_comp("memory"), str8_lit_comp("@inherit(tab) x:\n{\n  @display_name(\"Zoom\") @description(\"The zoom level for displaying bytes in the memory view.\")\n  @default(1.0) 'zoom': @range[0.5, 2] f32,\n  @display_name(\"Base Address\") @description(\"An expression which refers to the base address of data which should be viewed as memory.\")\n  'expression': expr_string,\n  @display_name(\"Address Range Size\") @description(\"The number of bytes of the viewed memory range.\")\n  'size': expr_string,\n  @display_name(\"Cursor Address\") @description(\"The address of the cursor.\")\n  'cursor': expr_string,\n  @default(1) @display_name(\"Cursor Size\") @description(\"The size, in bytes, of the cursor.\")\n  'cursor_size': @range[1, 16] u64,\n  @expand_if(\"!$.auto_columns\") @default(16) @description(\"The number of columns to build before building new rows.\")\n  'num_columns': @range[1, 64] u64,\n  @default(16) @display_name(\"Default Radix\") @description(\"The default radix with which numeric values should be displayed, when peeking.\")\n  @or(2, 8, 10, 16)\n  'default_radix': u64,\n  @default(1) @display_name(\"Track Mark To Cursor\") @description(\"Ensures that the mark always follows the cursor, if the cursor value is updated.\")\n  'track_mark_to_cursor': bool,\n  @default(1) @display_name(\"Allow Mutation\") @description(\"Allows operations which mutate memory.\")\n  'allow_mutation': bool,\n  @default(0) @display_name(\"Automatically Size Columns\") @description(\"Determines the number of columns based on the available space.\")\n  'auto_columns': bool,\n  @default(1) @display_name(\"Peek As Unsigned\") 'peek_as_unsigned': bool,\n  @default(1) @display_name(\"Peek As Signed\") 'peek_as_signed': bool,\n  @default(1) @display_name(\"Peek As Float\") 'peek_as_float': bool,\n  @display_name(\"Extra Peek Types\") @description(\"A list of types as which to interpret selected memory.\")\n  'peek_types': query,\n}\n")},
+{str8_lit_comp("memory"), str8_lit_comp("@inherit(tab) x:\n{\n  @display_name(\"Zoom\") @description(\"The zoom level for displaying bytes in the memory view.\")\n  @default(1.0) 'zoom': @range[0.5, 2] f32,\n  @display_name(\"Base Address\") @description(\"An expression which refers to the base address of data which should be viewed as memory.\")\n  'expression': expr_string,\n  @display_name(\"Address Range Size\") @description(\"The number of bytes of the viewed memory range.\")\n  'size': expr_string,\n  @display_name(\"Cursor Address\") @description(\"The address of the cursor.\")\n  'cursor': expr_string,\n  @default(1) @display_name(\"Cursor Size\") @description(\"The size, in bytes, of the cursor.\")\n  'cursor_size': @range[1, 16] u64,\n  @expand_if(\"!$.auto_columns\") @default(16) @description(\"The number of columns to build before building new rows.\")\n  'num_columns': @range[1, 64] u64,\n  @default(16) @display_name(\"Default Radix\") @description(\"The default radix with which numeric values should be displayed, when peeking.\")\n  @or(2, 8, 10, 16)\n  'default_radix': u64,\n  @default(1) @display_name(\"Track Mark To Cursor\") @description(\"Ensures that the mark always follows the cursor, if the cursor value is updated.\")\n  'track_mark_to_cursor': bool,\n  @default(1) @display_name(\"Allow Mutation\") @description(\"Allows operations which mutate memory.\")\n  'allow_mutation': bool,\n  @default(0) @display_name(\"Automatically Size Columns\") @description(\"Determines the number of columns based on the available space.\")\n  'auto_columns': bool,\n  @default(1) @display_name(\"Peek As Unsigned\") 'peek_as_unsigned': bool,\n  @default(1) @display_name(\"Peek As Signed\") 'peek_as_signed': bool,\n  @default(1) @display_name(\"Peek As Float\") 'peek_as_float': bool,\n  @display_name(\"Extra Peek Types\") @description(\"A list of types as which to interpret selected memory.\")\n  'peek_types': set,\n}\n")},
 {str8_lit_comp("bitmap"), str8_lit_comp("@inherit(tab) x:\n{\n  @description(\"An expression which refers to the base address of data which should be viewed as a bitmap.\")\n  'expression': expr_string,\n  @description(\"An expression describing the width of the bitmap, in pixels.\") @order(0) 'w': u64,\n  @description(\"An expression describing the height of the bitmap, in pixels.\") @order(1) 'h': u64,\n  @display_name(\"Bitmap Format\") @description(\"The pixel format that the bitmap data should be interpreted as being within.\")\n  'fmt': code_string,\n}\n")},
 {str8_lit_comp("color"), str8_lit_comp("@inherit(tab) x:\n{\n  @display_name(\"Value\") @description(\"An expression to describe the value or location of the color.\")\n  'expression': expr_string,\n}\n")},
 {str8_lit_comp("geo3d"), str8_lit_comp("@inherit(tab) x:\n{\n  @display_name(\"Expression\") @description(\"An expression to describe the base address of the index buffer.\")\n  'expression': expr_string,\n  'count': expr_string,\n  'vtx': expr_string,\n  'vtx_size': expr_string,\n  'yaw': @range[0, 1] f32,\n  'pitch': @range[-0.5, 0] f32,\n  'zoom': @range[0, 100] f32,\n}\n")},
 {str8_lit_comp("getting_started"), str8_lit_comp("@inherit(tab) x:\n{\n}\n")},
-{str8_lit_comp("target"), str8_lit_comp("@row_commands(@cmd_line save_cfg_to_project, enable_cfg, launch_and_run, launch_and_step_into, duplicate_cfg, remove_cfg)\n@collection_commands(add_target)\nx:\n{\n  'label':              code_string,\n  'executable':         path,\n  'arguments':          string,\n  'working_directory':  path,\n  'entry_point':        expr_string,\n  'stdout_path':        @no_relativize path,\n  'stderr_path':        @no_relativize path,\n  'stdin_path':         @no_relativize path,\n  'environment':        query,\n  'debug_subprocesses': bool,\n  @no_revert @no_expand @default(0) 'enabled': bool,\n}\n")},
+{str8_lit_comp("target"), str8_lit_comp("@row_commands(@cmd_line save_cfg_to_project, enable_cfg, launch_and_run, launch_and_step_into, duplicate_cfg, remove_cfg)\n@collection_commands(add_target)\nx:\n{\n  'label':              code_string,\n  'executable':         path,\n  'arguments':          string,\n  'working_directory':  path,\n  'entry_point':        expr_string,\n  'stdout_path':        @no_relativize path,\n  'stderr_path':        @no_relativize path,\n  'stdin_path':         @no_relativize path,\n  'environment':        set,\n  'debug_subprocesses': bool,\n  @no_revert @no_expand @default(0) 'enabled': bool,\n}\n")},
 {str8_lit_comp("breakpoint"), str8_lit_comp("@row_commands(enable_cfg, duplicate_cfg, remove_cfg)\n@collection_commands(toggle_breakpoint, add_breakpoint, add_address_breakpoint, add_function_breakpoint, clear_breakpoints)\nx:\n{\n  'label':            code_string,\n  'condition':        expr_string,\n  'source_location':  path_pt,\n  'address_location': expr_string,\n  'hit_count':        u64,\n  'address_range_size': @or(0, 1, 2, 4, 8) u64,\n  'break_on_write':   bool,\n  'break_on_read':    bool,\n  'break_on_execute': bool,\n  @no_revert @no_expand @default(1) 'enabled': bool,\n}\n")},
 {str8_lit_comp("watch_pin"), str8_lit_comp("@row_commands(duplicate_cfg, remove_cfg)\n@collection_commands(add_watch_pin, toggle_watch_pin)\nx:\n{\n  'expression':       expr_string,\n  'source_location':  path_pt,\n  'address_location': expr_string,\n}\n")},
 {str8_lit_comp("debug_info"), str8_lit_comp("@row_commands(enable_cfg, duplicate_cfg, remove_cfg)\n@collection_commands(load_debug_info)\nx:\n{\n  'path': @no_relativize path,\n  @query 'guid': string,\n  @no_revert @no_expand @default(1) 'enabled': bool,\n}\n")},
@@ -450,10 +464,10 @@ RD_NameSchemaInfo rd_name_schema_info_table[26] =
 {str8_lit_comp("type_view"), str8_lit_comp("@collection_commands(add_type_view) @row_commands(remove_cfg) x:{'type':expr_string, 'expr':expr_string}")},
 {str8_lit_comp("recent_project"), str8_lit_comp("x:{'path':path}")},
 {str8_lit_comp("recent_file"), str8_lit_comp("x:{'path':path}")},
-{str8_lit_comp("machine"), str8_lit_comp("x:{'label':code_string, @no_expand 'active':bool, 'unattached_processes':query, 'processes':query}")},
+{str8_lit_comp("machine"), str8_lit_comp("x:{'label':code_string, @no_expand 'active':bool, 'unattached_processes':set, 'processes':set}")},
-{str8_lit_comp("process"), str8_lit_comp("x:{'label':code_string, 'id':u64, @no_expand 'active':bool, 'modules':query, 'threads':query}")},
+{str8_lit_comp("process"), str8_lit_comp("x:{'label':code_string, 'id':u64, @no_expand 'active':bool, 'modules':set, 'threads':set}")},
 {str8_lit_comp("module"), str8_lit_comp("x:{'exe':path, 'dbg':path, 'vaddr_range':vaddr_range}")},
-{str8_lit_comp("thread"), str8_lit_comp("x:{'label':code_string, 'id':u64, @no_expand 'active':bool, 'call_stack':query}")},
+{str8_lit_comp("thread"), str8_lit_comp("x:{'label':code_string, 'id':u64, @no_expand 'active':bool, 'call_stack':set}")},
 };
 
 String8 rd_reg_slot_code_name_table[49] =

src/raddbg/generated/raddbg.meta.h

@@ -603,7 +603,7 @@ C_LINKAGE_BEGIN
 extern String8 rd_tab_fast_path_view_name_table[25];
 extern String8 rd_tab_fast_path_query_name_table[25];
 extern RD_VocabInfo rd_vocab_info_table[360];
-extern RD_NameSchemaInfo rd_name_schema_info_table[26];
+extern RD_NameSchemaInfo rd_name_schema_info_table[40];
 extern String8 rd_reg_slot_code_name_table[49];
 extern Rng1U64 rd_reg_slot_range_table[49];
 extern String8 rd_binding_version_remap_old_name_table[8];

src/raddbg/raddbg.mdesk

@@ -226,7 +226,7 @@ RD_VocabTable:
 
 @table(name schema) RD_SchemaTable:
 {
-  //- rjf: users / projects
+  //- rjf: @schema users
   {
     user,
     ```
@@ -253,7 +253,7 @@ RD_VocabTable:
         @description("The user's theme, which describes all colors used throughout the UI.")
         'theme': string,
       @no_expand @display_name('User Theme')
-        'theme_colors': query,
+        'theme_colors': set,
       
       //- rjf: autocompletion
       @display_name('Autocompletion Lister') @description("Enables the autocompletion lister while typing expressions.") @default(1)
@@ -305,9 +305,12 @@ RD_VocabTable:
     ```
   }
   
+  //- rjf: @schema project
+  //
   // TODO(rjf): the control codes could be fed from the D_ExceptionCodeKindTable, but
   // we do not support that in this generator - we'd need a way to form a table-generated
   // string and put it into a table cell...
+  //
   {
     project
       ```
@@ -328,7 +331,7 @@ RD_VocabTable:
       @default("None") @display_name('Project Theme') @description("The project's theme, which describes all colors used throughout the UI, and can override the user's theme.")
         'theme': string,
       @no_expand @display_name('Project Theme') @description("The project's theme, which describes all colors used throughout the UI, and can override the user's theme.")
-        'theme_colors': query,
+        'theme_colors': set,
       
       //- rjf: exception settings
       @default(1) @display_name("Break On Win32 Control-C Exceptions") @description("Code: 0x40010005")
@@ -409,7 +412,7 @@ RD_VocabTable:
     ```
   }
   
-  //- rjf: theme colors
+  //- rjf: @schema theme_color
   {
     theme_color,
     ```
@@ -423,7 +426,7 @@ RD_VocabTable:
     ```
   }
   
-  //- rjf: windows
+  //- rjf: @schema window
   {
     window,
     ```
@@ -454,7 +457,7 @@ RD_VocabTable:
     ```
   }
   
-  //- rjf: tabs
+  //- rjf: @schema tab
   {
     tab,
     ```
@@ -467,21 +470,49 @@ RD_VocabTable:
     ```
   }
   
-  //- rjf: views
+  //- rjf: @schema bin
-  {
+  {bin ```x:{ @description('An expression to which the 2-radix display should apply.') 'expression': expr_string }```}
-    watch,
+  
-    ```
+  //- rjf: @schema oct
-      @inherit(tab) x:
+  {oct ```x:{ @description('An expression to which the 8-radix display should apply.') 'expression': expr_string }```}
-    {
+  
-      @override @display_name('Tab Row Height') @description("Controls the tab's row height, in multiples of the font size.")
+  //- rjf: @schema hex
-        'row_height': @range[1.75f, 5.f] f32,
+  {hex ```x:{ @description('An expression to which the 16-radix display should apply.') 'expression': expr_string }```}
-      'label': code_string,
+  
-      @description("The root expression which is evaluated to produce the watch window.")
+  //- rjf: @schema digits
-        'expression': expr_string,
+  {digits ```x:{ @description('An expression to which the digit display should apply.') 'expression': expr_string, @description('The minimum number of digits to display.') 'digit_count': u64 }```}
-      @no_expand 'watches': query,
+  
-    }
+  //- rjf: @schema no_string
-    ```
+  {no_string ```x:{ @description('The expression for which string visualization should be disabled.') 'expression': expr_string}```}
-  }
+  
+  //- rjf: @schema no_char
+  {no_char ```x:{ @description('The expression for which character visualization should be disabled.') 'expression': expr_string}```}
+  
+  //- rjf: @schema no_addr
+  {no_addr ```x:{ @description('The expression for which address visualization should be disabled.') 'expression': expr_string}```}
+  
+  //- rjf: @schema sequence
+  {sequence ```x:{ @description('The number of expansions to generate.') 'count': expr_string}```}
+  
+  //- rjf: @schema rows
+  {rows ```x:{ @description('The expression for which rows should be generated.') 'expression': expr_string, @description('A list of expressions which will be used to generate rows.') '...'}```}
+  
+  //- rjf: @schema columns
+  {columns ```x:{ @description('The expression for whose expansions columns should be generated.') 'expression': expr_string, @description('A list of expressions which will be used to generate columns for each expansion from `expression`.') '...'}```}
+  
+  //- rjf: @schema omit
+  {omit ```x:{ @description('The expression for which certain members should be omitted.') 'expression': expr_string, @description('A list of member names to omit from the expansion.') '...'}```}
+  
+  //- rjf: @schema range1
+  {range1 ```x:{ @description('The expression which should be bounded by `min` and `max`.') 'expression': expr_string, @description('The lower bound.') min, @description('The upper bound.') max}```}
+  
+  //- rjf: @schema array
+  {array ```x:{ @description('An expression of the base address of the array.') 'base_address': expr_string, @description('The number of elements in the array.') count}```}
+  
+  //- rjf: @schema slice
+  {slice ```x:{ @description('An expression of a structure that is to be interpreted as a slice.') 'expression': expr_string}```}
+  
+  //- rjf: @schema list
   {
     list,
     ```
@@ -494,6 +525,24 @@ RD_VocabTable:
     }
     ```
   }
+  
+  //- rjf: @schema watch
+  {
+    watch,
+    ```
+      @inherit(tab) x:
+    {
+      @override @display_name('Tab Row Height') @description("Controls the tab's row height, in multiples of the font size.")
+        'row_height': @range[1.75f, 5.f] f32,
+      'label': code_string,
+      @description("The root expression which is evaluated to produce the watch window.")
+        'expression': expr_string,
+      @no_expand 'watches': set,
+    }
+    ```
+  }
+  
+  //- rjf: @schema text
   {
     text,
     ```
@@ -514,6 +563,8 @@ RD_VocabTable:
     }
     ```
   }
+  
+  //- rjf: @schema disasm
   {
     disasm,
     ```
@@ -537,6 +588,8 @@ RD_VocabTable:
     }
     ```
   }
+  
+  //- rjf: @schema memory
   {
     memory,
     ```
@@ -567,10 +620,12 @@ RD_VocabTable:
       @default(1) @display_name("Peek As Signed") 'peek_as_signed': bool,
       @default(1) @display_name("Peek As Float") 'peek_as_float': bool,
       @display_name("Extra Peek Types") @description("A list of types as which to interpret selected memory.")
-        'peek_types': query,
+        'peek_types': set,
     }
     ```
   }
+  
+  //- rjf: @schema bitmap
   {
     bitmap,
     ```
@@ -585,6 +640,8 @@ RD_VocabTable:
     }
     ```
   }
+  
+  //- rjf: @schema color
   {
     color,
     ```
@@ -595,6 +652,8 @@ RD_VocabTable:
     }
     ```
   }
+  
+  //- rjf: @schema geo3d
   {
     geo3d,
     ```
@@ -612,7 +671,7 @@ RD_VocabTable:
     ```
   }
   
-  //- rjf: getting started
+  //- rjf: @schema getting_started
   {
     getting_started,
     ```
@@ -622,7 +681,7 @@ RD_VocabTable:
     ```
   }
   
-  //- rjf: targets
+  //- rjf: @schema target
   {
     target,
     ```
@@ -638,14 +697,14 @@ RD_VocabTable:
       'stdout_path':        @no_relativize path,
       'stderr_path':        @no_relativize path,
       'stdin_path':         @no_relativize path,
-      'environment':        query,
+      'environment':        set,
       'debug_subprocesses': bool,
       @no_revert @no_expand @default(0) 'enabled': bool,
     }
     ```,
   }
   
-  //- rjf: breakpoints
+  //- rjf: @schema breakpoint
   {
     breakpoint,
     ```
@@ -667,7 +726,7 @@ RD_VocabTable:
     ```,
   }
   
-  //- rjf: watch pins
+  //- rjf: @schema watch_pin
   {
     watch_pin,
     ```
@@ -682,7 +741,7 @@ RD_VocabTable:
     ```,
   }
   
-  //- rjf: debug infos
+  //- rjf: @schema debug_info
   {
     debug_info,
     ```
@@ -697,46 +756,52 @@ RD_VocabTable:
     ```,
   }
   
-  //- rjf: file path maps
+  //- rjf: @schema file_path_map
   {
     file_path_map,
     ```@collection_commands(add_file_path_map) @row_commands(remove_cfg) x:{'source': @no_relativize path, 'dest': @no_relativize path}```,
   }
   
-  //- rjf: type views
+  //- rjf: @schema type_view
   {
     type_view,
     ```@collection_commands(add_type_view) @row_commands(remove_cfg) x:{'type':expr_string, 'expr':expr_string}```,
   }
   
-  //- rjf: recent projects
+  //- rjf: @schema recent_project
   {
     recent_project,
     ```x:{'path':path}```,
   }
   
-  //- rjf: recent files
+  //- rjf: @schema recent_file
   {
     recent_file,
     ```x:{'path':path}```,
   }
   
-  //- rjf: control entities
+  //- rjf: @schema machine
   {
     machine,
-    ```x:{'label':code_string, @no_expand 'active':bool, 'unattached_processes':query, 'processes':query}```,
+    ```x:{'label':code_string, @no_expand 'active':bool, 'unattached_processes':set, 'processes':set}```,
   }
+  
+  //- rjf: @schema process
   {
     process,
-    ```x:{'label':code_string, 'id':u64, @no_expand 'active':bool, 'modules':query, 'threads':query}```,
+    ```x:{'label':code_string, 'id':u64, @no_expand 'active':bool, 'modules':set, 'threads':set}```,
   }
+  
+  //- rjf: @schema module
   {
     module,
     ```x:{'exe':path, 'dbg':path, 'vaddr_range':vaddr_range}```,
   }
+  
+  //- rjf: @schema thread
   {
     thread,
-    ```x:{'label':code_string, 'id':u64, @no_expand 'active':bool, 'call_stack':query}```,
+    ```x:{'label':code_string, 'id':u64, @no_expand 'active':bool, 'call_stack':set}```,
   }
 }
 

src/raddbg/raddbg_core.c

@@ -6014,7 +6014,7 @@ rd_window_frame(void)
                         UI_TagF("weak") ui_label(display_name);
                       }
                     }
-                    UI_TagF("weak") ui_label(desc);
+                    UI_TagF("weak") rd_label(desc);
                   }
                 }
               }
@@ -9345,7 +9345,7 @@ rd_set_autocomp_regs_(E_Eval dst_eval, RD_Regs *regs)
       MD_Node *arg_schema = &md_nil_node;
       if(callee_expr.size != 0)
       {
-        E_Eval callee_eval = e_eval_from_string(callee_expr);
+        E_Eval callee_eval = e_eval_from_stringf("view:%S", callee_expr);
         E_Type *callee_type = e_type_from_key(callee_eval.irtree.type_key);
         if(callee_type->kind == E_TypeKind_LensSpec)
         {
@@ -9375,7 +9375,7 @@ rd_set_autocomp_regs_(E_Eval dst_eval, RD_Regs *regs)
       cursor_info.list_expr = push_str8_copy(ws->autocomp_arena, list_expr);
       cursor_info.filter = push_str8_copy(ws->autocomp_arena, filter);
       cursor_info.replaced_range = replaced_range;
-      cursor_info.callee_expr = push_str8_copy(ws->autocomp_arena, callee_expr);
+      cursor_info.callee_expr = str8f(ws->autocomp_arena, "view:%S", callee_expr);
       cursor_info.arg_schema = arg_schema;
       
       scratch_end(scratch);
@@ -9454,7 +9454,7 @@ rd_code_color_slot_from_txt_token_kind(TXT_TokenKind kind)
 }
 
 internal RD_CodeColorSlot
-rd_code_color_slot_from_txt_token_kind_lookup_string(TXT_TokenKind kind, String8 string)
+rd_code_color_slot_from_txt_token_kind_lookup_string(TXT_TokenKind kind, String8 string, B32 allow_macros, B32 is_called)
 {
   RD_CodeColorSlot color = RD_CodeColorSlot_CodeDefault;
   if(kind == TXT_TokenKind_Identifier || kind == TXT_TokenKind_Keyword)
@@ -9505,6 +9505,17 @@ rd_code_color_slot_from_txt_token_kind_lookup_string(TXT_TokenKind kind, String8
       }
     }
     
+    // rjf: try to map as macro
+    if((!mapped || is_called) && allow_macros)
+    {
+      E_Expr *expr = e_string2expr_map_lookup(e_ir_ctx->macro_map, string);
+      if(expr != &e_expr_nil)
+      {
+        mapped = 1;
+        color = RD_CodeColorSlot_CodeMeta;
+      }
+    }
+    
     // rjf: try to map using asynchronous matching system
     if(!mapped && kind == TXT_TokenKind_Identifier)
     {
@@ -11615,7 +11626,7 @@ rd_frame(void)
       }
       
       
-      //- rjf: add types for queries
+      //- rjf: add types for sets
       {
         e_string2typekey_map_insert(rd_frame_arena(), rd_state->meta_name2type_map, str8_lit("environment"),
                                     e_type_key_cons(.kind = E_TypeKind_Set,

src/raddbg/raddbg_core.h

@@ -755,7 +755,7 @@ internal void rd_set_autocomp_regs_(E_Eval dst_eval, RD_Regs *regs);
 internal MD_Node *rd_theme_tree_from_name(Arena *arena, Access *access, String8 theme_name);
 internal Vec4F32 rd_rgba_from_code_color_slot(RD_CodeColorSlot slot);
 internal RD_CodeColorSlot rd_code_color_slot_from_txt_token_kind(TXT_TokenKind kind);
-internal RD_CodeColorSlot rd_code_color_slot_from_txt_token_kind_lookup_string(TXT_TokenKind kind, String8 string);
+internal RD_CodeColorSlot rd_code_color_slot_from_txt_token_kind_lookup_string(TXT_TokenKind kind, String8 string, B32 allow_macros, B32 is_called);
 
 //- rjf: fonts
 internal F32 rd_font_size(void);

src/raddbg/raddbg_eval.c

@@ -361,7 +361,7 @@ E_TYPE_ACCESS_FUNCTION_DEF(schema)
         child_type_key = e_type_key_cons(.kind = E_TypeKind_Struct, .name = str8_lit("vaddr_range"), .count = vaddr_range_members.count, .members = vaddr_range_members.v);
         scratch_end(scratch);
       }
-      else if(str8_match(child_schema->first->string, str8_lit("query"), 0))
+      else if(str8_match(child_schema->first->string, str8_lit("set"), 0))
       {
         child_type_key = e_string2typekey_map_lookup(rd_state->meta_name2type_map, child_schema->string);
       }

src/raddbg/raddbg_widgets.c

@@ -2347,7 +2347,7 @@ rd_code_slice(RD_CodeSliceParams *params, TxtPt *cursor, TxtPt *mark, S64 *prefe
           
           // rjf: token -> token color
           RD_CodeColorSlot token_color_slot = rd_code_color_slot_from_txt_token_kind(token->kind);
-          RD_CodeColorSlot lookup_color_slot = preceded_by_dot ? token_color_slot : rd_code_color_slot_from_txt_token_kind_lookup_string(token->kind, token_string);
+          RD_CodeColorSlot lookup_color_slot = preceded_by_dot ? token_color_slot : rd_code_color_slot_from_txt_token_kind_lookup_string(token->kind, token_string, 0, 0);
           Vec4F32 token_color = rd_rgba_from_code_color_slot(token_color_slot);
           if(lookup_color_slot != RD_CodeColorSlot_CodeDefault)
           {
@@ -3224,9 +3224,10 @@ rd_fstrs_from_code_string(Arena *arena, F32 alpha, B32 indirection_size_change,
       case TXT_TokenKind_Keyword:
       {
         RD_CodeColorSlot lookup_theme_color_slot = RD_CodeColorSlot_CodeDefault;
+        B32 is_called = (token+1 < tokens_opl && token[1].kind == TXT_TokenKind_Symbol && str8_match(str8_substr(string, token[1].range), str8_lit("("), 0));
         if(!preceded_by_dot)
         {
-          lookup_theme_color_slot = rd_code_color_slot_from_txt_token_kind_lookup_string(token->kind, token_string);
+          lookup_theme_color_slot = rd_code_color_slot_from_txt_token_kind_lookup_string(token->kind, token_string, 1, is_called);
         }
         if(lookup_theme_color_slot != RD_CodeColorSlot_CodeDefault)
         {