summaryrefslogtreecommitdiff
path: root/libguile/script.c
diff options
context:
space:
mode:
authorAndy Wingo <wingo@pobox.com>2010-09-28 09:22:38 +0200
committerAndy Wingo <wingo@pobox.com>2010-09-28 09:22:38 +0200
commit97b18a66403aee100021485d85009b975ecb1614 (patch)
treee3fc18b83615a54b2d12c542da69fbd881e0f105 /libguile/script.c
parentf2ee6341baa31d75f9734a93545eb2608dd5653c (diff)
downloadguile-97b18a66403aee100021485d85009b975ecb1614.tar.gz
default to regular vm for noninteractive use
* libguile/script.c (scm_compile_shell_switches): Select the debugging VM in the cases that we previously would select deval -- when running interactively without --no-debug, or otherwise with --debug. * libguile/vm.c: Default to the regular engine. (scm_c_set_vm_engine_x): Remove requirement for the VM to have no pending computations.
Diffstat (limited to 'libguile/script.c')
-rw-r--r--libguile/script.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/libguile/script.c b/libguile/script.c
index 03d5de194..088c06b92 100644
--- a/libguile/script.c
+++ b/libguile/script.c
@@ -40,6 +40,7 @@
#include "libguile/strports.h"
#include "libguile/validate.h"
#include "libguile/version.h"
+#include "libguile/vm.h"
#ifdef HAVE_STRING_H
#include <string.h>
@@ -718,7 +719,10 @@ scm_compile_shell_switches (int argc, char **argv)
was not explicitly turned off, turn on debugging. */
if (turn_on_debugging || (interactive && !dont_turn_on_debugging))
{
+ /* FIXME: backtraces and positions should always be on (?) */
tail = scm_cons (scm_cons (sym_turn_on_debugging, SCM_EOL), tail);
+ scm_c_set_default_vm_engine_x (SCM_VM_DEBUG_ENGINE);
+ scm_c_set_vm_engine_x (scm_the_vm (), SCM_VM_DEBUG_ENGINE);
}
{