Zxc200611/pocketpy
1
0
Fork 0
mirror of https://github.com/pocketpy/pocketpy synced 2025-12-14 14:00:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix repl

Browse Source
This commit is contained in:
blueloveTH 2024-06-09 17:20:53 +08:00
parent 1c053af8d1
commit bd5cb80027
5 changed files with 39 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/pocketpy/compiler/compiler.hpp
View File

@ -60,9 +60,8 @@ struct Compiler {
static void init_pratt_rules() noexcept; static void init_pratt_rules() noexcept;
bool match(TokenIndex expected) noexcept; bool match(TokenIndex expected) noexcept;
bool match_newlines_repl() noexcept{ return match_newlines(mode() == REPL_MODE); }
bool match_newlines(bool repl_throw = false) noexcept;
bool match_end_stmt() noexcept; bool match_end_stmt() noexcept;
bool match_newlines(bool* need_more_lines = NULL) noexcept;
/*************************************************/ /*************************************************/
[[nodiscard]] Error* EXPR() noexcept{ return parse_expression(PREC_LOWEST + 1); } [[nodiscard]] Error* EXPR() noexcept{ return parse_expression(PREC_LOWEST + 1); }
[[nodiscard]] Error* EXPR_TUPLE(bool allow_slice = false) noexcept; [[nodiscard]] Error* EXPR_TUPLE(bool allow_slice = false) noexcept;
@ -130,7 +129,6 @@ struct Compiler {
[[nodiscard]] Error* SyntaxError(const char* msg = "invalid syntax", ...) noexcept; [[nodiscard]] Error* SyntaxError(const char* msg = "invalid syntax", ...) noexcept;
[[nodiscard]] Error* IndentationError(const char* msg) noexcept{ return lexer._error(false, "IndentationError", msg, {}); } [[nodiscard]] Error* IndentationError(const char* msg) noexcept{ return lexer._error(false, "IndentationError", msg, {}); }
[[nodiscard]] Error* NeedMoreLines() noexcept{ [[nodiscard]] Error* NeedMoreLines() noexcept{
assert(false);
return lexer._error(false, "NeedMoreLines", "", {}, (i64)ctx()->is_compiling_class); return lexer._error(false, "NeedMoreLines", "", {}, (i64)ctx()->is_compiling_class);
} }

5
include/pocketpy/compiler/lexer.hpp
View File

@ -129,10 +129,7 @@ struct Lexer {
[[nodiscard]] Error* _error(bool lexer_err, const char* type, const char* msg, va_list args, i64 userdata=0) noexcept; [[nodiscard]] Error* _error(bool lexer_err, const char* type, const char* msg, va_list args, i64 userdata=0) noexcept;
[[nodiscard]] Error* SyntaxError(const char* fmt, ...) noexcept; [[nodiscard]] Error* SyntaxError(const char* fmt, ...) noexcept;
[[nodiscard]] Error* IndentationError(const char* msg) noexcept { return _error(true, "IndentationError", msg, {}); } [[nodiscard]] Error* IndentationError(const char* msg) noexcept { return _error(true, "IndentationError", msg, {}); }
[[nodiscard]] Error* NeedMoreLines() noexcept { [[nodiscard]] Error* NeedMoreLines() noexcept { return _error(true, "NeedMoreLines", "", {}, 0); }
assert(false);
return _error(true, "NeedMoreLines", "", {}, 0);
}
Lexer(VM* vm, std::shared_ptr<SourceData> src) noexcept; Lexer(VM* vm, std::shared_ptr<SourceData> src) noexcept;

2
scripts/run_tests.py
View File

@ -74,7 +74,7 @@ if len(sys.argv) == 2:
test_dir('benchmarks/') test_dir('benchmarks/')
else: else:
test_dir('tests/') test_dir('tests/')
# test_repl() test_repl()
print("ALL TESTS PASSED") print("ALL TESTS PASSED")

55
src/compiler/compiler.cpp
View File

@ -8,6 +8,7 @@ namespace pkpy {
#define consume(expected) if(!match(expected)) return SyntaxError("expected '%s', got '%s'", TK_STR(expected), TK_STR(curr().type)); #define consume(expected) if(!match(expected)) return SyntaxError("expected '%s', got '%s'", TK_STR(expected), TK_STR(curr().type));
#define consume_end_stmt() if(!match_end_stmt()) return SyntaxError("expected statement end") #define consume_end_stmt() if(!match_end_stmt()) return SyntaxError("expected statement end")
#define check_newlines_repl() { bool __nml; match_newlines(&__nml); if(__nml) return NeedMoreLines(); }
#define check(B) if((err = B)) return err #define check(B) if((err = B)) return err
PrattRule Compiler::rules[kTokenCount]; PrattRule Compiler::rules[kTokenCount];
@ -171,14 +172,15 @@ bool Compiler::match(TokenIndex expected) noexcept{
return true; return true;
} }
bool Compiler::match_newlines(bool repl_throw) noexcept{ bool Compiler::match_newlines(bool* need_more_lines) noexcept{
bool consumed = false; bool consumed = false;
if(curr().type == TK("@eol")) { if(curr().type == TK("@eol")) {
while(curr().type == TK("@eol")) while(curr().type == TK("@eol")) advance();
advance();
consumed = true; consumed = true;
} }
if(repl_throw && curr().type == TK("@eof")) return NeedMoreLines(); if(need_more_lines) {
*need_more_lines = (mode() == REPL_MODE && curr().type == TK("@eof"));
}
return consumed; return consumed;
} }
@ -199,11 +201,11 @@ Error* Compiler::EXPR_TUPLE(bool allow_slice) noexcept{
// tuple expression // tuple expression
int count = 1; int count = 1;
do { do {
if(curr().brackets_level) match_newlines_repl(); if(curr().brackets_level) check_newlines_repl()
if(!is_expression(allow_slice)) break; if(!is_expression(allow_slice)) break;
check(parse_expression(PREC_LOWEST + 1, allow_slice)); check(parse_expression(PREC_LOWEST + 1, allow_slice));
count += 1; count += 1;
if(curr().brackets_level) match_newlines_repl(); if(curr().brackets_level) check_newlines_repl();
} while(match(TK(","))); } while(match(TK(",")));
TupleExpr* e = make_expr<TupleExpr>(count); TupleExpr* e = make_expr<TupleExpr>(count);
for(int i=count-1; i>=0; i--) for(int i=count-1; i>=0; i--)
@ -351,9 +353,9 @@ Error* Compiler::exprUnaryOp() noexcept{
Error* Compiler::exprGroup() noexcept{ Error* Compiler::exprGroup() noexcept{
Error* err; Error* err;
match_newlines_repl(); check_newlines_repl()
check(EXPR_TUPLE()); // () is just for change precedence check(EXPR_TUPLE()); // () is just for change precedence
match_newlines_repl(); check_newlines_repl()
consume(TK(")")); consume(TK(")"));
if(ctx()->s_top()->is_tuple()) return NULL; if(ctx()->s_top()->is_tuple()) return NULL;
Expr* g = make_expr<GroupedExpr>(ctx()->s_popx()); Expr* g = make_expr<GroupedExpr>(ctx()->s_popx());
@ -368,7 +370,7 @@ Error* Compiler::consume_comp(Opcode op0, Opcode op1) noexcept{
check(EXPR_VARS()); // [expr, vars] check(EXPR_VARS()); // [expr, vars]
consume(TK("in")); consume(TK("in"));
check(parse_expression(PREC_TERNARY + 1)); // [expr, vars, iter] check(parse_expression(PREC_TERNARY + 1)); // [expr, vars, iter]
match_newlines_repl(); check_newlines_repl()
if(match(TK("if"))) { if(match(TK("if"))) {
check(parse_expression(PREC_TERNARY + 1)); // [expr, vars, iter, cond] check(parse_expression(PREC_TERNARY + 1)); // [expr, vars, iter, cond]
has_cond = true; has_cond = true;
@ -379,7 +381,7 @@ Error* Compiler::consume_comp(Opcode op0, Opcode op1) noexcept{
ce->vars = ctx()->s_popx(); ce->vars = ctx()->s_popx();
ce->expr = ctx()->s_popx(); ce->expr = ctx()->s_popx();
ctx()->s_push(ce); ctx()->s_push(ce);
match_newlines_repl(); check_newlines_repl()
return NULL; return NULL;
} }
@ -388,16 +390,16 @@ Error* Compiler::exprList() noexcept{
int line = prev().line; int line = prev().line;
int count = 0; int count = 0;
do { do {
match_newlines_repl(); check_newlines_repl()
if(curr().type == TK("]")) break; if(curr().type == TK("]")) break;
check(EXPR()); count += 1; check(EXPR()); count += 1;
match_newlines_repl(); check_newlines_repl()
if(count == 1 && match(TK("for"))) { if(count == 1 && match(TK("for"))) {
check(consume_comp(OP_BUILD_LIST, OP_LIST_APPEND)); check(consume_comp(OP_BUILD_LIST, OP_LIST_APPEND));
consume(TK("]")); consume(TK("]"));
return NULL; return NULL;
} }
match_newlines_repl(); check_newlines_repl()
} while(match(TK(","))); } while(match(TK(",")));
consume(TK("]")); consume(TK("]"));
ListExpr* e = make_expr<ListExpr>(count); ListExpr* e = make_expr<ListExpr>(count);
@ -413,7 +415,7 @@ Error* Compiler::exprMap() noexcept{
bool parsing_dict = false; // {...} may be dict or set bool parsing_dict = false; // {...} may be dict or set
int count = 0; int count = 0;
do { do {
match_newlines_repl(); check_newlines_repl()
if(curr().type == TK("}")) break; if(curr().type == TK("}")) break;
check(EXPR()); // [key] check(EXPR()); // [key]
int star_level = ctx()->s_top()->star_level(); int star_level = ctx()->s_top()->star_level();
@ -434,7 +436,7 @@ Error* Compiler::exprMap() noexcept{
} }
} }
count += 1; count += 1;
match_newlines_repl(); check_newlines_repl()
if(count == 1 && match(TK("for"))) { if(count == 1 && match(TK("for"))) {
if(parsing_dict){ if(parsing_dict){
check(consume_comp(OP_BUILD_DICT, OP_DICT_ADD)); check(consume_comp(OP_BUILD_DICT, OP_DICT_ADD));
@ -444,7 +446,7 @@ Error* Compiler::exprMap() noexcept{
consume(TK("}")); consume(TK("}"));
return NULL; return NULL;
} }
match_newlines_repl(); check_newlines_repl()
} while(match(TK(","))); } while(match(TK(",")));
consume(TK("}")); consume(TK("}"));
@ -466,7 +468,7 @@ Error* Compiler::exprCall() noexcept{
e->callable = ctx()->s_popx(); e->callable = ctx()->s_popx();
ctx()->s_push(e); // push onto the stack in advance ctx()->s_push(e); // push onto the stack in advance
do { do {
match_newlines_repl(); check_newlines_repl()
if(curr().type == TK(")")) break; if(curr().type == TK(")")) break;
if(curr().type == TK("@id") && next().type == TK("=")) { if(curr().type == TK("@id") && next().type == TK("=")) {
consume(TK("@id")); consume(TK("@id"));
@ -485,7 +487,7 @@ Error* Compiler::exprCall() noexcept{
e->args.push_back(ctx()->s_popx()); e->args.push_back(ctx()->s_popx());
} }
} }
match_newlines_repl(); check_newlines_repl()
} while(match(TK(","))); } while(match(TK(",")));
consume(TK(")")); consume(TK(")"));
return NULL; return NULL;
@ -549,9 +551,9 @@ Error* Compiler::exprSlice1() noexcept{
Error* Compiler::exprSubscr() noexcept{ Error* Compiler::exprSubscr() noexcept{
Error* err; Error* err;
int line = prev().line; int line = prev().line;
match_newlines_repl(); check_newlines_repl()
check(EXPR_TUPLE(true)); check(EXPR_TUPLE(true));
match_newlines_repl(); check_newlines_repl()
consume(TK("]")); // [lhs, rhs] consume(TK("]")); // [lhs, rhs]
SubscrExpr* e = make_expr<SubscrExpr>(); SubscrExpr* e = make_expr<SubscrExpr>();
e->line = line; e->line = line;
@ -578,7 +580,12 @@ Error* Compiler::compile_block_body(PrattCallback callback) noexcept{
} }
return NULL; return NULL;
} }
if(!match_newlines_repl()) return SyntaxError("expected a new line after ':'");
bool need_more_lines;
bool consumed = match_newlines(&need_more_lines);
if(need_more_lines) return NeedMoreLines();
if(!consumed) return SyntaxError("expected a new line after ':'");
consume(TK("@indent")); consume(TK("@indent"));
while(curr().type != TK("@dedent")) { while(curr().type != TK("@dedent")) {
match_newlines(); match_newlines();
@ -838,7 +845,10 @@ Error* Compiler::compile_decorated() noexcept{
do { do {
check(EXPR()); check(EXPR());
count += 1; count += 1;
if(!match_newlines_repl()) return SyntaxError(); bool need_more_lines;
bool consumed = match_newlines(&need_more_lines);
if(need_more_lines) return NeedMoreLines();
if(!consumed) return SyntaxError("expected a newline after '@'");
} while(match(TK("@"))); } while(match(TK("@")));
if(match(TK("class"))) { if(match(TK("class"))) {
@ -1340,5 +1350,6 @@ Error* Compiler::SyntaxError(const char* msg, ...) noexcept{
#undef consume #undef consume
#undef consume_end_stmt #undef consume_end_stmt
#undef check #undef check
#undef check_newlines_repl
} // namespace pkpy } // namespace pkpy

3
src/pocketpy.cpp
View File

@ -1731,6 +1731,9 @@ CodeObject_ VM::compile(std::string_view source, const Str& filename, CompileMod
void VM::__compile_error(Error* err){ void VM::__compile_error(Error* err){
assert(err != nullptr); assert(err != nullptr);
if(err->type == std::string_view("NeedMoreLines")){
throw NeedMoreLines((bool)err->userdata);
}
__last_exception = vm->call( __last_exception = vm->call(
vm->builtins->attr(err->type), vm->builtins->attr(err->type),
VAR((const char*)err->msg) VAR((const char*)err->msg)