From e81d88507bff0776dcb120444505526117a38c40 Mon Sep 17 00:00:00 2001
From: Brendan Hansen <brendan.f.hansen@gmail.com>
Date: Sun, 29 Aug 2021 16:44:04 -0500
Subject: [PATCH] bugfix with deferred statements in macros

---
 bin/onyx                             | Bin 426784 -> 426784 bytes
 include/onyxastnodes.h               |   9 +++++----
 modules/ui/components/workspace.onyx |   8 +++-----
 src/onyxwasm.c                       |   2 +-
 4 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/bin/onyx b/bin/onyx
index 8fb63e10d8eda1a518b3256b1b2d5d09b2d20041..15df32450febd4af2954ef117f5f9457407ef32f 100755
GIT binary patch
delta 192
zcmZ3`CbghVYC{LJ2rG+C;UUwsP46Xx^ES;%=$|a|)qL|D=J;=na?O8!ZvXR>F;kn7
zuRTqb35c1ur>U|$kznN5?rq27&j_Sv+p~ORW#pLN>&o&M$nADx`2*x`@9<&S%n77z
z!dUW{f%NJ~mU~=4x+{gHmxYUkzhx2w14Huzf$55wELK4Am`t#7)7NCN+y`=dvRN*J
ev?b)T^m72|59KV`c8nbDG22+S$82Lgas~jIQ9!u>

delta 192
zcmZ3`CbghVYC{LJNSyjiy_rY4j8+|I|GIYJM84LI;Zd9CFvovm<ZJ%(bNip4jG5Yu
zZ0%{POhC-MJx!J6i3B6dc5gcte?}lZ+n(hkD<jMFURRdCKyJ4i%O4<jdxsCpW=<e&
z6ULIq45U{_vfSeW(p@Pmy)0Zz{4J9h7#Nx#a7<UsWU&H@$7F(yo4zKC<vx(xlg)A&
dq%9$zrJn;xe<)|kwqs;zkJ$!Px{dY782~a|L1zE}

diff --git a/include/onyxastnodes.h b/include/onyxastnodes.h
index 759251ad..aaf7be65 100644
--- a/include/onyxastnodes.h
+++ b/include/onyxastnodes.h
@@ -493,13 +493,14 @@ typedef enum VarArgKind {
 
 typedef enum BlockRule {
     Block_Rule_New_Scope         = BH_BIT(1),
-    Block_Rule_Clear_Defer       = BH_BIT(2),
-    Block_Rule_Override_Return   = BH_BIT(3),
+    Block_Rule_Emit_Instructions = BH_BIT(2),
+    Block_Rule_Clear_Defer       = BH_BIT(3),
+    Block_Rule_Override_Return   = BH_BIT(4),
 
-    Block_Rule_Normal     = Block_Rule_New_Scope | Block_Rule_Clear_Defer,
+    Block_Rule_Normal     = Block_Rule_New_Scope | Block_Rule_Clear_Defer | Block_Rule_Emit_Instructions,
     Block_Rule_Macro      = Block_Rule_New_Scope,
     Block_Rule_Code_Block = Block_Rule_New_Scope,
-    Block_Rule_Do_Block   = Block_Rule_New_Scope | Block_Rule_Clear_Defer | Block_Rule_Override_Return,
+    Block_Rule_Do_Block   = Block_Rule_New_Scope | Block_Rule_Clear_Defer | Block_Rule_Override_Return | Block_Rule_Emit_Instructions,
 } BlockRule;
 
 typedef struct Arguments Arguments;
diff --git a/modules/ui/components/workspace.onyx b/modules/ui/components/workspace.onyx
index eba50d64..4977611f 100644
--- a/modules/ui/components/workspace.onyx
+++ b/modules/ui/components/workspace.onyx
@@ -30,9 +30,7 @@ workspace_start :: (use r: Rectangle, site := #callsite, state: ^Workspace_State
 
     @Hack // This whole situtation is a hack of trying to a pointer to a valid state.
     if state == null {
-        state = map.get_ptr(^workspace_states, hash);
-
-        if state == null {
+        if state = map.get_ptr(^workspace_states, hash); state == null {
             map.put(^workspace_states, hash, .{});
             state = map.get_ptr(^workspace_states, hash);
         }
@@ -51,8 +49,8 @@ workspace_start :: (use r: Rectangle, site := #callsite, state: ^Workspace_State
         }
     }
 
-    mx, my := get_mouse_position();
-    if Rectangle.contains(r, mx, my) {
+    if  mx, my := get_mouse_position();
+        Rectangle.contains(r, mx, my) {
         set_hot_item(hash);
     }
 
diff --git a/src/onyxwasm.c b/src/onyxwasm.c
index 435a7820..beeddfb9 100644
--- a/src/onyxwasm.c
+++ b/src/onyxwasm.c
@@ -282,7 +282,7 @@ EMIT_FUNC(function_body, AstFunction* fd) {
 EMIT_FUNC(block, AstBlock* block, b32 generate_block_headers) {
     bh_arr(WasmInstruction) code = *pcode;
 
-    generate_block_headers = generate_block_headers && (block->rules & Block_Rule_New_Scope);
+    generate_block_headers = generate_block_headers && (block->rules & Block_Rule_Emit_Instructions);
 
     if (generate_block_headers) {
         emit_enter_structured_block(mod, &code, (block->rules & Block_Rule_Override_Return)
-- 
2.25.1