From: Jérémie Astor Date: Wed, 6 May 2020 16:34:21 +0000 (+0200) Subject: :art: Flag fixing X-Git-Tag: nightly~1653 X-Git-Url: http://10.10.0.4:5575/?a=commitdiff_plain;h=8e682dc7fb004978a5b6a1de1ac02ea8600e675d;p=gwion.git :art: Flag fixing --- diff --git a/src/parse/check.c b/src/parse/check.c index 8a196dc0..0b11a3cc 100644 --- a/src/parse/check.c +++ b/src/parse/check.c @@ -1361,7 +1361,7 @@ ANN m_bool check_class_def(const Env env, const Class_Def c) { const Class_Def cdef = t->e->def; if(t->e->owner_class && !GET_FLAG(t->e->owner_class, check)) CHECK_BB(check_class_def(env, t->e->owner_class->e->def)) - if(GET_FLAG(t, checked))return GW_OK; + if(GET_FLAG(t, check))return GW_OK; SET_FLAG(t, check); if(cdef->base.ext) CHECK_BB(cdef_parent(env, cdef)) diff --git a/src/parse/scan1.c b/src/parse/scan1.c index ab876aa8..c83fa680 100644 --- a/src/parse/scan1.c +++ b/src/parse/scan1.c @@ -511,6 +511,7 @@ ANN m_bool scan1_class_def(const Env env, const Class_Def c) { const Type t = c->base.type; const Class_Def cdef = t->e->def; if(GET_FLAG(t, scan1))return GW_OK; + SET_FLAG(cdef, scan1); if(t->e->owner_class && !GET_FLAG(t->e->owner_class, scan1)) CHECK_BB(scan1_class_def(env, t->e->owner_class->e->def)) SET_FLAG(cdef->base.type, scan1); @@ -518,7 +519,6 @@ ANN m_bool scan1_class_def(const Env env, const Class_Def c) { CHECK_BB(cdef_parent(env, cdef)) if(cdef->body) CHECK_BB(env_body(env, cdef, scan1_section)) - SET_FLAG(cdef, scan1); return GW_OK; }