diff --git a/src/LuaCEmbedResponse/LuaCembedResponse_pt2.h b/src/LuaCEmbedResponse/LuaCembedResponse_pt2.h deleted file mode 100644 index 353c88b..0000000 --- a/src/LuaCEmbedResponse/LuaCembedResponse_pt2.h +++ /dev/null @@ -1,6 +0,0 @@ - - -LuaCEmbedResponse * LuaCEmbed_send_table(LuaCEmbedTable *table); - - -LuaCEmbedResponse * LuaCEmbed_send_multi_return(LuaCEmbedTable *table); diff --git a/src/constants/all.h b/src/constants/all.h index e72bb69..ba44bf9 100644 --- a/src/constants/all.h +++ b/src/constants/all.h @@ -1,6 +1,10 @@ -#include "main_callback.h" -#include "types.h" -#include "responses.h" -#include "lua_code.h" -#include "errors.h" -#include "aplication.h" + +#ifndef PRIVATE_LUACEMBED_CONSTANTS +#define PRIVATE_LUACEMBED_CONSTANTS + #include "main_callback.h" + #include "types.h" + #include "responses.h" + #include "lua_code.h" + #include "errors.h" + #include "aplication.h" +#endif \ No newline at end of file diff --git a/src/declaration.h b/src/declaration.h index 3361d02..33e5439 100644 --- a/src/declaration.h +++ b/src/declaration.h @@ -1,19 +1,9 @@ -#ifdef _WIN32 -#include -#else -#include -#include -#endif -#include -#include -#include -#include -#include "dependencies/dependencies.h" +#ifndef LUACEMBED_H +#include "inports.h" +#include "dependencies/declaration.h" #include "constants/all.h" -#include "LuaCEmbedResponse/LuaCEmbedResponse.h" -#include "LuaCEmbed/declaration.h" -#include "LuaCEmbedResponse/LuaCembedResponse_pt2.h" - -#include "extra/extra.h" -#include "namespace/declaration.h" \ No newline at end of file +#include "types/all.h" +#include "functions/declaration.h" +#define LUACEMBED_H +#endif diff --git a/src/dependencies/UniversalGarbage/declaration.h b/src/dependencies/UniversalGarbage/declaration.h new file mode 100644 index 0000000..516944d --- /dev/null +++ b/src/dependencies/UniversalGarbage/declaration.h @@ -0,0 +1,19 @@ +#ifndef UNIVERSAL_GARBAGE_H +#ifdef __cplusplus +extern "C" { +#endif + +#include +#include +#include +#include +#include "macros.h" +#include "types/all.h" +#include "functions/declaration.h" + +#ifdef __cplusplus +} +#endif + +#define UNIVERSAL_GARBAGE_H +#endif diff --git a/src/dependencies/UniversalGarbage/definition.c b/src/dependencies/UniversalGarbage/definition.c new file mode 100644 index 0000000..59efbfb --- /dev/null +++ b/src/dependencies/UniversalGarbage/definition.c @@ -0,0 +1,2 @@ +#include "declaration.h" +#include "functions/definition.c" diff --git a/src/dependencies/UniversalGarbage/functions/declaration.h b/src/dependencies/UniversalGarbage/functions/declaration.h new file mode 100644 index 0000000..c9370c2 --- /dev/null +++ b/src/dependencies/UniversalGarbage/functions/declaration.h @@ -0,0 +1,3 @@ + +#include "garbage_element/garbage_element.h" +#include "garbage/garbage.h" diff --git a/src/dependencies/UniversalGarbage/functions/definition.c b/src/dependencies/UniversalGarbage/functions/definition.c new file mode 100644 index 0000000..c2bfeba --- /dev/null +++ b/src/dependencies/UniversalGarbage/functions/definition.c @@ -0,0 +1,2 @@ +#include "garbage_element/garbage_element.c" +#include "garbage/garbage.c" diff --git a/src/dependencies/UniversalGarbage.h b/src/dependencies/UniversalGarbage/functions/garbage/garbage.c similarity index 51% rename from src/dependencies/UniversalGarbage.h rename to src/dependencies/UniversalGarbage/functions/garbage/garbage.c index 6ba5987..5727657 100644 --- a/src/dependencies/UniversalGarbage.h +++ b/src/dependencies/UniversalGarbage/functions/garbage/garbage.c @@ -1,139 +1,5 @@ - - -#ifndef UNIVERSAL_GARBAGE_H - - -#include -#include -#include -#include - - - - - -#define UniversalGarbage_create_empty_struct(name,element_type) \ -(element_type*)malloc(sizeof(element_type)); \ -*name = (element_type){0}; - - -#define UniversalGarbage_cast(value) ((void**)&value) - - -#define UniversalGarbage_add(garbage,deallocator_callback,value) \ - rawUniversalGarbage_add(garbage,(void*)deallocator_callback,UniversalGarbage_cast(value)) - -#define UniversalGarbage_add_simple(garbage,value) \ - UniversalGarbage_add(garbage,free,value) - - -#define UniversalGarbage_add_return(garbage,deallocator_callback,value) \ - UniversalGarbage_add(garbage->return_values,deallocator_callback,value) - - -#define UniversalGarbage_add_simple_return(garbage,value) \ - UniversalGarbage_add_simple(garbage->return_values,value) - - - -#define UniversalGarbage_remove(garbage,value) \ - rawUniversalGarbage_remove(garbage,UniversalGarbage_cast(value)); - - -#define UniversalGarbage_disconnect(garbage,value) \ - rawUniversalGarbage_disconnect(garbage,UniversalGarbage_cast(value)); - - - - -#define UniversalGarbage_reallocate(garbage,value) \ - rawUniversalGarbage_reallocate(garbage,UniversalGarbage_cast(value)) - - -#define UniversalGarbage_resset(garbage,value) \ - rawUniversalGarbage_resset(garbage,UniversalGarbage_cast(value)) - - - - - - -typedef struct privateUniversalGarbageElement{ - void **pointer; - void (*deallocator_callback)(void *element); - void *pointed_value; -}privateUniversalGarbageElement; - -void private_UniversalGarbageSimpleElement_free_pointed_value(privateUniversalGarbageElement *self); - - -void private_UniversalGarbageSimpleElement_free(privateUniversalGarbageElement *self); - -privateUniversalGarbageElement * private_newUniversalGarbageSimpleElement(void (*dealocator_callback)(void *element), void **pointer); - - - -typedef struct UniversalGarbage{ - - struct UniversalGarbage *return_values; - privateUniversalGarbageElement **elements; - int elements_size; - bool is_the_root; - -}UniversalGarbage; - -UniversalGarbage * newUniversalGarbage(); - -UniversalGarbage * private_new_MainUniversalGarbage(); - - - -bool rawUniversalGarbage_resset(UniversalGarbage *self, void **pointer); - -bool rawUniversalGarbage_remove(UniversalGarbage *self, void **pointer); - -bool rawUniversalGarbage_disconnect(UniversalGarbage *self, void **pointer); - -bool rawUniversalGarbage_reallocate(UniversalGarbage *self, void **pointer); - -bool rawUniversalGarbage_add(UniversalGarbage *self, void *release_callback, void **pointer); - -void private_UniversalGarbage_free_all_sub_elements(UniversalGarbage *self); - -void UniversalGarbage_free_including_return(UniversalGarbage *self); - -void UniversalGarbage_free(UniversalGarbage *self); - - - - - - - -privateUniversalGarbageElement * private_newUniversalGarbageSimpleElement(void (*dealocator_callback)(void *element), void **pointer){ - - privateUniversalGarbageElement * self = UniversalGarbage_create_empty_struct( - self, - privateUniversalGarbageElement - ); - self->pointer = pointer; - self->deallocator_callback = dealocator_callback; - self->pointed_value = *pointer; - return self; -} -void private_UniversalGarbageSimpleElement_free_pointed_value(privateUniversalGarbageElement *self){ - if(self->pointed_value){ - self->deallocator_callback(self->pointed_value); - self->pointed_value = NULL; - } -} - -void private_UniversalGarbageSimpleElement_free(privateUniversalGarbageElement *self){ - private_UniversalGarbageSimpleElement_free_pointed_value(self); - free(self); -} - +#include "../unique.definition_requirements.h" UniversalGarbage * private_new_MainUniversalGarbage(){ UniversalGarbage *self = UniversalGarbage_create_empty_struct(self,UniversalGarbage) @@ -236,7 +102,8 @@ bool rawUniversalGarbage_disconnect(UniversalGarbage *self, void **pointer){ self->elements_size-=1; bool its_not_the_last = i < self->elements_size; if(its_not_the_last){ - self->elements[i] = self->elements[self->elements_size]; + privateUniversalGarbageElement *last_element = self->elements[self->elements_size]; + self->elements[i] = last_element; } return true; } @@ -246,31 +113,26 @@ bool rawUniversalGarbage_disconnect(UniversalGarbage *self, void **pointer){ } -bool rawUniversalGarbage_add(UniversalGarbage *self, void *release_callback, void **pointer){ +bool rawUniversalGarbage_add(UniversalGarbage *self, void (*dealocator_callback)(void *element), void **pointer){ if(!pointer){ return false; } - - for(int i = 0; i < self->elements_size; i++){ - privateUniversalGarbageElement *current = self->elements[i]; - if(current->pointer == pointer){ - return false; + if(*pointer){ + for(int i = 0; i < self->elements_size; i++){ + privateUniversalGarbageElement *current = self->elements[i]; + if(current->pointed_value == *pointer){ + return false; + } } } + self->elements = (privateUniversalGarbageElement**)realloc( self->elements, (self->elements_size + 1) * sizeof(privateUniversalGarbageElement*) ); - void (*dealocator_callback)(void *element); -#ifdef __cplusplus - dealocator_callback =reinterpret_cast(release_callback); -#else - dealocator_callback = (void*)(void*)release_callback; - -#endif @@ -313,9 +175,3 @@ void UniversalGarbage_free(UniversalGarbage *self){ free(self); } - - - - -#define UNIVERSAL_GARBAGE_H -#endif \ No newline at end of file diff --git a/src/dependencies/UniversalGarbage/functions/garbage/garbage.h b/src/dependencies/UniversalGarbage/functions/garbage/garbage.h new file mode 100644 index 0000000..8515ce6 --- /dev/null +++ b/src/dependencies/UniversalGarbage/functions/garbage/garbage.h @@ -0,0 +1,25 @@ + + +#include "../unique.declaration_requirements.h" + +UniversalGarbage * newUniversalGarbage(); + +UniversalGarbage * private_new_MainUniversalGarbage(); + + + +bool rawUniversalGarbage_resset(UniversalGarbage *self, void **pointer); + +bool rawUniversalGarbage_remove(UniversalGarbage *self, void **pointer); + +bool rawUniversalGarbage_disconnect(UniversalGarbage *self, void **pointer); + +bool rawUniversalGarbage_reallocate(UniversalGarbage *self, void **pointer); + +bool rawUniversalGarbage_add(UniversalGarbage *self, void (*dealocator_callback)(void *element), void **pointer); + +void private_UniversalGarbage_free_all_sub_elements(UniversalGarbage *self); + +void UniversalGarbage_free_including_return(UniversalGarbage *self); + +void UniversalGarbage_free(UniversalGarbage *self); diff --git a/src/dependencies/UniversalGarbage/functions/garbage_element/garbage_element.c b/src/dependencies/UniversalGarbage/functions/garbage_element/garbage_element.c new file mode 100644 index 0000000..8755464 --- /dev/null +++ b/src/dependencies/UniversalGarbage/functions/garbage_element/garbage_element.c @@ -0,0 +1,26 @@ + +#include "../unique.definition_requirements.h" + + +privateUniversalGarbageElement * private_newUniversalGarbageSimpleElement(void (*dealocator_callback)(void *element), void **pointer){ + + privateUniversalGarbageElement * self = UniversalGarbage_create_empty_struct( + self, + privateUniversalGarbageElement + ); + self->pointer = pointer; + self->deallocator_callback = dealocator_callback; + self->pointed_value = *pointer; + return self; +} +void private_UniversalGarbageSimpleElement_free_pointed_value(privateUniversalGarbageElement *self){ + if(self->pointed_value){ + self->deallocator_callback(self->pointed_value); + self->pointed_value = NULL; + } +} + +void private_UniversalGarbageSimpleElement_free(privateUniversalGarbageElement *self){ + private_UniversalGarbageSimpleElement_free_pointed_value(self); + free(self); +} diff --git a/src/dependencies/UniversalGarbage/functions/garbage_element/garbage_element.h b/src/dependencies/UniversalGarbage/functions/garbage_element/garbage_element.h new file mode 100644 index 0000000..c055166 --- /dev/null +++ b/src/dependencies/UniversalGarbage/functions/garbage_element/garbage_element.h @@ -0,0 +1,10 @@ + +#include "../unique.declaration_requirements.h" + + +void private_UniversalGarbageSimpleElement_free_pointed_value(privateUniversalGarbageElement *self); + + +void private_UniversalGarbageSimpleElement_free(privateUniversalGarbageElement *self); + +privateUniversalGarbageElement * private_newUniversalGarbageSimpleElement(void (*dealocator_callback)(void *element), void **pointer); diff --git a/src/dependencies/UniversalGarbage/functions/unique.declaration_requirements.h b/src/dependencies/UniversalGarbage/functions/unique.declaration_requirements.h new file mode 100644 index 0000000..b6d8d46 --- /dev/null +++ b/src/dependencies/UniversalGarbage/functions/unique.declaration_requirements.h @@ -0,0 +1 @@ +#include "../types/all.h" diff --git a/src/dependencies/UniversalGarbage/functions/unique.definition_requirements.h b/src/dependencies/UniversalGarbage/functions/unique.definition_requirements.h new file mode 100644 index 0000000..9904ab6 --- /dev/null +++ b/src/dependencies/UniversalGarbage/functions/unique.definition_requirements.h @@ -0,0 +1,2 @@ + +#include "../declaration.h" diff --git a/src/dependencies/UniversalGarbage/macros.h b/src/dependencies/UniversalGarbage/macros.h new file mode 100644 index 0000000..a54956a --- /dev/null +++ b/src/dependencies/UniversalGarbage/macros.h @@ -0,0 +1,41 @@ + +#define UniversalGarbage_create_empty_struct(name,element_type) \ +(element_type*)malloc(sizeof(element_type)); \ +*name = (element_type){0}; + + +#define UniversalGarbage_cast(value) ((void**)&value) + + +#define UniversalGarbage_add(garbage,deallocator_callback,value) \ + rawUniversalGarbage_add(garbage,(void(*)(void*))deallocator_callback,UniversalGarbage_cast(value)) + +#define UniversalGarbage_add_simple(garbage,value) \ + UniversalGarbage_add(garbage,free,value) + + +#define UniversalGarbage_add_return(garbage,deallocator_callback,value) \ + UniversalGarbage_add(garbage->return_values,deallocator_callback,value) + + +#define UniversalGarbage_add_simple_return(garbage,value) \ + UniversalGarbage_add_simple(garbage->return_values,value) + + + +#define UniversalGarbage_remove(garbage,value) \ + rawUniversalGarbage_remove(garbage,UniversalGarbage_cast(value)); + + +#define UniversalGarbage_disconnect(garbage,value) \ + rawUniversalGarbage_disconnect(garbage,UniversalGarbage_cast(value)); + + + + +#define UniversalGarbage_reallocate(garbage,value) \ + rawUniversalGarbage_reallocate(garbage,UniversalGarbage_cast(value)) + + +#define UniversalGarbage_resset(garbage,value) \ + rawUniversalGarbage_resset(garbage,UniversalGarbage_cast(value)) diff --git a/src/dependencies/UniversalGarbage/one.c b/src/dependencies/UniversalGarbage/one.c new file mode 100644 index 0000000..679ffc7 --- /dev/null +++ b/src/dependencies/UniversalGarbage/one.c @@ -0,0 +1,6 @@ + + +#ifndef UNIVERSAL_GARBAGE_H +#include "definition.c" +#define UNIVERSAL_GARBAGE_H +#endif diff --git a/src/dependencies/UniversalGarbage/types/all.h b/src/dependencies/UniversalGarbage/types/all.h new file mode 100644 index 0000000..81bae8a --- /dev/null +++ b/src/dependencies/UniversalGarbage/types/all.h @@ -0,0 +1,2 @@ +#include "garbage.h" +#include "garbage_element.h" diff --git a/src/dependencies/UniversalGarbage/types/garbage.h b/src/dependencies/UniversalGarbage/types/garbage.h new file mode 100644 index 0000000..199012c --- /dev/null +++ b/src/dependencies/UniversalGarbage/types/garbage.h @@ -0,0 +1,15 @@ +#include "garbage_element.h" + +#ifndef PRIVATE_UNIVERSAL_GARBAGE_TYPE +#define PRIVATE_UNIVERSAL_GARBAGE_TYPE + + +typedef struct UniversalGarbage{ + + struct UniversalGarbage *return_values; + privateUniversalGarbageElement **elements; + int elements_size; + bool is_the_root; + +}UniversalGarbage; +#endif diff --git a/src/dependencies/UniversalGarbage/types/garbage_element.h b/src/dependencies/UniversalGarbage/types/garbage_element.h new file mode 100644 index 0000000..a8369be --- /dev/null +++ b/src/dependencies/UniversalGarbage/types/garbage_element.h @@ -0,0 +1,9 @@ + +#ifndef PRIVATE_UNIVERSGAL_GARBAGE_ELEMENT_TYPE +#define PRIVATE_UNIVERSGAL_GARBAGE_ELEMENT_TYPE +typedef struct privateUniversalGarbageElement{ + void **pointer; + void (*deallocator_callback)(void *element); + void *pointed_value; +}privateUniversalGarbageElement; +#endif diff --git a/src/dependencies/declaration.h b/src/dependencies/declaration.h new file mode 100644 index 0000000..0f38838 --- /dev/null +++ b/src/dependencies/declaration.h @@ -0,0 +1,11 @@ + + +#ifndef UNIVERSAL_GARBAGE_H +#define UNIVERSALGARBAGE_DEFINED_IN_LUACEMBED +#include "UniversalGarbage/declaration.h" +#endif + +#ifndef PRIVATE_TEST_LUA +#define PRIVATE_TEST_LUA +#include "lua/onelua.c" +#endif diff --git a/src/dependencies/defintion.c b/src/dependencies/defintion.c new file mode 100644 index 0000000..d1668b3 --- /dev/null +++ b/src/dependencies/defintion.c @@ -0,0 +1,3 @@ +#ifdef UNIVERSALGARBAGE_DEFINED_IN_LUACEMBED +#include "UniversalGarbage/definition.c" +#endif diff --git a/src/dependencies/dependencies.h b/src/dependencies/dependencies.h deleted file mode 100644 index 383bdb8..0000000 --- a/src/dependencies/dependencies.h +++ /dev/null @@ -1,2 +0,0 @@ -#include "UniversalGarbage.h" -#include "lua/onelua.c" diff --git a/src/dependencies/lua/onelua.c b/src/dependencies/lua/onelua.c index db326ae..ddda5a3 100644 --- a/src/dependencies/lua/onelua.c +++ b/src/dependencies/lua/onelua.c @@ -19,7 +19,6 @@ #endif #endif #endif -#include #include "custom_math/custom_math.h" #include "custom_math/custom_math.c" /* @@ -126,4 +125,4 @@ /* luac */ #ifdef MAKE_LUAC #include "luac.c" -#endif \ No newline at end of file +#endif diff --git a/src/LuaCEmbed/args/args_error/args_error.c b/src/functions/LuaCEmbed/args/args_error/args_error.c similarity index 100% rename from src/LuaCEmbed/args/args_error/args_error.c rename to src/functions/LuaCEmbed/args/args_error/args_error.c diff --git a/src/LuaCEmbed/args/args_error/args_error.h b/src/functions/LuaCEmbed/args/args_error/args_error.h similarity index 79% rename from src/LuaCEmbed/args/args_error/args_error.h rename to src/functions/LuaCEmbed/args/args_error/args_error.h index 7300a8e..47af29f 100644 --- a/src/LuaCEmbed/args/args_error/args_error.h +++ b/src/functions/LuaCEmbed/args/args_error/args_error.h @@ -1,4 +1,5 @@ +#include "../unique.declaration_requirements.h" int LuaCEmbed_ensure_arg_exist(LuaCEmbed *self, private_lua_cembed_incremented_arg index); diff --git a/src/LuaCEmbed/args/basic/basic.c b/src/functions/LuaCEmbed/args/basic/basic.c similarity index 100% rename from src/LuaCEmbed/args/basic/basic.c rename to src/functions/LuaCEmbed/args/basic/basic.c diff --git a/src/LuaCEmbed/args/basic/basic.h b/src/functions/LuaCEmbed/args/basic/basic.h similarity index 93% rename from src/LuaCEmbed/args/basic/basic.h rename to src/functions/LuaCEmbed/args/basic/basic.h index 6263703..894a5a5 100644 --- a/src/LuaCEmbed/args/basic/basic.h +++ b/src/functions/LuaCEmbed/args/basic/basic.h @@ -1,3 +1,4 @@ +#include "../unique.declaration_requirements.h" int privateLuaCEmbed_put_arg_on_top(LuaCEmbed *self, int index); @@ -20,4 +21,3 @@ char * LuaCEmbed_get_raw_str_arg(LuaCEmbed *self,long *size, int index); LuaCEmbedTable * LuaCEmbed_get_arg_table(LuaCEmbed *self,int index); LuaCEmbedTable* LuaCEmbed_run_args_lambda(LuaCEmbed *self, int index, LuaCEmbedTable *args_to_call, int total_returns); - diff --git a/src/LuaCEmbed/args/declaration.h b/src/functions/LuaCEmbed/args/declaration.h similarity index 100% rename from src/LuaCEmbed/args/declaration.h rename to src/functions/LuaCEmbed/args/declaration.h diff --git a/src/LuaCEmbed/args/definition.h b/src/functions/LuaCEmbed/args/definition.h similarity index 100% rename from src/LuaCEmbed/args/definition.h rename to src/functions/LuaCEmbed/args/definition.h diff --git a/src/LuaCEmbed/args/evaluation/evaluation.c b/src/functions/LuaCEmbed/args/evaluation/evaluation.c similarity index 100% rename from src/LuaCEmbed/args/evaluation/evaluation.c rename to src/functions/LuaCEmbed/args/evaluation/evaluation.c diff --git a/src/LuaCEmbed/args/evaluation/evaluation.h b/src/functions/LuaCEmbed/args/evaluation/evaluation.h similarity index 94% rename from src/LuaCEmbed/args/evaluation/evaluation.h rename to src/functions/LuaCEmbed/args/evaluation/evaluation.h index da15cac..155ed47 100644 --- a/src/LuaCEmbed/args/evaluation/evaluation.h +++ b/src/functions/LuaCEmbed/args/evaluation/evaluation.h @@ -1,4 +1,5 @@ +#include "../unique.declaration_requirements.h" int private_LuaCembed_run_code_with_args(LuaCEmbed *self,int index,const char *code,va_list args); @@ -16,4 +17,3 @@ double LuaCEmbed_get_double_arg_clojure_evalation(LuaCEmbed *self,int index,cons bool LuaCEmbed_get_bool_arg_clojure_evalation(LuaCEmbed *self,int index,const char *code,...); char* LuaCEmbed_get_string_arg_clojure_evalation(LuaCEmbed *self,int index,const char *code,...); - diff --git a/src/functions/LuaCEmbed/args/unique.declaration_requirements.h b/src/functions/LuaCEmbed/args/unique.declaration_requirements.h new file mode 100644 index 0000000..6364ee2 --- /dev/null +++ b/src/functions/LuaCEmbed/args/unique.declaration_requirements.h @@ -0,0 +1 @@ +#include "../unique.declaration_requirements.h" diff --git a/src/functions/LuaCEmbed/args/unique.defintion_requirements.h b/src/functions/LuaCEmbed/args/unique.defintion_requirements.h new file mode 100644 index 0000000..5949eb7 --- /dev/null +++ b/src/functions/LuaCEmbed/args/unique.defintion_requirements.h @@ -0,0 +1 @@ +#include "unique.defintion_requirements.h" diff --git a/src/LuaCEmbed/basic/basic.c b/src/functions/LuaCEmbed/basic/basic.c similarity index 100% rename from src/LuaCEmbed/basic/basic.c rename to src/functions/LuaCEmbed/basic/basic.c diff --git a/src/LuaCEmbed/basic/basic.h b/src/functions/LuaCEmbed/basic/basic.h similarity index 95% rename from src/LuaCEmbed/basic/basic.h rename to src/functions/LuaCEmbed/basic/basic.h index f02bc09..e26c2b9 100644 --- a/src/LuaCEmbed/basic/basic.h +++ b/src/functions/LuaCEmbed/basic/basic.h @@ -1,4 +1,5 @@ +#include "../unique.declaration_requirements.h" LuaCEmbed * newLuaCEmbedEvaluation(); @@ -36,5 +37,3 @@ void privata_LuaCEmbed_increment_stack_(LuaCEmbed *self); void privata_LuaCEmbed_decrement_stack(LuaCEmbed *self); void LuaCEmbed_free(LuaCEmbed *self); - - diff --git a/src/LuaCEmbed/callback_handle/callback_handle.c b/src/functions/LuaCEmbed/callback_handle/callback_handle.c similarity index 100% rename from src/LuaCEmbed/callback_handle/callback_handle.c rename to src/functions/LuaCEmbed/callback_handle/callback_handle.c diff --git a/src/LuaCEmbed/callback_handle/callback_handle.h b/src/functions/LuaCEmbed/callback_handle/callback_handle.h similarity index 92% rename from src/LuaCEmbed/callback_handle/callback_handle.h rename to src/functions/LuaCEmbed/callback_handle/callback_handle.h index 20c5c8e..b06f3df 100644 --- a/src/LuaCEmbed/callback_handle/callback_handle.h +++ b/src/functions/LuaCEmbed/callback_handle/callback_handle.h @@ -1,3 +1,4 @@ +#include "../unique.declaration_requirements.h" int privateLuaCEmbed_main_callback_handler(lua_State *L); @@ -10,4 +11,3 @@ void LuaCEmbed_add_callback(LuaCEmbed *self, const char *callback_name, LuaCEmbe void LuaCEmbed_add_global_callback(LuaCEmbed *self, const char *callback_name, LuaCEmbedResponse* (*callback)(LuaCEmbed *args)); - diff --git a/src/LuaCEmbed/declaration.h b/src/functions/LuaCEmbed/declaration.h similarity index 100% rename from src/LuaCEmbed/declaration.h rename to src/functions/LuaCEmbed/declaration.h diff --git a/src/LuaCEmbed/definition.h b/src/functions/LuaCEmbed/definition.h similarity index 100% rename from src/LuaCEmbed/definition.h rename to src/functions/LuaCEmbed/definition.h diff --git a/src/LuaCEmbed/evaluation/evaluation.c b/src/functions/LuaCEmbed/evaluation/evaluation.c similarity index 100% rename from src/LuaCEmbed/evaluation/evaluation.c rename to src/functions/LuaCEmbed/evaluation/evaluation.c diff --git a/src/LuaCEmbed/evaluation/evaluation.h b/src/functions/LuaCEmbed/evaluation/evaluation.h similarity index 94% rename from src/LuaCEmbed/evaluation/evaluation.h rename to src/functions/LuaCEmbed/evaluation/evaluation.h index fa7c95d..fa48ed2 100644 --- a/src/LuaCEmbed/evaluation/evaluation.h +++ b/src/functions/LuaCEmbed/evaluation/evaluation.h @@ -1,12 +1,13 @@ +#include "../unique.declaration_requirements.h" #ifdef _WIN32 VOID CALLBACK TimerHandler(HWND hwnd, UINT uMsg, UINT_PTR idEvent, DWORD dwTime); -#else +#else void private_LuaCembed_handle_timeout(int signum); -#endif +#endif int privateLuaCEmbed_start_func_evaluation(lua_State *state); @@ -32,5 +33,3 @@ long long LuaCEmbed_get_evaluation_long(LuaCEmbed *self,const char *code, ...); double LuaCEmbed_get_evaluation_double(LuaCEmbed *self,const char *code, ...); bool LuaCEmbed_get_evaluation_bool(LuaCEmbed *self,const char *code, ...); - - diff --git a/src/LuaCEmbed/globals/declaration.h b/src/functions/LuaCEmbed/globals/declaration.h similarity index 100% rename from src/LuaCEmbed/globals/declaration.h rename to src/functions/LuaCEmbed/globals/declaration.h diff --git a/src/LuaCEmbed/globals/definition.h b/src/functions/LuaCEmbed/globals/definition.h similarity index 100% rename from src/LuaCEmbed/globals/definition.h rename to src/functions/LuaCEmbed/globals/definition.h diff --git a/src/LuaCEmbed/globals/errors/errors.c b/src/functions/LuaCEmbed/globals/errors/errors.c similarity index 100% rename from src/LuaCEmbed/globals/errors/errors.c rename to src/functions/LuaCEmbed/globals/errors/errors.c diff --git a/src/LuaCEmbed/globals/errors/errors.h b/src/functions/LuaCEmbed/globals/errors/errors.h similarity index 65% rename from src/LuaCEmbed/globals/errors/errors.h rename to src/functions/LuaCEmbed/globals/errors/errors.h index 16ae62f..55cfbcc 100644 --- a/src/LuaCEmbed/globals/errors/errors.h +++ b/src/functions/LuaCEmbed/globals/errors/errors.h @@ -1,4 +1,5 @@ +#include "../unique.declaration_requirements.h" int LuaCEmbed_ensure_global_type(LuaCEmbed *self, const char *name,int expected_type); diff --git a/src/LuaCEmbed/globals/getters/getters.c b/src/functions/LuaCEmbed/globals/getters/getters.c similarity index 100% rename from src/LuaCEmbed/globals/getters/getters.c rename to src/functions/LuaCEmbed/globals/getters/getters.c diff --git a/src/LuaCEmbed/globals/getters/getters.h b/src/functions/LuaCEmbed/globals/getters/getters.h similarity index 94% rename from src/LuaCEmbed/globals/getters/getters.h rename to src/functions/LuaCEmbed/globals/getters/getters.h index c0e915c..2ae665a 100644 --- a/src/LuaCEmbed/globals/getters/getters.h +++ b/src/functions/LuaCEmbed/globals/getters/getters.h @@ -1,4 +1,5 @@ +#include "../unique.declaration_requirements.h" int LuaCEmbed_get_global_type(LuaCEmbed *self,const char *name); diff --git a/src/LuaCEmbed/globals/setters/setters.c b/src/functions/LuaCEmbed/globals/setters/setters.c similarity index 100% rename from src/LuaCEmbed/globals/setters/setters.c rename to src/functions/LuaCEmbed/globals/setters/setters.c diff --git a/src/LuaCEmbed/globals/setters/setters.h b/src/functions/LuaCEmbed/globals/setters/setters.h similarity index 91% rename from src/LuaCEmbed/globals/setters/setters.h rename to src/functions/LuaCEmbed/globals/setters/setters.h index 1f22314..b7fbaaf 100644 --- a/src/LuaCEmbed/globals/setters/setters.h +++ b/src/functions/LuaCEmbed/globals/setters/setters.h @@ -1,3 +1,4 @@ +#include "../unique.declaration_requirements.h" void LuaCEmbed_set_global_string(LuaCEmbed *self, const char *name, const char *value); diff --git a/src/functions/LuaCEmbed/globals/unique.declaration_requirements.h b/src/functions/LuaCEmbed/globals/unique.declaration_requirements.h new file mode 100644 index 0000000..6364ee2 --- /dev/null +++ b/src/functions/LuaCEmbed/globals/unique.declaration_requirements.h @@ -0,0 +1 @@ +#include "../unique.declaration_requirements.h" diff --git a/src/functions/LuaCEmbed/globals/unique.defintion_requirements.h b/src/functions/LuaCEmbed/globals/unique.defintion_requirements.h new file mode 100644 index 0000000..5949eb7 --- /dev/null +++ b/src/functions/LuaCEmbed/globals/unique.defintion_requirements.h @@ -0,0 +1 @@ +#include "unique.defintion_requirements.h" diff --git a/src/LuaCEmbed/lib_props/lib_props.c b/src/functions/LuaCEmbed/lib_props/lib_props.c similarity index 100% rename from src/LuaCEmbed/lib_props/lib_props.c rename to src/functions/LuaCEmbed/lib_props/lib_props.c diff --git a/src/LuaCEmbed/lib_props/lib_props.h b/src/functions/LuaCEmbed/lib_props/lib_props.h similarity index 94% rename from src/LuaCEmbed/lib_props/lib_props.h rename to src/functions/LuaCEmbed/lib_props/lib_props.h index 58f8e59..aac0bf0 100644 --- a/src/LuaCEmbed/lib_props/lib_props.h +++ b/src/functions/LuaCEmbed/lib_props/lib_props.h @@ -1,4 +1,5 @@ +#include "../unique.declaration_requirements.h" void LuaCEmbed_set_long_lib_prop(LuaCEmbed *self,const char *name,long long value); @@ -22,4 +23,3 @@ bool LuaCEmbed_get_bool_lib_prop(LuaCEmbed *self,const char *name); char * LuaCEmbed_get_string_lib_prop(LuaCEmbed *self,const char *name); LuaCEmbedTable *LuaCEmbed_get_table_lib_prop(LuaCEmbed *self,const char *name); - diff --git a/src/LuaCEmbed/lib_start/lib_start.c b/src/functions/LuaCEmbed/lib_start/lib_start.c similarity index 100% rename from src/LuaCEmbed/lib_start/lib_start.c rename to src/functions/LuaCEmbed/lib_start/lib_start.c diff --git a/src/LuaCEmbed/lib_start/lib_start.h b/src/functions/LuaCEmbed/lib_start/lib_start.h similarity index 74% rename from src/LuaCEmbed/lib_start/lib_start.h rename to src/functions/LuaCEmbed/lib_start/lib_start.h index 8bc3150..654b8e8 100644 --- a/src/LuaCEmbed/lib_start/lib_start.h +++ b/src/functions/LuaCEmbed/lib_start/lib_start.h @@ -1,3 +1,4 @@ +#include "../unique.declaration_requirements.h" int private_LuaCemb_internal_free(lua_State *L); diff --git a/src/LuaCEmbed/memory/memory.c b/src/functions/LuaCEmbed/memory/memory.c similarity index 100% rename from src/LuaCEmbed/memory/memory.c rename to src/functions/LuaCEmbed/memory/memory.c diff --git a/src/LuaCEmbed/memory/memory.h b/src/functions/LuaCEmbed/memory/memory.h similarity index 70% rename from src/LuaCEmbed/memory/memory.h rename to src/functions/LuaCEmbed/memory/memory.h index 3975fc5..bf1f009 100644 --- a/src/LuaCEmbed/memory/memory.h +++ b/src/functions/LuaCEmbed/memory/memory.h @@ -1,10 +1,7 @@ +#include "../unique.declaration_requirements.h" -long lua_cembed_used_memory = 0; -long lua_cembed_memory_limit = -1; - void LuaCEmbed_set_memory_limit(LuaCEmbed *self, double limit); static void *private_LuaCembed_custom_allocator(void *ud, void *ptr, size_t osize, size_t nsize) ; - diff --git a/src/LuaCEmbed/protection_macros.h b/src/functions/LuaCEmbed/protection_macros.h similarity index 100% rename from src/LuaCEmbed/protection_macros.h rename to src/functions/LuaCEmbed/protection_macros.h diff --git a/src/LuaCEmbed/table/declaration.h b/src/functions/LuaCEmbed/table/declaration.h similarity index 100% rename from src/LuaCEmbed/table/declaration.h rename to src/functions/LuaCEmbed/table/declaration.h diff --git a/src/LuaCEmbed/table/definition.h b/src/functions/LuaCEmbed/table/definition.h similarity index 100% rename from src/LuaCEmbed/table/definition.h rename to src/functions/LuaCEmbed/table/definition.h diff --git a/src/LuaCEmbed/table/protection_macros.h b/src/functions/LuaCEmbed/table/protection_macros.h similarity index 100% rename from src/LuaCEmbed/table/protection_macros.h rename to src/functions/LuaCEmbed/table/protection_macros.h diff --git a/src/LuaCEmbed/table/table/append/append.c b/src/functions/LuaCEmbed/table/table/append/append.c similarity index 100% rename from src/LuaCEmbed/table/table/append/append.c rename to src/functions/LuaCEmbed/table/table/append/append.c diff --git a/src/LuaCEmbed/table/table/append/append.h b/src/functions/LuaCEmbed/table/table/append/append.h similarity index 89% rename from src/LuaCEmbed/table/table/append/append.h rename to src/functions/LuaCEmbed/table/table/append/append.h index 8b29b86..bed1b1e 100644 --- a/src/LuaCEmbed/table/table/append/append.h +++ b/src/functions/LuaCEmbed/table/table/append/append.h @@ -1,4 +1,5 @@ +#include "../unique.declaration_requirements.h" void LuaCEmbedTable_append_table(LuaCEmbedTable *self, LuaCEmbedTable *table); @@ -11,4 +12,4 @@ void LuaCEmbedTable_append_long(LuaCEmbedTable *self, long long value); void LuaCEmbedTable_append_double(LuaCEmbedTable *self, double value); -void LuaCEmbedTable_append_bool(LuaCEmbedTable *self, bool value); \ No newline at end of file +void LuaCEmbedTable_append_bool(LuaCEmbedTable *self, bool value); diff --git a/src/LuaCEmbed/table/table/basic/basic.c b/src/functions/LuaCEmbed/table/table/basic/basic.c similarity index 100% rename from src/LuaCEmbed/table/table/basic/basic.c rename to src/functions/LuaCEmbed/table/table/basic/basic.c diff --git a/src/LuaCEmbed/table/table/basic/basic.h b/src/functions/LuaCEmbed/table/table/basic/basic.h similarity index 85% rename from src/LuaCEmbed/table/table/basic/basic.h rename to src/functions/LuaCEmbed/table/table/basic/basic.h index 6c03fab..7df7a91 100644 --- a/src/LuaCEmbed/table/table/basic/basic.h +++ b/src/functions/LuaCEmbed/table/table/basic/basic.h @@ -1,3 +1,4 @@ +#include "../unique.declaration_requirements.h" LuaCEmbedTable * private_newLuaCembedTable(LuaCEmbed *main_embed, const char *format, ...); @@ -6,4 +7,4 @@ int private_lua_cEmbed_unpack(LuaCEmbedTable *self,const char * previews_functi void privateLuaCEmbedTable_free(LuaCEmbedTable *self); -void privateLuaCEmbedTable_free_setting_nill(LuaCEmbedTable *self); \ No newline at end of file +void privateLuaCEmbedTable_free_setting_nill(LuaCEmbedTable *self); diff --git a/src/LuaCEmbed/table/table/declaration.h b/src/functions/LuaCEmbed/table/table/declaration.h similarity index 100% rename from src/LuaCEmbed/table/table/declaration.h rename to src/functions/LuaCEmbed/table/table/declaration.h diff --git a/src/LuaCEmbed/table/table/definition.h b/src/functions/LuaCEmbed/table/table/definition.h similarity index 100% rename from src/LuaCEmbed/table/table/definition.h rename to src/functions/LuaCEmbed/table/table/definition.h diff --git a/src/LuaCEmbed/table/table/destroy/destroy.c b/src/functions/LuaCEmbed/table/table/destroy/destroy.c similarity index 100% rename from src/LuaCEmbed/table/table/destroy/destroy.c rename to src/functions/LuaCEmbed/table/table/destroy/destroy.c diff --git a/src/LuaCEmbed/table/table/destroy/destroy.h b/src/functions/LuaCEmbed/table/table/destroy/destroy.h similarity index 71% rename from src/LuaCEmbed/table/table/destroy/destroy.h rename to src/functions/LuaCEmbed/table/table/destroy/destroy.h index 23f506d..de35efc 100644 --- a/src/LuaCEmbed/table/table/destroy/destroy.h +++ b/src/functions/LuaCEmbed/table/table/destroy/destroy.h @@ -1,5 +1,6 @@ +#include "../unique.declaration_requirements.h" void LuaCembedTable_destroy_prop(LuaCEmbedTable *self, const char *name); -void LuaCEmbedTable_destroy_by_index(LuaCEmbedTable *self, long index); \ No newline at end of file +void LuaCEmbedTable_destroy_by_index(LuaCEmbedTable *self, long index); diff --git a/src/LuaCEmbed/table/table/errors/errors.c b/src/functions/LuaCEmbed/table/table/errors/errors.c similarity index 100% rename from src/LuaCEmbed/table/table/errors/errors.c rename to src/functions/LuaCEmbed/table/table/errors/errors.c diff --git a/src/LuaCEmbed/table/table/errors/errors.h b/src/functions/LuaCEmbed/table/table/errors/errors.h similarity index 81% rename from src/LuaCEmbed/table/table/errors/errors.h rename to src/functions/LuaCEmbed/table/table/errors/errors.h index 0474819..9f4e2ce 100644 --- a/src/LuaCEmbed/table/table/errors/errors.h +++ b/src/functions/LuaCEmbed/table/table/errors/errors.h @@ -1,3 +1,4 @@ +#include "../unique.declaration_requirements.h" int privateLuaCEmbedTable_ensure_type_with_key(LuaCEmbedTable *self, const char *name, int expected_type); diff --git a/src/LuaCEmbed/table/table/getters/declaration.h b/src/functions/LuaCEmbed/table/table/getters/declaration.h similarity index 100% rename from src/LuaCEmbed/table/table/getters/declaration.h rename to src/functions/LuaCEmbed/table/table/getters/declaration.h diff --git a/src/LuaCEmbed/table/table/getters/definition.h b/src/functions/LuaCEmbed/table/table/getters/definition.h similarity index 100% rename from src/LuaCEmbed/table/table/getters/definition.h rename to src/functions/LuaCEmbed/table/table/getters/definition.h diff --git a/src/LuaCEmbed/table/table/getters/index/index.c b/src/functions/LuaCEmbed/table/table/getters/index/index.c similarity index 100% rename from src/LuaCEmbed/table/table/getters/index/index.c rename to src/functions/LuaCEmbed/table/table/getters/index/index.c diff --git a/src/LuaCEmbed/table/table/getters/index/index.h b/src/functions/LuaCEmbed/table/table/getters/index/index.h similarity index 94% rename from src/LuaCEmbed/table/table/getters/index/index.h rename to src/functions/LuaCEmbed/table/table/getters/index/index.h index f72364d..fa0861e 100644 --- a/src/LuaCEmbed/table/table/getters/index/index.h +++ b/src/functions/LuaCEmbed/table/table/getters/index/index.h @@ -1,4 +1,5 @@ +#include "../unique.declaration_requirements.h" char *LuaCembedTable_get_key_by_index(LuaCEmbedTable *self, long index); @@ -20,5 +21,3 @@ double LuaCEmbedTable_get_double_by_index(LuaCEmbedTable *self, int index); char * LuaCEmbedTable_get_string_by_index(LuaCEmbedTable *self, int index); bool LuaCEmbedTable_get_bool_by_index(LuaCEmbedTable *self, int index); - - diff --git a/src/LuaCEmbed/table/table/getters/keys/keys.c b/src/functions/LuaCEmbed/table/table/getters/keys/keys.c similarity index 100% rename from src/LuaCEmbed/table/table/getters/keys/keys.c rename to src/functions/LuaCEmbed/table/table/getters/keys/keys.c diff --git a/src/LuaCEmbed/table/table/getters/keys/keys.h b/src/functions/LuaCEmbed/table/table/getters/keys/keys.h similarity index 89% rename from src/LuaCEmbed/table/table/getters/keys/keys.h rename to src/functions/LuaCEmbed/table/table/getters/keys/keys.h index ec5de2b..79f71d6 100644 --- a/src/LuaCEmbed/table/table/getters/keys/keys.h +++ b/src/functions/LuaCEmbed/table/table/getters/keys/keys.h @@ -1,3 +1,4 @@ +#include "../unique.declaration_requirements.h" diff --git a/src/functions/LuaCEmbed/table/table/getters/unique.declaration_requirements.h b/src/functions/LuaCEmbed/table/table/getters/unique.declaration_requirements.h new file mode 100644 index 0000000..6364ee2 --- /dev/null +++ b/src/functions/LuaCEmbed/table/table/getters/unique.declaration_requirements.h @@ -0,0 +1 @@ +#include "../unique.declaration_requirements.h" diff --git a/src/LuaCEmbed/table/table/setters/declaration.h b/src/functions/LuaCEmbed/table/table/setters/declaration.h similarity index 100% rename from src/LuaCEmbed/table/table/setters/declaration.h rename to src/functions/LuaCEmbed/table/table/setters/declaration.h diff --git a/src/LuaCEmbed/table/table/setters/definition.h b/src/functions/LuaCEmbed/table/table/setters/definition.h similarity index 100% rename from src/LuaCEmbed/table/table/setters/definition.h rename to src/functions/LuaCEmbed/table/table/setters/definition.h diff --git a/src/LuaCEmbed/table/table/setters/index/index.c b/src/functions/LuaCEmbed/table/table/setters/index/index.c similarity index 100% rename from src/LuaCEmbed/table/table/setters/index/index.c rename to src/functions/LuaCEmbed/table/table/setters/index/index.c diff --git a/src/LuaCEmbed/table/table/setters/index/index.h b/src/functions/LuaCEmbed/table/table/setters/index/index.h similarity index 90% rename from src/LuaCEmbed/table/table/setters/index/index.h rename to src/functions/LuaCEmbed/table/table/setters/index/index.h index 1fce205..72b4cdd 100644 --- a/src/LuaCEmbed/table/table/setters/index/index.h +++ b/src/functions/LuaCEmbed/table/table/setters/index/index.h @@ -1,3 +1,4 @@ +#include "../unique.declaration_requirements.h" void LuaCEmbedTable_set_string_by_index(LuaCEmbedTable *self, long index, const char *value); diff --git a/src/LuaCEmbed/table/table/setters/insert/insert.c b/src/functions/LuaCEmbed/table/table/setters/insert/insert.c similarity index 100% rename from src/LuaCEmbed/table/table/setters/insert/insert.c rename to src/functions/LuaCEmbed/table/table/setters/insert/insert.c diff --git a/src/LuaCEmbed/table/table/setters/insert/insert.h b/src/functions/LuaCEmbed/table/table/setters/insert/insert.h similarity index 92% rename from src/LuaCEmbed/table/table/setters/insert/insert.h rename to src/functions/LuaCEmbed/table/table/setters/insert/insert.h index c226d8f..6e7693d 100644 --- a/src/LuaCEmbed/table/table/setters/insert/insert.h +++ b/src/functions/LuaCEmbed/table/table/setters/insert/insert.h @@ -1,3 +1,4 @@ +#include "../unique.declaration_requirements.h" void private_LuaCEmbedTable_add_space(LuaCEmbedTable *self, long formatted_index); @@ -11,4 +12,3 @@ void LuaCEmbedTable_insert_long_at_index(LuaCEmbedTable *self, long long index void LuaCEmbedTable_insert_double_at_index(LuaCEmbedTable *self, long index,double value); void LuaCEmbedTable_insert_table_at_index(LuaCEmbedTable *self, long index,LuaCEmbedTable *table); - diff --git a/src/LuaCEmbed/table/table/setters/keys/keys.c b/src/functions/LuaCEmbed/table/table/setters/keys/keys.c similarity index 100% rename from src/LuaCEmbed/table/table/setters/keys/keys.c rename to src/functions/LuaCEmbed/table/table/setters/keys/keys.c diff --git a/src/LuaCEmbed/table/table/setters/keys/keys.h b/src/functions/LuaCEmbed/table/table/setters/keys/keys.h similarity index 92% rename from src/LuaCEmbed/table/table/setters/keys/keys.h rename to src/functions/LuaCEmbed/table/table/setters/keys/keys.h index 45f9f48..1a3caf8 100644 --- a/src/LuaCEmbed/table/table/setters/keys/keys.h +++ b/src/functions/LuaCEmbed/table/table/setters/keys/keys.h @@ -1,6 +1,7 @@ +#include "../unique.declaration_requirements.h" void LuaCEmbedTable_set_method(LuaCEmbedTable *self, const char *name, LuaCEmbedResponse *(*callback)(LuaCEmbedTable *self, LuaCEmbed *args)); @@ -15,4 +16,3 @@ void LuaCEmbedTable_set_bool_prop(LuaCEmbedTable *self, const char *name, bool void LuaCEmbedTable_set_evaluation_prop(LuaCEmbedTable *self, const char *name, const char *code, ...); - diff --git a/src/functions/LuaCEmbed/table/table/setters/unique.declaration_requirements.h b/src/functions/LuaCEmbed/table/table/setters/unique.declaration_requirements.h new file mode 100644 index 0000000..6364ee2 --- /dev/null +++ b/src/functions/LuaCEmbed/table/table/setters/unique.declaration_requirements.h @@ -0,0 +1 @@ +#include "../unique.declaration_requirements.h" diff --git a/src/LuaCEmbed/table/table/sub_tables/declaration.h b/src/functions/LuaCEmbed/table/table/sub_tables/declaration.h similarity index 100% rename from src/LuaCEmbed/table/table/sub_tables/declaration.h rename to src/functions/LuaCEmbed/table/table/sub_tables/declaration.h diff --git a/src/LuaCEmbed/table/table/sub_tables/definition.h b/src/functions/LuaCEmbed/table/table/sub_tables/definition.h similarity index 100% rename from src/LuaCEmbed/table/table/sub_tables/definition.h rename to src/functions/LuaCEmbed/table/table/sub_tables/definition.h diff --git a/src/LuaCEmbed/table/table/sub_tables/index/index.c b/src/functions/LuaCEmbed/table/table/sub_tables/index/index.c similarity index 100% rename from src/LuaCEmbed/table/table/sub_tables/index/index.c rename to src/functions/LuaCEmbed/table/table/sub_tables/index/index.c diff --git a/src/LuaCEmbed/table/table/sub_tables/index/index.h b/src/functions/LuaCEmbed/table/table/sub_tables/index/index.h similarity index 85% rename from src/LuaCEmbed/table/table/sub_tables/index/index.h rename to src/functions/LuaCEmbed/table/table/sub_tables/index/index.h index 3244198..4a0180f 100644 --- a/src/LuaCEmbed/table/table/sub_tables/index/index.h +++ b/src/functions/LuaCEmbed/table/table/sub_tables/index/index.h @@ -1,4 +1,5 @@ +#include "../unique.declaration_requirements.h" LuaCEmbedTable *LuaCEmbedTable_new_sub_table_appending(LuaCEmbedTable *self); @@ -7,6 +8,3 @@ LuaCEmbedTable *LuaCEmbedTable_get_sub_table_by_index(LuaCEmbedTable *self, lon void LuaCEmbedTable_set_sub_table_by_index(LuaCEmbedTable *self, long index,LuaCEmbedTable *sub_table); - - - diff --git a/src/LuaCEmbed/table/table/sub_tables/key/key.c b/src/functions/LuaCEmbed/table/table/sub_tables/key/key.c similarity index 100% rename from src/LuaCEmbed/table/table/sub_tables/key/key.c rename to src/functions/LuaCEmbed/table/table/sub_tables/key/key.c diff --git a/src/LuaCEmbed/table/table/sub_tables/key/key.h b/src/functions/LuaCEmbed/table/table/sub_tables/key/key.h similarity index 73% rename from src/LuaCEmbed/table/table/sub_tables/key/key.h rename to src/functions/LuaCEmbed/table/table/sub_tables/key/key.h index ac17850..afd8f01 100644 --- a/src/LuaCEmbed/table/table/sub_tables/key/key.h +++ b/src/functions/LuaCEmbed/table/table/sub_tables/key/key.h @@ -1,6 +1,7 @@ +#include "../unique.declaration_requirements.h" LuaCEmbedTable *LuaCEmbedTable_new_sub_table_by_key(LuaCEmbedTable *self, const char *name); LuaCEmbedTable *LuaCEmbedTable_get_sub_table_by_key(LuaCEmbedTable *self, const char *name); -void LuaCEmbedTable_set_sub_table_prop(LuaCEmbedTable *self, const char *name, LuaCEmbedTable *sub_table); \ No newline at end of file +void LuaCEmbedTable_set_sub_table_prop(LuaCEmbedTable *self, const char *name, LuaCEmbedTable *sub_table); diff --git a/src/functions/LuaCEmbed/table/table/sub_tables/unique.declaration_requirements.h b/src/functions/LuaCEmbed/table/table/sub_tables/unique.declaration_requirements.h new file mode 100644 index 0000000..6364ee2 --- /dev/null +++ b/src/functions/LuaCEmbed/table/table/sub_tables/unique.declaration_requirements.h @@ -0,0 +1 @@ +#include "../unique.declaration_requirements.h" diff --git a/src/functions/LuaCEmbed/table/table/unique.declaration_requirements.h b/src/functions/LuaCEmbed/table/table/unique.declaration_requirements.h new file mode 100644 index 0000000..6364ee2 --- /dev/null +++ b/src/functions/LuaCEmbed/table/table/unique.declaration_requirements.h @@ -0,0 +1 @@ +#include "../unique.declaration_requirements.h" diff --git a/src/LuaCEmbed/table/table_array/table_array.c b/src/functions/LuaCEmbed/table/table_array/table_array.c similarity index 100% rename from src/LuaCEmbed/table/table_array/table_array.c rename to src/functions/LuaCEmbed/table/table_array/table_array.c diff --git a/src/LuaCEmbed/table/table_array/table_array.h b/src/functions/LuaCEmbed/table/table_array/table_array.h similarity index 86% rename from src/LuaCEmbed/table/table_array/table_array.h rename to src/functions/LuaCEmbed/table/table_array/table_array.h index 4c878ca..4bf8d2b 100644 --- a/src/LuaCEmbed/table/table_array/table_array.h +++ b/src/functions/LuaCEmbed/table/table_array/table_array.h @@ -1,11 +1,6 @@ +#include "../unique.declaration_requirements.h" -typedef struct { - - LuaCEmbedTable **tables; - long size; - -}privateLuaCEmbedTableArray; privateLuaCEmbedTableArray *newprivateLuaCEmbedTableArray(); diff --git a/src/functions/LuaCEmbed/table/unique.declaration_requirements.h b/src/functions/LuaCEmbed/table/unique.declaration_requirements.h new file mode 100644 index 0000000..6364ee2 --- /dev/null +++ b/src/functions/LuaCEmbed/table/unique.declaration_requirements.h @@ -0,0 +1 @@ +#include "../unique.declaration_requirements.h" diff --git a/src/functions/LuaCEmbed/table/unique.defintion_requirements.h b/src/functions/LuaCEmbed/table/unique.defintion_requirements.h new file mode 100644 index 0000000..5949eb7 --- /dev/null +++ b/src/functions/LuaCEmbed/table/unique.defintion_requirements.h @@ -0,0 +1 @@ +#include "unique.defintion_requirements.h" diff --git a/src/functions/LuaCEmbed/unique.declaration_requirements.h b/src/functions/LuaCEmbed/unique.declaration_requirements.h new file mode 100644 index 0000000..033c2b5 --- /dev/null +++ b/src/functions/LuaCEmbed/unique.declaration_requirements.h @@ -0,0 +1 @@ +#include "../unique.defintions_requirements.h" diff --git a/src/functions/LuaCEmbed/unique.defintion_requirements.h b/src/functions/LuaCEmbed/unique.defintion_requirements.h new file mode 100644 index 0000000..5949eb7 --- /dev/null +++ b/src/functions/LuaCEmbed/unique.defintion_requirements.h @@ -0,0 +1 @@ +#include "unique.defintion_requirements.h" diff --git a/src/LuaCEmbedResponse/LuaCEmbedResponse.c b/src/functions/LuaCEmbedResponse/LuaCEmbedResponse.c similarity index 100% rename from src/LuaCEmbedResponse/LuaCEmbedResponse.c rename to src/functions/LuaCEmbedResponse/LuaCEmbedResponse.c diff --git a/src/LuaCEmbedResponse/LuaCEmbedResponse.h b/src/functions/LuaCEmbedResponse/LuaCEmbedResponse.h similarity index 79% rename from src/LuaCEmbedResponse/LuaCEmbedResponse.h rename to src/functions/LuaCEmbedResponse/LuaCEmbedResponse.h index 0d5e909..dc3ba60 100644 --- a/src/LuaCEmbedResponse/LuaCEmbedResponse.h +++ b/src/functions/LuaCEmbedResponse/LuaCEmbedResponse.h @@ -1,13 +1,5 @@ +#include "../unique.declaration_requirements.h" -typedef struct { - - int type; - double num_val; - bool its_string_ref; - long string_size; - char *string_val; - -}LuaCEmbedResponse; LuaCEmbedResponse *private_LuaCEmbedReturn_raw(); @@ -26,6 +18,11 @@ LuaCEmbedResponse * LuaCEmbed_send_error(const char *format,...); LuaCEmbedResponse * LuaCEmbed_send_evaluation(const char *code); +LuaCEmbedResponse * LuaCEmbed_send_table(LuaCEmbedTable *table); + + +LuaCEmbedResponse * LuaCEmbed_send_multi_return(LuaCEmbedTable *table); + diff --git a/src/functions/declaration.h b/src/functions/declaration.h new file mode 100644 index 0000000..5675802 --- /dev/null +++ b/src/functions/declaration.h @@ -0,0 +1 @@ +#include "extra/extra.h" diff --git a/src/functions/definition.c b/src/functions/definition.c new file mode 100644 index 0000000..3483120 --- /dev/null +++ b/src/functions/definition.c @@ -0,0 +1 @@ +#include "extra/extra.c" diff --git a/src/extra/extra.c b/src/functions/extra/extra.c similarity index 96% rename from src/extra/extra.c rename to src/functions/extra/extra.c index fc501a9..93e20f2 100644 --- a/src/extra/extra.c +++ b/src/functions/extra/extra.c @@ -1,4 +1,5 @@ +#include "../unique.defintions_requirements.h" const char * LuaCembed_convert_arg_code(int arg_code){ if(arg_code == LUA_CEMBED_NOT_FOUND){ @@ -44,4 +45,4 @@ char * private_LuaCembed_format(const char *expresion, ...){ char *result = private_LuaCembed_format_vaarg(expresion,args); va_end(args); return result; -} \ No newline at end of file +} diff --git a/src/extra/extra.h b/src/functions/extra/extra.h similarity index 80% rename from src/extra/extra.h rename to src/functions/extra/extra.h index 2796612..1d4878e 100644 --- a/src/extra/extra.h +++ b/src/functions/extra/extra.h @@ -1,4 +1,4 @@ - +#include "../unique.declarations_requirements.h" const char * LuaCembed_convert_arg_code(int arg_code); @@ -6,5 +6,3 @@ const char * LuaCembed_convert_arg_code(int arg_code); char * private_LuaCembed_format_vaarg(const char *expresion, va_list args); char * private_LuaCembed_format(const char *expresion, ...); - - diff --git a/src/namespace/LuaCEmbedNamespace/LuaCEmbedNamespace.c b/src/functions/namespace/LuaCEmbedNamespace/LuaCEmbedNamespace.c similarity index 100% rename from src/namespace/LuaCEmbedNamespace/LuaCEmbedNamespace.c rename to src/functions/namespace/LuaCEmbedNamespace/LuaCEmbedNamespace.c diff --git a/src/namespace/LuaCEmbedNamespace/LuaCEmbedNamespace.h b/src/functions/namespace/LuaCEmbedNamespace/LuaCEmbedNamespace.h similarity index 100% rename from src/namespace/LuaCEmbedNamespace/LuaCEmbedNamespace.h rename to src/functions/namespace/LuaCEmbedNamespace/LuaCEmbedNamespace.h diff --git a/src/namespace/args/args.c b/src/functions/namespace/args/args.c similarity index 100% rename from src/namespace/args/args.c rename to src/functions/namespace/args/args.c diff --git a/src/namespace/args/args.h b/src/functions/namespace/args/args.h similarity index 100% rename from src/namespace/args/args.h rename to src/functions/namespace/args/args.h diff --git a/src/namespace/declaration.h b/src/functions/namespace/declaration.h similarity index 100% rename from src/namespace/declaration.h rename to src/functions/namespace/declaration.h diff --git a/src/namespace/definition.h b/src/functions/namespace/definition.h similarity index 100% rename from src/namespace/definition.h rename to src/functions/namespace/definition.h diff --git a/src/namespace/globals/globals.c b/src/functions/namespace/globals/globals.c similarity index 100% rename from src/namespace/globals/globals.c rename to src/functions/namespace/globals/globals.c diff --git a/src/namespace/globals/globals.h b/src/functions/namespace/globals/globals.h similarity index 100% rename from src/namespace/globals/globals.h rename to src/functions/namespace/globals/globals.h diff --git a/src/namespace/response/response.c b/src/functions/namespace/response/response.c similarity index 100% rename from src/namespace/response/response.c rename to src/functions/namespace/response/response.c diff --git a/src/namespace/response/response.h b/src/functions/namespace/response/response.h similarity index 100% rename from src/namespace/response/response.h rename to src/functions/namespace/response/response.h diff --git a/src/namespace/table/table.c b/src/functions/namespace/table/table.c similarity index 100% rename from src/namespace/table/table.c rename to src/functions/namespace/table/table.c diff --git a/src/namespace/table/table.h b/src/functions/namespace/table/table.h similarity index 100% rename from src/namespace/table/table.h rename to src/functions/namespace/table/table.h diff --git a/src/namespace/types/types.c b/src/functions/namespace/types/types.c similarity index 100% rename from src/namespace/types/types.c rename to src/functions/namespace/types/types.c diff --git a/src/namespace/types/types.h b/src/functions/namespace/types/types.h similarity index 100% rename from src/namespace/types/types.h rename to src/functions/namespace/types/types.h diff --git a/src/functions/unique.declarations_requirements.h b/src/functions/unique.declarations_requirements.h new file mode 100644 index 0000000..b009633 --- /dev/null +++ b/src/functions/unique.declarations_requirements.h @@ -0,0 +1,2 @@ +#include "../types/all.h" +#include "../dependencies/declaration.h" diff --git a/src/functions/unique.defintions_requirements.h b/src/functions/unique.defintions_requirements.h new file mode 100644 index 0000000..6926fb0 --- /dev/null +++ b/src/functions/unique.defintions_requirements.h @@ -0,0 +1 @@ +#include "../declaration.h" diff --git a/src/globals.c b/src/globals.c new file mode 100644 index 0000000..d2cada3 --- /dev/null +++ b/src/globals.c @@ -0,0 +1,8 @@ + +#ifndef PRIVATE_LUACEMBED_GLOBALS +#define PRIVATE_LUACEMBED_GLOBALS +int lua_cembed_timeout = -1; +LuaCEmbed *global_current_lua_embed_object; +long lua_cembed_used_memory = 0; +long lua_cembed_memory_limit = -1; +#endif diff --git a/src/inports.h b/src/inports.h new file mode 100644 index 0000000..be2d134 --- /dev/null +++ b/src/inports.h @@ -0,0 +1,11 @@ +#ifdef _WIN32 +#include +#else +#include +#include +#endif + +#include +#include +#include +#include diff --git a/src/macros/all.h b/src/macros/all.h new file mode 100644 index 0000000..c53caf4 --- /dev/null +++ b/src/macros/all.h @@ -0,0 +1,5 @@ + +#ifndef PRIVATE_LUACEMBED_MACROS +#define PRIVATE_LUACEMBED_MACROS + +#endif diff --git a/src/types/all.h b/src/types/all.h new file mode 100644 index 0000000..d5b3a53 --- /dev/null +++ b/src/types/all.h @@ -0,0 +1,8 @@ +#ifndef PRIVATE_LUACEMBED_TYPE +#define PRIVATE_LUACEMBED_TYPE +#include "luacembed.h" +#include "namespace/all.h" +#include "response.h" +#include "table.h" +#include "table_array.h" +#endif diff --git a/src/LuaCEmbed/LuaCEmbed.h b/src/types/luacembed.h similarity index 73% rename from src/LuaCEmbed/LuaCEmbed.h rename to src/types/luacembed.h index 6c5e92e..5f9eb9e 100644 --- a/src/LuaCEmbed/LuaCEmbed.h +++ b/src/types/luacembed.h @@ -1,4 +1,7 @@ +#include "unique.type_dependencies.h" +#ifndef PRIVATE_LUACEMBED_LUACEMBE_TYPE +#define PRIVATE_LUACEMBED_LUACEMBE_TYPE typedef struct LuaCEmbed{ lua_State *state; const char *current_function; @@ -13,7 +16,4 @@ typedef struct LuaCEmbed{ char *main_lib_table; bool field_protection; }LuaCEmbed; - -int lua_cembed_timeout = -1; -LuaCEmbed *global_current_lua_embed_object; - +#endif diff --git a/src/types/namespace/all.h b/src/types/namespace/all.h new file mode 100644 index 0000000..e69de29 diff --git a/src/types/response.h b/src/types/response.h new file mode 100644 index 0000000..06dd960 --- /dev/null +++ b/src/types/response.h @@ -0,0 +1,14 @@ +#ifndef PRIVATE_LUACEMBED_RESPONSE_TYPE +#define PRIVATE_LUACEMBED_RESPONSE_TYPE + +typedef struct { + + int type; + double num_val; + bool its_string_ref; + long string_size; + char *string_val; + +}LuaCEmbedResponse; + +#endif diff --git a/src/LuaCEmbed/table/table/table.h b/src/types/table.h similarity index 60% rename from src/LuaCEmbed/table/table/table.h rename to src/types/table.h index a8e5391..a4215e7 100644 --- a/src/LuaCEmbed/table/table/table.h +++ b/src/types/table.h @@ -1,5 +1,6 @@ - - +#include "luacembed.h" +#ifndef PRIVATE_LUACEMBED_TABLE +#define PRIVATE_LUACEMBED_TABLE typedef struct { LuaCEmbed *main_object; char *prop_name; @@ -8,3 +9,4 @@ typedef struct { long index; }LuaCEmbedTable; +#endif diff --git a/src/types/table_array.h b/src/types/table_array.h new file mode 100644 index 0000000..45e9e61 --- /dev/null +++ b/src/types/table_array.h @@ -0,0 +1,12 @@ +#include "table.h" + + +#ifndef PRIVATE_LUACEMBED_TABLE_ARRAY +#define PRIVATE_LUACEMBED_TABLE_ARRAY +typedef struct { + + LuaCEmbedTable **tables; + long size; + +}privateLuaCEmbedTableArray; +#endif diff --git a/src/types/unique.type_dependencies.h b/src/types/unique.type_dependencies.h new file mode 100644 index 0000000..f81ab49 --- /dev/null +++ b/src/types/unique.type_dependencies.h @@ -0,0 +1,2 @@ + +#include "../dependencies/declaration.h"