summaryrefslogtreecommitdiff
path: root/libguile/stacks.c
diff options
context:
space:
mode:
authorAndy Wingo <wingo@pobox.com>2009-12-15 00:20:47 +0100
committerAndy Wingo <wingo@pobox.com>2009-12-15 00:22:02 +0100
commit93dbc31b9aa9442ad49cf41677bee6e9f1d24306 (patch)
tree8623d93229abde54753eb2e3de75404a94ece118 /libguile/stacks.c
parent5b98517a652ea51cbb0fd03e87a50c0b3add9707 (diff)
downloadguile-93dbc31b9aa9442ad49cf41677bee6e9f1d24306.tar.gz
expose frame-previous, once again
* libguile/frames.h: * libguile/frames.c (scm_frame_previous): Rename from scm_c_frame_prev, and expose to Scheme. Skip boot frames. * libguile/stacks.c (stack_depth, narrow_stack, scm_make_stack) (scm_stack_ref): Adjust for scm_frame_previous skipping boot frames.
Diffstat (limited to 'libguile/stacks.c')
-rw-r--r--libguile/stacks.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/libguile/stacks.c b/libguile/stacks.c
index 60f0159f3..61b7be3e4 100644
--- a/libguile/stacks.c
+++ b/libguile/stacks.c
@@ -69,9 +69,8 @@ stack_depth (SCM frame, SCM *fp)
long n;
/* count frames, skipping boot frames */
for (; scm_is_true (frame) && SCM_VM_FRAME_FP (frame) > fp;
- frame = scm_c_frame_prev (frame))
- if (!SCM_PROGRAM_IS_BOOT (scm_frame_procedure (frame)))
- ++n;
+ frame = scm_frame_previous (frame))
+ ++n;
return n;
}
@@ -112,7 +111,7 @@ narrow_stack (SCM stack, long inner, SCM inner_key, long outer, SCM outer_key)
for (; inner && len; --inner)
{
len--;
- frame = scm_c_frame_prev (frame);
+ frame = scm_frame_previous (frame);
}
}
else
@@ -122,7 +121,7 @@ narrow_stack (SCM stack, long inner, SCM inner_key, long outer, SCM outer_key)
{
SCM proc = scm_frame_procedure (frame);
len--;
- frame = scm_c_frame_prev (frame);
+ frame = scm_frame_previous (frame);
if (scm_is_eq (proc, inner_key))
break;
}
@@ -231,6 +230,11 @@ SCM_DEFINE (scm_make_stack, "make-stack", 1, 0, 1,
/* not reached */
}
+ /* FIXME: is this even possible? */
+ if (scm_is_true (frame)
+ && SCM_PROGRAM_IS_BOOT (scm_frame_procedure (frame)))
+ frame = scm_frame_previous (frame);
+
if (scm_is_false (frame))
return SCM_BOOL_F;
@@ -351,11 +355,7 @@ SCM_DEFINE (scm_stack_ref, "stack-ref", 2, 0, 0,
c_index = scm_to_unsigned_integer (index, 0, SCM_STACK_LENGTH(stack)-1);
frame = SCM_STACK_FRAME (stack);
while (c_index--)
- {
- frame = scm_c_frame_prev (frame);
- while (SCM_PROGRAM_IS_BOOT (scm_frame_procedure (frame)))
- frame = scm_c_frame_prev (frame);
- }
+ frame = scm_frame_previous (frame);
return frame;
}
#undef FUNC_NAME