Zxc200611/pocketpy
1
0
Fork 0
mirror of https://github.com/pocketpy/pocketpy synced 2026-06-21 07:57:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

revert

Browse Source
This commit is contained in:
blueloveTH 2026-06-18 10:34:02 +08:00
parent fe2d06b9b1
commit 6d2c0d0881
1 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/compiler/lexer.c
View File

@ -37,24 +37,16 @@ static void Lexer__dtor(Lexer* self) {
c11_vector__dtor(&self->indents); c11_vector__dtor(&self->indents);
} }
static const char* lexer_source_end(Lexer* self) {
return self->src->source->data + self->src->source->size;
}
static char eatchar(Lexer* self) { static char eatchar(Lexer* self) {
const char* end = lexer_source_end(self);
if(self->curr_char > end) return '\0';
char c = *self->curr_char; char c = *self->curr_char;
assert(c != '\n'); // eatchar() cannot consume a newline assert(c != '\n'); // eatchar() cannot consume a newline
self->curr_char = (self->curr_char < end) ? self->curr_char + 1 : end + 1; self->curr_char++;
return c; return c;
} }
static char eatchar_include_newline(Lexer* self) { static char eatchar_include_newline(Lexer* self) {
const char* end = lexer_source_end(self);
if(self->curr_char > end) return '\0';
char c = *self->curr_char; char c = *self->curr_char;
self->curr_char = (self->curr_char < end) ? self->curr_char + 1 : end + 1; self->curr_char++;
if(c == '\n') { if(c == '\n') {
self->current_line++; self->current_line++;
c11_vector__push(const char*, &self->src->line_starts, self->curr_char); c11_vector__push(const char*, &self->src->line_starts, self->curr_char);
@ -197,7 +189,7 @@ static Error* LexerError(Lexer* self, const char* fmt, ...) {
err->src = self->src; err->src = self->src;
PK_INCREF(self->src); PK_INCREF(self->src);
err->lineno = self->current_line; err->lineno = self->current_line;
const char* end = lexer_source_end(self); const char* end = self->src->source->data + self->src->source->size;
if(self->curr_char <= end && *self->curr_char == '\n') { err->lineno--; } if(self->curr_char <= end && *self->curr_char == '\n') { err->lineno--; }
va_list args; va_list args;
va_start(args, fmt); va_start(args, fmt);