koma/i3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cleanup cfgparse lexer/parser (ignore whitespace, solves conflicts)

Browse Source
This commit is contained in:
Michael Stapelberg
2011-05-22 21:48:25 +02:00
parent e27a8597d8
commit 1d6447187c
2 changed files with 88 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/cfgparse.l
View File

@ -72,7 +72,7 @@ EOL (\r?\n)
<FOR_WINDOW_COND>"]" { yy_pop_state(); return ']'; }
<REQUIRE_WS>[ \t]* { yy_pop_state(); return WHITESPACE; }
<REQUIRE_WS>[ \t]* { yy_pop_state(); }
<WANT_QSTRING>\"[^\"]+\" {
yy_pop_state();
/* strip quotes */
@ -172,13 +172,13 @@ title { yy_push_state(WANT_QSTRING); return TOK_TITLE;
BEGIN(INITIAL);
yy_push_state(BUFFER_LINE);
}
<BINDCODE_COND>[ \t]+ { BEGIN(BIND_AWS_COND); return WHITESPACE; }
<BINDSYM_COND>[ \t]+ { BEGIN(BINDSYM_AWS_COND); return WHITESPACE; }
<BIND_AWS_COND>[ \t]+ { BEGIN(BIND_A2WS_COND); return WHITESPACE; }
<BINDSYM_AWS_COND>[ \t]+ { BEGIN(BIND_A2WS_COND); return WHITESPACE; }
<OUTPUT_COND>[ \t]+ { BEGIN(OUTPUT_AWS_COND); return WHITESPACE; }
<OUTPUT_AWS_COND>[ \t]+ { BEGIN(BIND_A2WS_COND); return WHITESPACE; }
[ \t]+ { return WHITESPACE; }
<BINDCODE_COND>[ \t]+ { BEGIN(BIND_AWS_COND); }
<BINDSYM_COND>[ \t]+ { BEGIN(BINDSYM_AWS_COND); }
<BIND_AWS_COND>[ \t]+ { BEGIN(BIND_A2WS_COND); }
<BINDSYM_AWS_COND>[ \t]+ { BEGIN(BIND_A2WS_COND); }
<OUTPUT_COND>[ \t]+ { BEGIN(OUTPUT_AWS_COND); }
<OUTPUT_AWS_COND>[ \t]+ { BEGIN(BIND_A2WS_COND); }
[ \t]+ { /* ignore whitespace */ ; }
\"[^\"]+\" {
/* if ASSIGN_COND then */
BEGIN(INITIAL);