From: Jérémie Astor <astor.jeremie@wanadoo.fr>
Date: Sun, 8 Mar 2020 18:04:40 +0000 (+0100)
Subject: :fire: Remove Tuple
X-Git-Tag: nightly~1726^2~38
X-Git-Url: http://10.10.0.4:5575/?a=commitdiff_plain;h=3447fc206004a6d90017017d42de67c0e8b279b6;p=gwion.git

:fire: Remove Tuple
---

diff --git a/include/lang_private.h b/include/lang_private.h
index 61d650e3..96479a37 100644
--- a/include/lang_private.h
+++ b/include/lang_private.h
@@ -11,5 +11,4 @@ ANN m_bool import_array(const Gwi gwi);
 ANN m_bool import_ptr(const Gwi gwi);
 ANN m_bool import_func(const Gwi gwi);
 ANN m_bool import_modules(const Gwi gwi);
-ANN m_bool import_tuple(const Gwi gwi);
 #endif
diff --git a/src/lib/engine.c b/src/lib/engine.c
index 644546d6..c8519b9f 100644
--- a/src/lib/engine.c
+++ b/src/lib/engine.c
@@ -123,7 +123,6 @@ ANN static m_bool import_core_libs(const Gwi gwi) {
   GWI_BB(gwi_class_end(gwi))
 
   GWI_BB(import_array(gwi))
-  GWI_BB(import_tuple(gwi))
   GWI_BB(import_event(gwi))
   GWI_BB(import_ugen(gwi))
   GWI_BB(import_ptr(gwi))
diff --git a/src/lib/tuple.c b/src/lib/tuple.c
deleted file mode 100644
index f905a406..00000000
--- a/src/lib/tuple.c
+++ /dev/null
@@ -1,529 +0,0 @@
-#include "gwion_util.h"
-#include "gwion_ast.h"
-#include "gwion_env.h"
-#include "vm.h"
-#include "instr.h"
-#include "object.h"
-#include "emit.h"
-#include "vm.h"
-#include "gwion.h"
-#include "operator.h"
-#include "import.h"
-#include "gwi.h"
-#include "traverse.h"
-#include "object.h"
-#include "parse.h"
-#include "tuple.h"
-#include "array.h"
-
-#define TUPLE_NAME "Tuple"
-struct TupleEmit {
-  Exp e;
-  Vector v;
-  m_uint obj_offset;
-  m_uint tmp_offset;
-  m_uint mem_offset;
-  m_uint sz;
-  m_uint idx;
-};
-
-struct UnpackInfo_ {
-  m_uint obj_offset;
-  m_uint mem_offset;
-  m_uint size;
-};
-
-static INSTR(TupleUnpack) {
-  const M_Object o = *(M_Object*)(shred->reg - SZ_INT);
-  struct UnpackInfo_ *info = (struct UnpackInfo_*)instr->m_val;
-  memcpy(shred->mem + info->mem_offset, o->data + info->obj_offset, info->size);
-}
-
-INSTR(TupleMember) {
-  const M_Object o = *(M_Object*)(shred->reg - SZ_INT);
-  const Type base = o->type_ref;
-  const m_bit* byte = shred->code->bytecode + shred->pc * BYTECODE_SZ;
-  const Type t = (Type)vector_at(&base->e->tuple->types, instr->m_val);
-  const m_uint offset = vector_at(&base->e->tuple->offset, instr->m_val);
-  *(m_uint*)(byte + SZ_INT) = offset;
-  if(!instr->m_val2) {
-    if(t->size == SZ_INT)
-      *(m_uint*)(byte) = eDotMember;
-    else if(t->size == SZ_FLOAT)
-      *(m_uint*)(byte) = eDotMember2;
-    else {
-      *(m_uint*)(byte) = eDotMember3;
-      *(m_uint*)(byte + SZ_INT*2) = t->size;
-    }
-  } else
-    *(m_uint*)(byte) = eDotMember4;
-}
-
-static FREEARG(freearg_tuple_at) {
-  mp_free(((Gwion)gwion)->mp, UnpackInfo, (struct UnpackInfo*)instr->m_val);
-}
-
-ANN static void emit_unpack_instr_inner(const Emitter emit, struct TupleEmit *te) {
-  const Instr instr = emit_add_instr(emit, TupleUnpack);
-  struct UnpackInfo_ *info = mp_malloc(emit->gwion->mp, UnpackInfo);
-  info->obj_offset = te->obj_offset;
-  info->mem_offset = te->mem_offset;
-  info->size = te->sz;
-  instr->m_val = (m_uint)info;
-}
-
-ANN static int tuple_continue(struct TupleEmit *te) {
-  const m_bool ret = (te->e = te->e->next) &&
-       ++te->idx < VLEN(te->v);
-  if(!ret)
-    te->e = NULL;
-  return ret;
-}
-
-ANN static void unpack_instr_decl(const Emitter emit, struct TupleEmit *te) {
-  m_uint sz = 0;
-  te->sz = 0;
-  te->obj_offset = te->tmp_offset;
-  do {
-    if(te->e->exp_type == ae_exp_decl) {
-      const Value value = te->e->d.exp_decl.list->self->value;
-      te->sz += value->type->size;
-      sz += value->type->size;
-      value->from->offset = emit_local(emit, value->type->size, 0);
-    } else {
-      sz += ((Type)vector_at(te->v, te->idx))->size;
-      break;
-    }
-  } while(tuple_continue(te));
-  te->tmp_offset += sz;
-}
-
-ANN void emit_unpack_instr(const Emitter emit, struct TupleEmit *te) {
-  te->mem_offset = emit_code_offset(emit);
-  unpack_instr_decl(emit, te);
-  if(te->sz)
-    emit_unpack_instr_inner(emit, te);
-  if(te->e && (te->e = te->e->next))
-    emit_unpack_instr(emit, te);
-}
-
-static m_bool tuple_match(const Env env, const Type lhs, const Type rhs) {
-  DECL_OB(const Vector, lv, = &lhs->e->tuple->types)
-  DECL_OB(const Vector, rv, = &rhs->e->tuple->types)
-  for(m_uint i = 0; i < vector_size(rv); i++) {
-    DECL_OB(const Type, l, = (Type)vector_at(lv, i))
-    const Type r = (Type)vector_at(rv, i);
-    if(r != env->gwion->type[et_undefined])
-      CHECK_BB(isa(l, r))
-  }
-  return GW_OK;
-}
-
-static OP_CHECK(opck_at_object_tuple) {
-  const Exp_Binary *bin = (Exp_Binary*)data;
-  if(opck_rassign(env, data, mut) == env->gwion->type[et_null])
-    return env->gwion->type[et_null];
-  if(tuple_match(env, bin->lhs->type, bin->rhs->type) < 0)
-    return env->gwion->type[et_null];
-  bin->rhs->emit_var = 1;
-  return bin->rhs->type;
-}
-
-static OP_CHECK(opck_at_tuple_object) {
-  const Exp_Binary *bin = (Exp_Binary*)data;
-  if(opck_rassign(env, data, mut) == env->gwion->type[et_null])
-    return env->gwion->type[et_null];
-  if(!bin->rhs->type->e->tuple)
-    return bin->rhs->type;
-  if(tuple_match(env, bin->rhs->type, bin->lhs->type) < 0)
-    return env->gwion->type[et_null];
-  bin->rhs->emit_var = 1;
-  set_decl_ref(bin->rhs);
-  return bin->rhs->type;
-}
-
-static OP_CHECK(opck_cast_tuple_object) {
-  const Exp_Cast *cast = (Exp_Cast*)data;
-  if(tuple_match(env, cast->exp->type, exp_self(cast)->type) < 0)
-    return env->gwion->type[et_null];
-  return exp_self(cast)->type;
-}
-
-static INSTR(Tuple2Object) {
-  const M_Object o = *(M_Object*)(shred->reg - instr->m_val2);
-  const Type t = (Type)instr->m_val;
-  if(o && isa(o->type_ref, t) < 0)
-  // TODO: pass position by m_val2
-//    Except(shred, "can't cast %s to %s\n", o->type_ref->name, t->name);
-    Except(shred, _("can't cast\n"));
-}
-
-// TODO: do not emit Tuple2Object if full match
-static OP_EMIT(opem_cast_tuple_object) {
-  const Exp_Cast* exp = (Exp_Cast*)data;
-  const Instr instr = emit_add_instr(emit, Tuple2Object);
-  instr->m_val = (m_uint)exp_self(exp)->type;
-  instr->m_val2 = SZ_INT;
-  return instr;
-}
-static OP_EMIT(opem_at_tuple_object) {
-  const Exp_Binary *bin = (Exp_Binary*)data;
-  const Instr instr = emit_add_instr(emit, Tuple2Object);
-  instr->m_val = (m_uint)bin->rhs->type;
-  instr->m_val2 = SZ_INT*2;
-  return emit_add_instr(emit, ObjectAssign);
-}
-
-static OP_CHECK(opck_cast_tuple) {
-  const Exp_Cast *cast = (Exp_Cast*)data;
-  CHECK_BN(tuple_match(env, exp_self(cast)->type, cast->exp->type))
-  return exp_self(cast)->type;
-}
-
-static OP_CHECK(opck_impl_tuple) {
-  struct Implicit *imp = (struct Implicit*)data;
-  CHECK_BN(tuple_match(env, imp->e->type, imp->t))
-  return imp->t;
-}
-
-ANN void tuple_info(const Env env, Type_Decl *base, const Var_Decl var) {
-  const Value v = var->value;
-  const m_uint offset = vector_back(&env->class_def->e->tuple->offset);
-  vector_add(&env->class_def->e->tuple->types, (vtype)v->type);
-  vector_add(&env->class_def->e->tuple->offset, offset + v->type->size);
-  Type_Decl *td = cpy_type_decl(env->gwion->mp, base);
-  if(var->array)
-    td->array = cpy_array_sub(env->gwion->mp, var->array);
-  if(env->class_def->e->tuple->list) {
-    Type_List tl = env->class_def->e->tuple->list;
-    while(tl->next)
-      tl = tl->next;
-    tl->next = new_type_list(env->gwion->mp, td, NULL);
-  } else
-    env->class_def->e->tuple->list = new_type_list(env->gwion->mp, td, NULL);
-}
-
-INSTR(TupleCtor) {
-  const Type t = (Type)instr->m_val;
-  const M_Object o = new_object(shred->info->vm->gwion->mp, shred, t);
-  const m_uint sz = t->nspc->info->offset;
-  memcpy(o->data, shred->reg - sz, sz);
-  shred->reg -= (sz - SZ_INT);
-  *(M_Object*)(shred->reg - SZ_INT) = o;
-}
-
-ANN static Symbol tuple_sym(const Env env, const Vector v) {
-  GwText text = { .mp=env->gwion->mp };
-  text_add(&text, TUPLE_NAME);
-  text_add(&text, "<~");
-  for(m_uint i = 0; i < vector_size(v); ++i) {
-    const Type t = (Type)vector_at(v, i);
-    text_add(&text, t != (Type)1 ? t->name : "_");
-    if(i+1 < vector_size(v))
-      text_add(&text, ",");
-  }
-  text_add(&text, "~>");
-  const Symbol sym = insert_symbol(text.str);
-  text_release(&text);
-  return sym;
-}
-
-ANN Type tuple_type(const Env env, const Vector v, const loc_t pos) {
-  const Symbol sym = tuple_sym(env, v);
-  const Type exists = nspc_lookup_type0(env->curr, sym);
-  if(exists)
-    return exists;
-  Stmt_List base = NULL, curr = NULL;
-  Type_List tlbase = NULL, tl = NULL;
-  for(m_uint i = 0; i < vector_size(v); ++i) {
-    char name[num_digit(i) + 16];
-    sprintf(name, "@tuple member %"UINT_F, i);
-    const Symbol sym = insert_symbol(name);
-    const Type t = (Type)vector_at(v, i);
-    const Symbol tsym = insert_symbol(t != (Type)1 ? t->name : "@Undefined");
-    Exp decl = decl_from_id(env->gwion->mp, tsym, sym, pos);
-    const Stmt stmt = new_stmt_exp(env->gwion->mp, ae_stmt_exp, decl);
-    const Stmt_List slist = new_stmt_list(env->gwion->mp, stmt, NULL);
-    if(curr)
-      curr->next = slist;
-    if(!base)
-      base = slist;
-{// build Type_List
-  const ID_List ilist = new_id_list(env->gwion->mp, tsym,
-      loc_cpy(env->gwion->mp, pos));
-  Type_Decl *td = new_type_decl(env->gwion->mp, ilist);
-  Type_List tmp_tl = new_type_list(env->gwion->mp, td, NULL);
-    if(tl)
-      tl->next = tmp_tl;
-    if(!tlbase)
-      tlbase = tl = tmp_tl;
-
-}
-    curr = slist;
-  }
-  Section * section = new_section_stmt_list(env->gwion->mp, base);
-  Ast body = new_ast(env->gwion->mp, section, NULL);
-  const ID_List ilist = new_id_list(env->gwion->mp, insert_symbol(TUPLE_NAME),
-      loc_cpy(env->gwion->mp, pos));
-  Type_Decl *td = new_type_decl(env->gwion->mp, ilist);
-  Class_Def cdef = new_class_def(env->gwion->mp, ae_flag_template,
-        sym, td, body, loc_cpy(env->gwion->mp, pos));
-  Tmpl* tmpl = new_tmpl_call(env->gwion->mp, tlbase);
-  cdef->base.tmpl = tmpl;
-  CHECK_BO(scan0_class_def(env, cdef))
-  SET_FLAG(cdef->base.type, abstract);
-  cdef->base.type->e->tuple->list = tlbase;
-  CHECK_BO(traverse_cdef(env, cdef))
-  nspc_add_type_front(env->curr, sym, cdef->base.type);
-  return cdef->base.type;
-}
-
-ANN TupleForm new_tupleform(MemPool p) {
-  TupleForm tuple = mp_malloc(p, TupleForm);
-  vector_init(&tuple->types);
-  vector_init(&tuple->offset);
-  vector_add(&tuple->offset, 0);
-  tuple->list = NULL;
-  return tuple;
-}
-
-ANN void free_tupleform(MemPool p, const TupleForm tuple) {
-  vector_release(&tuple->types);
-  vector_release(&tuple->offset);
-  if(tuple->list)
-    free_type_list(p, tuple->list);
-}
-
-ANN Type check_array_access(const Env env, const Array_Sub array);
-
-static OP_CHECK(opck_tuple) {
-  const Array_Sub array = (Array_Sub)data;
-  const Vector v = &array->type->e->tuple->types;
-  const Exp exp = array->exp;
-  if(exp->exp_type != ae_exp_primary ||
-     exp->d.prim.prim_type != ae_prim_num)
-    ERR_O(exp->pos, _("tuple subscripts must be litteral"))
-  const m_uint idx = exp->d.prim.d.num;
-  if(idx >= vector_size(v))
-    ERR_O(exp->pos, _("tuple subscripts too big"))
-  const Type type = (Type)vector_at(v, idx);
-  if(type == env->gwion->type[et_undefined])
-    ERR_O(exp->pos, _("tuple subscripts is undefined at index %"UINT_F), idx)
-  if(!exp->next)
-    return type;
-  struct Array_Sub_ next = { exp->next, type, array->depth - 1 };
-  return check_array_access(env, &next);
-}
-
-static OP_CHECK(opck_tuple_ctor) {
-  const Exp_Call *call = (Exp_Call*)data;
-  const Exp exp = call->args;
-  if(exp)
-    CHECK_OO(check_exp(env, exp))
-  struct Vector_ v;
-  vector_init(&v);
-  Exp e = exp;
-  do vector_add(&v, (m_uint)e->type);
-  while((e = e->next));
-  const Type ret = tuple_type(env, &v, exp_self(call)->pos);
-  vector_release(&v);
-  return ret;
-}
-
-static OP_EMIT(opem_tuple_ctor) {
-  const Exp_Call *call = (Exp_Call*)data;
-  const Instr instr = emit_add_instr(emit, TupleCtor);
-  instr->m_val = (m_uint)exp_self(call)->type;
-  return instr;
-}
-
-static OP_CHECK(unpack_ck) {
-  const Exp_Call *call = (Exp_Call*)data;
-  const Symbol decl = insert_symbol("auto");
-  const Symbol skip = insert_symbol("_");
-  Exp e = call->args;
-  const Value v = nspc_lookup_value1(env->global_nspc, insert_symbol("false"));
-  while(e) {
-    if(e->exp_type != ae_exp_primary || e->d.prim.prim_type != ae_prim_id)
-      ERR_O(e->pos, _("invalid expression for unpack"))
-    if(e->d.prim.d.var != skip) {
-      const Symbol var = e->d.prim.d.var;
-      memset(&e->d, 0, sizeof(union exp_data));
-      e->type = env->gwion->type[et_auto];
-      e->d.exp_decl.type = env->gwion->type[et_auto];
-      e->exp_type = ae_exp_decl;
-      e->d.exp_decl.td = new_type_decl(env->gwion->mp, new_id_list(env->gwion->mp, decl, loc_cpy(env->gwion->mp, e->pos)));
-      e->d.exp_decl.list = new_var_decl_list(env->gwion->mp,
-        new_var_decl(env->gwion->mp, var, NULL, loc_cpy(env->gwion->mp, e->pos)), NULL);
-      e->d.exp_decl.list->self->value = v;
-    } else {
-      e->d.prim.prim_type = ae_prim_nil;
-      e->type = env->gwion->type[et_null];
-    }
-    e = e->next;
-  }
-  exp_self(call)->meta = ae_meta_var;
-  return call->func->type->e->d.base_type;
-}
-
-static OP_EMIT(unpack_em) {
-  const Exp_Call *call = (Exp_Call*)data;
-  if(exp_self(call)->meta == ae_meta_value)
-    return (Instr)GW_OK;
-  env_err(emit->env, exp_self(call)->pos, _("unused Tuple unpack"));
-  return NULL;
-}
-
-static void parents(const Env env, const Type t, const Vector v) {
-  const Nspc parent = t->e->owner;
-  if(parent->parent && parent != env->context->nspc && parent != env->global_nspc) {
-    const Type older = nspc_lookup_type1(parent->parent, insert_symbol(parent->name));
-    parents(env, older, v);
-  }
-  vector_add(v, (vtype)insert_symbol(t->name));
-}
-
-static OP_CHECK(opck_at_unpack) {
-  const Exp_Binary *bin = (Exp_Binary*)data;
-  Exp e = bin->rhs->d.exp_call.args;
-  int i = 0;
-  while(e) {
-    if(e->exp_type == ae_exp_decl) {
-      DECL_OO(const Type, t, = (Type)VPTR(&bin->lhs->type->e->tuple->types, i))
-      struct Vector_ v; // hoist?
-      vector_init(&v);
-      parents(env, t, &v);
-      ID_List id = e->d.exp_decl.td->xid;
-      id->xid = (Symbol)vector_front(&v);
-      for(m_uint i = 1; i < vector_size(&v); ++i)
-        id = (id->next = new_id_list(env->gwion->mp, (Symbol)vector_at(&v, i), loc_cpy(env->gwion->mp, e->pos)));
-      vector_release(&v);
-      const Exp next = e->next;
-      e->d.exp_decl.type = NULL;
-      e->next = NULL;
-      const m_bool ret = traverse_exp(env, e);
-      e->next = next;
-      CHECK_BO(ret)
-      bin->rhs->meta = ae_meta_value;
-    }
-    ++i;
-    e = e->next;
-  }
-  return bin->lhs->type;
-}
-
-static OP_EMIT(opem_at_unpack) {
-  const Exp_Binary *bin = (Exp_Binary*)data;
-  if(bin->rhs->d.exp_call.args) {
-    const Type t_null = emit->gwion->type[et_null];
-    Exp e = bin->rhs->d.exp_call.args;
-    m_uint sz = 0;
-    do if(e->type != t_null)
-      sz += e->type->size;
-    while((e = e->next));
-    const Instr pop = emit_add_instr(emit, RegPop);
-    pop->m_val = sz;
-    const Vector v = &bin->lhs->type->e->tuple->types;
-    struct TupleEmit te = { .e=bin->rhs->d.exp_call.args, .v=v };
-    emit_unpack_instr(emit, &te);
-  }
-  return (Instr)GW_OK;
-}
-
-static ANN Type scan_tuple(const Env env, const Type_Decl *td) {
-  struct Vector_ v;
-  vector_init(&v);
-  Type_List tl = td->types;
-  do {
-    const Type t = tl->td->xid->xid != insert_symbol("_") ?
-       known_type(env, tl->td) : (Type)1;
-    if(t)
-      vector_add(&v, (m_uint)t);
-    else {
-      vector_release(&v);
-      return env->gwion->type[et_null];
-    }
-  } while((tl = tl->next));
-  const Type ret = tuple_type(env, &v, td_pos(td));
-  vector_release(&v);
-  return ret;
-}
-
-static OP_CHECK(opck_tuple_scan) {
-  struct TemplateScan *ts = (struct TemplateScan*)data;
-  return ts->td->types ? scan_tuple(env, ts->td) : ts->t;
-}
-
-ANN static void tuple_access(const  Emitter emit, const m_uint idx,
-        const m_bool is_var) {
-  const Instr instr = emit_add_instr(emit, TupleMember);
-  instr->m_val = idx;
-  instr->m_val2 = is_var;
-  emit_add_instr(emit, DotMember); // just a place holder.
-}
-
-static OP_EMIT(opem_tuple_access) {
-  struct ArrayAccessInfo *info = (struct ArrayAccessInfo*)data;
-  const m_uint idx = info->array.exp->d.prim.d.num;
-  emit_except(emit, info->array.type);
-  tuple_access(emit, info->array.exp->d.prim.d.num, (info->array.depth -1)? 0 : info->is_var);
-  if(!info->array.exp->next)
-    return (Instr)GW_OK;
-  const Type type = (Type)vector_at(&info->array.type->e->tuple->types, idx);
-  struct Array_Sub_ next = { info->array.exp->next, type, info->array.depth - 1 };
-  info->array = next;
-  return (Instr)(m_uint)emit_array_access(emit, info);
-}
-
-GWION_IMPORT(tuple) {
-  const Type t_tuple = gwi_mk_type(gwi, TUPLE_NAME, SZ_INT, "Object");
-  gwi_add_type(gwi, t_tuple);
-  SET_FLAG(t_tuple, checked | ae_flag_scan2 | ae_flag_check | ae_flag_emit);
-  SET_FLAG(t_tuple, abstract | ae_flag_template);
-  GWI_BB(gwi_oper_ini(gwi, TUPLE_NAME, NULL, NULL))
-  GWI_BB(gwi_oper_add(gwi, opck_tuple_ctor))
-  GWI_BB(gwi_oper_emi(gwi, opem_tuple_ctor))
-  GWI_BB(gwi_oper_end(gwi, "@ctor", NULL))
-  GWI_BB(gwi_oper_add(gwi, opck_tuple_scan))
-  GWI_BB(gwi_oper_end(gwi, "@scan", NULL))
-  GWI_BB(gwi_oper_ini(gwi, "Object", TUPLE_NAME, NULL))
-  GWI_BB(gwi_oper_add(gwi, opck_at_object_tuple))
-  GWI_BB(gwi_oper_end(gwi, "@=>", ObjectAssign))
-  GWI_BB(gwi_oper_add(gwi, opck_cast_tuple))
-  GWI_BB(gwi_oper_end(gwi, "$", NoOp))
-  GWI_BB(gwi_oper_add(gwi, opck_impl_tuple))
-  GWI_BB(gwi_oper_end(gwi, "@implicit", NULL))
-  GWI_BB(gwi_oper_ini(gwi, TUPLE_NAME, "Object", NULL))
-  GWI_BB(gwi_oper_add(gwi, opck_at_tuple_object))
-  GWI_BB(gwi_oper_emi(gwi, opem_at_tuple_object))
-  GWI_BB(gwi_oper_end(gwi, "@=>", NULL))
-  GWI_BB(gwi_oper_add(gwi, opck_cast_tuple_object))
-  GWI_BB(gwi_oper_emi(gwi, opem_cast_tuple_object))
-  GWI_BB(gwi_oper_end(gwi, "$", NULL))
-  GWI_BB(gwi_oper_add(gwi, opck_impl_tuple))
-  GWI_BB(gwi_oper_end(gwi, "@implicit", NULL))
-  GWI_BB(gwi_oper_ini(gwi, TUPLE_NAME, "Tuple", NULL))
-  GWI_BB(gwi_oper_add(gwi, opck_at_object_tuple))
-  GWI_BB(gwi_oper_end(gwi, "@=>", ObjectAssign))
-  GWI_BB(gwi_oper_ini(gwi, "int", TUPLE_NAME, NULL))
-  GWI_BB(gwi_oper_add(gwi, opck_tuple))
-  GWI_BB(gwi_oper_emi(gwi, opem_tuple_access))
-  GWI_BB(gwi_oper_end(gwi, "@array", NULL))
-  gwi_register_freearg(gwi, TupleUnpack, freearg_tuple_at);
-
-  const Type t_unpack = gwi_mk_type(gwi, "Unpack", 0, NULL);
-  gwi_add_type(gwi, t_unpack);
-  SET_FLAG(t_unpack, checked | ae_flag_scan2 | ae_flag_check | ae_flag_emit);
-  GWI_BB(gwi_oper_ini(gwi, "Unpack", NULL, NULL))
-  GWI_BB(gwi_oper_add(gwi, unpack_ck))
-  GWI_BB(gwi_oper_emi(gwi, unpack_em))
-  GWI_BB(gwi_oper_end(gwi, "@ctor", NULL))
-  GWI_BB(gwi_oper_ini(gwi, "Object", "Unpack", NULL))
-  GWI_BB(gwi_oper_add(gwi, opck_at_unpack))
-  GWI_BB(gwi_oper_emi(gwi, opem_at_unpack))
-  GWI_BB(gwi_oper_end(gwi, "@=>", NULL))
-  GWI_BB(gwi_oper_add(gwi, opck_at_unpack))
-  GWI_BB(gwi_oper_emi(gwi, opem_at_unpack))
-  GWI_BB(gwi_oper_end(gwi, "==", NULL))
-  return GW_OK;
-}
diff --git a/tests/error/unused_unpack.gw b/tests/error/unused_unpack.gw
deleted file mode 100644
index e6e75962..00000000
--- a/tests/error/unused_unpack.gw
+++ /dev/null
@@ -1,2 +0,0 @@
-#! [contains] unused Tuple unpack
-Unpack(a,b);
diff --git a/tests/match/tuple.gw b/tests/match/tuple.gw
deleted file mode 100644
index 9c595568..00000000
--- a/tests/match/tuple.gw
+++ /dev/null
@@ -1,12 +0,0 @@
-class C {
-  string name;
-  int age;
-}
-
-C charles;
-"charles" => charles.name;
-21 => charles.age;
-
-match charles {
-  case Unpack(name, age): <<< name , " is ", age, " years old." >>>;
-}
diff --git a/tests/tuple/array_tuple_array.gw b/tests/tuple/array_tuple_array.gw
deleted file mode 100644
index 10849561..00000000
--- a/tests/tuple/array_tuple_array.gw
+++ /dev/null
@@ -1,11 +0,0 @@
-Tuple([1,2], "Tom") @=> <~int[], string~>Tuple ref tup;
-
-#!<<<tup[1]>>>;
-#!<<<tup[0][1]>>>;
-
-<~int[], string~>Tuple stack[3];
-tup @=> stack[2];
-<<< stack[2] >>>;
-<<< stack[2][1] >>>;
-<<< stack[2][0] >>>;
-<<< stack[2][0][1] >>>;
diff --git a/tests/tuple/cast_tuple.gw b/tests/tuple/cast_tuple.gw
deleted file mode 100644
index d30202d2..00000000
--- a/tests/tuple/cast_tuple.gw
+++ /dev/null
@@ -1,2 +0,0 @@
-Object o;
-o $ <~int~>Tuple;
diff --git a/tests/tuple/cast_tuple2.gw b/tests/tuple/cast_tuple2.gw
deleted file mode 100644
index 050f959f..00000000
--- a/tests/tuple/cast_tuple2.gw
+++ /dev/null
@@ -1,3 +0,0 @@
-class C { int i; }
-C c;
-c $ <~int~>Tuple;
diff --git a/tests/tuple/object2tuple.gw b/tests/tuple/object2tuple.gw
deleted file mode 100644
index ad2a8f9e..00000000
--- a/tests/tuple/object2tuple.gw
+++ /dev/null
@@ -1,3 +0,0 @@
-class C { int i; }
-C c @=> <~int~>Tuple ref t;
-t @=> C ref d;
diff --git a/tests/tuple/object2tuple_err.gw b/tests/tuple/object2tuple_err.gw
deleted file mode 100644
index c08e5766..00000000
--- a/tests/tuple/object2tuple_err.gw
+++ /dev/null
@@ -1,8 +0,0 @@
-class Person {
-  "Phil" @=> string @name;
-  45 => int age;
-}
-
-Person p @=> <~string,string~>Tuple ref t;
-<<<t[0]>>>;
-<<<t[1]>>>;
diff --git a/tests/tuple/object2tuple_err2.gw b/tests/tuple/object2tuple_err2.gw
deleted file mode 100644
index 8e20f44e..00000000
--- a/tests/tuple/object2tuple_err2.gw
+++ /dev/null
@@ -1,8 +0,0 @@
-class Person {
-  "Phil" @=> string @name;
-  45 => int age;
-}
-
-Person p @=> <~string,int,float~>Tuple ref t;
-<<<t[0]>>>;
-<<<t[1]>>>;
diff --git a/tests/tuple/object_array_access_multi.gw b/tests/tuple/object_array_access_multi.gw
deleted file mode 100644
index 37c78222..00000000
--- a/tests/tuple/object_array_access_multi.gw
+++ /dev/null
@@ -1,9 +0,0 @@
-Object t[2];
-#!<<< t[0] >>>;
-#!null @=> t[0];
-<<< t >>>;
-Tuple("tom", 12) @=> t[0];
-#!t << Tuple("tom", 12);
-#!<<< t.size() >>>;
-#!<<< t[0][0] >>>;
-#!<<< t[0][1] >>>;
diff --git a/tests/tuple/tupl_decl.gw b/tests/tuple/tupl_decl.gw
deleted file mode 100644
index 3127e9ce..00000000
--- a/tests/tuple/tupl_decl.gw
+++ /dev/null
@@ -1 +0,0 @@
-Tuple ref u;
diff --git a/tests/tuple/tuple.gw b/tests/tuple/tuple.gw
deleted file mode 100644
index 3127e9ce..00000000
--- a/tests/tuple/tuple.gw
+++ /dev/null
@@ -1 +0,0 @@
-Tuple ref u;
diff --git a/tests/tuple/tuple2obj_cast_err.gw b/tests/tuple/tuple2obj_cast_err.gw
deleted file mode 100644
index 151752a5..00000000
--- a/tests/tuple/tuple2obj_cast_err.gw
+++ /dev/null
@@ -1,2 +0,0 @@
-#! [contains] no match found for operator
-Tuple(1) $ Object;
diff --git a/tests/tuple/tuple2obj_err.gw b/tests/tuple/tuple2obj_err.gw
deleted file mode 100644
index c54366c7..00000000
--- a/tests/tuple/tuple2obj_err.gw
+++ /dev/null
@@ -1,2 +0,0 @@
-#! [contains] can't cast
-Tuple(1) @=> <~int~>Ptr ptr;
diff --git a/tests/tuple/tuple_abstract.gw b/tests/tuple/tuple_abstract.gw
deleted file mode 100644
index 3335d05b..00000000
--- a/tests/tuple/tuple_abstract.gw
+++ /dev/null
@@ -1,2 +0,0 @@
-#! [contains] Type 'Tuple' is abstract, declare as ref
-Tuple u;
diff --git a/tests/tuple/tuple_aray_access.gw b/tests/tuple/tuple_aray_access.gw
deleted file mode 100644
index 1ed8736d..00000000
--- a/tests/tuple/tuple_aray_access.gw
+++ /dev/null
@@ -1,6 +0,0 @@
-<<< Tuple("Tom", 12)[0] >>> ;
-#! <<< Tuple("Tom", 12)[1] >>> ;
-
-#! <<< Tuple("Tom", 12) @=> <~string, int~>Tuple @t >>> ;
-#! <<< t[0] >>> ;
-#! <<< t[1] >>> ;
diff --git a/tests/tuple/tuple_aray_access_exceed.gw b/tests/tuple/tuple_aray_access_exceed.gw
deleted file mode 100644
index b7bcfa6f..00000000
--- a/tests/tuple/tuple_aray_access_exceed.gw
+++ /dev/null
@@ -1 +0,0 @@
-Tuple("Tom", 12)[0][2];
diff --git a/tests/tuple/tuple_aray_access_multi.gw b/tests/tuple/tuple_aray_access_multi.gw
deleted file mode 100644
index 79350a2f..00000000
--- a/tests/tuple/tuple_aray_access_multi.gw
+++ /dev/null
@@ -1,11 +0,0 @@
-<~string,int~>Tuple t[2];
-#!<<< t[0] >>>;
-#!null @=> t[0];
-<<< t >>>;
-<<< t[0] >>>;
-<<< Tuple("tom", 12) @=> t[0] >>> ;
-
-#!t << Tuple("tom", 12);
-#!<<< t.size() >>>;
-#!<<< t[0][0] >>>;
-#!<<< t[0][1] >>>;
diff --git a/tests/tuple/tuple_aray_access_not_prim.gw b/tests/tuple/tuple_aray_access_not_prim.gw
deleted file mode 100644
index 9320ed44..00000000
--- a/tests/tuple/tuple_aray_access_not_prim.gw
+++ /dev/null
@@ -1,2 +0,0 @@
-int i;
-Tuple("Tom", 12)[i];
diff --git a/tests/tuple/tuple_array_access_invalid.gw b/tests/tuple/tuple_array_access_invalid.gw
deleted file mode 100644
index 3439089b..00000000
--- a/tests/tuple/tuple_array_access_invalid.gw
+++ /dev/null
@@ -1 +0,0 @@
-Tuple(1.2,"test")[3];
diff --git a/tests/tuple/tuple_at.gw b/tests/tuple/tuple_at.gw
deleted file mode 100644
index cf29a057..00000000
--- a/tests/tuple/tuple_at.gw
+++ /dev/null
@@ -1,6 +0,0 @@
-<<< Tuple("Tom", 6) @=> 
-<~string, int~>Tuple ref tup >>>;
-<<< typeof(tup) >>>;
-<<< tup >>>;
-<<< tup[0] >>>;
-<<< tup[1] >>>;
diff --git a/tests/tuple/tuple_at_err.gw b/tests/tuple/tuple_at_err.gw
deleted file mode 100644
index 5be9b3e1..00000000
--- a/tests/tuple/tuple_at_err.gw
+++ /dev/null
@@ -1,4 +0,0 @@
-Tuple("Tom", 6) @=> 
-<~float, int~>Tuple ref tup;
-<<< typeof(tup) >>>;
-<<< tup >>>;
diff --git a/tests/tuple/tuple_at_lit.gw b/tests/tuple/tuple_at_lit.gw
deleted file mode 100644
index 91c50bdf..00000000
--- a/tests/tuple/tuple_at_lit.gw
+++ /dev/null
@@ -1,2 +0,0 @@
-#! [contains] cannot assign
-Tuple("Tom", 6) @=> Tuple("Pat", 22);
diff --git a/tests/tuple/tuple_cast.gw b/tests/tuple/tuple_cast.gw
deleted file mode 100644
index 7b35faaf..00000000
--- a/tests/tuple/tuple_cast.gw
+++ /dev/null
@@ -1,4 +0,0 @@
-<~int~>Tuple ref a;
-
-<<< a >>>;
-<<< a $ Tuple >>>;
diff --git a/tests/tuple/tuple_cast2.gw b/tests/tuple/tuple_cast2.gw
deleted file mode 100644
index b6b3c891..00000000
--- a/tests/tuple/tuple_cast2.gw
+++ /dev/null
@@ -1,4 +0,0 @@
-<~int,int~>Tuple ref a;
-
-<<< a >>>;
-<<< a $ <~int~>Tuple >>>;
diff --git a/tests/tuple/tuple_cast3.gw b/tests/tuple/tuple_cast3.gw
deleted file mode 100644
index 0a3aebd5..00000000
--- a/tests/tuple/tuple_cast3.gw
+++ /dev/null
@@ -1 +0,0 @@
-Tuple(1) $ <~int~>Tuple;
diff --git a/tests/tuple/tuple_decl.gw b/tests/tuple/tuple_decl.gw
deleted file mode 100644
index b8e7cc78..00000000
--- a/tests/tuple/tuple_decl.gw
+++ /dev/null
@@ -1 +0,0 @@
-<~int~>Tuple ref a;
diff --git a/tests/tuple/tuple_empty.gw b/tests/tuple/tuple_empty.gw
deleted file mode 100644
index ff732b28..00000000
--- a/tests/tuple/tuple_empty.gw
+++ /dev/null
@@ -1,2 +0,0 @@
-Tuple ref tup;
-tup[1];
diff --git a/tests/tuple/tuple_implicit.gw b/tests/tuple/tuple_implicit.gw
deleted file mode 100644
index 54ead660..00000000
--- a/tests/tuple/tuple_implicit.gw
+++ /dev/null
@@ -1,7 +0,0 @@
-#! [contains] Tom
-fun void test(<~string~>Tuple t) {
-  <<< t[0] >>>;
-}
-
-Tuple( "Tom", 21) => test;
-#!Tuple("Tom") => test;
diff --git a/tests/tuple/tuple_implicit2.gw b/tests/tuple/tuple_implicit2.gw
deleted file mode 100644
index b9e38f0c..00000000
--- a/tests/tuple/tuple_implicit2.gw
+++ /dev/null
@@ -1,5 +0,0 @@
-class C { int i; }
-fun void test(C c) {
-
-}
-Tuple(1) => test;
diff --git a/tests/tuple/tuple_lit_error.gw b/tests/tuple/tuple_lit_error.gw
deleted file mode 100644
index 9d5b5717..00000000
--- a/tests/tuple/tuple_lit_error.gw
+++ /dev/null
@@ -1 +0,0 @@
-Tuple( new int);
diff --git a/tests/tuple/tuple_member_float.gw b/tests/tuple/tuple_member_float.gw
deleted file mode 100644
index cac61c9e..00000000
--- a/tests/tuple/tuple_member_float.gw
+++ /dev/null
@@ -1,4 +0,0 @@
-Tuple(.2, null, 3) @=> <~float, Object, int~>Tuple ref t;
-t[0];
-t[1];
-3 => t[2];
diff --git a/tests/tuple/tuple_skip.gw b/tests/tuple/tuple_skip.gw
deleted file mode 100644
index bad9d2a2..00000000
--- a/tests/tuple/tuple_skip.gw
+++ /dev/null
@@ -1,2 +0,0 @@
-Tuple(1, 2, 3) @=> Unpack(b, _, c);
-<<< c >>>;
diff --git a/tests/tuple/tuple_skip2.gw b/tests/tuple/tuple_skip2.gw
deleted file mode 100644
index 971feb97..00000000
--- a/tests/tuple/tuple_skip2.gw
+++ /dev/null
@@ -1,6 +0,0 @@
-Tuple("Tom", 2, "Taxi driver") @=> <~string,_, string~>Tuple ref t;
-<<< t>>>;
-<<< t[0]>>>;
-Tuple("Tom", 2.3, "Cook") @=> t;
-#!<<< t[1]>>>;
-<<< t[2]>>>;
diff --git a/tests/tuple/tuple_undefined.gw b/tests/tuple/tuple_undefined.gw
deleted file mode 100644
index 844164e0..00000000
--- a/tests/tuple/tuple_undefined.gw
+++ /dev/null
@@ -1,3 +0,0 @@
-#! [contains] tuple subscripts is undefined
-<~string, _~>Tuple ref t;
-t[1];
diff --git a/tests/tuple/tuple_unknown.gw b/tests/tuple/tuple_unknown.gw
deleted file mode 100644
index 5f52865c..00000000
--- a/tests/tuple/tuple_unknown.gw
+++ /dev/null
@@ -1,2 +0,0 @@
-<~int, strong~>Tuple ref a;
-<~int, string~>Tuple ref a;
diff --git a/tests/tuple/tuple_unpack_already_declared.gw b/tests/tuple/tuple_unpack_already_declared.gw
deleted file mode 100644
index 16336f58..00000000
--- a/tests/tuple/tuple_unpack_already_declared.gw
+++ /dev/null
@@ -1,3 +0,0 @@
-#! [contains] already been defined in the same scope
-int i;
-Tuple(12) @=> Unpack(i);