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

Update compiler.h

Browse Source
This commit is contained in:
blueloveTH 2023-03-31 17:30:24 +08:00
parent da022c5e25
commit 744b0f8dde
1 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/compiler.h
View File

@ -445,14 +445,13 @@ private:
} }
void exprCall() { void exprCall() {
auto e = _expr<CallExpr>(); auto e = expr_prev_line<CallExpr>();
do { do {
match_newlines(mode()==REPL_MODE); match_newlines(mode()==REPL_MODE);
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"));
Str key = prev().str(); Str key = prev().str();
// emit(OP_LOAD_CONST, co()->add_const(VAR(key)));
consume(TK("=")); consume(TK("="));
EXPR(); EXPR();
e->kwargs.push_back({key, ctx()->s_expr.popx()}); e->kwargs.push_back({key, ctx()->s_expr.popx()});
@ -538,24 +537,24 @@ private:
consume(TK("@dedent")); consume(TK("@dedent"));
} }
Token _compile_import() { Str _compile_import() {
consume(TK("@id")); consume(TK("@id"));
Token tkmodule = prev(); Str name = prev().str();
int index = co()->add_name(tkmodule.str(), NAME_SPECIAL); int index = ctx()->add_name(name, NAME_SPECIAL);
emit(OP_IMPORT_NAME, index); ctx()->emit(OP_IMPORT_NAME, index, peek(-2).line);
return tkmodule; return name;
} }
// import a as b // import a as b
void compile_normal_import() { void compile_normal_import() {
do { do {
Token tkmodule = _compile_import(); Str name = _compile_import();
if (match(TK("as"))) { if (match(TK("as"))) {
consume(TK("@id")); consume(TK("@id"));
tkmodule = prev(); name = prev().str();
} }
int index = co()->add_name(tkmodule.str(), name_scope()); int index = ctx()->add_name(name, name_scope());
emit(OP_STORE_NAME, index); ctx()->emit(OP_STORE_NAME, index, prev().line);
} while (match(TK(","))); } while (match(TK(",")));
consume_end_stmt(); consume_end_stmt();
} }
@ -566,12 +565,12 @@ private:
consume(TK("import")); consume(TK("import"));
if (match(TK("*"))) { if (match(TK("*"))) {
if(name_scope() != NAME_GLOBAL) SyntaxError("import * can only be used in global scope"); if(name_scope() != NAME_GLOBAL) SyntaxError("import * can only be used in global scope");
emit(OP_STORE_ALL_NAMES); ctx()->emit(OP_STORE_ALL_NAMES, BC_NOARG, prev().line);
consume_end_stmt(); consume_end_stmt();
return; return;
} }
do { do {
emit(OP_DUP_TOP_VALUE); ctx()->emit(OP_DUP_TOP_VALUE, BC_NOARG, BC_KEEPLINE);
consume(TK("@id")); consume(TK("@id"));
Token tkname = prev(); Token tkname = prev();
int index = co()->add_name(tkname.str(), NAME_ATTR); int index = co()->add_name(tkname.str(), NAME_ATTR);