Skip to content

structures forward declarations rework #23

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
mxyns wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

structures forward declarations rework #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 20 additions & 20 deletions examples/custom-gen/cdada.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,115 +45,115 @@ inline bool operator==(const foo_t & a1, const foo_t & a2){


//Operator
void __cdada_list_autogen_create_foo_t (void* m){
void __cdada_list_autogen_create_foo_t (cdada_list_t* m){
__cdada_list_int_t* s = (__cdada_list_int_t*)m;
s->list.custom = (void*)new std::list<foo_t>();
}
void __cdada_list_autogen_destroy_foo_t (void* m){
void __cdada_list_autogen_destroy_foo_t (cdada_list_t* m){
__cdada_list_int_t* s = (__cdada_list_int_t*)m;
std::list<foo_t>* p =
(std::list<foo_t>*)s->list.custom;
delete p;
}
void __cdada_list_autogen_clear_foo_t (void* m){
void __cdada_list_autogen_clear_foo_t (cdada_list_t* m){
__cdada_list_int_t* s = (__cdada_list_int_t*)m;
std::list<foo_t>* p =
(std::list<foo_t>*)s->list.custom;
p->clear();
}
bool __cdada_list_autogen_empty_foo_t (const void* m){
bool __cdada_list_autogen_empty_foo_t (const cdada_list_t* m){
__cdada_list_int_t* s = (__cdada_list_int_t*)m;
std::list<foo_t>* p =
(std::list<foo_t>*)s->list.custom;
return p->empty();
}
uint32_t __cdada_list_autogen_size_foo_t (const void* m){
uint32_t __cdada_list_autogen_size_foo_t (const cdada_list_t* m){
__cdada_list_int_t* s = (__cdada_list_int_t*)m;
std::list<foo_t>* p =
(std::list<foo_t>*)s->list.custom;
return p->size();
}
int __cdada_list_autogen_insert_foo_t (void* m, const void* val,
int __cdada_list_autogen_insert_foo_t (cdada_list_t* m, const void* val,
const uint32_t pos){
__cdada_list_int_t* s = (__cdada_list_int_t*)m;
std::list<foo_t>* p =
(std::list<foo_t>*)s->list.custom;
return cdada_list_insert_u<foo_t> (s, p, val, pos);
}
int __cdada_list_autogen_get_foo_t (const void* m, const uint32_t pos,
int __cdada_list_autogen_get_foo_t (const cdada_list_t* m, const uint32_t pos,
void* val){
__cdada_list_int_t* s = (__cdada_list_int_t*)m;
std::list<foo_t>* p =
(std::list<foo_t>*)s->list.custom;
return cdada_list_get_u<foo_t> (s, p, pos, val);
}
int __cdada_list_autogen_first_last_foo_t (const void* m, bool first,
int __cdada_list_autogen_first_last_foo_t (const cdada_list_t* m, bool first,
void* key){
__cdada_list_int_t* s = (__cdada_list_int_t*)m;
std::list<foo_t>* p =
(std::list<foo_t>*)s->list.custom;
return cdada_list_first_last_u<foo_t> (s, p, first, key);
}
int __cdada_list_autogen_erase_foo_t (void* m, const uint32_t pos){
int __cdada_list_autogen_erase_foo_t (cdada_list_t* m, const uint32_t pos){
__cdada_list_int_t* s = (__cdada_list_int_t*)m;
std::list<foo_t>* p =
(std::list<foo_t>*)s->list.custom;
return cdada_list_erase_u<foo_t> (s, p, pos);
}
int __cdada_list_autogen_remove_foo_t (void* m, const void* val){
int __cdada_list_autogen_remove_foo_t (cdada_list_t* m, const void* val){
__cdada_list_int_t* s = (__cdada_list_int_t*)m;
std::list<foo_t>* p =
(std::list<foo_t>*)s->list.custom;
return cdada_list_remove_u<foo_t> (s, p, val);
}
int __cdada_list_autogen_push_foo_t (void* m, const void* val,
int __cdada_list_autogen_push_foo_t (cdada_list_t* m, const void* val,
bool front){
__cdada_list_int_t* s = (__cdada_list_int_t*)m;
std::list<foo_t>* p =
(std::list<foo_t>*)s->list.custom;
return cdada_list_push_u<foo_t> (s, p, val, front);
}
int __cdada_list_autogen_pop_foo_t (void* m, bool front){
int __cdada_list_autogen_pop_foo_t (cdada_list_t* m, bool front){
__cdada_list_int_t* s = (__cdada_list_int_t*)m;
std::list<foo_t>* p =
(std::list<foo_t>*)s->list.custom;
return cdada_list_pop_u<foo_t> (s, p, front);
}
void __cdada_list_autogen_sort_foo_t (void* m){
void __cdada_list_autogen_sort_foo_t (cdada_list_t* m){
__cdada_list_int_t* s = (__cdada_list_int_t*)m;
std::list<foo_t>* p =
(std::list<foo_t>*)s->list.custom;
p->sort();
}
void __cdada_list_autogen_reverse_foo_t (void* m){
void __cdada_list_autogen_reverse_foo_t (cdada_list_t* m){
__cdada_list_int_t* s = (__cdada_list_int_t*)m;
std::list<foo_t>* p =
(std::list<foo_t>*)s->list.custom;
p->reverse();
}
void __cdada_list_autogen_unique_foo_t (void* m){
void __cdada_list_autogen_unique_foo_t (cdada_list_t* m){
__cdada_list_int_t* s = (__cdada_list_int_t*)m;
std::list<foo_t>* p =
(std::list<foo_t>*)s->list.custom;
p->unique();
}
void __cdada_list_autogen_traverse_foo_t (const void* m,
void __cdada_list_autogen_traverse_foo_t (const cdada_list_t* m,
cdada_list_it f,
void* opaque){
__cdada_list_int_t* s = (__cdada_list_int_t*)m;
std::list<foo_t>* p =
(std::list<foo_t>*)s->list.custom;
return cdada_list_traverse_u<foo_t> (s, p, f, opaque);
return cdada_list_traverse_u<foo_t> (m, p, f, opaque);
}
void __cdada_list_autogen_rtraverse_foo_t (const void* m,
void __cdada_list_autogen_rtraverse_foo_t (const cdada_list_t* m,
cdada_list_it f,
void* opaque){
__cdada_list_int_t* s = (__cdada_list_int_t*)m;
std::list<foo_t>* p =
(std::list<foo_t>*)s->list.custom;
return cdada_list_rtraverse_u<foo_t> (s, p, f, opaque);
return cdada_list_rtraverse_u<foo_t> (m, p, f, opaque);
}
void __cdada_list_autogen_dump_foo_t (const void* m,
void __cdada_list_autogen_dump_foo_t (const cdada_list_t* m,
std::stringstream& ss){
__cdada_list_int_t* s = (__cdada_list_int_t*)m;
std::list<foo_t>* p =
Expand Down
2 changes: 1 addition & 1 deletion include/cdada/list.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
/**
* cdada list structure
*/
typedef void cdada_list_t;
typedef struct cdada_list_t cdada_list_t;

//In case it's included from C++
CDADA_BEGIN_DECLS
Expand Down
40 changes: 20 additions & 20 deletions include/cdada/list_custom_cc.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* @internal Custom type create f
*/
#define __CDADA_LIST_CUSTOM_CREATE_F(TYPE) \
void __cdada_list_autogen_create_##TYPE (void* m){ \
void __cdada_list_autogen_create_##TYPE (cdada_list_t* m){ \
__cdada_list_int_t* s = (__cdada_list_int_t*)m; \
s->list.custom = (void*)new __CDADA_STD_LIST_TYPE(TYPE)(); \
}
Expand All @@ -64,7 +64,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* @internal Custom type destroy f
*/
#define __CDADA_LIST_CUSTOM_DESTROY_F(TYPE) \
void __cdada_list_autogen_destroy_##TYPE (void* m){ \
void __cdada_list_autogen_destroy_##TYPE (cdada_list_t* m){ \
__cdada_list_int_t* s = (__cdada_list_int_t*)m; \
__CDADA_STD_LIST_TYPE(TYPE)* p = \
(__CDADA_STD_LIST_TYPE(TYPE)*)s->list.custom; \
Expand All @@ -75,7 +75,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* @internal Custom type clear f
*/
#define __CDADA_LIST_CUSTOM_CLEAR_F(TYPE) \
void __cdada_list_autogen_clear_##TYPE (void* m){ \
void __cdada_list_autogen_clear_##TYPE (cdada_list_t* m){ \
__cdada_list_int_t* s = (__cdada_list_int_t*)m; \
__CDADA_STD_LIST_TYPE(TYPE)* p = \
(__CDADA_STD_LIST_TYPE(TYPE)*)s->list.custom; \
Expand All @@ -86,7 +86,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* @internal Custom type empty f
*/
#define __CDADA_LIST_CUSTOM_EMPTY_F(TYPE) \
bool __cdada_list_autogen_empty_##TYPE (const void* m){ \
bool __cdada_list_autogen_empty_##TYPE (const cdada_list_t* m){ \
__cdada_list_int_t* s = (__cdada_list_int_t*)m; \
__CDADA_STD_LIST_TYPE(TYPE)* p = \
(__CDADA_STD_LIST_TYPE(TYPE)*)s->list.custom; \
Expand All @@ -96,7 +96,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* @internal Custom type size f
*/
#define __CDADA_LIST_CUSTOM_SIZE_F(TYPE) \
uint32_t __cdada_list_autogen_size_##TYPE (const void* m){ \
uint32_t __cdada_list_autogen_size_##TYPE (const cdada_list_t* m){ \
__cdada_list_int_t* s = (__cdada_list_int_t*)m; \
__CDADA_STD_LIST_TYPE(TYPE)* p = \
(__CDADA_STD_LIST_TYPE(TYPE)*)s->list.custom; \
Expand All @@ -106,7 +106,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* @internal Custom type insert f
*/
#define __CDADA_LIST_CUSTOM_INSERT_F(TYPE) \
int __cdada_list_autogen_insert_##TYPE (void* m, const void* val, \
int __cdada_list_autogen_insert_##TYPE (cdada_list_t* m, const void* val, \
const uint32_t pos){ \
__cdada_list_int_t* s = (__cdada_list_int_t*)m; \
__CDADA_STD_LIST_TYPE(TYPE)* p = \
Expand All @@ -118,7 +118,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* @internal Custom type get f
*/
#define __CDADA_LIST_CUSTOM_GET_F(TYPE) \
int __cdada_list_autogen_get_##TYPE (const void* m, const uint32_t pos,\
int __cdada_list_autogen_get_##TYPE (const cdada_list_t* m, const uint32_t pos,\
void* val){ \
__cdada_list_int_t* s = (__cdada_list_int_t*)m; \
__CDADA_STD_LIST_TYPE(TYPE)* p = \
Expand All @@ -130,7 +130,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* @internal Custom type first_last f
*/
#define __CDADA_LIST_CUSTOM_FIRST_LAST_F(TYPE) \
int __cdada_list_autogen_first_last_##TYPE (const void* m, bool first, \
int __cdada_list_autogen_first_last_##TYPE (const cdada_list_t* m, bool first, \
void* key){ \
__cdada_list_int_t* s = (__cdada_list_int_t*)m; \
__CDADA_STD_LIST_TYPE(TYPE)* p = \
Expand All @@ -142,7 +142,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* @internal Custom type erase f
*/
#define __CDADA_LIST_CUSTOM_ERASE_F(TYPE) \
int __cdada_list_autogen_erase_##TYPE (void* m, const uint32_t pos){ \
int __cdada_list_autogen_erase_##TYPE (cdada_list_t* m, const uint32_t pos){ \
__cdada_list_int_t* s = (__cdada_list_int_t*)m; \
__CDADA_STD_LIST_TYPE(TYPE)* p = \
(__CDADA_STD_LIST_TYPE(TYPE)*)s->list.custom; \
Expand All @@ -153,7 +153,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* @internal Custom type remove f
*/
#define __CDADA_LIST_CUSTOM_REMOVE_F(TYPE) \
int __cdada_list_autogen_remove_##TYPE (void* m, const void* val){ \
int __cdada_list_autogen_remove_##TYPE (cdada_list_t* m, const void* val){ \
__cdada_list_int_t* s = (__cdada_list_int_t*)m; \
__CDADA_STD_LIST_TYPE(TYPE)* p = \
(__CDADA_STD_LIST_TYPE(TYPE)*)s->list.custom; \
Expand All @@ -164,7 +164,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* @internal Custom type push f
*/
#define __CDADA_LIST_CUSTOM_PUSH_F(TYPE) \
int __cdada_list_autogen_push_##TYPE (void* m, const void* val,\
int __cdada_list_autogen_push_##TYPE (cdada_list_t* m, const void* val,\
bool front){ \
__cdada_list_int_t* s = (__cdada_list_int_t*)m; \
__CDADA_STD_LIST_TYPE(TYPE)* p = \
Expand All @@ -176,7 +176,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* @internal Custom type pop f
*/
#define __CDADA_LIST_CUSTOM_POP_F(TYPE) \
int __cdada_list_autogen_pop_##TYPE (void* m, bool front){ \
int __cdada_list_autogen_pop_##TYPE (cdada_list_t* m, bool front){ \
__cdada_list_int_t* s = (__cdada_list_int_t*)m; \
__CDADA_STD_LIST_TYPE(TYPE)* p = \
(__CDADA_STD_LIST_TYPE(TYPE)*)s->list.custom; \
Expand All @@ -187,7 +187,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* @internal Custom type sort f
*/
#define __CDADA_LIST_CUSTOM_SORT_F(TYPE) \
void __cdada_list_autogen_sort_##TYPE (void* m){ \
void __cdada_list_autogen_sort_##TYPE (cdada_list_t* m){ \
__cdada_list_int_t* s = (__cdada_list_int_t*)m; \
__CDADA_STD_LIST_TYPE(TYPE)* p = \
(__CDADA_STD_LIST_TYPE(TYPE)*)s->list.custom; \
Expand All @@ -198,7 +198,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* @internal Custom type reverse f
*/
#define __CDADA_LIST_CUSTOM_REVERSE_F(TYPE) \
void __cdada_list_autogen_reverse_##TYPE (void* m){ \
void __cdada_list_autogen_reverse_##TYPE (cdada_list_t* m){ \
__cdada_list_int_t* s = (__cdada_list_int_t*)m; \
__CDADA_STD_LIST_TYPE(TYPE)* p = \
(__CDADA_STD_LIST_TYPE(TYPE)*)s->list.custom; \
Expand All @@ -209,7 +209,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* @internal Custom type unique f
*/
#define __CDADA_LIST_CUSTOM_UNIQUE_F(TYPE) \
void __cdada_list_autogen_unique_##TYPE (void* m){ \
void __cdada_list_autogen_unique_##TYPE (cdada_list_t* m){ \
__cdada_list_int_t* s = (__cdada_list_int_t*)m; \
__CDADA_STD_LIST_TYPE(TYPE)* p = \
(__CDADA_STD_LIST_TYPE(TYPE)*)s->list.custom; \
Expand All @@ -220,33 +220,33 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* @internal Custom type traverse f
*/
#define __CDADA_LIST_CUSTOM_TRAVERSE_F(TYPE) \
void __cdada_list_autogen_traverse_##TYPE (const void* m, \
void __cdada_list_autogen_traverse_##TYPE (const cdada_list_t* m, \
cdada_list_it f, \
void* opaque){ \
__cdada_list_int_t* s = (__cdada_list_int_t*)m; \
__CDADA_STD_LIST_TYPE(TYPE)* p = \
(__CDADA_STD_LIST_TYPE(TYPE)*)s->list.custom; \
return cdada_list_traverse_u< TYPE > (s, p, f, opaque);\
return cdada_list_traverse_u< TYPE > (m, p, f, opaque);\
}

/**
* @internal Custom type rtraverse f
*/
#define __CDADA_LIST_CUSTOM_RTRAVERSE_F(TYPE) \
void __cdada_list_autogen_rtraverse_##TYPE (const void* m, \
void __cdada_list_autogen_rtraverse_##TYPE (const cdada_list_t* m, \
cdada_list_it f, \
void* opaque){ \
__cdada_list_int_t* s = (__cdada_list_int_t*)m; \
__CDADA_STD_LIST_TYPE(TYPE)* p = \
(__CDADA_STD_LIST_TYPE(TYPE)*)s->list.custom; \
return cdada_list_rtraverse_u< TYPE > (s, p, f, opaque);\
return cdada_list_rtraverse_u< TYPE > (m, p, f, opaque);\
}

/**
* @internal Custom type dump f
*/
#define __CDADA_LIST_CUSTOM_DUMP_F(TYPE) \
void __cdada_list_autogen_dump_##TYPE (const void* m, \
void __cdada_list_autogen_dump_##TYPE (const cdada_list_t* m, \
std::stringstream& ss){\
__cdada_list_int_t* s = (__cdada_list_int_t*)m; \
__CDADA_STD_LIST_TYPE(TYPE)* p = \
Expand Down
Loading