cleanup
This commit is contained in:
@@ -333,10 +333,10 @@ S8 win_proc(void* hwnd, U4 msg, U8 wparam, S8 lparam)
|
||||
tape_ptr[cursor_idx] = pack_token(tag, val);
|
||||
}
|
||||
else if (tag != STag_Format) {
|
||||
U8*r anno_ptr = C_(U8*r, anno_arena.start);
|
||||
char* anno_str = (char*)&anno_ptr[cursor_idx];
|
||||
U8*r anno_ptr = u8_r(anno_arena.start);
|
||||
char* anno_str = (char*) & anno_ptr[cursor_idx];
|
||||
int len = 0;
|
||||
while (len < 8 && anno_str[len] != '\0' && anno_str[len] != ' ') len++;
|
||||
while (len < 8 && anno_str[len] != '\0' && anno_str[len] != ' ') len ++;
|
||||
if (len > 0) {
|
||||
anno_str[len - 1] = '\0';
|
||||
char c1 = anno_str[0] ? anno_str[0] : ' ';
|
||||
@@ -367,15 +367,14 @@ S8 win_proc(void* hwnd, U4 msg, U8 wparam, S8 lparam)
|
||||
}
|
||||
if (wparam == MS_VK_DOWN) {
|
||||
U8 line_start = cursor_idx;
|
||||
while (line_start > 0 && unpack_tag(tape_ptr[line_start - 1]) != STag_Format) line_start--;
|
||||
while (line_start > 0 && unpack_tag(tape_ptr[line_start - 1]) != STag_Format) line_start --;
|
||||
U8 col = cursor_idx - line_start;
|
||||
|
||||
U8 next_line_start = cursor_idx;
|
||||
while (next_line_start < tape_count && unpack_tag(tape_ptr[next_line_start]) != STag_Format) next_line_start++;
|
||||
while (next_line_start < tape_count && unpack_tag(tape_ptr[next_line_start]) != STag_Format) next_line_start ++;
|
||||
if (next_line_start < tape_count) {
|
||||
next_line_start++; // Skip the newline
|
||||
next_line_start ++; // Skip the newline
|
||||
U8 next_line_end = next_line_start;
|
||||
while (next_line_end < tape_count && unpack_tag(tape_ptr[next_line_end]) != STag_Format) next_line_end++;
|
||||
while (next_line_end < tape_count && unpack_tag(tape_ptr[next_line_end]) != STag_Format) next_line_end ++;
|
||||
U8 next_line_len = next_line_end - next_line_start;
|
||||
cursor_idx = next_line_start + (col < next_line_len ? col : next_line_len);
|
||||
}
|
||||
@@ -422,7 +421,7 @@ S8 win_proc(void* hwnd, U4 msg, U8 wparam, S8 lparam)
|
||||
if (is_shift) insert_idx ++;
|
||||
|
||||
if (tape_arena.used + sizeof(U4) <= tape_arena.capacity && anno_arena.used + sizeof(U8) <= anno_arena.capacity) {
|
||||
U8*r anno_ptr = C_(U8*r, anno_arena.start);
|
||||
U8*r anno_ptr = u8_r(anno_arena.start);
|
||||
for (U8 i = tape_count; i > insert_idx; i--) {
|
||||
tape_ptr[i] = tape_ptr[i-1];
|
||||
anno_ptr[i] = anno_ptr[i-1];
|
||||
@@ -451,7 +450,7 @@ S8 win_proc(void* hwnd, U4 msg, U8 wparam, S8 lparam)
|
||||
}
|
||||
case MS_WM_PAINT: {
|
||||
MS_PAINTSTRUCT ps;
|
||||
void* hdc = ms_begin_paint(hwnd, &ps);
|
||||
void* hdc = ms_begin_paint(hwnd, & ps);
|
||||
void* hFont = ms_create_font_a(20, 0, 0, 0, 400, 0, 0, 0, 0, 0, 0, 0, 0, "Consolas");
|
||||
void* hOldFont = ms_select_object(hdc, hFont);
|
||||
|
||||
@@ -467,34 +466,34 @@ S8 win_proc(void* hwnd, U4 msg, U8 wparam, S8 lparam)
|
||||
S4 start_x = 40, start_y = 60, spacing_x = 110, spacing_y = 35;
|
||||
S4 x = start_x, y = start_y;
|
||||
|
||||
U4*r tape_ptr = C_(U4*r, tape_arena.start);
|
||||
U8*r anno_ptr = C_(U8*r, anno_arena.start);
|
||||
U4*r tape_ptr = u4_r(tape_arena.start);
|
||||
U8*r anno_ptr = u8_r(anno_arena.start);
|
||||
|
||||
// Render Tokens
|
||||
for (U8 i = 0; i < tape_count; i++) {
|
||||
for (U8 i = 0; i < tape_count; i++)
|
||||
{
|
||||
if (x >= start_x + (TOKENS_PER_ROW * spacing_x)) {
|
||||
x = start_x; y += spacing_y;
|
||||
}
|
||||
|
||||
S4 render_y = y - scroll_y_offset;
|
||||
|
||||
if (i == cursor_idx && render_y >= 30 && render_y < 500) {
|
||||
ms_select_object(hdc, editor_mode == MODE_EDIT ? hBrushEdit : hBrushNav);
|
||||
ms_rectangle(hdc, x - 5, render_y - 2, x + 95, render_y + 22);
|
||||
}
|
||||
|
||||
if (render_y >= 30 && render_y < 500) {
|
||||
if (render_y >= 30 && render_y < 500)
|
||||
{
|
||||
U4 t = tape_ptr[i];
|
||||
U4 tag = unpack_tag(t);
|
||||
U4 val = unpack_val(t);
|
||||
U8 anno = anno_ptr[i];
|
||||
|
||||
if (tag == STag_Format && val == 0xA) {
|
||||
ms_set_text_color(hdc, 0x00444444);
|
||||
ms_text_out_a(hdc, x, render_y, " \\n ", 6);
|
||||
x = start_x;
|
||||
y += spacing_y;
|
||||
} else {
|
||||
}
|
||||
else
|
||||
{
|
||||
U4 color = tag_colors[tag];
|
||||
const char* prefix = tag_prefixes[tag];
|
||||
|
||||
@@ -504,24 +503,27 @@ S8 win_proc(void* hwnd, U4 msg, U8 wparam, S8 lparam)
|
||||
ms_set_text_color(hdc, 0x001E1E1E);
|
||||
}
|
||||
|
||||
char val_str[9]; if (tag == STag_Data) {
|
||||
char val_str[9];
|
||||
if (tag == STag_Data) {
|
||||
u64_to_hex(val, val_str, 6);
|
||||
val_str[6] = '\0';
|
||||
} else {
|
||||
}
|
||||
else
|
||||
{
|
||||
// Extract annotation string
|
||||
char* a_str = (char*)&anno;
|
||||
char* a_str = (char*) & anno;
|
||||
if (a_str[0] == '\0') {
|
||||
// Fallback to 2-character ID
|
||||
val_str[0] = (char)((val >> 8) & 0xFF);
|
||||
val_str[1] = (char)(val & 0xFF);
|
||||
val_str[2] = ' '; val_str[3] = ' '; val_str[4] = ' '; val_str[5] = ' ';
|
||||
val_str[6] = '\0';
|
||||
} else {
|
||||
}
|
||||
else {
|
||||
mem_copy(u8_(val_str), u8_(a_str), 8);
|
||||
val_str[8] = '\0';
|
||||
}
|
||||
}
|
||||
|
||||
char out_buf[12];
|
||||
out_buf[0] = prefix[0];
|
||||
out_buf[1] = ' ';
|
||||
@@ -531,10 +533,12 @@ S8 win_proc(void* hwnd, U4 msg, U8 wparam, S8 lparam)
|
||||
ms_text_out_a(hdc, x, render_y, out_buf, 10);
|
||||
x += spacing_x;
|
||||
}
|
||||
} else if (unpack_tag(tape_ptr[i]) == STag_Format && unpack_val(tape_ptr[i]) == 0xA) {
|
||||
}
|
||||
else if (unpack_tag(tape_ptr[i]) == STag_Format && unpack_val(tape_ptr[i]) == 0xA) {
|
||||
x = start_x;
|
||||
y += spacing_y;
|
||||
} else {
|
||||
}
|
||||
else {
|
||||
x += spacing_x;
|
||||
}
|
||||
}
|
||||
@@ -564,17 +568,15 @@ S8 win_proc(void* hwnd, U4 msg, U8 wparam, S8 lparam)
|
||||
// HUD: Display Current Token Meaning
|
||||
if (tape_count > 0 && cursor_idx < tape_count) {
|
||||
U4 cur_tag = unpack_tag(tape_ptr[cursor_idx]);
|
||||
const char* tag_name = tag_names[cur_tag];
|
||||
const char* tag_name = tag_names [cur_tag];
|
||||
U4 cur_color = tag_colors[cur_tag];
|
||||
|
||||
char semantics_str[64] = "Current Tag: ";
|
||||
U4 name_len = 0;
|
||||
while (tag_name[name_len]) {
|
||||
semantics_str[13 + name_len] = tag_name[name_len];
|
||||
name_len++;
|
||||
name_len ++;
|
||||
}
|
||||
semantics_str[13 + name_len] = '\0';
|
||||
|
||||
ms_set_text_color(hdc, cur_color);
|
||||
ms_text_out_a(hdc, 40, 580, semantics_str, 13 + name_len);
|
||||
}
|
||||
@@ -603,7 +605,7 @@ S8 win_proc(void* hwnd, U4 msg, U8 wparam, S8 lparam)
|
||||
ms_delete_object(hBrushEdit);
|
||||
ms_delete_object(hBrushNav);
|
||||
ms_delete_object(hHudBrush);
|
||||
ms_end_paint(hwnd, &ps);
|
||||
ms_end_paint(hwnd, & ps);
|
||||
return 0;
|
||||
}
|
||||
case MS_WM_DESTROY: { ms_post_quit_message(0); return 0; }
|
||||
@@ -616,11 +618,11 @@ int main(void) {
|
||||
Slice tape_mem = slice_ut_(u8_(ms_virtual_alloc(nullptr, 64 * 1024, MS_MEM_COMMIT | MS_MEM_RESERVE, MS_PAGE_READWRITE)), 64 * 1024);
|
||||
Slice anno_mem = slice_ut_(u8_(ms_virtual_alloc(nullptr, 64 * 1024, MS_MEM_COMMIT | MS_MEM_RESERVE, MS_PAGE_READWRITE)), 64 * 1024);
|
||||
Slice code_mem = slice_ut_(u8_(ms_virtual_alloc(nullptr, 64 * 1024, MS_MEM_COMMIT | MS_MEM_RESERVE, MS_PAGE_EXECUTE_READWRITE)), 64 * 1024);
|
||||
if (!tape_mem.ptr || !anno_mem.ptr || !code_mem.ptr) ms_exit_process(1);
|
||||
if (! tape_mem.ptr || ! anno_mem.ptr || ! code_mem.ptr) ms_exit_process(1);
|
||||
|
||||
farena_init(&tape_arena, tape_mem);
|
||||
farena_init(&anno_arena, anno_mem);
|
||||
farena_init(&code_arena, code_mem);
|
||||
farena_init(& tape_arena, tape_mem);
|
||||
farena_init(& anno_arena, anno_mem);
|
||||
farena_init(& code_arena, code_mem);
|
||||
|
||||
// Bootstrap Robust Sample: Factorial State Machine
|
||||
scatter(pack_token(STag_Comment, id2('I','N')), "INIT "); // .IN
|
||||
@@ -677,11 +679,11 @@ int main(void) {
|
||||
wc.hInstance = ms_get_stock_object(0);
|
||||
wc.lpszClassName = "ColorForthWindow";
|
||||
wc.hbrBackground = ms_get_stock_object(4);
|
||||
ms_register_class_a(&wc);
|
||||
ms_register_class_a(& wc);
|
||||
|
||||
void* hwnd = ms_create_window_ex_a(0, wc.lpszClassName, "Sourceless Global Memory Explorer", MS_WS_OVERLAPPEDWINDOW | MS_WS_VISIBLE, 100, 100, 1100, 750, nullptr, nullptr, wc.hInstance, nullptr);
|
||||
MS_MSG msg;
|
||||
while (ms_get_message_a(&msg, nullptr, 0, 0)) { ms_translate_message(&msg); ms_dispatch_message_a(&msg); }
|
||||
while (ms_get_message_a(& msg, nullptr, 0, 0)) { ms_translate_message(& msg); ms_dispatch_message_a(& msg); }
|
||||
ms_exit_process(0);
|
||||
return 0;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user