From 496bcf39c7070ad35c73610d2f2dd492cae8b94c Mon Sep 17 00:00:00 2001 From: Robert Bieber Date: Wed, 2 Jun 2010 07:48:48 +0000 Subject: Theme Editor: Fixed parsing and code generation for nested conditionals git-svn-id: svn://svn.rockbox.org/rockbox/trunk@26467 a1c6a512-1295-4272-9138-f99709370657 --- utils/themeeditor/skin_parser.c | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) (limited to 'utils/themeeditor/skin_parser.c') diff --git a/utils/themeeditor/skin_parser.c b/utils/themeeditor/skin_parser.c index 94d059bfcc..a771fe7584 100644 --- a/utils/themeeditor/skin_parser.c +++ b/utils/themeeditor/skin_parser.c @@ -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++; -- cgit v1.2.3