From b8e103e8c5da99bdcfc86db38ac17d707531d41e Mon Sep 17 00:00:00 2001
From: Brendan Hansen <brendan.f.hansen@gmail.com>
Date: Fri, 24 Jul 2020 18:54:16 -0500
Subject: [PATCH] Bugfix with package scopes

---
 onyx             | Bin 317552 -> 317552 bytes
 src/onyxsymres.c |   5 +++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/onyx b/onyx
index c60887d932277951aff5e9f3da8d50586f2ce6ce..484c0693d9084abed638e27dd23e8a0bafae2f8c 100755
GIT binary patch
delta 1216
zcmYk4Ur1A77{<Tvo!arwv8J1|a&yjYn%h!SXGKwYQHEXwY78<kNEt*WSvQ7hnF{3}
zMCiN7%ILC;fw0*&(=I~jBD^pnp)w;0G!Y?)g6w_IA89w|oZs_4&-a{nXFZg;9?A^O
zgDLT5TGG$_m9g5}%aw*RUEOa>p9CkqL%4(AnRwLoH<e2x5Bmj|y8Q!v{sA8G55S4S
z&TZ+*hOu&B^mC5e7y}8(j839Nl94RxWR^$@5>}zP=82>tvFqduku)Snb+Sf8M$)8{
zKSa_y5q0TE%0;vt$(T;eM0OyV(TRhI5y_%Xiiu<(VScU9AtISb>>6>+5;13VCoqPk
z^tqF{%)lT^+z5l)l5I9PNM$}XrSJh2>=&^x*!Zwm2!s8&;E4l7hl7kINjEXnv(1jr
z=eaz1S6LyeRNah^+VUCmW~g%UoRw_VzE%b;;%Ee%yiGJmAdg=ceG#ymI(Sz7b}gBC
zzR`4}h(++|MzMecnP++8%N%XM<D=IJ2ze5083FEIQo@7GGfuop97fKoMB^m-s=2Av
zr2Ae|dA}GUpPxIcv_Q`;YFQwrksAxRPi+$LmRJ<LMmgU93Kr)m>lAq}z)@}HZoRpu
zjPet>+|a8oqo1o+KKk8>%V4T(rw14g;0ha387r|6-V}FVfYq|;%yE$zMDY!Yog{9E
zX%s6qY^S!w6cSgd#}D~&k9v$(z2NR|<J`V0%~w$s#weKitSE?rwPv<RU1EThC|~5X
z{Iy#()o*#1(ObHSSunka?$xHNc$XxdmhjXbIyEGQqL9Nw;#m}O)5GRhyJ)hh>=J{B
z_<&ORQ#nD)KC+eF>&9Mfml-@Qpj-7lTT(D|kwWi@Ju$Ezyyy6+h=Fo4mbIK?aDQi=
zf|^{vY4BmzC;d-Nk}S#SA0s>{y3lVNbX6<=Y=BiP(fVq{^B8_=HDWFXmAp<!ad7dV
z*c%5czbI<s;Lf|2y{3MlMejS+wimS0uHBT?E=J<u;I~9L4y6Z9$SWPHoUKjq(fvE9
k!7(|eDJ5IVNFgqCN>TglQxLIF8QLBEcjW$O!@FPq0FiO;U;qFB

delta 1216
zcmYk4T}V@57{}lDnc38iZgX>G+nj5g=3H93^+Az!k@j&BWi_x1BP^jvF$t1P#Z+Rg
z52RiwExV0AglNlcT3uAol@~@7SY{MKVoEoCfb~4*W3-!d&hP*H|L^}iJ9ERibHlmA
z6JQP{M>4OUYS!Oxzx93cMpM{7`eXXxSBSRr^AB%zE@W{-|IG`68@hv$zF>sMf)S`L
z?nuwh&<#}rqo4bpgE3f)<f%sDMD$3eH1d*21`-xfT@yqykvKK-kw_MjDvit%S%Rcq
zBY%iU9f&$Lq%S~}jbun879u%Fo@&HJ#DHW<BV|O4NLWxUw2_DjiBlz>mqg5_?li`*
zls31$faw@m#Mvl#tyYW9MJn?vDaC_SFf0;LaPZ6GT@;+#uJJ_?qE{LjOV@W{sBf_o
zpAU2CVpv`wTdTMkA8@Q-tkk5)W#e|T)%cqkG>EDgxOt0ch(RH56MZpon$PgO+8i~R
z`99Nhok+y+=sNKZ2XYVcMPoK~z~`seIUuCR;4mHF-f20!k@@Zs-y$|4=Uc?V$LOo(
z=4P|zdrsv8;u84++`Ux|^yO1auXuvo=;eN;NvO2kD&two@%>k@%qFi>6pnza#>~B1
zb6*AJ>$tS9S6Rjdu3Y)RS2r$$DYBCu;7SNrxG#&bax38l5gq}%b-``(kl2XgD-t_M
zoEJ|}49q)rr^HMWXQ;=Fbh}46rc}A$?$6=enwExERE04P7XCsM#lgPwMTxS+5G$9z
z$T8_tw_>VIdB31{^<T__v6XbMG@Ze_bp3ukp4vmFJ`k7UVB-(O-8d9vKe9Z_r^)(?
z6AYr_ElQPlq%<{qb1J*ni@i=ZF}PDix5|4S$;8kp3cV^;CcwVos%ugfLzQH#IC6-=
z^<{fyRPXssgM)eRwLdjoZ_Pme5aEdEM87fOsgeKL5DQGx`gVx>3H;P{i17rh<$Hua
z2_Ak_tV)8N9~Zll;4N%jI;(u4C2u;Ew#U@cp5>HvTJ$Hu#k)i_39Hv{lfJbp@=|q*
n53Dm#gDNSZD&;AqzZe%fDyx0YQHVK5b!{&GD|X|9?)A@q(^v7>

diff --git a/src/onyxsymres.c b/src/onyxsymres.c
index 801da72e..3fbf0ff9 100644
--- a/src/onyxsymres.c
+++ b/src/onyxsymres.c
@@ -3,6 +3,7 @@
 #include "onyxparser.h"
 #include "onyxutils.h"
 
+
 AstBasicType basic_type_void   = { { Ast_Kind_Basic_Type, 0, NULL, "void"   }, &basic_types[Basic_Kind_Void]  };
 AstBasicType basic_type_bool   = { { Ast_Kind_Basic_Type, 0, NULL, "bool"   }, &basic_types[Basic_Kind_Bool]  };
 AstBasicType basic_type_i8     = { { Ast_Kind_Basic_Type, 0, NULL, "i8"     }, &basic_types[Basic_Kind_I8]    };
@@ -371,7 +372,7 @@ static void symres_use_package(AstUsePackage* package) {
         pac_node->package = p;
         pac_node->token = package->alias;
 
-        symbol_introduce(semstate.curr_package->include_scope, package->alias, (AstNode *) pac_node);
+        symbol_introduce(semstate.curr_package->scope, package->alias, (AstNode *) pac_node);
     }
 
     if (package->only != NULL) {
@@ -384,7 +385,7 @@ static void symres_use_package(AstUsePackage* package) {
                     "not found in package");
                 return;
             }
-            symbol_introduce(semstate.curr_package->include_scope, *tkn, thing);
+            symbol_introduce(semstate.curr_package->scope, *tkn, thing);
         }
     }
 
-- 
2.25.1