diff options
| author | Daniel Kolesa <d.kolesa@samsung.com> | 2019-12-04 16:04:19 +0100 |
|---|---|---|
| committer | Daniel Kolesa <d.kolesa@samsung.com> | 2019-12-04 16:07:09 +0100 |
| commit | c601944a13d63d2b4228aeca1cd680c5d092e58b (patch) | |
| tree | 7646fbc76b98dd41f4c8349bbb167711b3a9e32f /src/lib/eolian | |
| parent | e242a05d73c0fd7142c0d8c7804d5f60ffb80748 (diff) | |
| download | efl-c601944a13d63d2b4228aeca1cd680c5d092e58b.tar.gz | |
eolian: fix a parse bug where composites was treated as implements
In the specific case where you had "class A extends B composites C"
the correct composites branch was ignored and instead the implements
branch was used. This was entirely wrong/an oversight that did not
appear until now. Other combinations were handled correctly.
Diffstat (limited to 'src/lib/eolian')
| -rw-r--r-- | src/lib/eolian/eo_parser.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/lib/eolian/eo_parser.c b/src/lib/eolian/eo_parser.c index 8316c4f3bc..96de7a77ec 100644 --- a/src/lib/eolian/eo_parser.c +++ b/src/lib/eolian/eo_parser.c @@ -2301,8 +2301,11 @@ tags_done: { /* regular class can have a parent, but just one */ _inherit_dep(ls, ibuf, EINA_TRUE); + /* followed by composites */ + if (ls->t.kw == KW_composites) + goto noimp_comp; /* if not followed by implements, we're done */ - if ((ls->t.kw != KW_implements) && (ls->t.kw != KW_composites)) + if (ls->t.kw != KW_implements) { eo_lexer_dtor_pop(ls); goto inherit_done; @@ -2314,6 +2317,7 @@ tags_done: while (test_next(ls, ',')); } +noimp_comp: if (ls->t.kw == KW_composites) { if (type == EOLIAN_CLASS_INTERFACE) |