Index: src/object.c ================================================================== --- src/object.c +++ src/object.c @@ -55,11 +55,11 @@ return obj; } void* -cfw_new_p(CFWClass *class, ...) +cfw_create(CFWClass *class, ...) { CFWObject *obj; assert(class != cfw_refpool); Index: src/object.h ================================================================== --- src/object.h +++ src/object.h @@ -34,11 +34,11 @@ int ref_cnt; } CFWObject; extern CFWClass *cfw_object; extern void* cfw_new(CFWClass*, ...); -extern void* cfw_new_p(CFWClass*, ...); +extern void* cfw_create(CFWClass*, ...); extern void* cfw_ref(void*); extern void cfw_unref(void*); extern void cfw_free(void*); extern CFWClass* cfw_class(void*); extern bool cfw_is(void*, CFWClass*); Index: tests/tests.c ================================================================== --- tests/tests.c +++ tests/tests.c @@ -57,59 +57,59 @@ } int main() { - CFWRefPool *p; - CFWArray *a; - CFWString *s, *s2; - CFWMap *m; + CFWRefPool *pool; + CFWArray *array; + CFWString *str, *str2; + CFWMap *map; size_t i; - p = cfw_new(cfw_refpool); - - a = cfw_new_p(cfw_array, - cfw_new_p(cfw_string, "Hallo"), - cfw_new_p(cfw_string, " Welt"), - cfw_new_p(cfw_string, "!"), NULL); - - s = cfw_new(cfw_string, NULL); - - for (i = 0; i < cfw_array_size(a); i++) - cfw_string_append(s, cfw_array_get(a, i)); - - cfw_unref(p); - - puts(cfw_string_c(s)); - - p = cfw_new(cfw_refpool); - s2 = cfw_new_p(cfw_string, "ll"); - printf("%zd\n", cfw_string_find(s, s2, cfw_range_all)); - - cfw_unref(p); - cfw_unref(s); - - p = cfw_new(cfw_refpool); - - m = cfw_new_p(cfw_map, - cfw_new_p(cfw_string, "Hallo"), - cfw_new_p(cfw_string, "Welt!"), - cfw_new_p(cfw_string, "Test"), - cfw_new_p(cfw_string, "success!"), - cfw_new_p(cfw_string, "int"), - cfw_new_p(cfw_int, INTMAX_C(1234)), NULL); - - print_map(m); - - cfw_map_set(m, - cfw_new_p(cfw_string, "Hallo"), - cfw_new_p(cfw_string, "Test")); - - print_map(m); - - cfw_map_set(m, cfw_new_p(cfw_string, "Hallo"), NULL); - print_map(m); - - cfw_unref(p); + pool = cfw_new(cfw_refpool); + + array = cfw_create(cfw_array, + cfw_create(cfw_string, "Hallo"), + cfw_create(cfw_string, " Welt"), + cfw_create(cfw_string, "!"), NULL); + + str = cfw_new(cfw_string, NULL); + + for (i = 0; i < cfw_array_size(array); i++) + cfw_string_append(str, cfw_array_get(array, i)); + + cfw_unref(pool); + + puts(cfw_string_c(str)); + + pool = cfw_new(cfw_refpool); + str2 = cfw_create(cfw_string, "ll"); + printf("%zd\n", cfw_string_find(str, str2, cfw_range_all)); + + cfw_unref(pool); + cfw_unref(str); + + pool = cfw_new(cfw_refpool); + + map = cfw_create(cfw_map, + cfw_create(cfw_string, "Hallo"), + cfw_create(cfw_string, "Welt!"), + cfw_create(cfw_string, "Test"), + cfw_create(cfw_string, "success!"), + cfw_create(cfw_string, "int"), + cfw_create(cfw_int, INTMAX_C(1234)), NULL); + + print_map(map); + + cfw_map_set(map, + cfw_create(cfw_string, "Hallo"), + cfw_create(cfw_string, "Test")); + + print_map(map); + + cfw_map_set(map, cfw_create(cfw_string, "Hallo"), NULL); + print_map(map); + + cfw_unref(pool); return 0; }