From: Jérémie Astor <fennecdjay@gmail.com>
Date: Tue, 26 Apr 2022 16:54:24 +0000 (+0200)
Subject: :bug: Fix whitespace in macro arg
X-Git-Tag: nightly~275^2~40
X-Git-Url: http://10.10.0.4:5575/?a=commitdiff_plain;h=e94bd1341ef0f1f43110b8634c7e89f668790d38;p=gwion.git

:bug: Fix whitespace in macro arg
---

diff --git a/ast b/ast
index 3a71f063..c516e9b6 160000
--- a/ast
+++ b/ast
@@ -1 +1 @@
-Subproject commit 3a71f0635750cb4db48046926d050582937cf75e
+Subproject commit c516e9b680287fc6b2849aff6a97a50394f99dc8
diff --git a/src/clean.c b/src/clean.c
index 2e04d5d5..aabacdf3 100644
--- a/src/clean.c
+++ b/src/clean.c
@@ -68,6 +68,13 @@ ANN static void clean_exp_binary(Clean *a, Exp_Binary *b) {
   clean_exp(a, b->rhs);
 }
 
+ANN static void clean_captures(Clean *a, Capture_List b) {
+  for(uint32_t i = 0; i < b->len; i++) {
+    const Capture *cap = mp_vector_at(b, Capture, i);
+    if(cap->v) value_remref(cap->v, a->gwion);
+  }
+}
+
 ANN static void clean_exp_unary(Clean *a, Exp_Unary *b) {
   switch (b->unary_type) {
   case unary_exp:
@@ -82,6 +89,7 @@ ANN static void clean_exp_unary(Clean *a, Exp_Unary *b) {
     clean_stmt(a, b->code);
     break;
   }
+  if(b->captures) clean_captures(a, b->captures);
 }
 
 ANN static void clean_exp_cast(Clean *a, Exp_Cast *b) {
@@ -275,13 +283,6 @@ ANN static void clean_func_base(Clean *a, Func_Base *b) {
   if (b->tmpl) clean_tmpl(a, b->tmpl);
 }
 
-ANN static void clean_captures(Clean *a, Capture_List b) {
-  for(uint32_t i = 0; i < b->len; i++) {
-    const Capture *cap = mp_vector_at(b, Capture, i);
-    if(cap->v) value_remref(cap->v, a->gwion);
-  }
-}
-
 ANN static void clean_func_def(Clean *a, Func_Def b) {
   clean_func_base(a, b->base);
   if(b->captures) clean_captures(a, b->captures);
diff --git a/src/parse/check.c b/src/parse/check.c
index 4318a512..7fec714a 100644
--- a/src/parse/check.c
+++ b/src/parse/check.c
@@ -358,6 +358,7 @@ ANN static Type prim_id_non_res(const Env env, const Symbol *data) {
       prim_self(data)->value = env->gwion->type[et_op]->info->value;
       return env->gwion->type[et_op];
     }
+puts(s_name(*data));
     const m_str hint = (!env->func || strcmp(env->func->name, "in spork")) ?
         NULL : "vapturelist?";
     gwerr_basic(_("Invalid variable"), _("not legit at this point."), hint,
@@ -716,43 +717,56 @@ ANN static Type check_exp_call_template(const Env env, Exp_Call *exp) {
 }
 
 ANN Type upvalue_type(const Env env, Capture *cap);
-ANN static Type check_lambda_call(const Env env, Exp_Call *const exp) {
-  const Func_Def fdef = exp->func->d.exp_lambda.def;
-  if (exp->args) {
-    Exp e = exp->args;
-    CHECK_OO(check_exp(env, exp->args));
-    do if(tflag(e->type, tflag_ref) && !safe_tflag(exp_self(e)->cast_to, tflag_ref))
-       exp_setvar(e, true);
-    while((e = e->next));
-  }
-  Exp _args = NULL, tmp;
-  if(fdef->captures) {
-    if(!fdef->base->args)
-      fdef->base->args = new_mp_vector(env->gwion->mp, sizeof(Arg), 0);
-    for(uint32_t i = 0; i < fdef->captures->len; i++) {
-      Capture *const cap = mp_vector_at(fdef->captures, Capture, i);
-      DECL_OO(const Type, t, = upvalue_type(env, cap)); // could leak
-      Arg arg = {
-        .td = type2td(env->gwion, t, exp->func->pos),
-        .var_decl = { .xid = cap->xid }
-      };
-      mp_vector_add(env->gwion->mp, &fdef->base->args, Arg, arg);
-      const Exp exp = new_prim_id(env->gwion->mp, cap->xid, cap->pos);
-      if(_args) tmp = tmp->next = exp;
-      else _args = tmp = exp;
+
+ANN static m_bool lambda_args_ref(const Env env, Exp_Call *const call) {
+  Exp e = call->args;
+  CHECK_OB(check_exp(env, e));
+  do if(tflag(e->type, tflag_ref) && !safe_tflag(exp_self(e)->cast_to, tflag_ref))
+     exp_setvar(e, true);
+  while((e = e->next));
+  return GW_OK;
+}
+
+ANN2(1) static m_bool lambda_append_args(const Env env, Exp_Call *const call, const Exp add) {
+  if(!add) return GW_ERROR;
+  if (call->args) {
+    Exp e = call->args;
+    while(e->next) e = e->next;
+    e->next = add;
+  } else call->args = add;
+  return traverse_exp(env, add);
+}
+
+ANN static Exp check_lambda_captures(const Env env, const Func_Def fdef) {
+  if(!fdef->base->args)
+    fdef->base->args = new_mp_vector(env->gwion->mp, sizeof(Arg), 0);
+  Exp args = NULL, tmp;
+  for(uint32_t i = 0; i < fdef->captures->len; i++) {
+    Capture *const cap = mp_vector_at(fdef->captures, Capture, i);
+    const Type t = upvalue_type(env, cap);
+    if(!t) {
+      if(args) free_exp(env->gwion->mp, args);
+      return NULL;
     }
-    free_mp_vector(env->gwion->mp, sizeof(Capture), fdef->captures);
-    fdef->captures = NULL;
-  }
-  if(_args) {
-    if (exp->args) {
-      puts("here");
-      Exp e = exp->args;
-      while(e->next) e = e->next;
-      e->next = _args;
-    } else exp->args = _args;
-    CHECK_OO(traverse_exp(env, _args));
+    Arg arg = {
+      .td = type2td(env->gwion, t, cap->pos),
+      .var_decl = { .xid = cap->xid }
+    };
+    mp_vector_add(env->gwion->mp, &fdef->base->args, Arg, arg);
+    const Exp exp = new_prim_id(env->gwion->mp, cap->xid, cap->pos);
+    if(args) tmp = tmp->next = exp;
+    else args = tmp = exp;
   }
+  free_mp_vector(env->gwion->mp, sizeof(Capture), fdef->captures);
+  fdef->captures = NULL;
+  return args;
+}
+
+ANN static Type check_lambda_call(const Env env, Exp_Call *const exp) {
+  const Func_Def fdef = exp->func->d.exp_lambda.def;
+  if (exp->args) CHECK_BO(lambda_args_ref(env, exp));
+  const Exp _args = !fdef->captures ? NULL : check_lambda_captures(env, fdef);
+  if(fdef->captures) CHECK_BO(lambda_append_args(env, exp, _args));
   Exp_Lambda *l   = &exp->func->d.exp_lambda;
   Arg_List    args = l->def->base->args;
   Exp         e   = exp->args;
diff --git a/src/parse/scan1.c b/src/parse/scan1.c
index 28a31518..aadf3f41 100644
--- a/src/parse/scan1.c
+++ b/src/parse/scan1.c
@@ -235,23 +235,11 @@ ANN static m_bool scan1_exp_if(const Env env, const Exp_If *exp_if) {
 
 ANN static inline m_bool scan1_exp_unary(const restrict Env env,
                                          Exp_Unary *const  unary) {
-  if (unary->unary_type == unary_code) {
-/*
-if(strcmp("fork", s_name(unary->op))) {
-    const loc_t pos = exp_self(unary)->pos;
-    const Symbol sym = lambda_name(env->gwion->st, pos.first);
-    Exp lambda = new_exp_lambda(env->gwion->mp, sym, NULL, unary->code, pos);
-    lambda->d.exp_lambda.def->captures = unary->captures;
-    unary->captures = NULL;
-    mp_free(env->gwion->mp, Stmt, unary->code);
-    unary->exp = new_exp_call(env->gwion->mp, lambda, NULL, pos);
-    unary->unary_type = unary_exp;
-} else */{
-return scan1_stmt(env, unary->code);
-}
-
-  }
-  return unary->unary_type == unary_exp ? scan1_exp(env, unary->exp) : GW_OK;
+  if(unary->unary_type == unary_exp)
+    return scan1_exp(env, unary->exp);
+  if (unary->unary_type == unary_code)
+    return scan1_stmt(env, unary->code);
+  return GW_OK;
 }
 
 #define scan1_exp_lambda dummy_func