Skip to content

Clean up Lexer by using lexer_advance_current #23

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
marcoroth merged 1 commit into from
Feb 11, 2025
Merged

Clean up Lexer by using lexer_advance_current #23

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 16 additions & 32 deletions src/lexer.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,8 +190,7 @@ token_T* lexer_parse_html_comment_content(lexer_T* lexer) {
token_T* lexer_handle_data_state(lexer_T* lexer) {
switch (lexer->current_character) {
case '\n': {
lexer_advance(lexer);
return token_init("\n", TOKEN_NEWLINE, lexer);
return lexer_advance_current(lexer, TOKEN_NEWLINE);
} break;

case '<': {
Expand Down Expand Up @@ -272,14 +271,12 @@ token_T* lexer_handle_erb_open_state(lexer_T* lexer) {
token_T* lexer_handle_html_attributes_state(lexer_T* lexer) {
switch (lexer->current_character) {
case ' ': {
lexer_advance(lexer);
return token_init(" ", TOKEN_WHITESPACE, lexer);
return lexer_advance_current(lexer, TOKEN_WHITESPACE);
} break;

case '>': {
lexer->state = STATE_DATA;
lexer_advance(lexer);
return token_init(">", TOKEN_HTML_TAG_END, lexer);
return lexer_advance_current(lexer, TOKEN_HTML_TAG_END);
} break;

case '/': {
Expand Down Expand Up @@ -308,15 +305,13 @@ token_T* lexer_handle_tag_name_state(lexer_T* lexer) {

switch (lexer->current_character) {
case ' ': {
lexer_advance(lexer);
lexer->state = STATE_HTML_ATTRIBUTES;
return token_init(" ", TOKEN_WHITESPACE, lexer);
return lexer_advance_current(lexer, TOKEN_WHITESPACE);
} break;

case '>': {
lexer->state = STATE_DATA;
lexer_advance(lexer);
return token_init(">", TOKEN_HTML_TAG_END, lexer);
return lexer_advance_current(lexer, TOKEN_HTML_TAG_END);
} break;

default: {
Expand All @@ -334,15 +329,13 @@ token_T* lexer_handle_tag_name_state(lexer_T* lexer) {
token_T* lexer_handle_html_attribute_name_state(lexer_T* lexer) {
switch (lexer->current_character) {
case '=': {
lexer_advance(lexer);
lexer->state = STATE_HTML_ATTRIBUTE_EQUALS;
return token_init("=", TOKEN_HTML_EQUALS, lexer);
return lexer_advance_current(lexer, TOKEN_HTML_EQUALS);
} break;

case ' ': {
lexer_advance(lexer);
lexer->state = STATE_HTML_ATTRIBUTES;
return token_init(" ", TOKEN_WHITESPACE, lexer);
return lexer_advance_current(lexer, TOKEN_WHITESPACE);
} break;

case '/': {
Expand All @@ -358,9 +351,8 @@ token_T* lexer_handle_html_attribute_name_state(lexer_T* lexer) {
} break;

case '>': {
lexer_advance(lexer);
lexer->state = STATE_DATA;
return token_init(">", TOKEN_HTML_TAG_END, lexer);
return lexer_advance_current(lexer, TOKEN_HTML_TAG_END);
} break;

default: {
Expand All @@ -372,25 +364,21 @@ token_T* lexer_handle_html_attribute_name_state(lexer_T* lexer) {
token_T* lexer_handle_html_attribute_equals_state(lexer_T* lexer) {
switch (lexer->current_character) {
case '"': {
lexer_advance(lexer);
return token_init("\"", TOKEN_HTML_QUOTE, lexer);
return lexer_advance_current(lexer, TOKEN_HTML_QUOTE);
} break;

case '\'': {
lexer_advance(lexer);
return token_init("'", TOKEN_HTML_QUOTE, lexer);
return lexer_advance_current(lexer, TOKEN_HTML_QUOTE);
} break;

case ' ': {
lexer_advance(lexer);
lexer->state = STATE_HTML_ATTRIBUTES;
return token_init(" ", TOKEN_WHITESPACE, lexer);
return lexer_advance_current(lexer, TOKEN_WHITESPACE);
} break;

case '>': {
lexer_advance(lexer);
lexer->state = STATE_DATA;
return token_init(">", TOKEN_HTML_TAG_END, lexer);
return lexer_advance_current(lexer, TOKEN_HTML_TAG_END);
} break;

default: {
Expand All @@ -402,21 +390,18 @@ token_T* lexer_handle_html_attribute_equals_state(lexer_T* lexer) {
token_T* lexer_handle_html_attribute_value_state(lexer_T* lexer) {
switch (lexer->current_character) {
case '"': {
lexer_advance(lexer);
lexer->state = STATE_HTML_ATTRIBUTES;
return token_init("\"", TOKEN_HTML_QUOTE, lexer);
return lexer_advance_current(lexer, TOKEN_HTML_QUOTE);
} break;

case '\'': {
lexer_advance(lexer);
lexer->state = STATE_HTML_ATTRIBUTES;
return token_init("'", TOKEN_HTML_QUOTE, lexer);
return lexer_advance_current(lexer, TOKEN_HTML_QUOTE);
} break;

case ' ': {
lexer_advance(lexer);
lexer->state = STATE_HTML_ATTRIBUTES;
return token_init(" ", TOKEN_WHITESPACE, lexer);
return lexer_advance_current(lexer, TOKEN_WHITESPACE);
}

default: {
Expand All @@ -441,9 +426,8 @@ token_T* lexer_handle_html_tag_open_state(lexer_T* lexer) {
token_T* lexer_handle_html_tag_close_state(lexer_T* lexer) {
switch (lexer->current_character) {
case '>': {
lexer_advance(lexer);
lexer->state = STATE_DATA;
return token_init(">", TOKEN_HTML_TAG_END, lexer);
return lexer_advance_current(lexer, TOKEN_HTML_TAG_END);
}

default: {
Expand Down