diff options
author | Andy Wingo <wingo@pobox.com> | 2013-11-21 16:45:03 +0100 |
---|---|---|
committer | Andy Wingo <wingo@pobox.com> | 2013-11-21 16:45:03 +0100 |
commit | a222cbc9d147c0649b5b4621579de977a690b213 (patch) | |
tree | 05e3befc413d9a2f0320a3f68bca110d2e14c00d /libguile | |
parent | 972275eee5326b4628f207996e14e0040fb94256 (diff) | |
download | guile-a222cbc9d147c0649b5b4621579de977a690b213.tar.gz |
No more VM objects visible to Scheme
* libguile/vm.h:
* libguile/vm.c (scm_the_vm): Don't expose to Scheme.
(scm_vm_p): Remove, as it is not needed.
* module/system/vm/vm.scm: Remove the-vm and vm? exports.
* doc/ref/api-coverage.texi (Code Coverage):
* test-suite/tests/coverage.test:
* module/system/vm/coverage.scm (with-code-coverage): Don't take a VM
argument. Adapt documentation and tests.
* module/ice-9/command-line.scm: Remove the-vm autoload.
* module/system/vm/trace.scm (trace-calls-to-procedure):
(trace-calls-in-procedure):
(trace-instructions-in-procedure):
(call-with-trace): Remove #:vm kwarg, and adapt to trap changes.
* module/system/vm/trap-state.scm (the-trap-state): Rework to use a
parameter underneath instead of a weak key on (the-vm).
* module/system/vm/traps.scm (new-disabled-trap):
(new-enabled-trap): Remove vm argument.
(trap-at-procedure-call):
(trap-in-procedure):
(trap-instructions-in-procedure):
(trap-at-procedure-ip-in-range):
(trap-at-source-location):
(trap-frame-finish):
(trap-in-dynamic-extent):
(trap-calls-in-dynamic-extent):
(trap-instructions-in-dynamic-extent):
(trap-calls-to-procedure):
(trap-matching-instructions): Remove vm keyword arguments.
* test-suite/tests/control.test ("unwind"): Adapt test.
* test-suite/tests/eval.test (test-suite): Remove the-vm import.
Diffstat (limited to 'libguile')
-rw-r--r-- | libguile/vm.c | 19 | ||||
-rw-r--r-- | libguile/vm.h | 1 |
2 files changed, 3 insertions, 17 deletions
diff --git a/libguile/vm.c b/libguile/vm.c index 21180d8d0..65e822b26 100644 --- a/libguile/vm.c +++ b/libguile/vm.c @@ -830,12 +830,8 @@ scm_c_vm_run (SCM vm, SCM program, SCM *argv, int nargs) return vm_engines[vp->engine](vm, program, argv, nargs); } -/* Scheme interface */ - -SCM_DEFINE (scm_the_vm, "the-vm", 0, 0, 0, - (void), - "Return the current thread's VM.") -#define FUNC_NAME s_scm_the_vm +SCM +scm_the_vm (void) { scm_i_thread *t = SCM_I_CURRENT_THREAD; @@ -844,17 +840,8 @@ SCM_DEFINE (scm_the_vm, "the-vm", 0, 0, 0, return t->vm; } -#undef FUNC_NAME - -SCM_DEFINE (scm_vm_p, "vm?", 1, 0, 0, - (SCM obj), - "") -#define FUNC_NAME s_scm_vm_p -{ - return scm_from_bool (SCM_VM_P (obj)); -} -#undef FUNC_NAME +/* Scheme interface */ #define VM_DEFINE_HOOK(n) \ { \ diff --git a/libguile/vm.h b/libguile/vm.h index 214fd0ba1..a805469ed 100644 --- a/libguile/vm.h +++ b/libguile/vm.h @@ -59,7 +59,6 @@ SCM_API SCM scm_the_vm_fluid; SCM_API SCM scm_the_vm (void); SCM_API SCM scm_call_with_vm (SCM proc, SCM args); -SCM_API SCM scm_vm_p (SCM obj); SCM_API SCM scm_vm_apply_hook (void); SCM_API SCM scm_vm_push_continuation_hook (void); SCM_API SCM scm_vm_pop_continuation_hook (void); |