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

Merge pull request #12 from apsz3/main

Browse Source 
Assert with message
This commit is contained in:
BLUELOVETH 2023-02-11 20:03:49 +08:00 committed by GitHub
commit 794d0785a0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/compiler.h
View File

@ -871,6 +871,8 @@ __LISTCOMP:
compile_try_except(); compile_try_except();
}else if(match(TK("assert"))){ }else if(match(TK("assert"))){
EXPR(); EXPR();
if (match(TK(","))) EXPR();
else emit(OP_LOAD_CONST, co()->add_const(vm->PyStr("")));
emit(OP_ASSERT); emit(OP_ASSERT);
consume_end_stmt(); consume_end_stmt();
} else if(match(TK("with"))){ } else if(match(TK("with"))){

5
src/error.h
View File

@ -86,8 +86,9 @@ public:
StrStream ss; StrStream ss;
if(is_re) ss << "Traceback (most recent call last):\n"; if(is_re) ss << "Traceback (most recent call last):\n";
while(!st.empty()) { ss << st.top() << '\n'; st.pop(); } while(!st.empty()) { ss << st.top() << '\n'; st.pop(); }
ss << type << ": " << msg; if (!msg.empty()) ss << type << ": " << msg;
else ss << type;
return ss.str(); return ss.str();
} }
}; };
} }

4
src/vm.h
View File

@ -182,8 +182,10 @@ class VM {
case OP_LOAD_ELLIPSIS: frame->push(Ellipsis); break; case OP_LOAD_ELLIPSIS: frame->push(Ellipsis); break;
case OP_ASSERT: case OP_ASSERT:
{ {
PyVar _msg = frame->pop_value(this);
Str msg = PyStr_AS_C(asStr(_msg));
PyVar expr = frame->pop_value(this); PyVar expr = frame->pop_value(this);
if(asBool(expr) != True) _error("AssertionError", ""); if(asBool(expr) != True) _error("AssertionError", msg);
} break; } break;
case OP_EXCEPTION_MATCH: case OP_EXCEPTION_MATCH:
{ {

9
tests/_exception.py
View File

@ -41,4 +41,11 @@ def f1():
try: try:
f1() f1()
except KeyError: except KeyError:
print("PASS 04") print("PASS 04")
assert True, "Msg"
try:
assert False, "Msg"
except AssertionError:
print("PASS 05")