From ebd7135a6c9b4d3db994a28275052f8f849d104b Mon Sep 17 00:00:00 2001 From: Brendan Hansen Date: Wed, 23 Jun 2021 13:19:33 -0500 Subject: [PATCH] moved type_info package to 'builtin' instead of 'core' --- bin/onyx | Bin 409120 -> 409120 bytes core/std.onyx | 2 +- .../helper.onyx} | 4 ++-- core/{ => type_info}/type_info.onyx | 2 +- modules/ui/components/slider.onyx | 4 +--- src/onyx.c | 2 +- src/onyxbuiltins.c | 2 +- 7 files changed, 7 insertions(+), 9 deletions(-) rename core/{type_info_helper.onyx => type_info/helper.onyx} (99%) rename core/{ => type_info}/type_info.onyx (99%) diff --git a/bin/onyx b/bin/onyx index c55c29c4ae9604960fcb50c789c9836d98c56294..502d0108bfb4e56366ff68113bff3d80b0e9751f 100755 GIT binary patch delta 9104 zcmZ9Sd3;k<8isS4hNXz4KuN=1Ahu|s2~uo<7CJ6vEh#974oldpNK<4-rvwn_KxykY z!=-N1B7!VpYSkd3H0(PmFaq)$rKls|)}kZIFm}G1`yOX<{Ns@4d%kn;J?A#)d27X; z_=-F6{x#;d8)(aS85=j3+$g-dGg_nrA7{iW(x%#Sv4iA~Wa{huN4Tf%=f3y&sK zQ`Fr`y(J~Y*zD3yR_rLsW!naGy^6JyFUBT@R+qqlYf>SV7I(q=@O1&f_i0<1vTIdCa3@Z6?{hHO2zc_CzjVK4rB{5nd{2 zYZFVUsBOycowJlqAJv9CMVw8nCVSlfIyWkv#pH?8uUW>OMBDza^Qh8UP7QI{;x$Td zmo0Ww``YDOM9b=i4!4@xufAtIZ~cMD=lz~U51aiqto2}|Z9*=#t=~81Iu+Z6JZzI; z-HPo?Wo!q+dKH^ZLAGw#QpJv<2Dam1{feDL2@acmCTvKt`IO6c5p2C;edJ?X1ZzDM zx!y9WV*3iLQ?YMQ9ox;YZpH4T*n4dDcVWGX-Ah?)55krz_7oMc{RGyp*w3hv?bom& z#Wqka+keB>E4C?#M4R0jFy5f`aO8U9$;GxStW&YQ$ip@j)~(n~Dq}kY)~ndj6l6OQ zwp6h*sex@itY5JUDIv*bUkMvhYzgJEeHpf1v0KT;lSV>w~RV>^kzX)nKj1BGs0J+s$(03bu0D+#U}H25Z0^M zI?7`EEo`Y`Z&3l;s6EC``W4%fD%r-vh7{YKYS|{k)+@FjiC(m5NZw&P%( zik(6pw$H%26}yPa*sg%}Dt0{u*=n$*imjvuw%cL-imj%E-ZuMQ*pOlmQ7+rlu=R?) zNItf8u+|fi>%Bo$Y=4AxD)tW5v9)}NpJ&D1O|dC9dwW=~V)^^a_CDBB#rCHHwhzJj z6`MnqY$w2m6g!)0*)D;tS8NFhC;vMI)_O8>y}QW8b`Pvmv4_dSHU#Td>=i0wTMz41 z>}?9NjoEALRjFdzQv=(3VEu~iLkTXMJrg#h*kP2*b{uTIVm;(z`!uZeROEV>P!-!E zSf^q&s$;to)~(ne#rCn;FTr{hdy}%*#(aeJDz-Znu_)0%yBXH4*j*Hx zYP0W#^(uBhWwAXCTdLSksetW2Vf~7|NtJBxz=jmtglgHg-e>Gay<$6)=x4Jh!CFI+ z>+M4>wgX|EihYDUY~8SK#Xd=8Y^TF|6`M~%wu@m)6}y5O*cQY36{}Ig12%glY)G*? zD3|T~u=R?qAs^f0u-4kh^`56Hwx7W|6?={9*xrP7D>jB=(`@!`I9GWUn?_k_3+(~e zHD@F5dys0=Y~n0kPs?pCT?(?0^(; zow5c@;!|BEf6k#=9&eEtsGs~?JXVm0M-P?pIGln!PM`)J$5TRveuB)+NFjGdGg_08 z#Ivh1w(>YWGn+!0&FIa{q!$M@ql=kI+%5*`Q(Zg`Cl8N&NggXG$m4Ws7?jPoO&_d3 zLLQHKRLzHt`jtl?^~_4)rHtpXn2LBL`hdss>g!n_wG-!Q>*H(1$m;vY4~^zC z-}4iGHh0-QDB9$zab3PP`G>~FA;rBeO}3au6!&`PQT-1`CB5kJi~H!oDLutVdS=S1 z*@B? zslrJUr?nHEtLIM}CdB7dGd(rYH6VP0D>u0Ln_u*$q;Brdk5u&ewSnI>Hoj0ZFOf?- zsN;-WF@xsJ=p-Jabu;#gbu@J5Ht{|EIJ2Ahg4)fRmspTyOxtrUJS~l{B0$5gCW&d)&t6^D+uU}$St}Ffc7eNM#cx9VC(xpeSQTSl@TysR?qXDjz}uZf zrwox1IQ4|sG9dkAj9GsfbASG=aqWC7Z|LgL;ev+?Obc6>O<6^Uxx>wc>m9>8tnd41 zZRZBjO*|hsvq6X$kshe65W_c#V}VW&MxC*Weu3}CM6FvX)(4hcj4DZt`fZO^D$Mrx zdYGRQVsW5EnA=*!w7}*j=6}SARe|Ll%`=aP&Vd_Wn15|1dIY}w)?88@$g7BcO9Z-Z zihi|C(<$@wX3xu;69~Q+-M2+_;w z#tuI;uy~7Qb(F}_#5Rjfb8fRViyeH?_|hXPGL6+-?Cj(5cS6mDNIgOG=z2H~#)B2@ z(aLmP0bTP+Ad*qc-3&__kmf9mRp)fNuwu;gJoz z6Fy#NzQ0N4M|L#qMMHbAOprQ&Pr-Kt%M7U#_%rw}V3{Iy1vkJaFzfd>$snm48k!;w z=?s=pQg?7Xd=Ib;lN{h)@b`daoRkF4gzt&_n`EMNFB(Rp;Xbg;loG)+;gi8KRq6#^ z2;UnlbEOn;3B1!-zsV${B^MgDqM;91hD-N@_rdoC%Xldjd;z{6SO!cFfN#U6h4-I} zGGj_dL$}?=7py;6rc49CBj5*uWzLiVo(rD|mPykf@J9H;!6?YEDGU5D8vX#5anpm~ zFX0~o%fRVjum!QnBVZXhWrI5zzR)xT1(`Yx1*hTy!@x3k8V()_KLRY1r;*^v@Ht?a zJ&gh{2z%atHwrR-$_1~(1xABq05t}@3I0*AjG!I^?}i@>mLb$Q@Cn`P@BeWWWDYeR zT!#xh0hUSBli*wMe+0`cY67?=GLwm5nMO?lcW1BP-!vHo8Ay4+{cwRPU>QkG1&@HA z29}}Jbnq1T8DJSp%>*yn6CJ+4X%-4HnaTsN#|54O%WUdta3%a~uuP|(0awG%0n27(z%u80+gQKJ)D;bW zG{~r{3Y-i74p@d=)!^mu?}BCA^&WU5{QF=Tcm=}y&&6G6*o_96d3^xh55EU2Q?C!f zpTh42%iQZD@J;xS!7}+O+=oIFL^L&E8GZ%9o#FR`W&Cvj+z0+3SO#E+z>mNm1|tG1 zG#x?VNi-Y<%M|PwI3NBvSmt0Sz$@TSf@KnR3ar7O1{+xz@BbMTcAy~ymT_1uxCZ_# zSO#L}z~|x5gJmT4ckng%Pr%_&EScc~3NbjjT?ETq>=HOlD+pRHm^lz5&%>$Ovi+83 z=7WG59nKoC;eh3FGamz~Dk@I%9)c80-ukb%#p#vC2^ z0L#!$YdBy@H1jFfn4_D^a?T-!>vGN^%Pe!AY|~9n0GB?@z=vw%(mG5>8~+kG$;_v5 z=6i$^T+n)4`sia*Mqy!^?WBfF1UjshH7#WBkw zZPsy1n&v)ki8qf8_c*lDez6aKO5Wa(A+v0FM^*~2jdkvG>+Zn a%X4Uh&oCITl~2UBFc1+WwblJc%o+A@Zg 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 diff --git a/core/std.onyx b/core/std.onyx index e36f2391..0d12896c 100644 --- a/core/std.onyx +++ b/core/std.onyx @@ -41,7 +41,7 @@ package core #load "./wasi/clock" #load "./io/file" - #load "./type_info_helper" + #load "./type_info/helper" } #if runtime.Runtime == runtime.Runtime_Js { diff --git a/core/type_info_helper.onyx b/core/type_info/helper.onyx similarity index 99% rename from core/type_info_helper.onyx rename to core/type_info/helper.onyx index 1674e620..44c76a30 100644 --- a/core/type_info_helper.onyx +++ b/core/type_info/helper.onyx @@ -1,4 +1,4 @@ -package core.type_info +package builtin.type_info #private_file io :: package core.io @@ -109,4 +109,4 @@ write_type_name :: (writer: ^io.Writer, t: type_expr) { write_type_name(writer, f.return_type); } } -} \ No newline at end of file +} diff --git a/core/type_info.onyx b/core/type_info/type_info.onyx similarity index 99% rename from core/type_info.onyx rename to core/type_info/type_info.onyx index 3e323e89..13b8c0c4 100644 --- a/core/type_info.onyx +++ b/core/type_info/type_info.onyx @@ -1,7 +1,7 @@ // A lot of these names have been copied from JAI's introspection system. This is just because // I don't want to mentally bike-shed about the names; I just want to get something working. -package core.type_info +package builtin.type_info type_table : [] ^Type_Info; diff --git a/modules/ui/components/slider.onyx b/modules/ui/components/slider.onyx index 6fbfe9a4..7e48b943 100644 --- a/modules/ui/components/slider.onyx +++ b/modules/ui/components/slider.onyx @@ -17,7 +17,7 @@ Slider_Theme :: struct { default_slider_theme := Slider_Theme.{}; -slider :: (use r: Rectangle, value: ^$T, min_value: T, max_value: T, text: str, theme := ^default_slider_theme, site := #callsite, increment := 0) -> bool { +slider :: (use r: Rectangle, value: ^$T, min_value: T, max_value: T, theme := ^default_slider_theme, site := #callsite, increment := 0) -> bool { result := false; hash := get_site_hash(site, increment); @@ -30,8 +30,6 @@ slider :: (use r: Rectangle, value: ^$T, min_value: T, max_value: T, text: str, result = true; // Animate this? - // adjust_slider_value(value, mouse_state.x - x0, width, min_value, max_value); - x := mouse_state.x - x0; if T == i32 || T == i64 || T == u32 || T == u64 { diff --git a/src/onyx.c b/src/onyx.c index c25bb89f..e5aea9c6 100644 --- a/src/onyx.c +++ b/src/onyx.c @@ -207,7 +207,7 @@ static void context_init(CompileOptions* opts) { .state = Entity_State_Parse_Builtin, .type = Entity_Type_Load_File, .package = NULL, - .include = create_load(context.ast_alloc, "core/type_info"), + .include = create_load(context.ast_alloc, "core/type_info/type_info"), })); add_entities_for_node(NULL, (AstNode *) &builtin_stack_top, context.global_scope, NULL); diff --git a/src/onyxbuiltins.c b/src/onyxbuiltins.c index d3282244..85bdd5d7 100644 --- a/src/onyxbuiltins.c +++ b/src/onyxbuiltins.c @@ -391,7 +391,7 @@ void initialize_builtins(bh_allocator a) { return; } - p = package_lookup("core.type_info"); + p = package_lookup("builtin.type_info"); if (p != NULL) { type_table_node = (AstTyped *) symbol_raw_resolve(p->scope, "type_table"); } -- 2.25.1