From b0b8f3d5958d0f1f543cf966bcaab783ac415e6d Mon Sep 17 00:00:00 2001 From: Ed_ Date: Sun, 17 Mar 2024 15:30:30 -0400 Subject: [PATCH] latest (doing some ark vcs stuff) --- .ark_ignore | 6 ++---- code/grime_linked_list.odin | 1 + code/parser_code_agnostic.odin | 2 +- code/tick_update.odin | 6 +++--- scripts/build.ps1 | 2 +- 5 files changed, 8 insertions(+), 9 deletions(-) diff --git a/.ark_ignore b/.ark_ignore index 23ff934..4b4a689 100644 --- a/.ark_ignore +++ b/.ark_ignore @@ -18,8 +18,6 @@ .git/ .vscode/ logs/ -thirdparty/Odin/.git/ -thirdparty/ols/.git/ -thirdparty/ols/ +thirdparty/Odin/ thirdparty/ini/ -thirdparty/Odin/ \ No newline at end of file +thirdparty/ols/ \ No newline at end of file diff --git a/code/grime_linked_list.odin b/code/grime_linked_list.odin index 1553001..68cbf24 100644 --- a/code/grime_linked_list.odin +++ b/code/grime_linked_list.odin @@ -4,6 +4,7 @@ LL_Node :: struct ( $ Type : typeid ) { next : ^Type, } +// ll_push :: proc( list_ptr : ^(^ ($ Type)), node : ^Type ) { ll_push :: #force_inline proc "contextless" ( list_ptr : ^(^ ($ Type)), node : ^Type ) { list := (list_ptr^) node.next = list diff --git a/code/parser_code_agnostic.odin b/code/parser_code_agnostic.odin index b570fc0..dff02c9 100644 --- a/code/parser_code_agnostic.odin +++ b/code/parser_code_agnostic.odin @@ -84,7 +84,7 @@ PA_TokenType :: enum u32 { Vert_Bar, // | Vert_Bar_Double, // || Vert_Bar_Equal, // |= - Vert_Bar_Double_Equal, //= + Vert_Bar_Double_Equal, // |== B_Operator_End, Count, diff --git a/code/tick_update.odin b/code/tick_update.odin index ec25111..3a9f958 100644 --- a/code/tick_update.odin +++ b/code/tick_update.odin @@ -242,7 +242,7 @@ update :: proc( delta_time : f64 ) -> b32 // test_text_box() // test_parenting() - if false + if true { // frame := ui_widget( "Frame", {} ) // ui_parent(frame) @@ -312,7 +312,7 @@ update :: proc( delta_time : f64 ) -> b32 } // Whitespace AST test - if true + if false { profile("Whitespace AST test") @@ -336,10 +336,10 @@ update :: proc( delta_time : f64 ) -> b32 text_theme.disabled.bg_color = Color_Frame_Disabled text_theme.hot.bg_color = Color_Frame_Hover text_theme.active.bg_color = Color_Frame_Select + ui_style_theme( text_theme ) layout_text := text_style.layout - ui_style_theme( text_theme ) alloc_error : AllocatorError; success : bool // debug.lorem_content, success = os.read_entire_file( debug.path_lorem, frame_allocator() ) diff --git a/scripts/build.ps1 b/scripts/build.ps1 index 22e8f83..0e50d2b 100644 --- a/scripts/build.ps1 +++ b/scripts/build.ps1 @@ -255,7 +255,7 @@ push-location $path_root # $build_args += $flag_show_system_call # $build_args += $flag_no_bounds_check # $build_args += $flag_no_thread_checker - # $build_args += $flag_default_allocator_nil + $build_args += $flag_default_allocator_nil $build_args += ($flag_max_error_count + '10') # $build_args += $flag_sanitize_address # $build_args += $flag_sanitize_memory