Merge branch 'master' into next

This commit is contained in:
Michael Stapelberg 2012-03-21 21:41:13 +01:00
commit 36fdab7b6a
1 changed files with 2 additions and 0 deletions

View File

@ -148,6 +148,8 @@ EOL (\r?\n)
return '['; return '[';
} }
<EAT_WHITESPACE>[ \t]* { yy_pop_state(); } <EAT_WHITESPACE>[ \t]* { yy_pop_state(); }
<EAT_WHITESPACE>{EOL} { yy_pop_state(); }
<BINDSYM_COND>{EOL} { yy_pop_state(); }
<WANT_QSTRING>\"[^\"]+\" { <WANT_QSTRING>\"[^\"]+\" {
yy_pop_state(); yy_pop_state();
/* strip quotes */ /* strip quotes */