From d3ce44efe3b345fbb065956893b2d2f5931ca38a Mon Sep 17 00:00:00 2001 From: ChunEon Park Date: Sun, 16 Mar 2014 12:04:33 +0900 Subject: [PATCH] parser - code clean up sort the piece of the code by types. --- src/bin/edc_parser.c | 47 ++++++++++++++++++++++++-------------------- 1 file changed, 26 insertions(+), 21 deletions(-) diff --git a/src/bin/edc_parser.c b/src/bin/edc_parser.c index 12565a7..ab24995 100644 --- a/src/bin/edc_parser.c +++ b/src/bin/edc_parser.c @@ -39,6 +39,8 @@ parser_type_init(parser_data *pd) parser_attr *attr; //FIXME: construct from the configuration file. + + //Type: Constant Eina_List *types = NULL; types = eina_list_append(types, eina_stringshare_add("RECT")); types = eina_list_append(types, eina_stringshare_add("TEXT")); @@ -120,6 +122,7 @@ parser_type_init(parser_data *pd) attr->value.type = ATTR_VALUE_CONSTANT; pd->attrs = eina_inlist_append(pd->attrs, (Eina_Inlist *) attr); + //Type: Integer attr = calloc(1, sizeof(parser_attr)); attr->keyword = eina_stringshare_add("color"); attr->value.min = 0; @@ -127,13 +130,6 @@ parser_type_init(parser_data *pd) attr->value.type = ATTR_VALUE_INTEGER; pd->attrs = eina_inlist_append(pd->attrs, (Eina_Inlist *) attr); - attr = calloc(1, sizeof(parser_attr)); - attr->keyword = eina_stringshare_add("relative"); - attr->value.min = 0.0; - attr->value.max = 1; - attr->value.type = ATTR_VALUE_FLOAT; - pd->attrs = eina_inlist_append(pd->attrs, (Eina_Inlist *) attr); - attr = calloc(1, sizeof(parser_attr)); attr->keyword = eina_stringshare_add("scale"); attr->value.min = 0; @@ -148,20 +144,6 @@ parser_type_init(parser_data *pd) attr->value.type = ATTR_VALUE_INTEGER; pd->attrs = eina_inlist_append(pd->attrs, (Eina_Inlist *) attr); - attr = calloc(1, sizeof(parser_attr)); - attr->keyword = eina_stringshare_add("aspect"); - attr->value.min = 0.0; - attr->value.max = 1.0; - attr->value.type = ATTR_VALUE_FLOAT; - pd->attrs = eina_inlist_append(pd->attrs, (Eina_Inlist *) attr); - - attr = calloc(1, sizeof(parser_attr)); - attr->keyword = eina_stringshare_add("align"); - attr->value.min = 0.0; - attr->value.max = 1.0; - attr->value.type = ATTR_VALUE_FLOAT; - pd->attrs = eina_inlist_append(pd->attrs, (Eina_Inlist *) attr); - attr = calloc(1, sizeof(parser_attr)); attr->keyword = eina_stringshare_add("size"); attr->value.min = 1; @@ -190,6 +172,29 @@ parser_type_init(parser_data *pd) attr->value.type = ATTR_VALUE_INTEGER; pd->attrs = eina_inlist_append(pd->attrs, (Eina_Inlist *) attr); + //Type: Float + attr = calloc(1, sizeof(parser_attr)); + attr->keyword = eina_stringshare_add("relative"); + attr->value.min = 0.0; + attr->value.max = 1; + attr->value.type = ATTR_VALUE_FLOAT; + pd->attrs = eina_inlist_append(pd->attrs, (Eina_Inlist *) attr); + + attr = calloc(1, sizeof(parser_attr)); + attr->keyword = eina_stringshare_add("aspect"); + attr->value.min = 0.0; + attr->value.max = 1.0; + attr->value.type = ATTR_VALUE_FLOAT; + pd->attrs = eina_inlist_append(pd->attrs, (Eina_Inlist *) attr); + + attr = calloc(1, sizeof(parser_attr)); + attr->keyword = eina_stringshare_add("align"); + attr->value.min = 0.0; + attr->value.max = 1.0; + attr->value.type = ATTR_VALUE_FLOAT; + pd->attrs = eina_inlist_append(pd->attrs, (Eina_Inlist *) attr); + + //Type: Part attr = calloc(1, sizeof(parser_attr)); attr->keyword = eina_stringshare_add("target"); attr->instring = EINA_TRUE;