From: fennecdjay <astor.jeremie@wanadoo.fr>
Date: Thu, 4 Apr 2019 10:59:01 +0000 (+0200)
Subject: :art: Improve env_storage
X-Git-Tag: nightly~2563
X-Git-Url: http://10.11.0.4:5575/?a=commitdiff_plain;h=4b5e2bdb7f4a9e991bcf81023967fce6d7dee710;p=gwion.git

:art: Improve env_storage
---

diff --git a/include/env.h b/include/env.h
index 8889fbf8..ade845ad 100644
--- a/include/env.h
+++ b/include/env.h
@@ -51,7 +51,7 @@ ANEW ANN m_str tl2str(const Env, const Type_List); // in type_decl.c
 ANN m_bool compat_func(const __restrict__ Func_Def, const __restrict__ Func_Def);
 ANN Type known_type(const Env env, const Type_Decl*);
 ANN m_bool env_access(const Env env, const ae_flag flag);
-ANN void env_storage(const Env env, ae_flag* flag);
+ANN m_bool env_storage(const Env env, ae_flag flag);
 ANN void env_add_type(const Env, const Type);
 ANN Type find_type(const Env, ID_List);
 ANN m_bool already_defined(const Env env, const Symbol s, const uint pos);
diff --git a/src/oo/env_utils.c b/src/oo/env_utils.c
index f218fdce..27651ba7 100644
--- a/src/oo/env_utils.c
+++ b/src/oo/env_utils.c
@@ -33,9 +33,9 @@ ANN m_bool env_access(const Env env, const ae_flag flag) {
   return GW_OK;
 }
 
-ANN void env_storage(const Env env, ae_flag* flag) {
-  if(env->class_def && GET(*flag, ae_flag_global))
-    *flag &= (uint)~ae_flag_global;
+ANN m_bool env_storage(const Env env, ae_flag flag) {
+  CHECK_BB(env_access(env, flag))
+  return !(env->class_def && GET(flag, ae_flag_global)) ? GW_OK :GW_ERROR;
 }
 
 ANN static Type find_typeof(const Env env, ID_List path) {
diff --git a/src/parse/scan0.c b/src/parse/scan0.c
index 2da929b1..499dfd02 100644
--- a/src/parse/scan0.c
+++ b/src/parse/scan0.c
@@ -70,8 +70,7 @@ ANN static m_bool scan0_stmt_type(const Env env, const Stmt_Type stmt) { GWDEBUG
 }
 
 ANN m_bool scan0_stmt_enum(const Env env, const Stmt_Enum stmt) { GWDEBUG_EXE
-  CHECK_BB(env_access(env, stmt->flag))
-  env_storage(env, &stmt->flag);
+  CHECK_BB(env_storage(env, stmt->flag))
   if(stmt->xid) {
     const Value v = nspc_lookup_value1(env->curr, stmt->xid);
     if(v)
@@ -107,8 +106,7 @@ ANN static Type union_type(const Env env, const Nspc nspc, const Symbol s, const
 }
 
 ANN static m_bool scan0_stmt_union(const Env env, const Stmt_Union stmt) { GWDEBUG_EXE
-  CHECK_BB(env_access(env, stmt->flag))
-  env_storage(env, &stmt->flag);
+  CHECK_BB(env_storage(env, stmt->flag))
   if(stmt->xid) {
     CHECK_BB(scan0_defined(env, stmt->xid, stmt->self->pos))
     const Nspc nspc = !GET_FLAG(stmt, global) ?
@@ -151,8 +149,7 @@ ANN static m_bool scan0_Stmt_List(const Env env, Stmt_List l) { GWDEBUG_EXE
 }
 
 ANN static m_bool scan0_class_def_pre(const Env env, const Class_Def class_def) { GWDEBUG_EXE
-  CHECK_BB(env_access(env, class_def->flag))
-  env_storage(env, &class_def->flag);
+  CHECK_BB(env_storage(env, class_def->flag))
   if(GET_FLAG(class_def, global)) {
     vector_add(&env->scope->nspc_stack, (vtype)env->curr);
     env->curr = env->global_nspc;
diff --git a/src/parse/scan1.c b/src/parse/scan1.c
index 8dd975be..e839bd49 100644
--- a/src/parse/scan1.c
+++ b/src/parse/scan1.c
@@ -50,8 +50,7 @@ ANN static Type scan1_exp_decl_type(const Env env, Exp_Decl* decl) {
 }
 
 ANN m_bool scan1_exp_decl(const Env env, Exp_Decl* decl) { GWDEBUG_EXE
-  CHECK_BB(env_access(env, decl->td->flag))
-  env_storage(env, &decl->td->flag);
+  CHECK_BB(env_storage(env, decl->td->flag))
   Var_Decl_List list = decl->list;
   ((Exp_Decl*)decl)->type = scan1_exp_decl_type(env, (Exp_Decl*)decl);
   CHECK_OB(decl->type)
@@ -268,8 +267,7 @@ ANN static m_bool scan1_stmt_list(const Env env, Stmt_List l) { GWDEBUG_EXE
 }
 
 ANN m_bool scan1_func_def(const Env env, const Func_Def f) { GWDEBUG_EXE
-  CHECK_BB(env_access(env, f->flag))
-  env_storage(env, &f->flag);
+  CHECK_BB(env_storage(env, f->flag))
   if(tmpl_list_base(f->tmpl))
     return GW_OK;
   const Func former = env->func;