:art: Use generator for flags

diff --git a/ast b/ast
index 7497ebfbb141e592ffde20246a01a754a6c31e76..209581d7d804fab314f54ee35cf68210aabc0674 160000 (submodule)
--- a/ast
+++ b/ast
@@ -1 +1 @@
-Subproject commit 7497ebfbb141e592ffde20246a01a754a6c31e76
+Subproject commit 209581d7d804fab314f54ee35cf68210aabc0674

diff --git a/include/env/func.h b/include/env/func.h
index fbde81bba082f61bb7c591d096cea905fba0ba4a..026ab7c064d4d25f19854452416f3b31f88cac5b 100644 (file)
--- a/include/env/func.h
+++ b/include/env/func.h
@@ -25,33 +25,7 @@ struct Func_ {
 ANN void free_func(const Func, struct Gwion_*const);
 ANN static inline void func_addref(const Func f) { ++f->ref; }
 ANN static inline void func_remref(const Func f, struct Gwion_ *const gwion) { if(!--f->ref) free_func(f, gwion); }
-
-static inline int fflag(const Func f, const enum fflag flag) {
-  return (f->fflag & flag) == flag;
-}
-
-static inline int safe_fflag(const Func f, const enum fflag flag) {
-  return f ? ((f->fflag & flag) == flag) : 0;
-}
-#ifndef __cplusplus
-static inline void set_fflag(const Func f, const enum fflag flag) {
-  f->fflag |= flag;
-}
-
-static inline void unset_fflag(const Func f, const enum fflag flag) {
-  f->fflag &= ~flag;
-}
-#else
-static inline void set_fflag(const Func f, const enum fflag flag) {
-  const auto ff = f->fflag | flag;
-  f->fflag = static_cast<enum fflag>(ff);
-}
-
-static inline void unset_fflag(const Func f, const enum fflag flag) {
-  const auto ff = f->fflag & ~flag;
-  f->fflag = static_cast<enum fflag>(ff);
-}
-#endif
+FLAG_FUNC(Func, f)
 
 ANEW ANN Func new_func(MemPool, const m_str, const Func_Def);
 ANN2(1,2) Symbol func_symbol(const Env, const m_str, const m_str, const m_str, const m_uint);

diff --git a/include/env/type.h b/include/env/type.h
index b6400d90490a5f25b90a01a54fcce99bbe1428e8..9e1abbaa6c0e52183f7f4545261ef0edba0cead1 100644 (file)
--- a/include/env/type.h
+++ b/include/env/type.h
@@ -54,31 +54,8 @@ struct Type_ {
 ANN void free_type(const Type, struct Gwion_*const);
 ANN static inline void type_addref(const Type t) { ++t->ref; }
 ANN static inline void type_remref(const Type t, struct Gwion_ *const gwion) { if(!--t->ref) free_type(t, gwion); }
-ANN static inline int tflag(const Type t, const enum tflag flag) {
-  return (t->tflag & flag) == flag;
-}
-static inline int safe_tflag(const Type t, const enum tflag flag) {
-  return t ? ((t->tflag & flag) == flag) : 0;
-}
-#ifndef __cplusplus
-ANN static inline void set_tflag(const Type t, const enum tflag flag) {
-  t->tflag |= flag;
-}
-
-static inline void unset_tflag(const Type t, const enum tflag flag) {
-  t->tflag &= ~flag;
-}
-#else
-ANN static inline void set_tflag(const Type t, const enum tflag flag) {
-  auto ff = t->tflag | flag;
-  t->tflag = static_cast<enum tflag>(ff);
-}
+FLAG_FUNC(Type, t)
 
-static inline void unset_tflag(const Type t, const enum tflag flag) {
-  const auto ff = t->tflag & ~flag;
-  t->tflag = static_cast<enum fflag>(tt);
-}
-#endif
 ANN2(1,3) ANEW Type new_type(MemPool, const m_uint xid, const m_str name, const Type);
 ANEW ANN Type type_copy(MemPool, const Type type);
 ANN m_str get_type_name(const Env, const Type t, const m_uint);

diff --git a/include/env/value.h b/include/env/value.h
index 912eed82c11a20c26b25f02a0344d1df99a0fa0f..b49cd631922c2b501152aebc570ce3ec626e611e 100644 (file)
--- a/include/env/value.h
+++ b/include/env/value.h
@@ -38,20 +38,8 @@ struct Value_ {
 ANN void free_value(const Value, struct Gwion_*const);
 ANN static inline void value_addref(const Value v) { ++v->ref; }
 ANN static inline void value_remref(const Value v, struct Gwion_ *const gwion) { if(!--v->ref) free_value(v, gwion); }
-static inline int vflag(const Value v, const enum vflag flag) {
-  return (v->vflag & flag) == flag;
-}
 
-#ifndef __cplusplus
-static inline void set_vflag(const Value v, const enum vflag flag) {
-  v->vflag |= flag;
-}
-#else
-static inline void set_vflag(const Value v, const enum vflag flag) {
-  auto ff = v->vflag | flag;
-  v->vflag = static_cast<enum vflag>(ff);
-}
-#endif
+FLAG_FUNC(Value, v)
 
 ANEW ANN Value new_value(MemPool p, const Type type, const m_str name);
 ANN void valuefrom(const Env, struct ValueFrom_*);