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

eolian: fix parsing of c_name tags 

It was not properly consuming the ending ) token.
This commit is contained in:
Daniel Kolesa 2020-01-10 20:02:41 +01:00
parent e55f0a1dcf
commit 918987ef8a
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/lib/eolian/eo_parser.c
View File

@ -219,6 +219,7 @@ parse_c_name(Eo_Lexer *ls)
check_match(ls, ')', '(', pline, pcol); check_match(ls, ')', '(', pline, pcol);
return NULL; /* unreachable */ return NULL; /* unreachable */
} }
eo_lexer_get(ls);
return cname; return cname;
} }
@ -481,10 +482,7 @@ parse_struct(Eo_Lexer *ls, const char *name, Eina_Bool is_extern,
def->ownable = EINA_TRUE; def->ownable = EINA_TRUE;
} }
if (cname) if (cname)
{ def->base.c_name = eina_stringshare_ref(cname);
def->base.c_name = cname;
eo_lexer_dtor_pop(ls);
}
else else
def->base.c_name = make_c_name(name); def->base.c_name = make_c_name(name);
/* we can't know the order, pop when both are filled */ /* we can't know the order, pop when both are filled */
@ -865,7 +863,7 @@ tags_done:
def->base.name = eina_stringshare_add(eina_strbuf_string_get(buf)); def->base.name = eina_stringshare_add(eina_strbuf_string_get(buf));
if (cname) if (cname)
{ {
def->base.c_name = cname; def->base.c_name = eina_stringshare_ref(cname);
eo_lexer_dtor_pop(ls); eo_lexer_dtor_pop(ls);
} }
else else
@ -922,7 +920,7 @@ tags_done:
def->base.name = eina_stringshare_add(eina_strbuf_string_get(buf)); def->base.name = eina_stringshare_add(eina_strbuf_string_get(buf));
if (cname) if (cname)
{ {
def->base.c_name = cname; def->base.c_name = eina_stringshare_ref(cname);
eo_lexer_dtor_pop(ls); eo_lexer_dtor_pop(ls);
} }
else else
@ -986,7 +984,7 @@ tags_done:
def->base.name = eina_stringshare_add(eina_strbuf_string_get(buf)); def->base.name = eina_stringshare_add(eina_strbuf_string_get(buf));
if (cname) if (cname)
{ {
def->base.c_name = cname; def->base.c_name = eina_stringshare_ref(cname);
eo_lexer_dtor_pop(ls); eo_lexer_dtor_pop(ls);
} }
else else
@ -1448,7 +1446,7 @@ tags_done:
def->base.name = eina_stringshare_add(eina_strbuf_string_get(buf)); def->base.name = eina_stringshare_add(eina_strbuf_string_get(buf));
if (cname) if (cname)
{ {
def->base.c_name = cname; def->base.c_name = eina_stringshare_ref(cname);
eo_lexer_dtor_pop(ls); eo_lexer_dtor_pop(ls);
} }
else else
@ -2263,7 +2261,7 @@ tags_done:
ls->klass->base.name = eina_stringshare_add(eina_strbuf_string_get(buf)); ls->klass->base.name = eina_stringshare_add(eina_strbuf_string_get(buf));
if (cname) if (cname)
{ {
ls->klass->base.c_name = cname; ls->klass->base.c_name = eina_stringshare_ref(cname);
eo_lexer_dtor_pop(ls); eo_lexer_dtor_pop(ls);
} }
else else
@ -2490,7 +2488,7 @@ postparams:
} }
def->base.name = name; def->base.name = name;
if (cname) if (cname)
def->base.c_name = cname; def->base.c_name = eina_stringshare_ref(cname);
/* we can't know the order, pop when both are filled */ /* we can't know the order, pop when both are filled */
if (freefunc && cname) if (freefunc && cname)
{ {