mo7sen/evol-headers
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added some abandoned changes to the typesystem

Browse Source 
Signed-off-by: Robear Selwans <robear.selwans@outlook.com>
This commit is contained in:
Robear Selwans
2022-02-06 15:55:03 +00:00
parent 0d169433a4
commit d0ff4170be
3 changed files with 65 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ev_hash.h
View File

@@ -44,6 +44,7 @@ static inline u64 rotl64 ( u64 x, i8 r )
#endif // EV_CC_MSVC #endif // EV_CC_MSVC
#include "ev_macros.h"
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// Block read - if your platform needs to do endian-swapping or can only // Block read - if your platform needs to do endian-swapping or can only

92
ev_types.h
View File

@@ -8,7 +8,7 @@
typedef void(*ev_copy_fn)(void *dst, void *src); typedef void(*ev_copy_fn)(void *dst, void *src);
typedef void(*ev_free_fn)(void *self); typedef void(*ev_free_fn)(void *self);
typedef u64(*ev_hash_fn)(void *self, u64 seed); typedef u64(*ev_hash_fn)(void *self, u64 seed);
typedef bool(*ev_equal_fn)(void *self, void *other); typedef i32(*ev_cmp_fn)(void *self, void *other);
typedef struct { typedef struct {
EV_DEBUG(const char *name;) EV_DEBUG(const char *name;)
@@ -16,10 +16,10 @@ typedef struct {
u32 size; u32 size;
u32 alignment; u32 alignment;
ev_copy_fn copy_fn; ev_copy_fn copy_fn;
ev_free_fn free_fn; ev_free_fn free_fn;
ev_hash_fn hash_fn; ev_hash_fn hash_fn;
ev_equal_fn equal_fn; ev_cmp_fn cmp_fn;
void *default_val; void *default_val;
void *invalid_val; void *invalid_val;
@@ -28,33 +28,62 @@ typedef struct {
#define COPY_FUNCTION(T,name) EV_CAT(EV_CAT(EV_CAT(EV_COPY_FUNCTION_,T),_),name) #define COPY_FUNCTION(T,name) EV_CAT(EV_CAT(EV_CAT(EV_COPY_FUNCTION_,T),_),name)
#define FREE_FUNCTION(T,name) EV_CAT(EV_CAT(EV_CAT(EV_FREE_FUNCTION_,T),_),name) #define FREE_FUNCTION(T,name) EV_CAT(EV_CAT(EV_CAT(EV_FREE_FUNCTION_,T),_),name)
#define HASH_FUNCTION(T,name) EV_CAT(EV_CAT(EV_CAT(EV_HASH_FUNCTION_,T),_),name) #define HASH_FUNCTION(T,name) EV_CAT(EV_CAT(EV_CAT(EV_HASH_FUNCTION_,T),_),name)
#define EQUAL_FUNCTION(T,name) EV_CAT(EV_CAT(EV_CAT(EV_EQUAL_FUNCTION_,T),_),name) #define CMP_FUNCTION(T,name) EV_CAT(EV_CAT(EV_CAT(EV_CMP_FUNCTION_ ,T),_),name)
#include <string.h>
#define DEFINE_COPY_FUNCTION(T,name) void COPY_FUNCTION(T,name)(T *dst, T *src) #define DEFINE_COPY_FUNCTION(T,name) void COPY_FUNCTION(T,name)(T *dst, T *src)
#define DEFINE_DEFAULT_COPY_FUNCTION(T) \ #define DEFINE_DEFAULT_INTERNAL_COPY_FUNCTION(T) \
DEFINE_COPY_FUNCTION(T,DEFAULT) { *dst = *src; } static inline DEFINE_COPY_FUNCTION(T,__EV_INTERNAL) { memcpy(dst, src, sizeof(T)); }
#define DEFINE_FREE_FUNCTION(T,name) void FREE_FUNCTION(T,name)(T *self) #define DEFINE_FREE_FUNCTION(T,name) void FREE_FUNCTION(T,name)(T *self)
#define DEFINE_DEFAULT_FREE_FUNCTION(T) \ #define DEFINE_DEFAULT_INTERNAL_FREE_FUNCTION(T) \
DEFINE_FREE_FUNCTION(T,DEFAULT) { (void)self; } static inline DEFINE_FREE_FUNCTION(T,__EV_INTERNAL) { (void)self; }
#define DEFINE_HASH_FUNCTION(T,name) void HASH_FUNCTION(T,name)(T *self, u64 seed) #define DEFINE_HASH_FUNCTION(T,name) u64 HASH_FUNCTION(T,name)(T *self, u64 seed)
#define DEFINE_DEFAULT_HASH_FUNCTION(T) \ #define DEFINE_DEFAULT_INTERNAL_HASH_FUNCTION(T) \
DEFINE_HASH_FUNCTION(T,DEFAULT) { ev_hash_murmur3(self, sizeof(T), seed); } static inline DEFINE_HASH_FUNCTION(T,__EV_INTERNAL) { return ev_hash_murmur3(self, sizeof(T), seed); }
#define DEFINE_EQUAL_FUNCTION(T,name) bool EQUAL_FUNCTION(T,name)(T *self, T *other) #define DEFINE_CMP_FUNCTION(T,name) i32 CMP_FUNCTION(T,name)(T *self, T *other)
// NOTE: This shouldn't be used for non-arithmetic types. #define DEFINE_DEFAULT_INTERNAL_CMP_FUNCTION(T) \
#define DEFINE_DEFAULT_EQUAL_FUNCTION(T) \ static inline DEFINE_CMP_FUNCTION(T,__EV_INTERNAL) { return memcmp(self, other, sizeof(T)); }
DEFINE_EQUAL_FUNCTION(T,DEFAULT) { return memcmp(self, other, sizeof(T)); }
#define DECLARE_COPY_FUNCTION(T,name) DEFINE_COPY_FUNCTION(T,name); #define DECLARE_COPY_FUNCTION(T,name) DEFINE_COPY_FUNCTION(T,name);
#define DECLARE_FREE_FUNCTION(T,name) DEFINE_FREE_FUNCTION(T,name); #define DECLARE_FREE_FUNCTION(T,name) DEFINE_FREE_FUNCTION(T,name);
#define DECLARE_HASH_FUNCTION(T,name) DEFINE_HASH_FUNCTION(T,name); #define DECLARE_HASH_FUNCTION(T,name) DEFINE_HASH_FUNCTION(T,name);
#define DECLARE_EQUAL_FUNCTION(T,name) DEFINE_EQUAL_FUNCTION(T,name); #define DECLARE_CMP_FUNCTION(T,name) DEFINE_CMP_FUNCTION(T,name);
#define ACTIVE_COPY_FUNCTION(T) __EV_TYPE_INTERNAL_##T##_ACTIVE_COPY_FN
#define ACTIVE_FREE_FUNCTION(T) __EV_TYPE_INTERNAL_##T##_ACTIVE_FREE_FN
#define ACTIVE_HASH_FUNCTION(T) __EV_TYPE_INTERNAL_##T##_ACTIVE_HASH_FN
#define ACTIVE_CMP_FUNCTION(T) __EV_TYPE_INTERNAL_##T##_ACTIVE_CMP_FN
#define COPY_FUNCTION_TYPE(T) __EV_TYPE_INTERNAL_##T##_COPY_FN_TYPE
#define FREE_FUNCTION_TYPE(T) __EV_TYPE_INTERNAL_##T##_FREE_FN_TYPE
#define HASH_FUNCTION_TYPE(T) __EV_TYPE_INTERNAL_##T##_HASH_FN_TYPE
#define CMP_FUNCTION_TYPE(T) __EV_TYPE_INTERNAL_##T##_CMP_FN_TYPE
#define DEFINE_FUNCTION_TYPES(T) \
typedef void(*COPY_FUNCTION_TYPE(T))(T*,T*); \
typedef void(*FREE_FUNCTION_TYPE(T))(T*); \
typedef u64(*HASH_FUNCTION_TYPE(T))(T*,u64); \
typedef i32(*CMP_FUNCTION_TYPE(T))(T*,T*)
#define DEFINE_DEFAULT_INTERNAL_FUNCTIONS(T) \
DEFINE_DEFAULT_INTERNAL_COPY_FUNCTION(T) \
DEFINE_DEFAULT_INTERNAL_FREE_FUNCTION(T) \
DEFINE_DEFAULT_INTERNAL_HASH_FUNCTION(T) \
DEFINE_DEFAULT_INTERNAL_CMP_FUNCTION(T)
#define EV_OVERRIDE_VAR(T) EV_CAT(__ev_internal_override_var_,T) #define EV_OVERRIDE_VAR(T) EV_CAT(__ev_internal_override_var_,T)
#define TypeData(T) EV_CAT(EV_TYPEDATA_,T) #define TypeData(T) EV_CAT(EV_TYPEDATA_,T)
#define TYPEDATA_GEN(T, ...) \ #define TYPEDATA_GEN(T, ...) \
DEFINE_FUNCTION_TYPES(T); \
DEFINE_DEFAULT_INTERNAL_FUNCTIONS(T); \
static const COPY_FUNCTION_TYPE(T) ACTIVE_COPY_FUNCTION(T) = COPY_FUNCTION(T,__EV_INTERNAL); \
static const FREE_FUNCTION_TYPE(T) ACTIVE_FREE_FUNCTION(T) = FREE_FUNCTION(T,__EV_INTERNAL); \
static const HASH_FUNCTION_TYPE(T) ACTIVE_HASH_FUNCTION(T) = HASH_FUNCTION(T,__EV_INTERNAL); \
static const CMP_FUNCTION_TYPE(T) ACTIVE_CMP_FUNCTION(T) = CMP_FUNCTION(T,__EV_INTERNAL); \
EV_VA_OPT(__VA_ARGS__)(EV_FOREACH_UDATA(__EV_STRUCT_METHOD_DEF, T, __VA_ARGS__)) \
EV_WARNING_PUSH(); \ EV_WARNING_PUSH(); \
EV_WARNING_DISABLE_GCC("override-init"); \ EV_WARNING_DISABLE_GCC("override-init"); \
EV_WARNING_DISABLE_CLANG("override-init"); \ EV_WARNING_DISABLE_CLANG("override-init"); \
@@ -64,33 +93,34 @@ typedef struct {
.alignment = EV_ALIGNOF(T), \ .alignment = EV_ALIGNOF(T), \
.default_val = (void*)&(T){0}, \ .default_val = (void*)&(T){0}, \
.invalid_val = (void*)&(T){0}, \ .invalid_val = (void*)&(T){0}, \
EV_VA_OPT(__VA_ARGS__)(EV_FOREACH_UDATA(__EV_STRUCT_METHOD_DEF, T, __VA_ARGS__)) \ .copy_fn = (ev_copy_fn)ACTIVE_COPY_FUNCTION(T), \
.free_fn = (ev_free_fn)ACTIVE_FREE_FUNCTION(T), \
.hash_fn = (ev_hash_fn)ACTIVE_HASH_FUNCTION(T), \
.cmp_fn = (ev_cmp_fn) ACTIVE_CMP_FUNCTION(T) \
}; \ }; \
EV_WARNING_POP(); \ EV_WARNING_POP(); \
EV_UNUSED static T EV_OVERRIDE_VAR(T) EV_UNUSED static T EV_OVERRIDE_VAR(T)
#define __EV_STRUCT_METHOD_DEF(T, ...) EV_CAT(__EV_,EV_CAT(EV_HEAD __VA_ARGS__,_FN))(T, EV_TAIL __VA_ARGS__)
#define COPY(...) (COPY , __VA_ARGS__) #define COPY(...) (COPY , __VA_ARGS__)
#define FREE(...) (FREE , __VA_ARGS__) #define FREE(...) (FREE , __VA_ARGS__)
#define HASH(...) (HASH , __VA_ARGS__) #define HASH(...) (HASH , __VA_ARGS__)
#define EQUAL(...) (EQUAL , __VA_ARGS__) #define CMP(...) (CMP , __VA_ARGS__)
#define DEFAULT(...) (DEFAULT, __VA_ARGS__) #define DEFAULT(...) (DEFAULT, __VA_ARGS__)
#define INVALID(...) (INVALID, __VA_ARGS__) #define INVALID(...) (INVALID, __VA_ARGS__)
#define __EV_COPY_FN(T,name) .copy_fn = (ev_copy_fn) COPY_FUNCTION(T,name), #define __EV_STRUCT_METHOD_DEF(T, ...) EV_CAT(__EV_,EV_CAT(EV_HEAD __VA_ARGS__,_FN))(T, EV_TAIL __VA_ARGS__)
#define __EV_FREE_FN(T,name) .free_fn = (ev_free_fn) FREE_FUNCTION(T,name), #define __EV_COPY_FN(T,name) ACTIVE_COPY_FUNCTION(T) = (COPY_FUNCTION_TYPE(T)) COPY_FUNCTION(T,name);
#define __EV_HASH_FN(T,name) .hash_fn = (ev_hash_fn) HASH_FUNCTION(T,name), #define __EV_FREE_FN(T,name) ACTIVE_FREE_FUNCTION(T) = (FREE_FUNCTION_TYPE(T)) FREE_FUNCTION(T,name);
#define __EV_EQUAL_FN(T,name) .equal_fn = (ev_equal_fn)EQUAL_FUNCTION(T,name), #define __EV_HASH_FN(T,name) ACTIVE_HASH_FUNCTION(T) = (HASH_FUNCTION_TYPE(T)) HASH_FUNCTION(T,name);
#define __EV_CMP_FN(T,name) ACTIVE_CMP_FUNCTION(T) = (CMP_FUNCTION_TYPE(T)) CMP_FUNCTION(T,name);
#define __EV_DEFAULT_FN(T, ...) .default_val = (void*)&(T){ __VA_ARGS__ }, #define __EV_DEFAULT_FN(T, ...) .default_val = (void*)&(T){ __VA_ARGS__ },
#define __EV_INVALID_FN(T, ...) .invalid_val = (void*)&(T){ __VA_ARGS__ }, #define __EV_INVALID_FN(T, ...) .invalid_val = (void*)&(T){ __VA_ARGS__ },
#define METHOD_CHECK(...) __VA_ARGS__ EV_DEBUG(?__VA_ARGS__:assert(!EV_STR(__VA_ARGS__)"not defined")) #define EV_COPY(T) TypeData(T).copy_fn
#define EV_FREE(T) TypeData(T).free_fn
#define EV_COPY(T) METHOD_CHECK(TypeData(T).copy_fn) #define EV_HASH(T) TypeData(T).hash_fn
#define EV_FREE(T) METHOD_CHECK(TypeData(T).free_fn) #define EV_CMP(T) TypeData(T).cmp_fn
#define EV_HASH(T) METHOD_CHECK(TypeData(T).hash_fn)
#define EV_EQUAL(T) METHOD_CHECK(TypeData(T).equal_fn)
#define __EV_OVERRIDE_DEFAULT(T, ...) EV_OVERRIDE_VAR(T).__VA_ARGS__, #define __EV_OVERRIDE_DEFAULT(T, ...) EV_OVERRIDE_VAR(T).__VA_ARGS__,
#define __EV_DEFAULT_INTERNAL(T) (*(T*)TypeData(T).default_val) #define __EV_DEFAULT_INTERNAL(T) (*(T*)TypeData(T).default_val)
#define EV_DEFAULT(T, ...) EV_VA_OPT_ELSE(__VA_ARGS__) \ #define EV_DEFAULT(T, ...) EV_VA_OPT_ELSE(__VA_ARGS__) \

3
ev_vec.h
View File

@@ -582,6 +582,9 @@ ev_vec_setlen(
__ev_vec_syncmeta(*v) __ev_vec_syncmeta(*v)
} }
// TODO if new_len < old_len:
// vec_pop(old_len - new_len)
metadata->length = len; metadata->length = len;
return EV_VEC_ERR_NONE; return EV_VEC_ERR_NONE;
} }