Commit 2e29973b4dc117887641449c2821d9fd2722a491
2025-03-04T20:28:30
wip pstruct
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 170 171 172 173 174 175
diff --git a/http/http_request.c b/http/http_request.c
index 23d9395..88045fb 100644
--- a/http/http_request.c
+++ b/http/http_request.c
@@ -318,18 +318,18 @@ s_tag * http_request_buf_parse (s_tag *req, s_buf *buf)
" buf_read_until_str_into_file");
goto restore;
}
- upload.type = TAG_STRUCT;
- if (! struct_init(&upload.data.struct_, sym_Upload))
+ upload.type = TAG_PSTRUCT;
+ if (! pstruct_init(&upload.data.pstruct, sym_Upload))
goto restore;
- if (! struct_allocate(&upload.data.struct_))
+ if (! struct_allocate(upload.data.pstruct))
goto restore;
- if (! struct_set(&upload.data.struct_, sym_1("filename"),
+ if (! struct_set(upload.data.pstruct, sym_1("filename"),
&filename))
goto restore;
- if (! struct_set(&upload.data.struct_, sym_1("size"),
+ if (! struct_set(upload.data.pstruct, sym_1("size"),
&size))
goto restore;
- if (! struct_set(&upload.data.struct_, sym_1("tmp_path"),
+ if (! struct_set(upload.data.pstruct, sym_1("tmp_path"),
&path))
goto restore;
tmp_req.body.data.list =
@@ -389,13 +389,13 @@ s_tag * http_request_buf_parse (s_tag *req, s_buf *buf)
tmp_req.body = body;
}
}
- if (! tag_init_struct(&tmp, sym_1("HTTP.Request")))
+ if (! tag_init_pstruct(&tmp, sym_1("HTTP.Request")))
goto restore;
- if (! struct_allocate(&tmp.data.struct_)) {
+ if (! struct_allocate(tmp.data.pstruct)) {
tag_void(&tmp);
goto restore;
}
- *((s_http_request *) tmp.data.struct_.data) = tmp_req;
+ *((s_http_request *) tmp.data.pstruct->data) = tmp_req;
goto clean;
restore:
list_delete_all(multipart_headers);
diff --git a/http/http_response.c b/http/http_response.c
index b6fec9a..624e1b9 100644
--- a/http/http_response.c
+++ b/http/http_response.c
@@ -238,7 +238,7 @@ sw http_response_buf_write (const s_http_response *response,
result += r;
}
else if (type == &g_sym_Buf) {
- in = response->body.data.struct_.data;
+ in = response->body.data.pstruct->data;
while (buf_refill(in, in->size) > 0) {
err_inspect_buf(in);
if (! buf_read_to_str(in, &str))
diff --git a/libkc3/struct.c b/libkc3/struct.c
index 17d1130..83c06ab 100644
--- a/libkc3/struct.c
+++ b/libkc3/struct.c
@@ -428,6 +428,22 @@ s_struct * struct_new_type (s_struct_type *st)
return s;
}
+s_struct * struct_new_with_data (const s_sym *module, void *data,
+ bool free_data)
+{
+ s_struct *s;
+ assert(module);
+ assert(data);
+ s = alloc(sizeof(s_struct));
+ if (! s)
+ return NULL;
+ if (! struct_init_with_data(s, module, data, free_data)) {
+ free(s);
+ return NULL;
+ }
+ return s;
+}
+
uw * struct_offset (const s_struct *s, const s_sym * const *key,
uw *dest)
{
diff --git a/test/inspect_test.c b/test/inspect_test.c
index 7aac858..d414eff 100644
--- a/test/inspect_test.c
+++ b/test/inspect_test.c
@@ -20,11 +20,12 @@
#include "../libkc3/inspect.h"
#include "../libkc3/integer.h"
#include "../libkc3/list.h"
+#include "../libkc3/pstruct.h"
#include "../libkc3/ratio.h"
#include "../libkc3/str.h"
+#include "../libkc3/struct.h"
#include "../libkc3/sym.h"
#include "../libkc3/tag.h"
-#include "../libkc3/struct.h"
#include "../libkc3/tuple.h"
#include "../libkc3/var.h"
#include "test.h"
@@ -145,16 +146,16 @@
do { \
s_pretty pretty = {0}; \
s_str result; \
- s_struct struct_test = {0}; \
+ p_struct struct_test = NULL; \
assert(test); \
test_context("inspect_struct(" # test ") -> " # expected); \
- TEST_EQ(struct_init_1(&struct_test, (test)), &struct_test); \
- TEST_EQ(inspect_struct(&struct_test, &result), &result); \
+ TEST_EQ(pstruct_init_1(&struct_test, (test)), &struct_test); \
+ TEST_EQ(inspect_struct(struct_test, &result), &result); \
TEST_STRNCMP(result.ptr.p, (expected), result.size); \
- TEST_EQ(buf_inspect_struct_size(&pretty, &struct_test), \
+ TEST_EQ(buf_inspect_struct_size(&pretty, struct_test), \
strlen(expected)); \
str_clean(&result); \
- struct_clean(&struct_test); \
+ pstruct_clean(&struct_test); \
test_context(NULL); \
} while (0)
diff --git a/window/sdl2/demo/earth.c b/window/sdl2/demo/earth.c
index c50ae68..16c6086 100644
--- a/window/sdl2/demo/earth.c
+++ b/window/sdl2/demo/earth.c
@@ -50,13 +50,14 @@ bool earth_load (s_sequence *seq)
if (! tag_map(&seq->tag, 3))
return false;
map = &seq->tag.data.map;
- tag_init_sym( map->key + 0, sym_1("camera"));
- tag_init_ptr_free( map->value + 0, camera);
- tag_init_sym( map->key + 1, sym_1("camera_rot_x_speed"));
- tag_init_f64( map->value + 1, 0.01);
- tag_init_sym( map->key + 2, sym_1("sphere"));
- tag_init_struct_with_data(map->value + 2, sym_1("GL.Sphere"),
- sphere, false);
+ tag_init_sym( map->key + 0, sym_1("camera"));
+ tag_init_ptr_free( map->value + 0, camera);
+ tag_init_sym( map->key + 1,
+ sym_1("camera_rot_x_speed"));
+ tag_init_f64( map->value + 1, 0.01);
+ tag_init_sym( map->key + 2, sym_1("sphere"));
+ tag_init_pstruct_with_data(map->value + 2, sym_1("GL.Sphere"),
+ sphere, false);
return true;
}
@@ -78,13 +79,13 @@ bool earth_render (s_sequence *seq)
map = &seq->tag.data.map;
if (map->value[0].type != TAG_PTR_FREE ||
map->value[1].type != TAG_F64 ||
- map->value[2].type != TAG_STRUCT) {
+ map->value[2].type != TAG_PSTRUCT) {
err_puts("earth_render: invalid map");
return false;
}
camera = map->value[0].data.ptr_free.p;
camera_rot_x_speed = &map->value[1].data.f64;
- sphere = map->value[2].data.struct_.data;
+ sphere = map->value[2].data.pstruct->data;
gl_camera_set_aspect_ratio(camera, window->w, window->h);
camera->rotation.x += seq->dt * (*camera_rot_x_speed) *
M_PI * 2.0f;
diff --git a/window/sdl2/kubz b/window/sdl2/kubz
index 36df94a..c2731bc 160000
--- a/window/sdl2/kubz
+++ b/window/sdl2/kubz
@@ -1 +1 @@
-Subproject commit 36df94af87af73435edd441ded193b5862c6ca53
+Subproject commit c2731bcdc39f7798a2f2daca041e1d82c0fc8ac2