q66 pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=6d453bc6944897c6f0de34f3c7592f608061d320
commit 6d453bc6944897c6f0de34f3c7592f608061d320
Author: Daniel Kolesa <d.kol...@osg.samsung.com>
Date: Tue May 16 16:47:33 2017 +0200
eolian gen: pass the unit around
---
src/bin/eolian/headers.c | 3 ++-
src/bin/eolian/headers.h | 2 +-
src/bin/eolian/main.c | 40 ++++++++++++++++++++++------------------
src/bin/eolian/sources.c | 6 ++++--
src/bin/eolian/sources.h | 4 ++--
src/bin/eolian/types.c | 9 ++++++---
src/bin/eolian/types.h | 7 +++----
7 files changed, 40 insertions(+), 31 deletions(-)
diff --git a/src/bin/eolian/headers.c b/src/bin/eolian/headers.c
index 2b88f6cd63..27f498e807 100644
--- a/src/bin/eolian/headers.c
+++ b/src/bin/eolian/headers.c
@@ -183,7 +183,8 @@ _gen_func(const Eolian_Function *fid, Eolian_Function_Type
ftype,
}
void
-eo_gen_header_gen(const Eolian_Class *cl, Eina_Strbuf *buf, Eina_Bool legacy)
+eo_gen_header_gen(const Eolian_Unit *src EINA_UNUSED, const Eolian_Class *cl,
+ Eina_Strbuf *buf, Eina_Bool legacy)
{
if (!cl)
return;
diff --git a/src/bin/eolian/headers.h b/src/bin/eolian/headers.h
index 55b4c071b0..e45d851da5 100644
--- a/src/bin/eolian/headers.h
+++ b/src/bin/eolian/headers.h
@@ -3,6 +3,6 @@
#include "main.h"
-void eo_gen_header_gen(const Eolian_Class *cl, Eina_Strbuf *buf, Eina_Bool
legacy);
+void eo_gen_header_gen(const Eolian_Unit *src, const Eolian_Class *cl,
Eina_Strbuf *buf, Eina_Bool legacy);
#endif
diff --git a/src/bin/eolian/main.c b/src/bin/eolian/main.c
index ece44a5ed8..5319fdeeb6 100644
--- a/src/bin/eolian/main.c
+++ b/src/bin/eolian/main.c
@@ -287,15 +287,16 @@ void eo_gen_class_names_get(const Eolian_Class *cl, char
**cname,
}
static Eina_Bool
-_write_header(const char *ofname, const char *ifname, Eina_Bool legacy)
+_write_header(const Eolian_Unit *src, const char *ofname,
+ const char *ifname, Eina_Bool legacy)
{
INF("generating header: %s (legacy: %d)", ofname, legacy);
Eina_Strbuf *buf = eina_strbuf_new();
- eo_gen_types_header_gen(ifname, buf, EINA_TRUE, legacy);
+ eo_gen_types_header_gen(src, ifname, buf, EINA_TRUE, legacy);
buf = _include_guard(ifname, "TYPES", buf);
- Eina_Strbuf *cltd = eo_gen_class_typedef_gen(ifname);
+ Eina_Strbuf *cltd = eo_gen_class_typedef_gen(src, ifname);
if (cltd)
{
cltd = _include_guard(ifname, "CLASS_TYPE", cltd);
@@ -305,7 +306,7 @@ _write_header(const char *ofname, const char *ifname,
Eina_Bool legacy)
}
const Eolian_Class *cl = eolian_class_get_by_file(ifname);
- eo_gen_header_gen(cl, buf, legacy);
+ eo_gen_header_gen(src, cl, buf, legacy);
if (cl || !legacy)
{
buf = _include_guard(_get_filename(ofname), NULL, buf);
@@ -321,14 +322,15 @@ _write_header(const char *ofname, const char *ifname,
Eina_Bool legacy)
}
static Eina_Bool
-_write_stub_header(const char *ofname, const char *ifname)
+_write_stub_header(const Eolian_Unit *src, const char *ofname,
+ const char *ifname)
{
INF("generating stub header: %s", ofname);
Eina_Strbuf *buf = eina_strbuf_new();
- eo_gen_types_header_gen(ifname, buf, EINA_FALSE, EINA_FALSE);
+ eo_gen_types_header_gen(src, ifname, buf, EINA_FALSE, EINA_FALSE);
- Eina_Strbuf *cltd = eo_gen_class_typedef_gen(ifname);
+ Eina_Strbuf *cltd = eo_gen_class_typedef_gen(src, ifname);
if (cltd)
{
eina_strbuf_prepend_char(buf, '\n');
@@ -344,14 +346,15 @@ _write_stub_header(const char *ofname, const char *ifname)
}
static Eina_Bool
-_write_source(const char *ofname, const char *ifname, Eina_Bool eot)
+_write_source(const Eolian_Unit *src, const char *ofname,
+ const char *ifname, Eina_Bool eot)
{
INF("generating source: %s", ofname);
Eina_Strbuf *buf = eina_strbuf_new();
const Eolian_Class *cl = eolian_class_get_by_file(ifname);
- eo_gen_types_source_gen(ifname, buf);
- eo_gen_source_gen(cl, buf);
+ eo_gen_types_source_gen(src, ifname, buf);
+ eo_gen_source_gen(src, cl, buf);
if (cl || (eot && eina_strbuf_length_get(buf)))
{
if (_write_file(ofname, buf))
@@ -366,7 +369,7 @@ _write_source(const char *ofname, const char *ifname,
Eina_Bool eot)
}
static Eina_Bool
-_write_impl(const char *ofname, const char *ifname)
+_write_impl(const Eolian_Unit *src, const char *ofname, const char *ifname)
{
INF("generating impl: %s", ofname);
@@ -378,7 +381,7 @@ _write_impl(const char *ofname, const char *ifname)
if (!_read_file(ofname, &buf))
return EINA_FALSE;
- eo_gen_impl_gen(cl, buf);
+ eo_gen_impl_gen(src, cl, buf);
Eina_Bool ret = _write_file(ofname, buf);
eina_strbuf_free(buf);
return ret;
@@ -485,7 +488,8 @@ main(int argc, char **argv)
goto end;
}
- if (!eolian_file_parse(input))
+ const Eolian_Unit *src = eolian_file_parse(input);
+ if (!src)
{
fprintf(stderr, "eolian: could not parse file '%s'\n", input);
goto end;
@@ -506,15 +510,15 @@ main(int argc, char **argv)
Eina_Bool succ = EINA_TRUE;
if (gen_what & GEN_H)
- succ = _write_header(outs[_get_bit_pos(GEN_H)], eobn, EINA_FALSE);
+ succ = _write_header(src, outs[_get_bit_pos(GEN_H)], eobn, EINA_FALSE);
if (succ && (gen_what & GEN_H_LEGACY))
- succ = _write_header(outs[_get_bit_pos(GEN_H_LEGACY)], eobn, EINA_TRUE);
+ succ = _write_header(src, outs[_get_bit_pos(GEN_H_LEGACY)], eobn,
EINA_TRUE);
if (succ && (gen_what & GEN_H_STUB))
- succ = _write_stub_header(outs[_get_bit_pos(GEN_H_STUB)], eobn);
+ succ = _write_stub_header(src, outs[_get_bit_pos(GEN_H_STUB)], eobn);
if (succ && (gen_what & GEN_C))
- succ = _write_source(outs[_get_bit_pos(GEN_C)], eobn, !strcmp(ext,
".eot"));
+ succ = _write_source(src, outs[_get_bit_pos(GEN_C)], eobn, !strcmp(ext,
".eot"));
if (succ && (gen_what & GEN_C_IMPL))
- succ = _write_impl(outs[_get_bit_pos(GEN_C_IMPL)], eobn);
+ succ = _write_impl(src, outs[_get_bit_pos(GEN_C_IMPL)], eobn);
if (!succ)
goto end;
diff --git a/src/bin/eolian/sources.c b/src/bin/eolian/sources.c
index 6004a9ea26..9ffb2ad6b5 100644
--- a/src/bin/eolian/sources.c
+++ b/src/bin/eolian/sources.c
@@ -636,7 +636,8 @@ _gen_initializer(const Eolian_Class *cl, Eina_Strbuf *buf)
}
void
-eo_gen_source_gen(const Eolian_Class *cl, Eina_Strbuf *buf)
+eo_gen_source_gen(const Eolian_Unit *src EINA_UNUSED,
+ const Eolian_Class *cl, Eina_Strbuf *buf)
{
if (!cl)
return;
@@ -949,7 +950,8 @@ _gen_proto(const Eolian_Class *cl, const Eolian_Function
*fid,
}
void
-eo_gen_impl_gen(const Eolian_Class *cl, Eina_Strbuf *buf)
+eo_gen_impl_gen(const Eolian_Unit *src EINA_UNUSED,
+ const Eolian_Class *cl, Eina_Strbuf *buf)
{
if (!cl)
return;
diff --git a/src/bin/eolian/sources.h b/src/bin/eolian/sources.h
index 05d711458b..7d2e8d3db0 100644
--- a/src/bin/eolian/sources.h
+++ b/src/bin/eolian/sources.h
@@ -3,7 +3,7 @@
#include "main.h"
-void eo_gen_source_gen(const Eolian_Class *cl, Eina_Strbuf *buf);
-void eo_gen_impl_gen(const Eolian_Class *cl, Eina_Strbuf *buf);
+void eo_gen_source_gen(const Eolian_Unit *src, const Eolian_Class *cl,
Eina_Strbuf *buf);
+void eo_gen_impl_gen(const Eolian_Unit *src, const Eolian_Class *cl,
Eina_Strbuf *buf);
#endif
diff --git a/src/bin/eolian/types.c b/src/bin/eolian/types.c
index 7ad63f74fd..85faf24ec7 100644
--- a/src/bin/eolian/types.c
+++ b/src/bin/eolian/types.c
@@ -183,7 +183,8 @@ _var_generate(const Eolian_Variable *vr, Eina_Bool legacy)
return buf;
}
-void eo_gen_types_header_gen(const char *eof, Eina_Strbuf *buf,
+void eo_gen_types_header_gen(const Eolian_Unit *src EINA_UNUSED,
+ const char *eof, Eina_Strbuf *buf,
Eina_Bool full, Eina_Bool legacy)
{
const Eolian_Declaration *decl;
@@ -237,7 +238,8 @@ void eo_gen_types_header_gen(const char *eof, Eina_Strbuf
*buf,
}
}
-void eo_gen_types_source_gen(const char *eof, Eina_Strbuf *buf)
+void eo_gen_types_source_gen(const Eolian_Unit *src EINA_UNUSED,
+ const char *eof, Eina_Strbuf *buf)
{
const Eolian_Declaration *decl;
@@ -285,7 +287,8 @@ void eo_gen_types_source_gen(const char *eof, Eina_Strbuf
*buf)
}
}
-Eina_Strbuf *eo_gen_class_typedef_gen(const char *eof)
+Eina_Strbuf *eo_gen_class_typedef_gen(const Eolian_Unit *src EINA_UNUSED,
+ const char *eof)
{
const Eolian_Class *cl = eolian_class_get_by_file(eof);
if (!cl)
diff --git a/src/bin/eolian/types.h b/src/bin/eolian/types.h
index 4b04a66155..100206f703 100644
--- a/src/bin/eolian/types.h
+++ b/src/bin/eolian/types.h
@@ -1,9 +1,8 @@
#ifndef EOLIAN_GEN_TYPES_H
#define EOLIAN_GEN_TYPES_H
-void eo_gen_types_header_gen(const char *eof, Eina_Strbuf *buf,
- Eina_Bool full, Eina_Bool legacy);
-void eo_gen_types_source_gen(const char *eof, Eina_Strbuf *buf);
-Eina_Strbuf *eo_gen_class_typedef_gen(const char *eof);
+void eo_gen_types_header_gen(const Eolian_Unit *src, const char *eof,
Eina_Strbuf *buf, Eina_Bool full, Eina_Bool legacy);
+void eo_gen_types_source_gen(const Eolian_Unit *src, const char *eof,
Eina_Strbuf *buf);
+Eina_Strbuf *eo_gen_class_typedef_gen(const Eolian_Unit *src, const char *eof);
#endif
--
