diff options
author | Dave Davenport <qball@blame.services> | 2022-01-24 19:49:16 +0100 |
---|---|---|
committer | Dave Davenport <qball@blame.services> | 2022-01-24 19:49:16 +0100 |
commit | f9ea58f7c532c4e96233fb75db3f2a34c826c59d (patch) | |
tree | 1c484d5595b3cb09eeed0dff8e6e757fc8ad2b4c | |
parent | 55b043bcfaaadba44a7139fe8a9ab97db495eb46 (diff) |
[Theme] Fix lexer for SET.
-rw-r--r-- | lexer/theme-lexer.l | 40 | ||||
-rw-r--r-- | lexer/theme-parser.y | 1 |
2 files changed, 20 insertions, 21 deletions
diff --git a/lexer/theme-lexer.l b/lexer/theme-lexer.l index 6404e07b..781728e5 100644 --- a/lexer/theme-lexer.l +++ b/lexer/theme-lexer.l @@ -523,26 +523,26 @@ if ( queue == NULL ) { return T_BOPEN; } -<PROPERTIES,PROPERTIES_ENV,PROPERTIES_VAR_DEFAULT>{EM} { return T_UNIT_EM; } -<PROPERTIES,PROPERTIES_ENV,PROPERTIES_VAR_DEFAULT>{CH} { return T_UNIT_CH; } -<PROPERTIES,PROPERTIES_ENV,PROPERTIES_VAR_DEFAULT,MEDIA_CONTENT>{PX} { return T_UNIT_PX; } -<PROPERTIES,PROPERTIES_ENV,PROPERTIES_VAR_DEFAULT,MEDIA_CONTENT>{MM} { return T_UNIT_MM; } -<PROPERTIES,PROPERTIES_ENV,PROPERTIES_VAR_DEFAULT>{PERCENT} { return T_PERCENT; } -<PROPERTIES,PROPERTIES_ENV,PROPERTIES_VAR_DEFAULT>{LS_SOLID} { return T_SOLID; } -<PROPERTIES,PROPERTIES_ENV,PROPERTIES_VAR_DEFAULT>{LS_DASH} { return T_DASH; } - -<PROPERTIES,PROPERTIES_ENV,PROPERTIES_VAR_DEFAULT>{INHERIT} { return T_INHERIT; } -<PROPERTIES,PROPERTIES_ENV,PROPERTIES_VAR_DEFAULT>{MODIFIER_ADD} { return T_MODIFIER_ADD; } -<PROPERTIES,PROPERTIES_ENV,PROPERTIES_VAR_DEFAULT>{MODIFIER_SUBTRACT} { return T_MODIFIER_SUBTRACT; } -<PROPERTIES,PROPERTIES_ENV,PROPERTIES_VAR_DEFAULT>{MODIFIER_MULTIPLY} { return T_MODIFIER_MULTIPLY; } -<PROPERTIES,PROPERTIES_ENV,PROPERTIES_VAR_DEFAULT>{MODIFIER_MIN} { return T_MODIFIER_MIN; } -<PROPERTIES,PROPERTIES_ENV,PROPERTIES_VAR_DEFAULT>{MODIFIER_MAX} { return T_MODIFIER_MAX; } -<PROPERTIES,PROPERTIES_ENV,PROPERTIES_VAR_DEFAULT>{MODIFIER_ROUND} { return T_MODIFIER_ROUND; } -<PROPERTIES,PROPERTIES_ENV,PROPERTIES_VAR_DEFAULT>{MODIFIER_FLOOR} { return T_MODIFIER_FLOOR; } -<PROPERTIES,PROPERTIES_ENV,PROPERTIES_VAR_DEFAULT>{MODIFIER_CEIL} { return T_MODIFIER_CEIL; } -<PROPERTIES,PROPERTIES_ENV,PROPERTIES_VAR_DEFAULT>{CALC} { return T_CALC; } - -<PROPERTIES,PROPERTIES_ENV,PROPERTIES_VAR_DEFAULT>{ENV} { +<PROPERTIES,PROPERTIES_ENV,PROPERTIES_SET,PROPERTIES_VAR_DEFAULT>{EM} { return T_UNIT_EM; } +<PROPERTIES,PROPERTIES_ENV,PROPERTIES_SET,PROPERTIES_VAR_DEFAULT>{CH} { return T_UNIT_CH; } +<PROPERTIES,PROPERTIES_ENV,PROPERTIES_SET,PROPERTIES_VAR_DEFAULT,MEDIA_CONTENT>{PX} { return T_UNIT_PX; } +<PROPERTIES,PROPERTIES_ENV,PROPERTIES_SET,PROPERTIES_VAR_DEFAULT,MEDIA_CONTENT>{MM} { return T_UNIT_MM; } +<PROPERTIES,PROPERTIES_ENV,PROPERTIES_SET,PROPERTIES_VAR_DEFAULT>{PERCENT} { return T_PERCENT; } +<PROPERTIES,PROPERTIES_ENV,PROPERTIES_SET,PROPERTIES_VAR_DEFAULT>{LS_SOLID} { return T_SOLID; } +<PROPERTIES,PROPERTIES_ENV,PROPERTIES_SET,PROPERTIES_VAR_DEFAULT>{LS_DASH} { return T_DASH; } + +<PROPERTIES,PROPERTIES_ENV,PROPERTIES_SET,PROPERTIES_VAR_DEFAULT>{INHERIT} { return T_INHERIT; } +<PROPERTIES,PROPERTIES_ENV,PROPERTIES_SET,PROPERTIES_VAR_DEFAULT>{MODIFIER_ADD} { return T_MODIFIER_ADD; } +<PROPERTIES,PROPERTIES_ENV,PROPERTIES_SET,PROPERTIES_VAR_DEFAULT>{MODIFIER_SUBTRACT} { return T_MODIFIER_SUBTRACT; } +<PROPERTIES,PROPERTIES_ENV,PROPERTIES_SET,PROPERTIES_VAR_DEFAULT>{MODIFIER_MULTIPLY} { return T_MODIFIER_MULTIPLY; } +<PROPERTIES,PROPERTIES_ENV,PROPERTIES_SET,PROPERTIES_VAR_DEFAULT>{MODIFIER_MIN} { return T_MODIFIER_MIN; } +<PROPERTIES,PROPERTIES_ENV,PROPERTIES_SET,PROPERTIES_VAR_DEFAULT>{MODIFIER_MAX} { return T_MODIFIER_MAX; } +<PROPERTIES,PROPERTIES_ENV,PROPERTIES_SET,PROPERTIES_VAR_DEFAULT>{MODIFIER_ROUND} { return T_MODIFIER_ROUND; } +<PROPERTIES,PROPERTIES_ENV,PROPERTIES_SET,PROPERTIES_VAR_DEFAULT>{MODIFIER_FLOOR} { return T_MODIFIER_FLOOR; } +<PROPERTIES,PROPERTIES_ENV,PROPERTIES_SET,PROPERTIES_VAR_DEFAULT>{MODIFIER_CEIL} { return T_MODIFIER_CEIL; } +<PROPERTIES,PROPERTIES_ENV,PROPERTIES_SET,PROPERTIES_VAR_DEFAULT>{CALC} { return T_CALC; } + +<PROPERTIES,PROPERTIES_ENV,PROPERTIES_SET,PROPERTIES_VAR_DEFAULT>{ENV} { yytext[yyleng-1] = '\0'; const char *val = g_getenv(yytext+2); if ( val ) { diff --git a/lexer/theme-parser.y b/lexer/theme-parser.y index 1d109dcc..0e2194c0 100644 --- a/lexer/theme-parser.y +++ b/lexer/theme-parser.y @@ -586,7 +586,6 @@ t_property_element $$->value.list = $2; } | T_SET_OPEN t_property_element_set_optional T_SET_CLOSE { -printf("set create\n"); $$ = rofi_theme_property_create ( P_SET ); $$->value.list = $2; } |