From 9c0bf11dd144d09c20f16acaf3d40030b4534ec8 Mon Sep 17 00:00:00 2001 From: John Mark Bell Date: Sat, 3 May 2008 10:10:32 +0000 Subject: 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 --- src/lex/lex.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src/lex') 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 '*': -- cgit v1.2.3