mirrors/janet
1
0
Fork 0
mirror of https://github.com/janet-lang/janet synced 2025-11-05 01:53:01 +00:00
Code Issues 1 Releases Wiki Activity

Remove vm crash return and use error instead.

Browse Source
This commit is contained in:
bakpakin
2017-07-09 16:15:44 -04:00
parent de9d7bcfdc
commit 53cead0bab
3 changed files with 4 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/vm.c
View File

@@ -36,7 +36,6 @@ int gst_continue(Gst *vm) {
#define gst_exit(vm, r) return ((vm)->ret = (r), GST_RETURN_OK)
#define gst_error(vm, e) do { (vm)->ret = gst_string_cv((vm), (e)); goto vm_error; } while (0)
#define gst_crash(vm, e) return ((vm)->crash = (e), GST_RETURN_CRASH)
#define gst_assert(vm, cond, e) do {if (!(cond)){gst_error((vm), (e));}} while (0)
/* Intialize local state */
@@ -452,8 +451,6 @@ int gst_run(Gst *vm, GstValue callee) {
} else {
/* Create new thread */
vm->thread = gst_thread(vm, callee, 64);
if (vm->thread == NULL)
return GST_RETURN_CRASH;
}
if (callee.type == GST_CFUNCTION) {
vm->ret.type = GST_NIL;
@@ -461,7 +458,8 @@ int gst_run(Gst *vm, GstValue callee) {
} else if (callee.type == GST_FUNCTION) {
result = gst_continue(vm);
} else {
return GST_RETURN_CRASH;
vm->ret = gst_string_cv(vm, "expected function");
return GST_RETURN_ERROR;
}
/* Handle yields */
while (result == GST_RETURN_OK && vm->thread->status == GST_THREAD_PENDING) {
@@ -503,7 +501,6 @@ uint32_t gst_count_args(Gst *vm) {
/* Initialize the VM */
void gst_init(Gst *vm) {
vm->ret.type = GST_NIL;
vm->crash = NULL;
/* Garbage collection */
vm->blocks = NULL;
vm->nextCollection = 0;