diff options
author | Andy Wingo <wingo@pobox.com> | 2010-02-19 10:49:24 +0100 |
---|---|---|
committer | Andy Wingo <wingo@pobox.com> | 2010-02-19 12:10:11 +0100 |
commit | 6e84cb95b18d81ef7a8490cccdfb08d3f88116ea (patch) | |
tree | 41d26678df853cb3e6f77bdb08ebe962c58306f5 /libguile/vm-i-system.c | |
parent | 07a0c7d5d9523936d5fe4cac595bd75859416c9e (diff) | |
download | guile-6e84cb95b18d81ef7a8490cccdfb08d3f88116ea.tar.gz |
rename <control> to <abort>
* libguile/vm-i-system.c (abort): Rename instruction from `throw'.
* libguile/vm.c (vm_abort): Rename from vm_throw.
* module/language/tree-il.scm (<abort>, make-abort, abort-src,
abort-tag, abort-args: Rename from <control> & company.
* module/language/tree-il/analyze.scm:
* module/language/tree-il/compile-glil.scm:
* module/language/tree-il/primitives.scm: Fix all callers.
Diffstat (limited to 'libguile/vm-i-system.c')
-rw-r--r-- | libguile/vm-i-system.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libguile/vm-i-system.c b/libguile/vm-i-system.c index 15e339492..c72b84d0e 100644 --- a/libguile/vm-i-system.c +++ b/libguile/vm-i-system.c @@ -1508,7 +1508,7 @@ VM_DEFINE_INSTRUCTION (85, wind, "wind", 0, 2, 0) NEXT; } -VM_DEFINE_INSTRUCTION (86, throw, "throw", 1, -1, -1) +VM_DEFINE_INSTRUCTION (86, abort, "abort", 1, -1, -1) { unsigned n = FETCH (); SCM k; @@ -1517,8 +1517,8 @@ VM_DEFINE_INSTRUCTION (86, throw, "throw", 1, -1, -1) POP (args); POP (k); SYNC_REGISTER (); - vm_throw (vm, k, args); - /* vm_throw should not return */ + vm_abort (vm, k, args); + /* vm_abort should not return */ abort (); } |