devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

Theme Editor: Fixed parsing and code generation for nested conditionals

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@26467 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Robert Bieber 2010-06-02 07:48:48 +00:00
parent 7f10b0336e
commit 496bcf39c7
3 changed files with 40 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

32
utils/themeeditor/skin_parser.c
View file

@ -295,6 +295,7 @@ struct skin_element* skin_parse_sublines_optional(char** document,
char* cursor = *document;
int sublines = 1;
int i;
int nested = 0;
retval = skin_alloc_element();
retval->type = SUBLINES;
@ -311,8 +312,24 @@ struct skin_element* skin_parse_sublines_optional(char** document,
&& !(check_viewport(cursor) && cursor != *document))
{
if(*cursor == COMMENTSYM)
{
skip_comment(&cursor);
continue;
}
if(*cursor == ENUMLISTOPENSYM && conditional)
{
nested++;
cursor++;
while(nested)
{
if(*cursor == ENUMLISTOPENSYM)
nested++;
if(*cursor == ENUMLISTCLOSESYM)
nested--;
cursor++;
}
}
/* Accounting for escaped subline symbols */
if(*cursor == TAGSYM)
{
@ -637,6 +654,7 @@ int skin_parse_conditional(struct skin_element* element, char** document)
struct skin_element* tag = skin_alloc_element(); /* The tag to evaluate */
int children = 1;
int i;
int nested = 0;
element->type = CONDITIONAL;
element->line = skin_line;
@ -660,6 +678,20 @@ int skin_parse_conditional(struct skin_element* element, char** document)
continue;
}
if(*cursor == ENUMLISTOPENSYM)
{
nested++;
cursor++;
while(nested)
{
if(*cursor == ENUMLISTOPENSYM)
nested++;
if(*cursor == ENUMLISTCLOSESYM)
nested--;
cursor++;
}
}
if(*cursor == TAGSYM)
{
cursor++;