Commit a191720b55c5671fb7ae02bff689da4cb1a1bcdd
2024-01-05T20:28:33
asan
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169
diff --git a/libc3/env.c b/libc3/env.c
index 4dd22fe..9befcef 100644
--- a/libc3/env.c
+++ b/libc3/env.c
@@ -807,6 +807,48 @@ bool env_eval_void (s_env *env, const void *_, s_tag *dest)
return true;
}
+s_list ** env_get_struct_type_spec (s_env *env,
+ const s_sym *module,
+ s_list **dest)
+{
+ s_facts_with_cursor cursor;
+ s_fact *found;
+ s_tag tag_defstruct;
+ s_tag tag_module;
+ s_tag tag_var;
+ s_tag tmp;
+ assert(env);
+ assert(module);
+ assert(dest);
+ tag_init_sym_1(&tag_defstruct, "defstruct");
+ tag_init_sym(&tag_module, module);
+ tag_init_var(&tag_var);
+ if (! env_module_maybe_reload(env, module, &env->facts))
+ return NULL;
+ facts_with(&env->facts, &cursor, (t_facts_spec) {
+ &tag_module, &tag_defstruct, &tag_var, NULL, NULL });
+ found = facts_with_cursor_next(&cursor);
+ if (! found) {
+ facts_with_cursor_clean(&cursor);
+ return NULL;
+ }
+ if (! env_eval_tag(env, found->object, &tmp)) {
+ facts_with_cursor_clean(&cursor);
+ return NULL;
+ }
+ facts_with_cursor_clean(&cursor);
+ if (tmp.type != TAG_LIST ||
+ ! list_is_plist(tmp.data.list)) {
+ warnx("env_get_struct_type_spec: module %s"
+ " has a defstruct that is not a property list",
+ module->str.ptr.ps8);
+ tag_clean(&tmp);
+ return NULL;
+ }
+ *dest = tmp.data.list;
+ return dest;
+}
+
s_env * env_init (s_env *env, int argc, s8 **argv)
{
s_str path;
@@ -845,49 +887,6 @@ s_env * env_init (s_env *env, int argc, s8 **argv)
return env;
}
-const s_list ** env_get_struct_type_spec (s_env *env,
- const s_sym *module,
- const s_list **dest)
-{
- s_facts_cursor cursor;
- s_tag tag_defstruct;
- s_tag tag_module;
- s_tag tag_var;
- s_tag tmp;
- assert(env);
- assert(module);
- assert(dest);
- tag_init_sym_1(&tag_defstruct, "defstruct");
- tag_init_sym(&tag_module, module);
- tag_init_var(&tag_var);
- if (! env_module_maybe_reload(env, module, &env->facts))
- return NULL;
- facts_with_tags(&env->facts, &cursor, &tag_module,
- &tag_defstruct, &tag_var);
- if (! facts_cursor_next(&cursor)) {
- /*warnx("env_get_struct_type_spec: module %s"
- " does not use defstruct",
- module->str.ptr.ps8);*/
- facts_cursor_clean(&cursor);
- return NULL;
- }
- if (! env_eval_tag(env, &tag_var, &tmp)) {
- facts_cursor_clean(&cursor);
- return NULL;
- }
- facts_cursor_clean(&cursor);
- if (tmp.type != TAG_LIST ||
- ! list_is_plist(tmp.data.list)) {
- warnx("env_get_struct_type_spec: module %s"
- " has a defstruct that is not a property list",
- module->str.ptr.ps8);
- tag_clean(&tmp);
- return NULL;
- }
- *dest = tmp.data.list;
- return dest;
-}
-
s_env * env_init_args (s_env *env, int argc, s8 **argv)
{
s8 a[PATH_MAX];
@@ -936,7 +935,7 @@ bool env_module_load (s_env *env, const s_sym *module, s_facts *facts)
{
s_str path;
s_struct_type *st;
- const s_list *st_spec;
+ s_list *st_spec;
s_tag tag_module_name;
s_tag tag_load_time;
s_tag tag_st = {0};
@@ -960,14 +959,17 @@ bool env_module_load (s_env *env, const s_sym *module, s_facts *facts)
str_clean(&path);
tag_init_sym(&tag_module_name, module);
tag_init_sym_1(&tag_load_time, "load_time");
- facts_replace_tags(facts, &tag_module_name, &tag_load_time, &tag_time);
+ facts_replace_tags(facts, &tag_module_name, &tag_load_time,
+ &tag_time);
tag_clean(&tag_time);
if (env_get_struct_type_spec(env, module, &st_spec)) {
tag_init_sym_1(&tag_struct_type, "struct_type");
tag_st.type = TAG_STRUCT_TYPE;
st = &tag_st.data.struct_type;
struct_type_init(st, module, st_spec);
- facts_replace_tags(facts, &tag_module_name, &tag_struct_type, &tag_st);
+ facts_replace_tags(facts, &tag_module_name, &tag_struct_type,
+ &tag_st);
+ list_delete_all(st_spec);
}
return true;
}
diff --git a/libc3/env.h b/libc3/env.h
index 74db809..627a8d9 100644
--- a/libc3/env.h
+++ b/libc3/env.h
@@ -64,9 +64,8 @@ bool env_eval_tag (s_env *env, const s_tag *tag,
bool env_eval_tuple (s_env *env, const s_tuple *tuple,
s_tag *dest);
bool env_eval_void (s_env *env, const void *_, s_tag *dest);
-const s_list ** env_get_struct_type_spec (s_env *env,
- const s_sym *module,
- const s_list **dest);
+s_list ** env_get_struct_type_spec (s_env *env, const s_sym *module,
+ s_list **dest);
bool env_module_load (s_env *env, const s_sym *module,
s_facts *facts);
bool env_module_maybe_reload (s_env *env,
diff --git a/libc3/struct_type.c b/libc3/struct_type.c
index 40735ab..84ffdf4 100644
--- a/libc3/struct_type.c
+++ b/libc3/struct_type.c
@@ -127,7 +127,7 @@ s_struct_type * struct_type_init_from_env (s_struct_type *st,
const s_sym *module,
s_env *env)
{
- const s_list *spec;
+ s_list *spec;
assert(st);
assert(module);
assert(env);
@@ -136,6 +136,7 @@ s_struct_type * struct_type_init_from_env (s_struct_type *st,
return NULL;
if (! struct_type_init(st, module, spec))
return NULL;
+ list_delete_all(spec);
return st;
}