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

Assert takes optional message

Browse Source
This commit is contained in:
aps 2023-02-10 22:34:44 -05:00
parent 817f7c3583
commit 2563f64670
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/compiler.h
View File

@ -887,6 +887,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"))){

3
src/error.h
View File

@ -86,7 +86,8 @@ 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.compare("") != 0) ss << type << ": " << msg;
else ss << type;
return ss.str(); return ss.str();
} }
}; };

4
src/vm.h
View File

@ -186,8 +186,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:
{ {