summaryrefslogtreecommitdiff
path: root/libguile/frames.c
diff options
context:
space:
mode:
authorAndy Wingo <wingo@pobox.com>2011-02-11 12:43:05 +0100
committerAndy Wingo <wingo@pobox.com>2011-02-11 12:43:05 +0100
commit423fca76e6100cf9584a5a974b1c0bbaf0b1cb85 (patch)
treea2caa07cc09ce23a72dc75055523b1d500e826e2 /libguile/frames.c
parent7948811252c38bb80ed6bcf8d060bc29eeac382b (diff)
downloadguile-423fca76e6100cf9584a5a974b1c0bbaf0b1cb85.tar.gz
frame-source available in default environment
* libguile/frames.c (scm_frame_source): Don't call out to (system vm frames), as this routine is used when printing exceptions. Make available in the default environment (ugh). * module/system/vm/frame.scm: Remove frame-source definition and export.
Diffstat (limited to 'libguile/frames.c')
-rw-r--r--libguile/frames.c19
1 files changed, 10 insertions, 9 deletions
diff --git a/libguile/frames.c b/libguile/frames.c
index 2f870843b..bc1bb82a8 100644
--- a/libguile/frames.c
+++ b/libguile/frames.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2001, 2009, 2010 Free Software Foundation, Inc.
+/* Copyright (C) 2001, 2009, 2010, 2011 Free Software Foundation, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License
@@ -92,17 +92,18 @@ SCM_DEFINE (scm_frame_arguments, "frame-arguments", 1, 0, 0,
}
#undef FUNC_NAME
-SCM
-scm_frame_source (SCM frame)
+SCM_DEFINE (scm_frame_source, "frame-source", 1, 0, 0,
+ (SCM frame),
+ "")
+#define FUNC_NAME s_scm_frame_source
{
- static SCM var = SCM_BOOL_F;
-
- if (scm_is_false (var))
- var = scm_c_module_lookup (scm_c_resolve_module ("system vm frame"),
- "frame-source");
+ SCM_VALIDATE_VM_FRAME (1, frame);
- return scm_call_1 (SCM_VARIABLE_REF (var), frame);
+ return scm_program_source (scm_frame_procedure (frame),
+ scm_frame_instruction_pointer (frame),
+ SCM_UNDEFINED);
}
+#undef FUNC_NAME
/* The number of locals would be a simple thing to compute, if it weren't for
the presence of not-yet-active frames on the stack. So we have a cheap