hugok
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Eolian: remove --class option. 

Now, the .eo file needs to be supplied instead of the class.
This commit is contained in:
Daniel Zaoui 2014-02-16 16:09:06 +02:00
parent 17abdbdd43
commit 9add4c695c
6 changed files with 94 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
src/bin/eolian/main.c
View File

@ -13,7 +13,7 @@ static int eo_version = 0;
static Eina_Bool legacy_support = EINA_FALSE;
static Eina_Bool
_generate_h_file(char *filename, char *classname, Eina_Bool append)
_generate_h_file(char *filename, const char *classname, Eina_Bool append)
{
Eina_Bool ret = EINA_FALSE;
Eina_Strbuf *hfile = eina_strbuf_new();
@ -54,7 +54,7 @@ end:
}
static Eina_Bool
_generate_c_file(char *filename, char *classname, Eina_Bool append)
_generate_c_file(char *filename, const char *classname, Eina_Bool append)
{
Eina_Bool ret = EINA_FALSE;
@ -79,7 +79,7 @@ end:
// TODO join with header gen.
static Eina_Bool
_generate_legacy_header_file(char *filename, char *classname, Eina_Bool append)
_generate_legacy_header_file(char *filename, const char *classname, Eina_Bool append)
{
Eina_Bool ret = EINA_FALSE;
@ -120,7 +120,7 @@ end:
}
static Eina_Bool
_generate_eo_and_legacy_h_file(char *filename, char *classname)
_generate_eo_and_legacy_h_file(char *filename, const char *classname)
{
Eina_Bool ret = EINA_FALSE;
@ -151,11 +151,11 @@ int main(int argc, char **argv)
eina_init();
int ret = 0;
Eina_Bool help = EINA_FALSE, show = EINA_FALSE;
Eina_List *files = NULL, *itr;
Eina_List *classes = NULL;
Eina_List *included_files = NULL, *itr;
Eina_List *files4gen = NULL;
const char *classname;
char *h_filename = NULL, *c_filename = NULL,
*classname = NULL, *leg_filename = NULL,
*eoleg_filename = NULL;
*leg_filename = NULL, *eoleg_filename = NULL;
Eina_Bool happend = EINA_FALSE;
Eina_Bool lappend = EINA_FALSE;
@ -174,11 +174,10 @@ int main(int argc, char **argv)
{"gle", required_argument, 0, 5},
{"legacy", no_argument, 0, 6},
{"include", required_argument, 0, 'I'},
{"class", required_argument, 0, 'c'},
{0, 0, 0, 0}
};
int long_index =0, opt;
while ((opt = getopt_long(argc, argv,"Vho:I:c:", long_options, &long_index )) != -1)
while ((opt = getopt_long(argc, argv,"Vho:I:", long_options, &long_index )) != -1)
{
switch (opt) {
case 0: break;
@ -208,8 +207,8 @@ int main(int argc, char **argv)
sprintf(filepath, "%s/%s", dir, file);
if ((!ecore_file_is_dir(filepath)) && eina_str_has_suffix(filepath, EO_SUFFIX))
{
/* Allocated string will be freed during deletion of "files" list. */
files = eina_list_append(files, strdup(filepath));
/* Allocated string will be freed during deletion of "included_files" list. */
included_files = eina_list_append(included_files, strdup(filepath));
}
free(filepath);
free(file);
@ -219,19 +218,24 @@ int main(int argc, char **argv)
free(dir);
break;
}
case 'c': classes = eina_list_append(classes, optarg); break;
default: help = EINA_TRUE;
}
}
if (eina_list_count(classes)) classname = eina_list_data_get(classes);
if (!files || help || !classname)
while (optind < argc)
{
printf("Usage: %s [-h/--help] [-V/--verbose] [-I/--include input_dir] [--legacy] [--gh|--gc|--ah] filename [-c/--class] classname \n", argv[0]);
char *short_name = argv[optind++];
char *included_file;
EINA_LIST_FOREACH(included_files, itr, included_file)
if (strstr(included_file, short_name))
files4gen = eina_list_append(files4gen, included_file);
}
if (!included_files || help || !files4gen)
{
printf("Usage: %s [-h/--help] [-V/--verbose] [-I/--include input_dir] [--legacy] [--gh|--gc|--ah filename] eo_file... \n", argv[0]);
printf(" --eo1/--eo2 Set generator to eo1/eo2 mode. Must be specified\n");
printf(" --gh Generate c header file [.h] for eo class specified by classname\n");
printf(" --gc Generate c source file [.c] for eo class specified by classname\n");
printf(" --gh Generate c header file [.h]\n");
printf(" --gc Generate c source file [.c]\n");
printf(" --ah Append eo class definitions to an existing c header file [.h]\n");
printf(" --al Append legacy function definitions to an existing c header file [.h]\n");
printf(" --gle Generate eo and legacy file [.h]\n");
@ -241,7 +245,7 @@ int main(int argc, char **argv)
eolian_init();
const char *filename;
EINA_LIST_FOREACH(files, itr, filename)
EINA_LIST_FOREACH(included_files, itr, filename)
{
if (!eolian_eo_file_parse(filename))
{
@ -250,7 +254,15 @@ int main(int argc, char **argv)
}
}
if (show) eolian_show(classname);
char *fname;
if (show)
{
EINA_LIST_FOREACH(files4gen, itr, fname)
{
const char *cname = eolian_class_find_by_file(fname);
eolian_show(cname);
}
}
if (!eo_version)
{
@ -259,6 +271,8 @@ int main(int argc, char **argv)
goto end;
}
classname = eolian_class_find_by_file(eina_list_data_get(files4gen));
if (h_filename)
{
printf("%s header file %s\n", (happend) ? "Appending" : "Generating", h_filename);
@ -268,10 +282,12 @@ int main(int argc, char **argv)
if (c_filename)
{
printf("Generating source file %s\n", c_filename);
Eina_List *l = NULL;
char *cname = NULL;
EINA_LIST_FOREACH(classes,l,cname)
_generate_c_file(c_filename, cname, (classes != l));
const char *cname;
EINA_LIST_FOREACH(files4gen, itr, fname)
{
cname = eolian_class_find_by_file(fname);
_generate_c_file(c_filename, cname, (files4gen != itr));
}
}
if (leg_filename)
@ -287,9 +303,9 @@ int main(int argc, char **argv)
}
end:
EINA_LIST_FREE(files, filename)
EINA_LIST_FREE(included_files, filename)
free((char *)filename);
eina_list_free(classes);
eina_list_free(files4gen);
eolian_shutdown();
eina_shutdown();
return ret;

11
src/lib/eolian/Eolian.h
View File

@ -128,6 +128,17 @@ EAPI int eolian_shutdown(void);
*/
EAPI Eina_Bool eolian_show(const char *class_name);
/*
* @brief Finds a class by its location (.eo file)
*
* @param[in] file_name filename where the class is stored.
* @return the class name stored in the file
*
* @ingroup Eolian
*/
EAPI const char *
eolian_class_find_by_file(const char *file_name);
/*
* @brief Returns the class type of the given class
*

2
src/lib/eolian/eo_lexer.c
View File

@ -2846,6 +2846,8 @@ eo_tokenizer_database_fill(const char *filename)
else type = EOLIAN_CLASS_UNKNOWN_TYPE;
}
database_class_add(kls->name, type);
database_class_file_set(kls->name, filename);
if (kls->comment) database_class_description_set(kls->name, kls->comment);
EINA_LIST_FOREACH(kls->inherits, l, s)

2
src/lib/eolian/eo_lexer.rl
View File

@ -1155,6 +1155,8 @@ eo_tokenizer_database_fill(const char *filename)
else type = EOLIAN_CLASS_UNKNOWN_TYPE;
}
database_class_add(kls->name, type);
database_class_file_set(kls->name, filename);
if (kls->comment) database_class_description_set(kls->name, kls->comment);
EINA_LIST_FOREACH(kls->inherits, l, s)

31
src/lib/eolian/eolian_database.c
View File

@ -7,6 +7,7 @@ static int _database_init_count = 0;
typedef struct
{
Eina_Stringshare *name;
Eina_Stringshare *file;
Eolian_Class_Type type;
Eina_Stringshare *description;
Eina_Stringshare *legacy_prefix;
@ -103,6 +104,7 @@ _class_del(Class_desc *class)
EINA_LIST_FREE(class->events, ev) database_event_free(ev);
eina_stringshare_del(class->name);
eina_stringshare_del(class->file);
eina_stringshare_del(class->description);
eina_stringshare_del(class->legacy_prefix);
free(class);
@ -164,6 +166,35 @@ database_class_add(const char *class_name, Eolian_Class_Type type)
return EINA_TRUE;
}
Eina_Bool
database_class_file_set(const char *class_name, const char *file_name)
{
Class_desc *cl = _class_get(class_name);
if (!cl) return EINA_FALSE;
cl->file = eina_stringshare_add(file_name);
return EINA_TRUE;
}
EAPI const char *
eolian_class_find_by_file(const char *file_name)
{
const Eina_List *names_list = eolian_class_names_list_get();
const Eina_List *itr;
const char *class_name;
Eina_Stringshare *shr_file = eina_stringshare_add(file_name);
EINA_LIST_FOREACH(names_list, itr, class_name)
{
Class_desc *cl = _class_get(class_name);
if (cl->file == shr_file)
{
eina_stringshare_del(shr_file);
return class_name;
}
}
eina_stringshare_del(shr_file);
return NULL;
}
EAPI Eolian_Class_Type
eolian_class_type_get(const char *class_name)
{

4
src/lib/eolian/eolian_database.h
View File

@ -24,6 +24,10 @@ database_class_description_set(const char *class_name, const char *description);
void
database_class_legacy_prefix_set(const char *class_name, const char *legacy_prefix);
/* Set file of class */
Eina_Bool
database_class_file_set(const char *class_name, const char *file_name);
/* Create a function */
Eolian_Function database_function_new(const char *function_name, Eolian_Function_Type foo_type);