abdelrahman/wizapp-stdlib
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix array pop for C++ pointer types

Browse Source
This commit is contained in:
Abdelrahman Said
2025-11-08 20:45:41 +00:00
parent 0a00721c10
commit 1bdc1ad955
3 changed files with 28 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
codegen/array/make_array.py
View File

@@ -219,16 +219,29 @@ def make_array(user_datatypes: Dict[CDataType, ArrayData] = {}):
array_typename=array_data.array_typename, array_typename=array_data.array_typename,
), ),
) )
array_pop_cppmacro = CMacro(
name=f"wapp_{type_string_lower}_array_pop(ARRAY_PTR)", if "*" in type_string:
value=__format_func_body( array_pop_cppmacro = CMacro(
filename=snippets_dir / "array_pop_macro_cpp", name=f"wapp_{type_string_lower}_array_pop(ARRAY_PTR)",
type_string=type_string, value=__format_func_body(
type_string_upper=type_string_upper, filename=snippets_dir / "ptr_array_pop_macro_cpp",
type_string_lower=type_string_lower, type_string=type_string,
array_typename=array_data.array_typename, type_string_upper=type_string_upper,
), type_string_lower=type_string_lower,
) array_typename=array_data.array_typename,
),
)
else:
array_pop_cppmacro = CMacro(
name=f"wapp_{type_string_lower}_array_pop(ARRAY_PTR)",
value=__format_func_body(
filename=snippets_dir / "array_pop_macro_cpp",
type_string=type_string,
type_string_upper=type_string_upper,
type_string_lower=type_string_lower,
array_typename=array_data.array_typename,
),
)
get_func = CFunc( get_func = CFunc(
name=f"wapp_{type_string_lower}_array_get", name=f"wapp_{type_string_lower}_array_get",

4
codegen/array/snippets/ptr_array_pop_macro_cpp Normal file
View File

@@ -0,0 +1,4 @@
(ARRAY_PTR != NULL && (ARRAY_PTR)->count > 0 ? \
*_{Tlower}_array_pop(ARRAY_PTR) : \
({T})(0) \
)

2
src/primitives/array/array.h
View File

@@ -51,7 +51,7 @@ BEGIN_C_LINKAGE
}()) }())
#define wapp_void_ptr_array_pop(ARRAY_PTR) (ARRAY_PTR != NULL && (ARRAY_PTR)->count > 0 ? \ #define wapp_void_ptr_array_pop(ARRAY_PTR) (ARRAY_PTR != NULL && (ARRAY_PTR)->count > 0 ? \
*_void_ptr_array_pop(ARRAY_PTR) : \ *_void_ptr_array_pop(ARRAY_PTR) : \
void *{} \ (void *)(0) \
) )
#define wapp_str8_array(...) ([&]() { \ #define wapp_str8_array(...) ([&]() { \
wapp_persist Str8 buf[wapp_misc_utils_u64_round_up_pow2(wapp_misc_utils_va_args_count(Str8, __VA_ARGS__) * 2)] = {__VA_ARGS__}; \ wapp_persist Str8 buf[wapp_misc_utils_u64_round_up_pow2(wapp_misc_utils_va_args_count(Str8, __VA_ARGS__) * 2)] = {__VA_ARGS__}; \