From 8e454e810d9af4ebaec3df92ce3c47880a877790 Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C3=A9r=C3=A9mie=20Astor?= Date: Wed, 6 Jan 2021 22:23:42 +0100 Subject: [PATCH] :art: Update --- include/env/value.h | 16 +++++++++------- include/import/item.h | 2 +- plug | 2 +- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/include/env/value.h b/include/env/value.h index 8ee40aaf..094ab557 100644 --- a/include/env/value.h +++ b/include/env/value.h @@ -22,17 +22,19 @@ enum vflag { // vflag_used = 1 << 3 } __attribute__((packed)); +union __attribute__((transparent_union)) value_data { + m_uint num; + m_float fnum; + m_uint* ptr; + struct M_Object_ *obj; + Func func_ref; +}; + struct Value_ { Type type; m_str name; struct ValueFrom_ *from; - union __attribute__((transparent_union)) value_data { - m_uint num; - m_float fnum; - m_uint* ptr; - struct M_Object_ *obj; - Func func_ref; - } d; + union value_data d; uint16_t ref; ae_flag flag; enum vflag vflag; diff --git a/include/import/item.h b/include/import/item.h index 1c9622e6..68de56e3 100644 --- a/include/import/item.h +++ b/include/import/item.h @@ -3,6 +3,6 @@ ANN m_int gwi_item_ini(const Gwi gwi, const m_str type, const m_str name); ANN2(1) m_int gwi_item_end(const Gwi gwi, const ae_flag flag, union value_data); -#define gwi_item_end(a, b, c) gwi_item_end(a, (const ae_flag)(b), c) +//#define gwi_item_end(a, b, c) gwi_item_end(a, (const ae_flag)(b), c) ANN void ck_clean_item(MemPool, ImportCK*); #endif diff --git a/plug b/plug index 3ed7d6c8..70680a9f 160000 --- a/plug +++ b/plug @@ -1 +1 @@ -Subproject commit 3ed7d6c8e6bfecba2cab290035eb846068592884 +Subproject commit 70680a9f3ca9abb4b9003c9f69b1b9f33b81557e -- 2.43.0