From d94bc7862d7eed279f3cf4277594febbbeebbb1b Mon Sep 17 00:00:00 2001 From: Brendan Hansen Date: Thu, 12 Aug 2021 19:24:57 -0500 Subject: [PATCH] bugfixes with macro expansions --- bin/onyx | Bin 413864 -> 413904 bytes core/builtin.onyx | 2 +- .../immediate_mode/immediate_renderer.onyx | 2 ++ src/onyxclone.c | 9 +++++++++ 4 files changed, 12 insertions(+), 1 deletion(-) diff --git a/bin/onyx b/bin/onyx index 5d1db354bbb530e15b69912db51f024ff3d0d445..fe2bd2b265a22591bb311e29f9011240bf2a48c2 100755 GIT binary patch delta 15146 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 B+!O!+ delta 14877 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 M_5rAV!Ykze05(9s6#xJL diff --git a/core/builtin.onyx b/core/builtin.onyx index 0a33897c..3d7db024 100644 --- a/core/builtin.onyx +++ b/core/builtin.onyx @@ -190,4 +190,4 @@ any :: struct { // Represents a code block. Not constructable outside of using a '#code' directive. -Code :: struct {} \ No newline at end of file +Code :: struct {_:i32;} \ No newline at end of file diff --git a/modules/immediate_mode/immediate_renderer.onyx b/modules/immediate_mode/immediate_renderer.onyx index 81756646..f34242d9 100644 --- a/modules/immediate_mode/immediate_renderer.onyx +++ b/modules/immediate_mode/immediate_renderer.onyx @@ -521,7 +521,9 @@ apply_transform :: (transform: Transform) do global_renderer->apply_transform(tr save_matrix :: macro () { + // Not counting a specific name for this import I :: package immediate_mode + I.push_matrix(); defer I.pop_matrix(); } \ No newline at end of file diff --git a/src/onyxclone.c b/src/onyxclone.c index e470b57d..3c0b5f2c 100644 --- a/src/onyxclone.c +++ b/src/onyxclone.c @@ -126,6 +126,9 @@ AstNode* ast_clone(bh_allocator a, void* n) { if (node == NULL) return NULL; if (!should_clone(node)) return node; + static int clone_depth = 0; + clone_depth++; + i32 node_size = ast_kind_to_size(node); // bh_printf("Cloning %s with size %d\n", onyx_ast_node_kind_string(node->kind), node_size); @@ -363,6 +366,11 @@ AstNode* ast_clone(bh_allocator a, void* n) { break; case Ast_Kind_Function: { + if (clone_depth > 1) { + clone_depth--; + return node; + } + AstFunction* df = (AstFunction *) nn; AstFunction* sf = (AstFunction *) node; @@ -442,6 +450,7 @@ AstNode* ast_clone(bh_allocator a, void* n) { } } + clone_depth--; return nn; } -- 2.25.1