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

f

Browse Source
This commit is contained in:
aps 2023-02-15 12:24:36 -05:00
parent 72e36997ca
commit 4c8b5236e7
5 changed files with 34 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/compiler.h
View File

@ -74,8 +74,6 @@ public:
rules[TK("@str")] = { METHOD(exprLiteral), NO_INFIX };
rules[TK("@fstr")] = { METHOD(exprFString), NO_INFIX };
rules[TK("?")] = { nullptr, METHOD(exprTernary), PREC_TERNARY };
// do not include standalone, as it allows naked assignment
//rules[TK(":=")] = { nullptr, METHOD(exprWalrus), PREC_ASSIGNMENT };
rules[TK("=")] = { nullptr, METHOD(exprAssign), PREC_ASSIGNMENT };
rules[TK("+=")] = { nullptr, METHOD(exprAssign), PREC_ASSIGNMENT };
rules[TK("-=")] = { nullptr, METHOD(exprAssign), PREC_ASSIGNMENT };
@ -402,13 +400,6 @@ private:
emit(OP_LOAD_LAMBDA, co()->add_const(vm->PyFunction(func)));
}
void exprWalrus() {
// NAME is on stack
EXPR_TUPLE();
// EXPR is on stack
emit(OP_STORE_REF); // will pop the value and the name off the stack,
// we need to return the value now
}
void exprAssign() {
co()->_rvalue = true;
TokenIndex op = parser->prev.type;
@ -512,21 +503,10 @@ private:
}
void exprGrouping() {
// either a expr in parens,
// or a tuple.
match_newlines(mode()==REPL_MODE);
// do {
// if (peek() == TK("@id")) {
// consume(TK("@id"));
// exprAssign();
// }
// else {
// EXPR();
// }
// } while (match(TK(",")));
// EXPR_TUPLE();
do {
if (peek() == TK(")")) break;
// match walrus operator
if(peek() == TK("@id") && peek_next() == TK(":=")) {
consume(TK("@id"));
Token tkname = parser->prev;
@ -534,26 +514,18 @@ private:
tkname.str(),
codes.size()>1 ? NAME_LOCAL : NAME_GLOBAL
);
// store the expr into NAME,
// and push it on the stack as well,
// so it is available as a value
// in the expression
emit(OP_LOAD_NAME_REF, index);
consume(TK(":="));
exprWalrus();
EXPR();
emit(OP_STORE_REF);
emit(OP_LOAD_NAME, index);
// const Str& key = parser->prev.str();
// emit(OP_LOAD_CONST, co()->add_const(vm->PyStr(key)));
// consume(TK("="));
// co()->_rvalue=true; EXPR(); co()->_rvalue=false;
}
else {
EXPR_TUPLE();
}
else EXPR_TUPLE();
} while (match(TK(",")));
// if (peek() == TK("@id")) {
// consume(TK("@id"));
// exprAssign();
// } else {
// EXPR_TUPLE();
// }
match_newlines(mode()==REPL_MODE);
consume(TK(")"));
}

6
src/vm.h
View File

File diff suppressed because one or more lines are too long

10
tests/_basic.py
View File

@ -117,3 +117,13 @@ assert round(23.2) == 23
assert round(23.8) == 24
assert round(-23.2) == -23
assert round(-23.8) == -24
assert (x := 1) == 1
assert (a := 1, b := 2)
assert a == 1
assert b == 2
assert (x := (a := 1, b := 2)) == (1, 2)
assert x == 1
assert (x := 0) + 1 == 1
assert (x := 1, y := 2, 3) == (1,2,3)

1
tests/_controlflow.py
View File

@ -64,4 +64,3 @@ count = 0
while (count < 1000):
count = count + 1
assert count == 1000

7
tests/_walrus.py
View File

@ -1,7 +0,0 @@
assert ( x := 1) == 1
assert ( y := 1) + 2 == 3
a = (y := 4) + 5
assert a == 9
assert y == 4