js/CoreFW
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rename cfw_new_p to cfw_create.

Browse source
This commit is contained in:
Jonathan Schleifer 2012-04-22 17:30:25 +02:00
parent 290017b471
commit 5508a6a8f7
3 changed files with 37 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/object.c
View file

@ -57,7 +57,7 @@ cfw_new(CFWClass *class, ...)
} }
void* void*
cfw_new_p(CFWClass *class, ...) cfw_create(CFWClass *class, ...)
{ {
CFWObject *obj; CFWObject *obj;

2
src/object.h
View file

@ -36,7 +36,7 @@ typedef struct CFWObject {
extern CFWClass *cfw_object; extern CFWClass *cfw_object;
extern void* cfw_new(CFWClass*, ...); extern void* cfw_new(CFWClass*, ...);
extern void* cfw_new_p(CFWClass*, ...); extern void* cfw_create(CFWClass*, ...);
extern void* cfw_ref(void*); extern void* cfw_ref(void*);
extern void cfw_unref(void*); extern void cfw_unref(void*);
extern void cfw_free(void*); extern void cfw_free(void*);

70
tests/tests.c
View file

@ -59,57 +59,57 @@ print_map(CFWMap *map)
int int
main() main()
{ {
CFWRefPool *p; CFWRefPool *pool;
CFWArray *a; CFWArray *array;
CFWString *s, *s2; CFWString *str, *str2;
CFWMap *m; CFWMap *map;
size_t i; size_t i;
p = cfw_new(cfw_refpool); pool = cfw_new(cfw_refpool);
a = cfw_new_p(cfw_array, array = cfw_create(cfw_array,
cfw_new_p(cfw_string, "Hallo"), cfw_create(cfw_string, "Hallo"),
cfw_new_p(cfw_string, " Welt"), cfw_create(cfw_string, " Welt"),
cfw_new_p(cfw_string, "!"), NULL); cfw_create(cfw_string, "!"), NULL);
s = cfw_new(cfw_string, NULL); str = cfw_new(cfw_string, NULL);
for (i = 0; i < cfw_array_size(a); i++) for (i = 0; i < cfw_array_size(array); i++)
cfw_string_append(s, cfw_array_get(a, i)); cfw_string_append(str, cfw_array_get(array, i));
cfw_unref(p); cfw_unref(pool);
puts(cfw_string_c(s)); puts(cfw_string_c(str));
p = cfw_new(cfw_refpool); pool = cfw_new(cfw_refpool);
s2 = cfw_new_p(cfw_string, "ll"); str2 = cfw_create(cfw_string, "ll");
printf("%zd\n", cfw_string_find(s, s2, cfw_range_all)); printf("%zd\n", cfw_string_find(str, str2, cfw_range_all));
cfw_unref(p); cfw_unref(pool);
cfw_unref(s); cfw_unref(str);
p = cfw_new(cfw_refpool); pool = cfw_new(cfw_refpool);
m = cfw_new_p(cfw_map, map = cfw_create(cfw_map,
cfw_new_p(cfw_string, "Hallo"), cfw_create(cfw_string, "Hallo"),
cfw_new_p(cfw_string, "Welt!"), cfw_create(cfw_string, "Welt!"),
cfw_new_p(cfw_string, "Test"), cfw_create(cfw_string, "Test"),
cfw_new_p(cfw_string, "success!"), cfw_create(cfw_string, "success!"),
cfw_new_p(cfw_string, "int"), cfw_create(cfw_string, "int"),
cfw_new_p(cfw_int, INTMAX_C(1234)), NULL); cfw_create(cfw_int, INTMAX_C(1234)), NULL);
print_map(m); print_map(map);
cfw_map_set(m, cfw_map_set(map,
cfw_new_p(cfw_string, "Hallo"), cfw_create(cfw_string, "Hallo"),
cfw_new_p(cfw_string, "Test")); cfw_create(cfw_string, "Test"));
print_map(m); print_map(map);
cfw_map_set(m, cfw_new_p(cfw_string, "Hallo"), NULL); cfw_map_set(map, cfw_create(cfw_string, "Hallo"), NULL);
print_map(m); print_map(map);
cfw_unref(p); cfw_unref(pool);
return 0; return 0;
} }