aniani/elinks
1
0
Fork 0
mirror of https://github.com/rkd77/elinks.git synced 2024-12-04 14:46:47 -05:00
Code

scan_sgml_tokens(): Drop local variable and use scanner->current

Browse Source 
... so lower level scanners can change the next token to use.
This commit is contained in:
Jonas Fonseca 2006-01-07 01:25:42 +01:00 committed by Jonas Fonseca
parent bca330fcbd
commit f8d44ffe32
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/dom/sgml/scanner.c
View File

@ -622,35 +622,34 @@ static struct dom_scanner_token *
scan_sgml_tokens(struct dom_scanner *scanner) scan_sgml_tokens(struct dom_scanner *scanner)
{ {
struct dom_scanner_token *table_end = scanner->table + DOM_SCANNER_TOKENS; struct dom_scanner_token *table_end = scanner->table + DOM_SCANNER_TOKENS;
struct dom_scanner_token *current;
if (!begin_dom_token_scanning(scanner)) if (!begin_dom_token_scanning(scanner))
return get_dom_scanner_token(scanner); return get_dom_scanner_token(scanner);
/* Scan tokens until we fill the table */ /* Scan tokens until we fill the table */
for (current = scanner->table + scanner->tokens; for (scanner->current = scanner->table + scanner->tokens;
current < table_end && scanner->position < scanner->end; scanner->current < table_end && scanner->position < scanner->end;
current++) { scanner->current++) {
if (scanner->state == SGML_STATE_ELEMENT if (scanner->state == SGML_STATE_ELEMENT
|| (*scanner->position == '<' || (*scanner->position == '<'
&& scanner->state != SGML_STATE_PROC_INST)) { && scanner->state != SGML_STATE_PROC_INST)) {
skip_sgml_space(scanner, &scanner->position); skip_sgml_space(scanner, &scanner->position);
if (scanner->position >= scanner->end) break; if (scanner->position >= scanner->end) break;
scan_sgml_element_token(scanner, current); scan_sgml_element_token(scanner, scanner->current);
/* Shall we scratch this token? */ /* Shall we scratch this token? */
if (current->type == SGML_TOKEN_SKIP) { if (scanner->current->type == SGML_TOKEN_SKIP) {
current--; scanner->current--;
} }
} else if (scanner->state == SGML_STATE_TEXT) { } else if (scanner->state == SGML_STATE_TEXT) {
scan_sgml_text_token(scanner, current); scan_sgml_text_token(scanner, scanner->current);
} else { } else {
scan_sgml_proc_inst_token(scanner, current); scan_sgml_proc_inst_token(scanner, scanner->current);
} }
} }
return end_dom_token_scanning(scanner, current); return end_dom_token_scanning(scanner, scanner->current);
} }