diff options
| author | John Mark Bell <jmb@netsurf-browser.org> | 2008-05-03 10:10:32 +0000 |
|---|---|---|
| committer | John Mark Bell <jmb@netsurf-browser.org> | 2008-05-03 10:10:32 +0000 |
| commit | 9c0bf11dd144d09c20f16acaf3d40030b4534ec8 (patch) | |
| tree | 44a72258f16419913f12b11ad9a4a78bb0964570 /src/lex | |
| parent | a7c8ab91210e368b8b2f23e1d79d42ad1b364560 (diff) | |
| download | libcss-9c0bf11dd144d09c20f16acaf3d40030b4534ec8.tar.gz libcss-9c0bf11dd144d09c20f16acaf3d40030b4534ec8.tar.bz2 | |
Fix testdriver to accept # in input
Significantly more tests for the lexer -- this basically covers all the non-OOD/EOF cases
Fix bug in lexing of "/x" -- the CHAR(/) was getting dropped by the "don't emit comment tokens" logic
svn path=/trunk/libcss/; revision=4120
Diffstat (limited to 'src/lex')
| -rw-r--r-- | src/lex/lex.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/lex/lex.c b/src/lex/lex.c index 4df6cea..044bc1a 100644 --- a/src/lex/lex.c +++ b/src/lex/lex.c @@ -281,7 +281,8 @@ css_error css_lexer_get_token(css_lexer *lexer, const css_token **token) return S(lexer, token); case sCOMMENT: error = Comment(lexer, token); - if (!lexer->emit_comments && error == CSS_OK) + if (!lexer->emit_comments && error == CSS_OK && + (*token)->type == CSS_TOKEN_COMMENT) goto start; return error; case sMATCH: @@ -1192,7 +1193,8 @@ start: lexer->context.lastWasStar = false; lexer->context.lastWasCR = false; error = Comment(lexer, token); - if (!lexer->emit_comments && error == CSS_OK) + if (!lexer->emit_comments && error == CSS_OK && + (*token)->type == CSS_TOKEN_COMMENT) goto start; return error; case '~': case '|': case '^': case '$': case '*': |