From 90a9a404e2373959272858e422fbe1035416cb52 Mon Sep 17 00:00:00 2001 From: blueloveTH Date: Sun, 25 Feb 2024 13:06:41 +0800 Subject: [PATCH] some refactor --- include/pocketpy/compiler.h | 1 - include/pocketpy/lexer.h | 1 - src/compiler.cpp | 4 +--- src/lexer.cpp | 2 -- 4 files changed, 1 insertion(+), 7 deletions(-) diff --git a/include/pocketpy/compiler.h b/include/pocketpy/compiler.h index ea7cf561..0b6d1134 100644 --- a/include/pocketpy/compiler.h +++ b/include/pocketpy/compiler.h @@ -25,7 +25,6 @@ class Compiler { stack_no_copy contexts; VM* vm; bool unknown_global_scope; // for eval/exec() call - bool used; // for parsing token stream int i = 0; std::vector tokens; diff --git a/include/pocketpy/lexer.h b/include/pocketpy/lexer.h index 47611d37..760662ba 100644 --- a/include/pocketpy/lexer.h +++ b/include/pocketpy/lexer.h @@ -106,7 +106,6 @@ struct Lexer { std::vector nexts; stack_no_copy> indents; int brackets_level = 0; - bool used = false; char peekchar() const{ return *curr_char; } bool match_n_chars(int n, char c0); diff --git a/src/compiler.cpp b/src/compiler.cpp index c669e355..135a47ca 100644 --- a/src/compiler.cpp +++ b/src/compiler.cpp @@ -1196,15 +1196,13 @@ __EAT_DOTS_END: Compiler::Compiler(VM* vm, std::string_view source, const Str& filename, CompileMode mode, bool unknown_global_scope) :lexer(vm, std::make_shared(source, filename, mode)){ this->vm = vm; - this->used = false; this->unknown_global_scope = unknown_global_scope; init_pratt_rules(); } CodeObject_ Compiler::compile(){ - PK_ASSERT(!used) - used = true; + PK_ASSERT(i == 0) // make sure it is the first time to compile tokens = lexer.run(); CodeObject_ code = push_global_context(); diff --git a/src/lexer.cpp b/src/lexer.cpp index 71d56cf6..0a8c0b5f 100644 --- a/src/lexer.cpp +++ b/src/lexer.cpp @@ -472,8 +472,6 @@ static bool is_unicode_Lo_char(uint32_t c) { } std::vector Lexer::run() { - PK_ASSERT(!used) - used = true; while (lex_one_token()); return std::move(nexts); }