From 9e8f4efc94c896b4df2110272f42d2c93e1512d4 Mon Sep 17 00:00:00 2001 From: John Mark Bell Date: Mon, 1 Dec 2008 03:35:40 +0000 Subject: Simplify decision as to whether to intern token data by inserting markers into the css_token_type enum. svn path=/trunk/libcss/; revision=5860 --- src/lex/lex.h | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) (limited to 'src/lex/lex.h') diff --git a/src/lex/lex.h b/src/lex/lex.h index 5fed823..feb589e 100644 --- a/src/lex/lex.h +++ b/src/lex/lex.h @@ -34,13 +34,22 @@ typedef union css_lexer_optparams { * Token type */ typedef enum css_token_type { - CSS_TOKEN_IDENT, CSS_TOKEN_ATKEYWORD, CSS_TOKEN_STRING, - CSS_TOKEN_INVALID_STRING, CSS_TOKEN_HASH, CSS_TOKEN_NUMBER, - CSS_TOKEN_PERCENTAGE, CSS_TOKEN_DIMENSION, CSS_TOKEN_URI, - CSS_TOKEN_UNICODE_RANGE, CSS_TOKEN_CDO, CSS_TOKEN_CDC, CSS_TOKEN_S, - CSS_TOKEN_COMMENT, CSS_TOKEN_FUNCTION, CSS_TOKEN_INCLUDES, - CSS_TOKEN_DASHMATCH, CSS_TOKEN_PREFIXMATCH, CSS_TOKEN_SUFFIXMATCH, - CSS_TOKEN_SUBSTRINGMATCH, CSS_TOKEN_CHAR, CSS_TOKEN_EOF + CSS_TOKEN_IDENT, CSS_TOKEN_ATKEYWORD, CSS_TOKEN_HASH, + CSS_TOKEN_FUNCTION, + + /* Those tokens that want lowercase strings interned appear above */ + CSS_TOKEN_LAST_INTERN_LOWER, + + CSS_TOKEN_STRING, CSS_TOKEN_INVALID_STRING, CSS_TOKEN_URI, + CSS_TOKEN_UNICODE_RANGE, CSS_TOKEN_CHAR, CSS_TOKEN_NUMBER, + CSS_TOKEN_PERCENTAGE, CSS_TOKEN_DIMENSION, + + /* Those tokens that want strings interned appear above */ + CSS_TOKEN_LAST_INTERN, + + CSS_TOKEN_CDO, CSS_TOKEN_CDC, CSS_TOKEN_S, CSS_TOKEN_COMMENT, + CSS_TOKEN_INCLUDES, CSS_TOKEN_DASHMATCH, CSS_TOKEN_PREFIXMATCH, + CSS_TOKEN_SUFFIXMATCH, CSS_TOKEN_SUBSTRINGMATCH, CSS_TOKEN_EOF } css_token_type; /** -- cgit v1.2.3