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

eolian gen2: fix file read to actually trigger impl gen

This commit is contained in:
Daniel Kolesa 2016-10-06 14:56:49 +02:00
parent 08e2703917
commit 1ad1eb300b
2 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/bin/eolian2/main.c
View File

@ -183,12 +183,15 @@ end:
return fret;
}
static Eina_Strbuf *
_read_file(const char *fname)
static Eina_Bool
_read_file(const char *fname, Eina_Strbuf **buf)
{
FILE *f = fopen(fname, "rb");
if (!f)
return NULL;
{
*buf = eina_strbuf_new();
return EINA_TRUE;
}
fseek(f, 0, SEEK_END);
long fs = ftell(f);
@ -196,7 +199,7 @@ _read_file(const char *fname)
{
fprintf(stderr, "eolian: could not get length of '%s'\n", fname);
fclose(f);
return NULL;
return EINA_FALSE;
}
fseek(f, 0, SEEK_SET);
@ -205,7 +208,7 @@ _read_file(const char *fname)
{
fprintf(stderr, "eolian: could not allocate memory for '%s'\n", fname);
fclose(f);
return NULL;
return EINA_FALSE;
}
long as = fread(cont, 1, fs, f);
@ -215,12 +218,13 @@ _read_file(const char *fname)
fs, fname, as);
free(cont);
fclose(f);
return NULL;
return EINA_FALSE;
}
cont[fs] = '\0';
fclose(f);
return eina_strbuf_manage_new_length(cont, fs);
*buf = eina_strbuf_manage_new_length(cont, fs);
return EINA_TRUE;
}
char *eo_gen_c_full_name_get(const char *nm)
@ -361,8 +365,8 @@ _write_impl(const char *ofname, const char *ifname)
if (!cl)
return EINA_FALSE;
Eina_Strbuf *buf = _read_file(ofname);
if (!buf)
Eina_Strbuf *buf;
if (!_read_file(ofname, &buf))
return EINA_FALSE;
eo_gen_impl_gen(cl, buf);

6
src/bin/eolian2/sources.c
View File

@ -859,7 +859,7 @@ eo_gen_impl_gen(const Eolian_Class *cl, Eina_Strbuf *buf)
if (adt[0] && !_type_exists(adt, buf))
{
printf("generating data type structure %s...\n", adt);
eina_strbuf_append_printf(beg, "typedef struct\n{\n} %s;\n\n", adt);
eina_strbuf_append_printf(beg, "typedef struct\n{\n\n} %s;\n\n", adt);
}
if (eina_strbuf_length_get(beg))
@ -902,7 +902,7 @@ eo_gen_impl_gen(const Eolian_Class *cl, Eina_Strbuf *buf)
eina_strbuf_append_printf(buf,
"EOLIAN static void\n"
"_%s_class_constructor(Efl_Class *klass)\n"
"{\n"
"{\n\n"
"}\n\n", cnamel);
}
}
@ -917,7 +917,7 @@ eo_gen_impl_gen(const Eolian_Class *cl, Eina_Strbuf *buf)
eina_strbuf_append_printf(buf,
"EOLIAN static void\n"
"_%s_class_destructor(Efl_Class *klass)\n"
"{\n"
"{\n\n"
"}\n\n", cnamel);
}
}