From 6b5edd67af9eac6749e66ce4bfc7b9223040d69a Mon Sep 17 00:00:00 2001
From: fennecdjay <astor.jeremie@wanadoo.fr>
Date: Tue, 9 Jul 2019 19:01:45 +0200
Subject: [PATCH] :art: More fixes and tests

---
 src/arg.gcda                    | Bin 992 -> 992 bytes
 src/arg.gcno                    | Bin 9152 -> 9152 bytes
 src/compile.gcda                | Bin 696 -> 696 bytes
 src/compile.gcno                | Bin 8192 -> 8192 bytes
 src/gwion.gcda                  | Bin 724 -> 724 bytes
 src/gwion.gcno                  | Bin 8744 -> 8744 bytes
 src/gwiondata.gcda              | Bin 192 -> 192 bytes
 src/gwiondata.gcno              | Bin 1876 -> 1876 bytes
 src/lib/func.c                  |  20 +++++++--------
 src/main.gcda                   | Bin 160 -> 160 bytes
 src/main.gcno                   | Bin 1348 -> 1348 bytes
 src/parse/check.c               |  24 +++++-------------
 src/parse/scan1.c               |   4 +--
 src/parse/scan2.c               |   3 +--
 src/plug.gcda                   | Bin 800 -> 792 bytes
 src/plug.gcno                   | Bin 11056 -> 10944 bytes
 src/soundinfo.gcda              | Bin 120 -> 120 bytes
 src/soundinfo.gcno              | Bin 848 -> 848 bytes
 tests/import/driver.so          | Bin 23496 -> 0 bytes
 tests/import/test.log           |  42 ++++++++++++++++++++++++++++++++
 tests/tree/array_cast.gw        |   2 ++
 tests/tree/did_you_mean_type.gw |   4 +++
 tests/tree/push_func.gw         |   1 +
 tests/tree/reddit.gw            |   8 ++++++
 tests/tree/template_fptr.gw     |  11 +++++++++
 25 files changed, 86 insertions(+), 33 deletions(-)
 delete mode 100755 tests/import/driver.so
 create mode 100644 tests/tree/array_cast.gw
 create mode 100644 tests/tree/did_you_mean_type.gw
 create mode 100644 tests/tree/push_func.gw
 create mode 100644 tests/tree/reddit.gw
 create mode 100644 tests/tree/template_fptr.gw

diff --git a/src/arg.gcda b/src/arg.gcda
index 3dcc1be1753c780ac1b0ff78b7b65572a2dfe459..bf449aee3bb98e1109a43e981caf545abf9770ed 100644
GIT binary patch
literal 992
zcmYdHNlw=?v~*1An|GaofngyNkPrnDGf#*x0-21=KtiqmQ1Cu^l}S6DKQ{uEFmgcE
z04cCqY&1{|thc-7g=<i8+xJ^@wtNQZWg|k5`*${ZRx_>AD^Gsdf%I?z^@xES1_U5S
zfdI&jAOPdTXpj)d&EE?P9Ngw>L>M0FECQJ!1{8ytflDvU3>Xcyf&ra|$-`)vo$h~2
zgx62n6*T3_bY761d_W0wy~OfiW`5Xd=OX+f!^g;ON)O0PHza?!umCwg05cQj9zrxk
z7iQSWK_%p23ZOK)c`#{EID-I;hPeYGifKN~99;6miVHz4f|&=4SD=1y+?!_Z(bzXP
z{Nldn)5Aew#sidq#W}Gw%&fa=??ud=F22xG2^NOMDY0gttAm+&Z<|~gTlI^}q~wX7
eg6z7SWX}Jq98#4*?m*6iuyBBdKg?dBeGCA?5=~tI

literal 992
zcmYdHNlw=?v~-+%$?ggR1H(clAfYe7z@Xmg$PQ#OG6M;<{zJk0<W(l^bpG53RKmys
zRRg5JYC*IvP!BQ<WP|l~*Sv5IDsKCJYtEL>AiZor36S|90Ha}gfkI$C?%&zuS<SRc
zuRQr-2hzg@lrV?t0oe@#Fg-9nj0Q@9&G=qe;NUi2Bf{`VXA#H@F`xv@3|x9)X258u
zl?>=KOddwV>~#NIBD{XmuAnJbrt^aA<O52e>m`;CGxNhvI~U;>89qjKQ+hyVx&b9j
zp@!JW0XaY*451h}p)|~0=zN$sR2c(|4^y|85hAk&N~5cTsfUS6Kp8L^<~Nu;Og)T-
z*#nb@@nJNv;tTj8Dp{Z!VBrDeg5%yabC1Tpx#1W0J)a&93Ns#{gbLJg#L_Uc?y9{P
zF?YK7LQ5qW7|f73g{50kX_%S!w#kLDRlm55FHgYChUw`k$gayt=KR0PAypaV4p5lF
P`~nMKSop)lfl3$v>1b6R

diff --git a/src/arg.gcno b/src/arg.gcno
index 4b9a987eaf14c13cdb1d160100447e72f66e3b4f..38f07084fca7019cdcc9d8b42711f16f1dc25302 100644
GIT binary patch
delta 21
ccmX@$e!!h4KQB35%h1v>rElK#jXYbF0bOJWk^lez

delta 21
dcmX@$e!!h4KQB35%h1ws?j^e`8+o=U0{~vR2&@1A

diff --git a/src/compile.gcda b/src/compile.gcda
index d73115463110ad3aed16bf365cc7e9d9d73388bd..6b4cdd62b09f824fbb385e7b9ea57c664dd612ed 100644
GIT binary patch
literal 696
zcmYdHNlw=?v~*nDKkqsN1H(clAR!7QW}XmX1Tq<!fyDRbA13)bZ06W)+I;}1gpma(
z<^m#+Xdn};HdJl8*^bR@6W71q)&^25fusgq&l`|sKo9}42?)3$6oW66{~an1<HKll
zbAZ~wc4y7d3D@|t^`+~+dPR`k0ze6v+80nWW1wcjXdS4X22gQy8fLcMfh>OJAM1}w
znm-l>nazb{Ho6@!yI?fTj4UVjP}6hViV~kCtI*vCbp`{>T`;{cK1?194feZY=4F{#
z4|8TsJE9f<GMfje5T+O1ESMif(EJS40yb;f!u^?dj?I5nw8=LV=2vL&F+7JdV0?5M
rW=6w3Ezj*HOn2I1Up)nxAq13wg%ga1TF>AFO-nF7E*ho}XcPkgmcvcT

literal 696
zcmYdHNlw=?v~;|C$?ggR1H(clAfYe7z@Xmg$PQ#OG6RY4%|A@?ci7Ca+qC-tPzfUo
zP|R8mNC1H;lm;@vYD3kgo9)=lHgWyyZEYa65<m%<T68*56l4Me!wn7y?F*q8+M)b)
zP<a?1M#Joc(LilryR&BKgll}+`qFh@y&}kNpf})lFXM$6J{2Sg1TcCLBZU8n4?=%L
zqk*Dev-J*S@iYHee^k=^u`tMNE}#Uue_(c?(=ao#oZLfA&v7eCe3q<2cOS%dgu7s7
zz}yLw$3lbMr<i$JX4b=;S<{ZF1%S-v0V?c=`W0ptjQ<wuM-P68X)r#J2R3Wk!u^?d
zj?I5nw8=LV=2uRr#dD$I2;-yEFf$tNX?bopVY<^6`|2sk3?ZNddUy#!&D4UXAs8PQ
J4bu<O1^|{rRD%Ej

diff --git a/src/compile.gcno b/src/compile.gcno
index 411f835521e342beb33934f7affbac0107de2acd..d69f6e16d049a3a6ee5d49c30f94952f5d111535 100644
GIT binary patch
delta 26
hcmZp0XmH@o&r43%GPHDD+&}L+*W^M*jg6+K<pF<N3Ag|N

delta 26
hcmZp0XmH@o&r43%GPHEOd&%w!*W^M*jg6+K<pF^+3DN)n

diff --git a/src/gwion.gcda b/src/gwion.gcda
index d0363d621ff30e26039326b7591b3bae83827d39..1a44e2f8051c62d0fbb2ef87c6445a97ca50c154 100644
GIT binary patch
literal 724
zcmYdHNlw=?v~)b)H}5(F1H(clAR!7QW}XmX1Tq<!fyCE}sao0D2mYA64&wtVVUz%h
z{RCnV5P?t(;!s)(N()2j$7uX-P(C^hGv^Uh9!P=hcF=HF4~hE66u7&68OUx0po9p>
zk$7mRG=mV70pk<WN31;1YOvcx>V3;QQWqVx+qC-t$Zae@2~gO90L&~P6Rb8PUf161
zyhD=Dot8@=wMsw<nA(A+VQ&0nEKnP9THAQ1^XEp88##ayu&~2L!}LnBG1<9?TS+@9
z{4WOSWkd3x3n*Za_&_E&OvJ3#)G*)FTlnYj?I$2T0ze5+dP4@BP!23EVPOSR1LMPJ
GkT?LvK|DtQ

literal 724
zcmYdHNlw=?v~--mB;X1I1H(clAi>Yaz~Cg6#0F$CG6RXP6;rjcvk&|+c^w9nS;!~>
z6#K&pB!EDe5kgOgPz)2H{9-7d6=Vt!!1xtVJ~|CEClzWgPz%^@2Mu@ikf?u5fxFw6
zf$UZQN-zLj0R}i|E~xZ3UI+umC!`OT{C}u9FdAqo*li;9zU3XMiw@dt+I;}zHWr`+
zJGz^oYBS<>?Y+)BB>CKFxdc+H1XK$OXAqz@%?q^$M#J0)qk&EU`{$FfKyAcnZR4HJ
zpBq7L<N!**!VVV=(<{lwWal1kCGDi}9~jjO89~tuv(HBg$N>U$`^2o))G*)FTlnYj
h?I$2T0zfr&V3j}zL1{xMJpmdAu&{y(V}u<@901lVK8gSU

diff --git a/src/gwion.gcno b/src/gwion.gcno
index 6c8e11e1b66f55d2bb4a97b733c50f5c39f6e6de..db0a66d4ed87b7ea57a2b8bb23b7fb77e8e1380b 100644
GIT binary patch
delta 25
hcmZ4CvciQoKQB35%h1yCc;CG1ToV&DHky7`1OS0o3Q7O~

delta 25
hcmZ4CvciQoKQB35%h1ws{*r(zToV&DHky7`1OR<P3FiO+

diff --git a/src/gwiondata.gcda b/src/gwiondata.gcda
index 8a97751765194fc59d80ca21f0ac4c42d5dbc03b..74199b69bc0c1cab507e6dbb248905b7b07ff7dc 100644
GIT binary patch
literal 192
zcmYdHNlw=?v~-m1n|GaofngyNkPrnDGf#*x0-21=K;q#YUX$>cQm&4U%9lVTj9fr5
n5s*S6XrL0X8Iyj*^5*aRBG{fcHx*=t08j#C4+xM;gY*Ib?0^*j

literal 192
zcmYdHNlw=?v~-+$$?ggR1H(clAfYe7z@Xmg$PQ#OG6RW+cX&<0V@kO?Ix1fRl`wJv
o#bkhLK!6YpR01|*(vMi){C!^p+w<n8g3JJE*M*uvE)B9D09RWUp#T5?

diff --git a/src/gwiondata.gcno b/src/gwiondata.gcno
index 5f90c6e373d2a3315ffbc57c9c4e74abd14f808a..83192df2f47fc818f887bcdf783e3cac80749e74 100644
GIT binary patch
delta 26
icmcb@cZH8PKQB35%h1wMwr}2buE`gfG&Y*bvjYHtzX=im

delta 26
icmcb@cZH8PKQB35%h1ws>Lt4?T$3*{X>2r=X9oa<$q8!!

diff --git a/src/lib/func.c b/src/lib/func.c
index 4d8cc62b..657d336d 100644
--- a/src/lib/func.c
+++ b/src/lib/func.c
@@ -67,20 +67,20 @@ struct FptrInfo {
 ANN static m_bool fptr_tmpl_push(const Env env, struct FptrInfo *info) {
   if(!info->rhs->def->base->tmpl)
     return GW_OK;
-// some kind of template_match ?
   ID_List t0 = info->lhs->def->base->tmpl->list,
           t1 = info->rhs->def->base->tmpl->list;
-nspc_push_type(env->gwion->mp, env->curr);
+  nspc_push_type(env->gwion->mp, env->curr);
   while(t0) {
-//    CHECK_OB(t1)
-nspc_add_type(env->curr, t0->xid, t_undefined);//
-nspc_add_type(env->curr, t1->xid, t_undefined);//
+   if(!t1) {
+     nspc_pop_type(env->gwion->mp, env->curr);
+     return GW_ERROR;
+   }
+   nspc_add_type(env->curr, t0->xid, t_undefined);
+   nspc_add_type(env->curr, t1->xid, t_undefined);
     t0 = t0->next;
     t1 = t1->next;
   }
-//  CHECK_BB(template_push_types(env, info->lhs->def->base->tmpl))
-//  return template_push_types(env, info->rhs->def->base->tmpl);
-return GW_OK;//
+  return GW_OK;
 }
 
 
@@ -146,10 +146,8 @@ ANN static Type fptr_type(const Env env, struct FptrInfo *info) {
       if(fptr_rettype(env, info) > 0 &&
            fptr_arity(info) && fptr_args(env, base) > 0)
       type = info->lhs->value_ref->type;
-      if(info->rhs->def->base->tmpl) {
-//        nspc_pop_type(env->gwion->mp, env->curr);
+      if(info->rhs->def->base->tmpl)
         nspc_pop_type(env->gwion->mp, env->curr);
-      }
     }
   }
   return type;
diff --git a/src/main.gcda b/src/main.gcda
index 1bd518d875d6a85a3783cde2156e2b4266bc65cf..5fce5e273cbc5a4c320d35f4b7d7335ac40cc5aa 100644
GIT binary patch
literal 160
zcmYdHNlw=?v~=uTJMTIJ1H(clAR!7QW}XmX1Tq<!fyC>g0yaI5MVVKQ-<Jd`VHAL>
p0a9SK#LyxjgMk1>1DRm6Z+`X(Jk{=QvZL8x3CL`aGLXeE001on6@UN$

literal 160
zcmYdHNlw=?v~-+(%kByT1H(clAfYe7z@Xmg$PQ#OG6RX%MFnhn9*Z)s9KSCKRKf_9
v2CD&57_<sV5(v;~8K}54lm;pRn|<@MPvEI`cat5>21`I@gX|Xs82|+UIeiuo

diff --git a/src/main.gcno b/src/main.gcno
index 6293d5742f6d765c65ca83ec7a7aea76df4d6def..d737dff5e3aeae9fc2fd71b8cb1a081c96243d42 100644
GIT binary patch
delta 25
hcmX@Yb%cvIKQB35%h1xXbM3tAToV&DHk$IY0swfl2=4#@

delta 25
hcmX@Yb%cvIKQB35%h1ws_AR?BToV&DHk$IY0swcQ2+IHf

diff --git a/src/parse/check.c b/src/parse/check.c
index a3e565eb..f20143ab 100644
--- a/src/parse/check.c
+++ b/src/parse/check.c
@@ -367,9 +367,7 @@ ANN2(1,2) static Func find_func_match_actual(const Env env, Func func, const Exp
         CHECK_OO(func->next);
         return find_func_match_actual(env, func->next, args, implicit, specific);
       }
-      if(e1->type == t_undefined ||
-(GET_FLAG(func, template) && isa(actual_type(func->value_ref->type), t_fptr) > 0)
-) {
+      if(e1->type == t_undefined || (GET_FLAG(func, template) && is_fptr(func->value_ref->type))) {
         if(func->value_ref->owner_class)
           CHECK_BO(template_push_types(env, func->value_ref->owner_class->e->def->base.tmpl))
         e1->type = known_type(env, e1->td);
@@ -381,7 +379,6 @@ ANN2(1,2) static Func find_func_match_actual(const Env env, Func func, const Exp
       e = e->next;
       e1 = e1->next;
     }
-printf("end %p %p\n", e1, func);
     if(!e1)
       return func;
   } while((func = func->next));
@@ -469,11 +466,10 @@ ANN static Func _find_template_match(const Env env, const Value v, const Exp_Cal
       m_func = find_func_match(env, fbase->func, exp->args);
       nspc_pop_type(env->gwion->mp, env->curr);
       if(!value && m_func) {
-printf("m_func %p\n", m_func);
-if(!m_func->def->base->ret_type)
-CHECK_BO(traverse_func_def(env, m_func->def))
+        if(!m_func->def->base->ret_type)
+          CHECK_BO(traverse_func_def(env, m_func->def))
         map_set(&v->owner->info->type->map, (vtype)sym, (vtype)actual_type(m_func->value_ref->type));
-}
+      }
     }
     free_stmt(env->gwion->mp, stmt);
   }
@@ -587,15 +583,11 @@ ANN static Type check_exp_call_template(const Env env, const Exp_Call *exp) {
   const Exp call = exp->func;
   const Exp args = exp->args;
   m_uint args_number = 0;
-puts("here ==");
   DECL_OO(const Value, value, = nspc_lookup_value1(call->type->e->owner, insert_symbol(call->type->name)))
-puts("after here ==");
   const m_uint type_number = get_type_number(value->d.func_ref->def->base->tmpl->list);
-printf("%s func\n", __func__) ;
   Type_List tl[type_number];
   ID_List list = value->d.func_ref->def->base->tmpl->list;
   while(list) {
-printf("%s func\n", __func__) ;
     Arg_List arg = value->d.func_ref->def->base->args;
     Exp template_arg = args;
     while(arg && template_arg) {
@@ -620,7 +612,7 @@ printf("%s func\n", __func__) ;
   DECL_OO(const Func,func, = get_template_func(env, exp, value))
   if(!func->def->base->ret_type) // template fptr
     CHECK_BO(traverse_func_def(env, func->def))
-    return func->def->base->ret_type;
+  return func->def->base->ret_type;
 }
 
 ANN static m_bool check_exp_call1_check(const Env env, const Exp exp) {
@@ -715,11 +707,7 @@ ANN static Type check_exp_call(const Env env, Exp_Call* exp) {
     CHECK_OO((exp->m_func = ret))
     return ret->def->base->ret_type;
   }
-
-  const Type t = check_exp_call1(env, exp);
-printf("here exp_call %p\n", t);
-return t;
-//  return check_exp_call1(env, exp);
+  return check_exp_call1(env, exp);
 }
 
 ANN static Type check_exp_unary(const Env env, const Exp_Unary* unary) {
diff --git a/src/parse/scan1.c b/src/parse/scan1.c
index 2856ea9e..ded15f44 100644
--- a/src/parse/scan1.c
+++ b/src/parse/scan1.c
@@ -245,8 +245,8 @@ ANN static m_bool scan1_args(const Env env, Arg_List list) {
 ANN m_bool scan1_stmt_fptr(const Env env, const Stmt_Fptr stmt) {
   if(!stmt->type)
     CHECK_BB(scan0_stmt_fptr(env, stmt))
-  if(stmt->base->tmpl)//
-    return GW_OK;//
+  if(stmt->base->tmpl)
+    return GW_OK;
   CHECK_OB((stmt->base->ret_type = known_type(env, stmt->base->td)))
   return stmt->base->args ? scan1_args(env, stmt->base->args) : GW_OK;
 }
diff --git a/src/parse/scan2.c b/src/parse/scan2.c
index 2d0af075..5b5fa989 100644
--- a/src/parse/scan2.c
+++ b/src/parse/scan2.c
@@ -93,8 +93,7 @@ ANN m_bool scan2_stmt_fptr(const Env env, const Stmt_Fptr ptr) {
   ptr->type->e->d.func = ptr->base->func;
   def->base->tmpl = ptr->base->tmpl;
   SET_FLAG(ptr->value, func | ae_flag_checked);
-if(!ptr->base->tmpl)//
-  if(ptr->base->args)
+  if(!ptr->base->tmpl && ptr->base->args)
     CHECK_BB(scan2_args(env, def))
   if(env->class_def) {
     if(GET_FLAG(ptr->base->td, global)) {
diff --git a/src/plug.gcda b/src/plug.gcda
index aa78ce69f691d5983376f3876f14caf6576d78a8..8b664567fd60c97db51de93ac11bfae73e6e2bfc 100644
GIT binary patch
literal 792
zcmYdHNlw=?v~+appLd;sfngyNkPrnDGf#*x0-21=K;q*P36rWRVf;VeuTTLhVHAL>
z0a6Sg^~3;}I*{2=05<#jk|Q$v3hrGB%sC7cUdYG=BoRtrN^#O)Gd{b#i)9mtb=#b4
z-U~8=52tdXB*11qymYiON~iBZ@W}&bL1u~pwTeI;hVDKXA11E^wFbtwVS@<3_~<lH
z7HsF-zlC;kId7v%41<os?1Y6EjJAiG1>?hLS*V@jP{$}k`7m)94O0)ZQ@~W$n?WjX
z9q-h}Eg(C!fD$mhFn@p&0tmqP5)du}D6T*N#)n$Xpa2#{#3M``7tIM(FA1e#d~_P-
t4j2to4h}af_HRD%YkLLkHtjwD@&gOh95f27c0%IekidoJ*9oX)008bIKOq1B

delta 185
zcmbQiwt&qvF(o-&%h1wMwZ8E>0|UcCCLjUAaZ*5nfq{`3NPJu(VN!L!_R7!qD^!3=
z7zHLy)SDQ<s|ZpD1z>g8mmHDVS8(r=WtizqkUE};4~-@UuuR;aJ8_D_<P;_eMz+bZ
zO!AXk7-fJw0WeQ}at@OO5OYla0TG>S!zcj46Xys_oT5E3fOWD7BS-;IKzQPQ*2zbh
FLIAfZGv5FJ

diff --git a/src/plug.gcno b/src/plug.gcno
index de8f8a67e3604c145b1c4cbe7f0ab07bdfd1b5bc..dc4198660920b242182bcccf24cca7a5d985d91b 100644
GIT binary patch
delta 318
zcmX|(F-rqc5QN{}y_}cayI{OPE?{xtQUoi52(f!Hc3KEgNgFI8NE9JIz<*#ag9s@E
zJ4?mZB0s@SEK>;Sw6${=iN(k6%+Bo7$?Q11yf__fG<Vv&H}~%a)SO1PUC}>ZkM->E
zs5Dhd5u;R_WEL?mrev~@EsTOP5;E0*?Y~HeT;4q<&uH|62;)jz6P06>>X1y)D~z-X
zjK(lY@kY8Szl=D{GA&yEN;+hgH}OI|$6fTCcv9M<40C@#6I{6wMpet(&^^bd)_7gB
z_|`raegkKY!7Q{$beZzpNRdPaEw@Ftc!;`mhrScxI%hHVR;5kmKh^UNuvoV=efjkE
F>%W7NK^_1A

delta 351
zcmX|)F-yZx5Xavo@3m=6Vrzv)C|ImQ5d@0}3JwV^IM_i+6-PzEMU;YqqupJ?Uq$F7
zh;zg*(6NKKir>K1Z{VF$had0mcmKOL+|Bm<^RuIq#pZgfNBs{MhgKt9t?1{Q_wRJO
zTN)^(h*2sgc_+~e>g1=NE9m4yT+h~)3~P`1i?zt+I?uR_W|V4?WE`e|N2)9oxRR;Z
z@l<+A$dw63W2RQeaz!`gwl9Vmr=^#FBpop0nYaLPm|(*SabPsEFrpOwVj0tR8yC(o
z0c4kPYIiZ5Ynxl%xWkKGCI=<6i7TgpedFQDkLdo_yXZM}WK$kS)*8DVlh6Z7)daO%
X5kp&(|DX6W9lTW|8oXZSw&s5Tk_$n9

diff --git a/src/soundinfo.gcda b/src/soundinfo.gcda
index 66d3f7d25d22fe63e535643e6e3fac0844c6e340..ade055bc0206238fcd62c146fc667641a8cc3d07 100644
GIT binary patch
delta 68
zcmb=ZkV#BQPS-NDbYz$??>Ykm!$Kw?AqpgBo)BT2C?mrO;)4LwL`P*2kOT<8Xb>9!
D;tC0~

delta 68
zcmb=ZkV#BQPS-NDbo_hC?g|3~!$Kw?p)bI|px)`oK2b)7lN-nf0q%*8$|4{M5P;Dj
FHUJGN3Y!1`

diff --git a/src/soundinfo.gcno b/src/soundinfo.gcno
index 6c38817e2d712e48980a868149884fe7ea917968..56f214484dc74f6f50db7695437bc3d606c2e353 100644
GIT binary patch
delta 26
icmcb>c7csIKQB35%h1x1VZyxYT$2kKH8z?`GXns6WC(Tu

delta 26
icmcb>c7csIKQB35%h1yC?<Kn{T$2kKH8z?`GXnsI7YR}T

diff --git a/tests/import/driver.so b/tests/import/driver.so
deleted file mode 100755
index f286bf3b834484d8128e955a4b8b1f622a3b3efa..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 23496
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

diff --git a/tests/import/test.log b/tests/import/test.log
index b584940e..8557b3a4 100644
--- a/tests/import/test.log
+++ b/tests/import/test.log
@@ -11398,3 +11398,45 @@ global_func.gw ==22565== Memcheck, a memory error detector
 ==4349== 
 ==4349== For counts of detected and suppressed errors, rerun with: -v
 ==4349== ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 0 from 0)
+/dev/null ==13821== Memcheck, a memory error detector
+==13821== Copyright (C) 2002-2017, and GNU GPL'd, by Julian Seward et al.
+==13821== Using Valgrind-3.14.0 and LibVEX; rerun with -h for copyright info
+==13821== Command: ./../../gwion -p. -d dummy /dev/null
+==13821== Parent PID: 13795
+==13821== 
+==13821== 
+==13821== HEAP SUMMARY:
+==13821==     in use at exit: 928 bytes in 10 blocks
+==13821==   total heap usage: 974 allocs, 964 frees, 7,596,796 bytes allocated
+==13821== 
+==13821== LEAK SUMMARY:
+==13821==    definitely lost: 928 bytes in 10 blocks
+==13821==    indirectly lost: 0 bytes in 0 blocks
+==13821==      possibly lost: 0 bytes in 0 blocks
+==13821==    still reachable: 0 bytes in 0 blocks
+==13821==         suppressed: 0 bytes in 0 blocks
+==13821== Rerun with --leak-check=full to see details of leaked memory
+==13821== 
+==13821== For counts of detected and suppressed errors, rerun with: -v
+==13821== ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 0 from 0)
+/dev/null ==14729== Memcheck, a memory error detector
+==14729== Copyright (C) 2002-2017, and GNU GPL'd, by Julian Seward et al.
+==14729== Using Valgrind-3.14.0 and LibVEX; rerun with -h for copyright info
+==14729== Command: ./../../gwion -p. -d dummy /dev/null
+==14729== Parent PID: 13795
+==14729== 
+==14729== 
+==14729== HEAP SUMMARY:
+==14729==     in use at exit: 576 bytes in 9 blocks
+==14729==   total heap usage: 956 allocs, 947 frees, 7,590,612 bytes allocated
+==14729== 
+==14729== LEAK SUMMARY:
+==14729==    definitely lost: 576 bytes in 9 blocks
+==14729==    indirectly lost: 0 bytes in 0 blocks
+==14729==      possibly lost: 0 bytes in 0 blocks
+==14729==    still reachable: 0 bytes in 0 blocks
+==14729==         suppressed: 0 bytes in 0 blocks
+==14729== Rerun with --leak-check=full to see details of leaked memory
+==14729== 
+==14729== For counts of detected and suppressed errors, rerun with: -v
+==14729== ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 0 from 0)
diff --git a/tests/tree/array_cast.gw b/tests/tree/array_cast.gw
new file mode 100644
index 00000000..1b7c437c
--- /dev/null
+++ b/tests/tree/array_cast.gw
@@ -0,0 +1,2 @@
+typedef int[2] _int;
+new _int $ _int;
diff --git a/tests/tree/did_you_mean_type.gw b/tests/tree/did_you_mean_type.gw
new file mode 100644
index 00000000..73b04597
--- /dev/null
+++ b/tests/tree/did_you_mean_type.gw
@@ -0,0 +1,4 @@
+class C {
+  <<<this.aa>>>;
+  int a;
+}
diff --git a/tests/tree/push_func.gw b/tests/tree/push_func.gw
new file mode 100644
index 00000000..2f7957f6
--- /dev/null
+++ b/tests/tree/push_func.gw
@@ -0,0 +1 @@
+me.exit;
diff --git a/tests/tree/reddit.gw b/tests/tree/reddit.gw
new file mode 100644
index 00000000..9b4fd259
--- /dev/null
+++ b/tests/tree/reddit.gw
@@ -0,0 +1,8 @@
+
+#! basic math printed out (note the space after '<<<' and before '>>>'
+<<<  1 + 2 >>>;
+
+#! define and operator
+operator $@+-*%~<>^&!= void (int i, int j) { <<< i, " ", j >>>; }
+
+1 $@+-*%~<>^&!= 2;
diff --git a/tests/tree/template_fptr.gw b/tests/tree/template_fptr.gw
new file mode 100644
index 00000000..3a130d9f
--- /dev/null
+++ b/tests/tree/template_fptr.gw
@@ -0,0 +1,11 @@
+typedef int ptr_t<~A~>(A);
+ptr_t ptr;
+<<<ptr>>>;
+
+fun int test<~A~>(A a) { <<< a >>>; }
+test @=> ptr;
+<<< ptr >>>;
+#!3;
+#!3 => test;
+ptr<~int~>(2);
+ptr<~float~>(2.3);
-- 
2.43.0