From 93c050fb46c9e653bfaa705670e5a73b2a6ff04c Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C3=A9r=C3=A9mie=20Astor?= Date: Fri, 8 May 2020 11:50:24 +0200 Subject: [PATCH] :art: Use envset in scan_class --- src/lib/object_op.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/src/lib/object_op.c b/src/lib/object_op.c index b43f05e5..6e051bf5 100644 --- a/src/lib/object_op.c +++ b/src/lib/object_op.c @@ -384,7 +384,7 @@ ANN static m_bool class2udef(const Env env, const Class_Def a, const Type t) { return GW_OK; } -ANN static m_bool scan0_cdef(const Env env, const Type t, const Class_Def a) { +ANN static m_bool _scan_class(const Env env, const Type t, const Class_Def a) { if(t->e->parent != env->gwion->type[et_union]) CHECK_BB(scan0_class_def(env, a)) else @@ -401,14 +401,18 @@ ANN static Type scan_class(const Env env, const Type t, const Type_Decl* td) { DECL_OO(const Class_Def, a, = template_class(env, t->e->def, td->types)) if(a->base.type) return a->base.type; + struct EnvSet es = { .env=env, .data=env, .func=(_exp_func)scan0_cdef, + .scope=env->scope->depth, .flag=ae_flag_scan0 }; + if(t->e->owner_class) + CHECK_BO(envset_push(&es, t->e->owner_class)) a->base.tmpl = mk_tmpl(env, t->e->def->base.tmpl, td->types); - if(scan0_cdef(env, t, a) < 0) { - free_tmpl(env->gwion->mp, a->base.tmpl); - return NULL; - } - if(GET_FLAG(t, builtin)) - SET_FLAG(a->base.type, builtin); - return a->base.type; + const m_bool ret = _scan_class(env, t, a); + if(es.run) + envset_pop(&es, t->e->owner_class); + if(ret > 0) + return a->base.type; + free_class_def(env->gwion->mp, a); + return NULL; } ANN static inline Symbol dot_symbol(SymTable *st, const Value v) { -- 2.43.0