From a5284f8c3f2b558efc03368249099c44bd2a3104 Mon Sep 17 00:00:00 2001 From: fennecdjay Date: Fri, 28 Oct 2022 06:30:49 +0200 Subject: [PATCH] :art: rename @scan to class --- src/env/type.c | 2 +- src/lib/array.c | 2 +- src/lib/closure.c | 2 +- src/lib/dict.c | 2 +- src/lib/object_op.c | 2 +- src/lib/ptr.c | 2 +- src/lib/ref.c | 2 +- src/parse/template.c | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/env/type.c b/src/env/type.c index 05b38149..fd1d8922 100644 --- a/src/env/type.c +++ b/src/env/type.c @@ -98,7 +98,7 @@ ANN Type array_type(const Env env, const Type src, const m_uint depth) { const size_t tdepth = depth + src->array_depth; const Type base = tdepth > 1 ? array_type(env, src, tdepth - 1) : src; struct TemplateScan ts = {.t = base, /*.td=td*/ }; - struct Op_Import opi = {.op = insert_symbol("@scan"), + struct Op_Import opi = {.op = insert_symbol("class"), .lhs = env->gwion->type[et_array], .data = (uintptr_t)&ts}; return op_check(env, &opi); diff --git a/src/lib/array.c b/src/lib/array.c index 7276fa77..cf8d5e73 100644 --- a/src/lib/array.c +++ b/src/lib/array.c @@ -990,7 +990,7 @@ GWION_IMPORT(array) { GWI_BB(gwi_oper_end(gwi, "@each_idx", NULL)) GWI_BB(gwi_oper_ini(gwi, "Array", NULL, NULL)) GWI_BB(gwi_oper_add(gwi, opck_array_scan)) - GWI_BB(gwi_oper_end(gwi, "@scan", NULL)) + GWI_BB(gwi_oper_end(gwi, "class", NULL)) GWI_BB(gwi_oper_ini(gwi, (m_str)OP_ANY_TYPE, NULL, "bool")) GWI_BB(gwi_oper_end(gwi, "@array_init", NoOp)) diff --git a/src/lib/closure.c b/src/lib/closure.c index 842f3139..312e371d 100644 --- a/src/lib/closure.c +++ b/src/lib/closure.c @@ -722,7 +722,7 @@ GWION_IMPORT(func) { GWI_BB(gwi_oper_ini(gwi, "funptr", NULL, NULL)) GWI_BB(gwi_oper_add(gwi, opck_closure_scan)) - GWI_BB(gwi_oper_end(gwi, "@scan", NULL)) + GWI_BB(gwi_oper_end(gwi, "class", NULL)) GWI_BB(gwi_oper_ini(gwi, (m_str)OP_ANY_TYPE, "function", NULL)) GWI_BB(gwi_oper_add(gwi, opck_func_call)) diff --git a/src/lib/dict.c b/src/lib/dict.c index b242a1d3..fd332ca1 100644 --- a/src/lib/dict.c +++ b/src/lib/dict.c @@ -691,7 +691,7 @@ GWION_IMPORT(dict) { GWI_BB(gwi_oper_ini(gwi, "Dict", NULL, NULL)) GWI_BB(gwi_oper_add(gwi, opck_dict_scan)) - GWI_BB(gwi_oper_end(gwi, "@scan", NULL)) + GWI_BB(gwi_oper_end(gwi, "class", NULL)) GWI_BB(gwi_oper_ini(gwi, "Dict", NULL, "int")) GWI_BB(gwi_oper_emi(gwi, opem_dict_each)) diff --git a/src/lib/object_op.c b/src/lib/object_op.c index ad031595..4aa44c55 100644 --- a/src/lib/object_op.c +++ b/src/lib/object_op.c @@ -437,6 +437,6 @@ GWION_IMPORT(object_op) { GWI_BB(gwi_oper_end(gwi, "!", NULL)) GWI_BB(gwi_oper_ini(gwi, "@Compound", NULL, NULL)) GWI_BB(gwi_oper_add(gwi, opck_struct_scan)) - GWI_BB(gwi_oper_end(gwi, "@scan", NULL)) + GWI_BB(gwi_oper_end(gwi, "class", NULL)) return GW_OK; } diff --git a/src/lib/ptr.c b/src/lib/ptr.c index f623dd7d..1274b3bf 100644 --- a/src/lib/ptr.c +++ b/src/lib/ptr.c @@ -185,7 +185,7 @@ GWION_IMPORT(ptr) { GWI_BB(gwi_class_end(gwi)) GWI_BB(gwi_oper_ini(gwi, "Ptr", NULL, NULL)) GWI_BB(gwi_oper_add(gwi, opck_ptr_scan)) - GWI_BB(gwi_oper_end(gwi, "@scan", NULL)) + GWI_BB(gwi_oper_end(gwi, "class", NULL)) GWI_BB(gwi_oper_ini(gwi, (m_str)OP_ANY_TYPE, "Ptr", NULL)) GWI_BB(gwi_oper_add(gwi, opck_ptr_assign)) GWI_BB(gwi_oper_emi(gwi, opem_ptr_assign)) diff --git a/src/lib/ref.c b/src/lib/ref.c index bbc19bb8..6f75b68d 100644 --- a/src/lib/ref.c +++ b/src/lib/ref.c @@ -192,6 +192,6 @@ GWION_IMPORT(ref) { gwidoc(gwi, "internal `Ref` type creation."); GWI_BB(gwi_oper_ini(gwi, "Ref", NULL, NULL)) GWI_BB(gwi_oper_add(gwi, opck_ref_scan)) - GWI_BB(gwi_oper_end(gwi, "@scan", NULL)) + GWI_BB(gwi_oper_end(gwi, "class", NULL)) return GW_OK; } diff --git a/src/parse/template.c b/src/parse/template.c index 5936114a..2684fac6 100644 --- a/src/parse/template.c +++ b/src/parse/template.c @@ -182,7 +182,7 @@ ANN static Type _scan_type(const Env env, const Type t, Type_Decl *td) { ? t->info->cdef->base.tmpl->list : NULL; const bool is_spread = is_spread_tmpl(t->info->cdef->base.tmpl); if(!single_variadic) CHECK_BO(check_tmpl(env, tl, sl, td->pos, is_spread)); - struct Op_Import opi = {.op = insert_symbol("@scan"), + struct Op_Import opi = {.op = insert_symbol("class"), .lhs = t, .data = (uintptr_t)&ts, .pos = td->pos}; -- 2.43.0