:art: update scanx

diff --git a/src/parse/scanx.c b/src/parse/scanx.c
index ec46f12251f229ce09f62c20564454e2b1d8a634..6d4ee499447dfccc66f2946be8e0be436761708e 100644 (file)
--- a/src/parse/scanx.c
+++ b/src/parse/scanx.c
@@ -6,12 +6,17 @@
 #include "traverse.h"
 #include "parse.h"
 
-ANN static inline bool _body_b(const Env e, Ast b, const _envset_func f) {
+ANN static inline bool _body(const Env e, Ast b, const _envset_func f) {
+  bool ok = true;
   for(m_uint i = 0; i < b->len; i++) {
     Section *section = mp_vector_at(b, Section, i);
-    CHECK_B(f(e, section));
+    if(section->poison) continue;
+    if(!f(e, section)) {
+      section->poison = e->context->error = true;
+      ok = false;
+    }
   }
-  return true;
+  return ok;
 }
 
 ANN static inline int actual(const Tmpl *tmpl) {
@@ -32,7 +37,7 @@ ANN bool scanx_body(const Env e, const Class_Def c, const _envset_func f,
                       void *d) {
   const m_int scope = env_push_type(e, c->base.type);
   if(c->base.tmpl) CHECK_B(tmpl_push(e, c->base.tmpl));
-  const bool ret = _body_b(d, c->body, f);
+  const bool ret = _body(d, c->body, f);
   _pop(e, c, scope);
   return ret;
 }
@@ -46,7 +51,7 @@ ANN static bool _scanx_cdef(const Env env, void *opt, const Type t,
 
 ANN bool scanx_cdef(const Env env, void *opt, const Type t,
                       const _envset_func f_cdef, const _envset_func f_udef) {
-  const bool   in_try = env->scope->in_try;
+  const bool in_try = env->scope->in_try;
   const bool ret    = _scanx_cdef(env, opt, t, f_cdef, f_udef);
   env->scope->in_try  = in_try;
   return ret;
@@ -55,7 +60,7 @@ ANN bool scanx_cdef(const Env env, void *opt, const Type t,
 ANN bool scanx_fdef(const Env env, void *data, const Func_Def fdef,
                       const _envset_func func) {
   if (fdef->base->tmpl) CHECK_B(template_push_types(env, fdef->base->tmpl));
-  const bool   in_try = env->scope->in_try;
+  const bool in_try = env->scope->in_try;
   const bool ret    = func(data, fdef);
   if (fdef->base->tmpl) nspc_pop_type(env->gwion->mp, env->curr);
   env->scope->in_try = in_try;