System/Libraries/Css/Tokenizer: Handle parentheses
This commit is contained in:
parent
0bf96d6429
commit
0d2b51cc39
1 changed files with 11 additions and 1 deletions
|
@ -25,6 +25,7 @@ class @css_tokenizer
|
||||||
I64 state;
|
I64 state;
|
||||||
I64 previous_state;
|
I64 previous_state;
|
||||||
I64 in_quote_char;
|
I64 in_quote_char;
|
||||||
|
Bool in_paren;
|
||||||
CFifoU8* match_fifo;
|
CFifoU8* match_fifo;
|
||||||
CFifoU8* property_fifo;
|
CFifoU8* property_fifo;
|
||||||
CFifoU8* value_fifo;
|
CFifoU8* value_fifo;
|
||||||
|
@ -54,6 +55,7 @@ U0 @css_init_tokenizer(@css_tokenizer* t, U8* buffer, I64 size, CTask* mem_task
|
||||||
t->buffer = buffer;
|
t->buffer = buffer;
|
||||||
t->pos = 0;
|
t->pos = 0;
|
||||||
t->in_quote_char = 0;
|
t->in_quote_char = 0;
|
||||||
|
t->in_paren = FALSE;
|
||||||
t->size = size;
|
t->size = size;
|
||||||
t->state = CSS_TOKENIZER_STATE_CONSUME_MATCH;
|
t->state = CSS_TOKENIZER_STATE_CONSUME_MATCH;
|
||||||
t->match_fifo = FifoU8New(1024);
|
t->match_fifo = FifoU8New(1024);
|
||||||
|
@ -134,6 +136,11 @@ U0 @css_tokenize_and_create_rules_from_buffer(JsonArray* rules, U8* buffer, I64
|
||||||
break;
|
break;
|
||||||
case CSS_TOKENIZER_STATE_CONSUME_VALUE:
|
case CSS_TOKENIZER_STATE_CONSUME_VALUE:
|
||||||
switch (token) {
|
switch (token) {
|
||||||
|
case '(':
|
||||||
|
case ')':
|
||||||
|
t.in_paren = T(token == '(', TRUE, FALSE);
|
||||||
|
FifoU8Ins(t.value_fifo, token);
|
||||||
|
goto @css_tokenizer_continue;
|
||||||
case '\'':
|
case '\'':
|
||||||
case '"':
|
case '"':
|
||||||
if (t.in_quote_char == token) {
|
if (t.in_quote_char == token) {
|
||||||
|
@ -161,8 +168,11 @@ U0 @css_tokenize_and_create_rules_from_buffer(JsonArray* rules, U8* buffer, I64
|
||||||
case '\t':
|
case '\t':
|
||||||
case '\r':
|
case '\r':
|
||||||
case '\n':
|
case '\n':
|
||||||
|
if (t.in_paren) {
|
||||||
|
goto @css_tokenizer_continue;
|
||||||
|
}
|
||||||
case ',':
|
case ',':
|
||||||
if (t.in_quote_char) {
|
if (t.in_quote_char || t.in_paren) {
|
||||||
FifoU8Ins(t.value_fifo, token);
|
FifoU8Ins(t.value_fifo, token);
|
||||||
goto @css_tokenizer_continue;
|
goto @css_tokenizer_continue;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue