diff options
Diffstat (limited to 'lexer/theme-parser.y')
-rw-r--r-- | lexer/theme-parser.y | 32 |
1 files changed, 11 insertions, 21 deletions
diff --git a/lexer/theme-parser.y b/lexer/theme-parser.y index 07588fa0..c33aeee9 100644 --- a/lexer/theme-parser.y +++ b/lexer/theme-parser.y @@ -231,12 +231,10 @@ static ThemeColor hwb_to_rgb ( double h, double w, double b ) %token T_OPTIONAL_COMMA "Optional comma separator (',')" %token T_FORWARD_SLASH "forward slash ('/')" %token T_PERCENT "Percent sign ('%')" + %token T_LIST_OPEN "List open ('[')" %token T_LIST_CLOSE "List close (']')" -%token T_ARRAY_OPEN "Set open ('{')" -%token T_ARRAY_CLOSE "Set close ('}')" - %token T_MODIFIER_ADD "Add ('+')" %token T_MODIFIER_SUBTRACT "Subtract ('-')" %token T_MODIFIER_MULTIPLY "Multiply ('*')" @@ -308,8 +306,6 @@ static ThemeColor hwb_to_rgb ( double h, double w, double b ) %type <ival> t_property_line_style %type <list> t_property_element_list %type <list> t_property_element_list_optional -%type <list> t_property_element_set -%type <list> t_property_element_set_optional %type <ival> t_property_orientation %type <ival> t_property_cursor %type <ival> t_name_prefix_optional @@ -585,10 +581,6 @@ t_property_element $$ = rofi_theme_property_create ( P_LIST ); $$->value.list = $2; } -| T_ARRAY_OPEN t_property_element_set_optional T_ARRAY_CLOSE { - $$ = rofi_theme_property_create ( P_ARRAY ); - $$->value.list = $2; -} | t_property_orientation { $$ = rofi_theme_property_create ( P_ORIENTATION ); $$->value.i = $1; @@ -661,20 +653,18 @@ t_property_element_list_optional ; t_property_element_list -: T_ELEMENT { $$ = g_list_append ( NULL, $1); } +: t_property_element { $$ = g_list_append ( NULL, $1); } +| T_ELEMENT { + Property *p = rofi_theme_property_create ( P_STRING ); + p->value.s = $1; + $$ = g_list_append ( NULL, p); +} | t_property_element_list T_COMMA T_ELEMENT { - $$ = g_list_append ( $1, $3 ); + Property *p = rofi_theme_property_create ( P_STRING ); + p->value.s = $3; + $$ = g_list_append ( $1, p); } -; -/** List of elements */ -t_property_element_set_optional -: %empty { $$ = NULL; } -| t_property_element_set { $$ = $1; } -; - -t_property_element_set -: t_property_element { $$ = g_list_append ( NULL, $1); } -| t_property_element_set T_COMMA t_property_element { +| t_property_element_list T_COMMA t_property_element { $$ = g_list_append ( $1, $3 ); } ; |