diff options
| author | Dave Davenport <qball@gmpclient.org> | 2017-05-09 14:12:03 +0200 |
|---|---|---|
| committer | Dave Davenport <qball@gmpclient.org> | 2017-05-09 14:12:03 +0200 |
| commit | 00e297c5caefa21daf896a22ab1092131d60999a (patch) | |
| tree | e9cd47a2bacd0e62d5bed15e2999fbf44f942ffc /lexer/theme-lexer.l | |
| parent | cf8796ccd3cf04b4ab1029f3da32c7784443e1d1 (diff) | |
Update highlight style parsing
Diffstat (limited to 'lexer/theme-lexer.l')
| -rw-r--r-- | lexer/theme-lexer.l | 36 |
1 files changed, 12 insertions, 24 deletions
diff --git a/lexer/theme-lexer.l b/lexer/theme-lexer.l index 0829ef33..e80d57a0 100644 --- a/lexer/theme-lexer.l +++ b/lexer/theme-lexer.l @@ -377,11 +377,11 @@ if ( queue == NULL ){ <SECTION>":" { g_queue_push_head ( queue, GINT_TO_POINTER (YY_START) ); BEGIN(PROPERTIES); return PSEP; } <PROPERTIES>";" { BEGIN(GPOINTER_TO_INT ( g_queue_pop_head ( queue ))); return PCLOSE;} -<PROPERTIES>(true|false) { yylval->bval= g_strcmp0(yytext, "true") == 0; return T_BOOLEAN;} +<PROPERTIES>(true|false) { yylval->bval= g_strcmp0(yytext, "true") == 0; return T_BOOLEAN;} <PROPERTIES>{PNNUMBER} { yylval->ival = (int)g_ascii_strtoll(yytext, NULL, 10); return T_INT;} <PROPERTIES>{PNNUMBER}\.{NUMBER}+ { yylval->fval = g_ascii_strtod(yytext, NULL); return T_DOUBLE;} -<PROPERTIES>\"{STRING}\" { yytext[yyleng-1] = '\0'; yylval->sval = g_strdup(&yytext[1]); return T_STRING;} -<PROPERTIES>@{WORD} { +<PROPERTIES>\"{STRING}\" { yytext[yyleng-1] = '\0'; yylval->sval = g_strdup(&yytext[1]); return T_STRING;} +<PROPERTIES>@{WORD} { yylval->sval = g_strdup(yytext); return T_LINK; } @@ -539,27 +539,15 @@ if ( queue == NULL ){ return T_COLOR; } -<PROPERTIES>{CENTER} { return T_POS_CENTER; } -<PROPERTIES>{EAST} { return T_POS_EAST; } -<PROPERTIES>{WEST} { return T_POS_WEST; } -<PROPERTIES>{SOUTH} { return T_POS_SOUTH; } -<PROPERTIES>{NORTH} { return T_POS_NORTH; } -<PROPERTIES>{NONE} { - yylval->ival = HL_NONE; - return T_HIGHLIGHT_STYLE; -} -<PROPERTIES>{BOLD} { - yylval->ival = HL_BOLD; - return T_HIGHLIGHT_STYLE; -} -<PROPERTIES>{ITALIC} { - yylval->ival = HL_ITALIC; - return T_HIGHLIGHT_STYLE; -} -<PROPERTIES>{UNDERLINE} { - yylval->ival = HL_UNDERLINE; - return T_HIGHLIGHT_STYLE; -} +<PROPERTIES>{CENTER} { return T_POS_CENTER; } +<PROPERTIES>{EAST} { return T_POS_EAST; } +<PROPERTIES>{WEST} { return T_POS_WEST; } +<PROPERTIES>{SOUTH} { return T_POS_SOUTH; } +<PROPERTIES>{NORTH} { return T_POS_NORTH; } +<PROPERTIES>{NONE} { return T_NONE; } +<PROPERTIES>{BOLD} { return T_BOLD; } +<PROPERTIES>{ITALIC} { return T_ITALIC; } +<PROPERTIES>{UNDERLINE} { return T_UNDERLINE; } <INITIAL><<EOF>> { ParseObject *po = g_queue_pop_head ( file_queue ); if ( po ) { |