q66 pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=51f49642b4bd9852163a45d2d4480e070e107472
commit 51f49642b4bd9852163a45d2d4480e070e107472
Author: Daniel Kolesa <d.kol...@osg.samsung.com>
Date: Wed Jun 17 14:26:07 2015 +0100
eolian: remove the outdated and ugly database printer (needs rework)
---
src/Makefile_Eolian.am | 1 -
src/bin/eolian/main.c | 11 +-
src/bindings/luajit/eolian.lua | 35 ----
src/lib/eolian/Eolian.h | 147 ---------------
src/lib/eolian/database_print.c | 403 ----------------------------------------
5 files changed, 2 insertions(+), 595 deletions(-)
diff --git a/src/Makefile_Eolian.am b/src/Makefile_Eolian.am
index 6c06368..a5635fd 100644
--- a/src/Makefile_Eolian.am
+++ b/src/Makefile_Eolian.am
@@ -29,7 +29,6 @@ lib_eolian_libeolian_la_SOURCES = \
lib/eolian/database_constructor_api.c \
lib/eolian/database_event.c \
lib/eolian/database_event_api.c \
- lib/eolian/database_print.c \
lib/eolian/database_expr.c \
lib/eolian/database_expr_api.c \
lib/eolian/database_var.c \
diff --git a/src/bin/eolian/main.c b/src/bin/eolian/main.c
index 0e7c090..f2dbd5a 100644
--- a/src/bin/eolian/main.c
+++ b/src/bin/eolian/main.c
@@ -315,7 +315,7 @@ static int legacy_support = 0;
int main(int argc, char **argv)
{
int ret = 1;
- Eina_Bool help = EINA_FALSE, show = EINA_FALSE;
+ Eina_Bool help = EINA_FALSE;
const char *eo_filename = NULL;
char *output_filename = NULL; /* if NULL, have to generate, otherwise use
the name stored there */
char *eo_filename_copy = NULL, *eo_file_basename;
@@ -340,7 +340,6 @@ int main(int argc, char **argv)
{
/* These options set a flag. */
{"eo", no_argument, &eo_needed, 1},
- {"verbose", no_argument, 0, 'v'},
{"help", no_argument, 0, 'h'},
{"gh", no_argument, &gen_opt, H_GEN},
{"gc", no_argument, &gen_opt, C_GEN},
@@ -361,7 +360,6 @@ int main(int argc, char **argv)
output_filename = strdup(optarg);
break;
}
- case 'v': show = EINA_TRUE; break;
case 'h': help = EINA_TRUE; break;
case 'I':
{
@@ -380,7 +378,7 @@ int main(int argc, char **argv)
if (help)
{
- printf("Usage: %s [-h/--help] [-v/--verbose] [-I/--include input_dir]
[--legacy] [--gh|--gc|--gi] [--output/-o outfile] file.eo ... \n", argv[0]);
+ printf("Usage: %s [-h/--help] [-I/--include input_dir] [--legacy]
[--gh|--gc|--gi] [--output/-o outfile] file.eo ... \n", argv[0]);
printf(" --help/-h Print that help\n");
printf(" --include/-I Include 'input_dir' as directory to search
.eo files into\n");
printf(" --output/-o Force output filename to 'outfile'\n");
@@ -416,11 +414,6 @@ int main(int argc, char **argv)
eo_filename_copy = strdup(eo_filename);
eo_file_basename = basename(eo_filename_copy);
- if (show)
- {
- const Eolian_Class *class = eolian_class_get_by_file(eo_file_basename);
- if (class) eolian_show_class(class);
- }
/* Only needed for .eo files */
if (is_eo && !eo_needed && !(gen_opt == H_GEN && legacy_support))
diff --git a/src/bindings/luajit/eolian.lua b/src/bindings/luajit/eolian.lua
index 452cb75..fa78cc2 100644
--- a/src/bindings/luajit/eolian.lua
+++ b/src/bindings/luajit/eolian.lua
@@ -189,13 +189,6 @@ ffi.cdef [[
Eina_Bool eolian_all_eo_files_parse();
Eina_Bool eolian_all_eot_files_parse();
Eina_Bool eolian_database_validate(void);
- Eina_Bool eolian_show_class(const Eolian_Class *klass);
- Eina_Bool eolian_show_typedef(const char *alias);
- Eina_Bool eolian_show_struct(const char *name);
- Eina_Bool eolian_show_enum(const char *name);
- Eina_Bool eolian_show_global(const char *name);
- Eina_Bool eolian_show_constant(const char *name);
- void eolian_show_all();
const Eolian_Class *eolian_class_get_by_name(const char *class_name);
const Eolian_Class *eolian_class_get_by_file(const char *file_name);
const char *eolian_class_file_get(const Eolian_Class *klass);
@@ -409,34 +402,6 @@ M.database_validate = function()
return eolian.eolian_database_validate() ~= 0
end
-M.show_class = function(klass)
- return eolian.eolian_show_class(klass) ~= 0
-end
-
-M.show_typedef = function(alias)
- return eolian.eolian_show_typedef(alias) ~= 0
-end
-
-M.show_struct = function(name)
- return eolian.eolian_show_typedef(name) ~= 0
-end
-
-M.show_enum = function(name)
- return eolian.eolian_show_enum(name) ~= 0
-end
-
-M.show_global = function(name)
- return eolian.eolian_show_global(name) ~= 0
-end
-
-M.show_constant = function(name)
- return eolian.eolian_show_constant(name) ~= 0
-end
-
-M.show_all = function()
- eolian.eolian_show_all()
-end
-
M.declaration_type = {
UNKNOWN = -1,
CLASS = 0,
diff --git a/src/lib/eolian/Eolian.h b/src/lib/eolian/Eolian.h
index c798137..5ebd90d 100644
--- a/src/lib/eolian/Eolian.h
+++ b/src/lib/eolian/Eolian.h
@@ -462,153 +462,6 @@ EAPI Eina_Bool eolian_all_eot_files_parse(void);
EAPI Eina_Bool eolian_database_validate(void);
/*
- * @brief Show information about a given class.
- *
- * If klass is NULL, this function will print information of
- * all the classes stored into the database.
- *
- * @param[in] klass the class to show
- *
- * @return EINA_TRUE on success, EINA_FALSE otherwise (currently always
- * succeeds).
- *
- * @see eolian_show_typedef
- * @see eolian_show_struct
- * @see eolian_show_enum
- * @see eolian_show_global
- * @see eolian_show_constant
- * @see eolian_show_all
- *
- * @ingroup Eolian
- */
-EAPI Eina_Bool eolian_show_class(const Eolian_Class *klass);
-
-/*
- * @brief Show information about a given typedef.
- *
- * If @c alias is NULL, this function will print information of
- * all the typedefs.
- *
- * @param[in] alias the typedef to show.
- *
- * @return EINA_TRUE on success, EINA_FALSE otherwise (when typedef is not
- * found).
- *
- * @see eolian_show_class
- * @see eolian_show_struct
- * @see eolian_show_enum
- * @see eolian_show_global
- * @see eolian_show_constant
- * @see eolian_show_all
- *
- * @ingroup Eolian
- */
-EAPI Eina_Bool eolian_show_typedef(const char *alias);
-
-/*
- * @brief Show information about a given struct.
- *
- * If @c name is NULL, this function will print information of
- * all the named global structs.
- *
- * @param[in] name the struct to show.
- *
- * @return EINA_TRUE on success, EINA_FALSE otherwise (when struct is not
- * found).
- *
- * @see eolian_show_class
- * @see eolian_show_typedef
- * @see eolian_show_enum
- * @see eolian_show_global
- * @see eolian_show_constant
- * @see eolian_show_all
- *
- * @ingroup Eolian
- */
-EAPI Eina_Bool eolian_show_struct(const char *name);
-
-/*
- * @brief Show information about a given enum.
- *
- * If @c name is NULL, this function will print information of
- * all the enums.
- *
- * @param[in] name the enum to show.
- *
- * @return EINA_TRUE on success, EINA_FALSE otherwise (when enum is not
- * found).
- *
- * @see eolian_show_class
- * @see eolian_show_typedef
- * @see eolian_show_struct
- * @see eolian_show_global
- * @see eolian_show_constant
- * @see eolian_show_all
- *
- * @ingroup Eolian
- */
-EAPI Eina_Bool eolian_show_enum(const char *name);
-
-/*
- * @brief Show information about a given global.
- *
- * If @c name is NULL, this function will print information of
- * all the globals.
- *
- * @param[in] name the global to show.
- *
- * @return EINA_TRUE on success, EINA_FALSE otherwise (when global is not
- * found).
- *
- * @see eolian_show_class
- * @see eolian_show_typedef
- * @see eolian_show_struct
- * @see eolian_show_enum
- * @see eolian_show_constant
- * @see eolian_show_all
- *
- * @ingroup Eolian
- */
-EAPI Eina_Bool eolian_show_global(const char *name);
-
-/*
- * @brief Show information about a given constant.
- *
- * If @c name is NULL, this function will print information of
- * all the constants.
- *
- * @param[in] name the constant to show.
- *
- * @return EINA_TRUE on success, EINA_FALSE otherwise (when constant is not
- * found).
- *
- * @see eolian_show_class
- * @see eolian_show_typedef
- * @see eolian_show_struct
- * @see eolian_show_enum
- * @see eolian_show_global
- * @see eolian_show_all
- *
- * @ingroup Eolian
- */
-EAPI Eina_Bool eolian_show_constant(const char *name);
-
-/*
- * @brief Show information about everything.
- *
- * This will print a complete dump of all information stored in the Eolian
- * database.
- *
- * @see eolian_show_class
- * @see eolian_show_typedef
- * @see eolian_show_struct
- * @see eolian_show_enum
- *
- * @ingroup Eolian
- */
-EAPI void eolian_show_all(void);
-
-/*
* @brief Gets a class by its name
*
* @param[in] class_name name of the class to get.
diff --git a/src/lib/eolian/database_print.c b/src/lib/eolian/database_print.c
deleted file mode 100644
index 741a363..0000000
--- a/src/lib/eolian/database_print.c
+++ /dev/null
@@ -1,403 +0,0 @@
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include <Eina.h>
-#include "eolian_database.h"
-
-static void
-_implements_print(Eolian_Implement *impl, int nb_spaces)
-{
- const char *t;
- Eolian_Function_Type ft = EOLIAN_UNRESOLVED;
- eolian_implement_function_get(impl, &ft);
- switch (ft)
- {
- case EOLIAN_PROP_SET: t = "SET"; break;
- case EOLIAN_PROP_GET: t = "GET"; break;
- case EOLIAN_METHOD: t = "METHOD"; break;
- case EOLIAN_UNRESOLVED: t = ""; break;
- default:
- return;
- }
- printf("%*s <%s> <%s>\n", nb_spaces + 5, "",
eolian_implement_full_name_get(impl), t);
-}
-
-static void
-_constructors_print(Eolian_Constructor *ctor, int nb_spaces)
-{
- const char *t;
- const Eolian_Function *func = eolian_constructor_function_get(ctor);
- Eolian_Function_Type ft = eolian_function_type_get(func);
- switch (ft)
- {
- case EOLIAN_PROP_SET: t = "SET"; break;
- case EOLIAN_PROP_GET: t = "GET"; break;
- case EOLIAN_METHOD: t = "METHOD"; break;
- case EOLIAN_UNRESOLVED: t = ""; break;
- default:
- return;
- }
- printf("%*s <%s> <%s>\n", nb_spaces + 5, "",
eolian_constructor_full_name_get(ctor), t);
-}
-
-
-static void
-_event_print(Eolian_Event *ev, int nb_spaces)
-{
- const Eolian_Type *type = eolian_event_type_get(ev);
- printf("%*s <%s> <", nb_spaces + 5, "", eolian_event_name_get(ev));
- if (type) database_type_print((Eolian_Type*)type);
- printf(">\n");
-}
-
-static Eina_Bool _function_print(const Eolian_Function *fid, int nb_spaces)
-{
- EINA_SAFETY_ON_NULL_RETURN_VAL(fid, EINA_FALSE);
- const char *ret_desc = eolian_function_return_comment_get(fid, fid->type);
- const Eolian_Type *tp;
- switch (fid->type)
- {
- case EOLIAN_PROPERTY:
- {
- printf("%*s<%s> %s\n", nb_spaces, "", ret_desc ? ret_desc : "",
fid->name);
- const char *str = eolian_function_description_get(fid,
EOLIAN_PROP_GET);
- if (str) printf("%*s<%s>\n", nb_spaces + 5, "", str);
- str = eolian_function_description_get(fid, EOLIAN_PROP_SET);
- if (str) printf("%*s<%s>\n", nb_spaces + 5, "", str);
- str = eolian_function_legacy_get(fid, EOLIAN_PROP_GET);
- if (str) printf("%*slegacy_get: <%s>\n", nb_spaces + 5, "", str);
- str = eolian_function_legacy_get(fid, EOLIAN_PROP_SET);
- if (str) printf("%*slegacy_set: <%s>\n", nb_spaces + 5, "", str);
- tp = eolian_function_return_type_get(fid, EOLIAN_PROP_GET);
- if (tp)
- {
- printf("%*sreturn type for get: <", nb_spaces + 5, "");
- database_type_print((Eolian_Type*)tp);
- printf(">\n");
- }
- tp = eolian_function_return_type_get(fid, EOLIAN_PROP_SET);
- if (tp)
- {
- printf("%*sreturn type for set: <", nb_spaces + 5, "");
- database_type_print((Eolian_Type*)tp);
- printf(">\n");
- }
- break;
- }
- case EOLIAN_PROP_GET:
- {
- printf("%*sGET:<%s> %s\n", nb_spaces, "", ret_desc ? ret_desc :
"", fid->name);
- const char *str = eolian_function_description_get(fid,
EOLIAN_PROP_GET);
- if (str) printf("%*s<%s>\n", nb_spaces + 5, "", str);
- str = eolian_function_legacy_get(fid, EOLIAN_PROP_GET);
- if (str) printf("%*slegacy: <%s>\n", nb_spaces + 5, "", str);
- tp = eolian_function_return_type_get(fid, EOLIAN_PROP_GET);
- if (tp)
- {
- printf("%*sreturn type: <", nb_spaces + 5, "");
- database_type_print((Eolian_Type*)tp);
- printf(">\n");
- }
- break;
- }
- case EOLIAN_PROP_SET:
- {
- printf("%*sSET:<%s> %s\n", nb_spaces, "", ret_desc ? ret_desc :
"", fid->name);
- const char *str = eolian_function_description_get(fid,
EOLIAN_PROP_SET);
- if (str) printf("%*s<%s>\n", nb_spaces + 5, "", str);
- str = eolian_function_legacy_get(fid, EOLIAN_PROP_SET);
- if (str) printf("%*slegacy: <%s>\n", nb_spaces + 5, "", str);
- tp = eolian_function_return_type_get(fid, EOLIAN_PROP_SET);
- if (tp)
- {
- printf("%*sreturn type: <", nb_spaces + 5, "");
- database_type_print((Eolian_Type*)tp);
- printf(">\n");
- }
- break;
- }
- case EOLIAN_METHOD:
- {
- printf("%*s<%s> %s\n", nb_spaces, "", ret_desc ? ret_desc : "",
fid->name);
- const char *str = eolian_function_description_get(fid,
EOLIAN_METHOD);
- if (str) printf("%*s<%s>\n", nb_spaces + 5, "", str);
- str = eolian_function_legacy_get(fid, EOLIAN_METHOD);
- if (str) printf("%*slegacy: <%s>\n", nb_spaces + 5, "", str);
- tp = eolian_function_return_type_get(fid, EOLIAN_METHOD);
- if (tp)
- {
- printf("%*sreturn type: <", nb_spaces + 5, "");
- database_type_print((Eolian_Type*)tp);
- printf(">\n");
- }
- if (fid->obj_is_const) printf("%*sobj const: <true>\n",
nb_spaces + 5, "");
- break;
- }
- default:
- return EINA_FALSE;
- }
- Eina_List *itr;
- Eolian_Function_Parameter *param;
- EINA_LIST_FOREACH(fid->params, itr, param)
- {
- char *param_dir = NULL;
- switch (param->param_dir)
- {
- case EOLIAN_IN_PARAM:
- param_dir = "IN";
- break;
- case EOLIAN_OUT_PARAM:
- param_dir = "OUT";
- break;
- case EOLIAN_INOUT_PARAM:
- param_dir = "INOUT";
- break;
- }
- printf("%*s%s <%s> <", nb_spaces + 5, "", param_dir, param->name);
- database_type_print((Eolian_Type*)param->type);
- printf("> <%s>\n", param->description?param->description:"");
- }
- return EINA_TRUE;
-}
-
-static Eina_Bool
-_class_print(const Eolian_Class *cl)
-{
- Eina_List *itr;
- Eolian_Function *function;
- const char *types[5] = {"", "Regular", "Regular Non Instantiable", "Mixin",
"Interface"};
-
- EINA_SAFETY_ON_NULL_RETURN_VAL(cl, EINA_FALSE);
- printf("Class %s:\n", cl->name);
- if (cl->description)
- printf(" description: <%s>\n", cl->description);
-
- printf(" type: %s\n", types[cl->type]);
-
- // Inherits
- if (cl->inherits)
- {
- printf(" inherits: ");
- char *word;
- EINA_LIST_FOREACH(cl->inherits, itr, word)
- printf("%s ", word);
- printf("\n");
- }
-
- // Legacy prefix
- if (cl->legacy_prefix)
- {
- printf(" legacy prefix: <%s>\n", cl->legacy_prefix);
- }
-
- // Eo prefix
- if (cl->eo_prefix)
- {
- printf(" Eo prefix: <%s>\n", cl->eo_prefix);
- }
-
- // Data type
- if (cl->data_type)
- {
- printf(" Data type: <%s>\n", cl->data_type);
- }
-
- // Properties
- printf(" properties:\n");
- EINA_LIST_FOREACH(cl->properties, itr, function)
- {
- _function_print(function, 4);
- }
- printf("\n");
-
- // Methods
- printf(" methods:\n");
- EINA_LIST_FOREACH(cl->methods, itr, function)
- {
- _function_print(function, 4);
- }
- printf("\n");
-
- // Implement
- printf(" implements:\n");
- Eolian_Implement *impl;
- EINA_LIST_FOREACH(cl->implements, itr, impl)
- {
- _implements_print(impl, 4);
- }
- printf("\n");
-
- // Constructor
- printf(" constructors:\n");
- Eolian_Constructor *ctor;
- EINA_LIST_FOREACH(cl->constructors, itr, ctor)
- {
- _constructors_print(ctor, 4);
- }
- printf("\n");
-
- // Implement
- printf(" events:\n");
- Eolian_Event *ev;
- EINA_LIST_FOREACH(cl->events, itr, ev)
- {
- _event_print(ev, 4);
- }
- printf("\n");
-
- return EINA_TRUE;
-}
-
-static Eina_Bool
-_cl_print_cb(const Eina_Hash *hash EINA_UNUSED, const void *key EINA_UNUSED,
- void *data, void *fdata EINA_UNUSED)
-{
- _class_print((Eolian_Class*)data);
- return EINA_TRUE;
-}
-
-EAPI Eina_Bool
-eolian_show_class(const Eolian_Class *class)
-{
- if (!class)
- eina_hash_foreach(_classes, _cl_print_cb, NULL);
- else
- _class_print(class);
- return EINA_TRUE;
-}
-
-static Eina_Bool
-_typedef_cb(Eina_Hash *hash EINA_UNUSED, const char *alias,
- const Eolian_Type *tp, const void *fdata EINA_UNUSED)
-{
- printf("Typedef: %s\n", alias);
- printf(" type: <");
- database_type_print(tp->base_type);
- printf(">\n");
- return EINA_TRUE;
-}
-
-EAPI Eina_Bool
-eolian_show_typedef(const char *alias)
-{
- if (!alias)
- eina_hash_foreach(_aliases, (Eina_Hash_Foreach)_typedef_cb, NULL);
- else
- {
- Eina_Stringshare *shr = eina_stringshare_add(alias);
- Eolian_Type *tp = eina_hash_find(_aliases, shr);
- eina_stringshare_del(shr);
- if (!tp) return EINA_FALSE;
- _typedef_cb(NULL, alias, tp, NULL);
- }
- return EINA_TRUE;
-}
-
-static Eina_Bool
-_struct_cb(Eina_Hash *hash EINA_UNUSED, const char *name,
- const Eolian_Type *tp, const void *fdata EINA_UNUSED)
-{
- printf("Struct: %s\n", name);
- printf(" type: <");
- database_type_print((Eolian_Type*)tp);
- printf(">\n");
- return EINA_TRUE;
-}
-
-EAPI Eina_Bool
-eolian_show_struct(const char *name)
-{
- if (!name)
- eina_hash_foreach(_structs, (Eina_Hash_Foreach)_struct_cb, NULL);
- else
- {
- Eina_Stringshare *shr = eina_stringshare_add(name);
- Eolian_Type *tp = eina_hash_find(_structs, shr);
- eina_stringshare_del(shr);
- if (!tp) return EINA_FALSE;
- _struct_cb(NULL, name, tp, NULL);
- }
- return EINA_TRUE;
-}
-
-static Eina_Bool
-_enum_cb(Eina_Hash *hash EINA_UNUSED, const char *name,
- const Eolian_Type *tp, const void *fdata EINA_UNUSED)
-{
- printf("Enum: %s\n", name);
- printf(" type: <");
- database_type_print((Eolian_Type*)tp);
- printf(">\n");
- return EINA_TRUE;
-}
-
-EAPI Eina_Bool
-eolian_show_enum(const char *name)
-{
- if (!name)
- eina_hash_foreach(_enums, (Eina_Hash_Foreach)_enum_cb, NULL);
- else
- {
- Eina_Stringshare *shr = eina_stringshare_add(name);
- Eolian_Type *tp = eina_hash_find(_enums, shr);
- eina_stringshare_del(shr);
- if (!tp) return EINA_FALSE;
- _enum_cb(NULL, name, tp, NULL);
- }
- return EINA_TRUE;
-}
-
-static Eina_Bool
-_var_cb(Eina_Hash *hash EINA_UNUSED, const char *name,
- const Eolian_Variable *var, const void *fdata EINA_UNUSED)
-{
- if (var->type == EOLIAN_VAR_CONSTANT)
- printf("Constant: %s\n", name);
- else
- printf("Global: %s\n", name);
- printf(" value: <");
- database_expr_print(var->value);
- printf(">\n");
- return EINA_TRUE;
-}
-
-EAPI Eina_Bool
-eolian_show_global(const char *name)
-{
- if (!name)
- eina_hash_foreach(_globals, (Eina_Hash_Foreach)_var_cb, NULL);
- else
- {
- Eina_Stringshare *shr = eina_stringshare_add(name);
- Eolian_Variable *var = eina_hash_find(_globals, shr);
- eina_stringshare_del(shr);
- if (!var) return EINA_FALSE;
- _var_cb(NULL, name, var, NULL);
- }
- return EINA_TRUE;
-}
-
-EAPI Eina_Bool
-eolian_show_constant(const char *name)
-{
- if (!name)
- eina_hash_foreach(_constants, (Eina_Hash_Foreach)_var_cb, NULL);
- else
- {
- Eina_Stringshare *shr = eina_stringshare_add(name);
- Eolian_Variable *var = eina_hash_find(_constants, shr);
- eina_stringshare_del(shr);
- if (!var) return EINA_FALSE;
- _var_cb(NULL, name, var, NULL);
- }
- return EINA_TRUE;
-}
-
-EAPI void
-eolian_show_all()
-{
- eolian_show_class(NULL);
- eolian_show_typedef(NULL);
- eolian_show_struct(NULL);
-}
--
