Compare commits

...

2 Commits

Author SHA1 Message Date
Maciej Samborski f9fa4ce612 Removed unused _daPush 2024-10-12 14:43:11 +02:00
Maciej Samborski 6413a9c95c Added generic daPush macro and removed unused macros 2024-10-12 14:42:24 +02:00
2 changed files with 19 additions and 21 deletions

8
da.h
View File

@ -18,7 +18,6 @@ enum daFields {
typedef void * dynarr;
GenericReturn _daCreate(size_t initCapacity, size_t type, size_t size);
GenericReturn _daPush(dynarr * da, void * item);
GenericReturn _daPushLit(dynarr * da, size_t item);
GenericReturn _daPushStr(dynarr * da, const char * str);
GenericReturn daCopy(dynarr da);
@ -43,9 +42,10 @@ void daBzero(dynarr da);
#define dynarr(type) type *
#define daCreate(type, cap) _daCreate(cap, sizeof(type), 0)
#define daPush(da, item) _daPush((void *)&da, &item)
#define daPushLit(da, item) _daPushLit((void *)&da, item)
#define daPushStr(da, str) _daPushStr((void *)&da, str)
#define daPush(da, item) _Generic((item), \
char *: _daPushStr, \
default: _daPushLit \
)((void *)&da, item)
#define daPop(da, item) _daPop(da, &item)
#endif // DA_H_

View File

@ -1,5 +1,3 @@
#include <stdio.h>
#define DA_IMPLEMENTATION
#include "da.h"
@ -49,13 +47,13 @@ int main(void)
dynarr(unsigned short) da = resultGeneric(dynarr(unsigned short), gr);
daPushLit(da, 69);
daPushLit(da, 420);
daPushLit(da, 1337);
daPushLit(da, 34);
daPushLit(da, 35);
daPush(da, 69);
daPush(da, 420);
daPush(da, 1337);
daPush(da, 34);
daPush(da, 35);
daPushLit(da, 1667);
daPush(da, 1667);
unsigned short x = 0;
@ -72,14 +70,14 @@ int main(void)
dynarr(char) da2 = daCreate(char, 1).val;
daPushLit(da2, 'H');
daPushLit(da2, 'i');
daPushLit(da2, ' ');
daPushLit(da2, 'm');
daPushLit(da2, 'o');
daPushLit(da2, 'm');
daPushLit(da2, '?');
daPushLit(da2, '?');
daPush(da2, 'H');
daPush(da2, 'i');
daPush(da2, ' ');
daPush(da2, 'm');
daPush(da2, 'o');
daPush(da2, 'm');
daPush(da2, '?');
daPush(da2, '?');
*(char *)daGetRef(da2, 6) = '!';
@ -96,7 +94,7 @@ int main(void)
dynarr(char *) da3 = daCreate(char *, 1).val;
for (size_t i = 0; i < 1000000; ++i) {
daPushStr(da3, "Test");
daPush(da3, "Test");
}
char * str;