Skip to content
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

Jump to bottom

Properly Lex String Literals #38

Closed
wants to merge 1 commit into from
Closed

Properly Lex String Literals #38

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
46 changes: 46 additions & 0 deletions src/lexer/lex.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,12 @@ int is_valid_numeric_or_id_char(char c) {
return isalnum(c) || (c == '_') || (c == '.');
}

int is_valid_string_char(char c, int* type) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What is type used for here? It doesn't seem to be used in the logic of the function and isn't accessible outside of it.

type = (c == '\'');
type += (c == '"')*2;
return (c == '\'') || (c == '"');
}

int real_lex(Lexer*, Token*);

/**
Expand Down Expand Up @@ -218,6 +224,46 @@ int real_lex(Lexer *l, Token *t) {
}

// TODO - parse character or string literal
int c;
int *type;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it might be clearer if we used named constants here instead of integer literals for the values of type. Also, is there a reason for the usage of an int*?

if (is_valid_string_char(init, type)) {
int open = type;
if (type == 1) {
c = getc(l->fp);
t->contents[pos++] = c;
c = getc(l->fp);
if (c != '\'') {
ungetc(c, l->fp);
t->contents[pos] = '\0';
t->type = ttype_many_chars(t->contents);
t->length = pos;
return 0;
}

} else if (type == 2) {
for (;;) {
c = getc(l->fp);
// If not alphanumeric or underscore, skip to end
if (c != '"')
break;
// OOB check
if (pos >= TOKEN_LENGTH - 1) {
PRINT_ERROR("identifier too long, over %d characters",
TOKEN_LENGTH);
PRINT_ERROR("identifier began with the following:");
PRINT_ERROR("%.*s", TOKEN_LENGTH, t->contents);
return -1;
}
t->contents[pos++] = c;
}
// We've ended!
ungetc(c, l->fp);
t->contents[pos] = '\0';
t->type = ttype_many_chars(t->contents);
t->length = pos;
return 0;
}
}

return 0;
}
Expand Down
Loading