[Guile-commits] GNU Guile branch, wip-case-lambda, updated. release_1-9-3-48-g827be0e

[Andy Wingo]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Guile".

http://git.savannah.gnu.org/cgit/guile.git/commit/?id=827be0eb86ae0a8d12bdcd1e46ff4bc20607f7a8

The branch, wip-case-lambda has been updated
       via  827be0eb86ae0a8d12bdcd1e46ff4bc20607f7a8 (commit)
       via  db31e3f4fa3c9d8d0c26916de721556e03916717 (commit)
      from  110a80803a32288df898d5f1ab944d64a248baf0 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 827be0eb86ae0a8d12bdcd1e46ff4bc20607f7a8
Author: Andy Wingo <address@hidden>
Date:   Sun Oct 4 23:05:20 2009 +0200

    fix off-by-one error in frames.c
    
    * libguile/frames.c (scm_vm_frame_num_locals, scm_vm_frame_local_ref)
      (scm_vm_frame_local_set_x): Fix off-by-one error.

commit db31e3f4fa3c9d8d0c26916de721556e03916717
Author: Andy Wingo <address@hidden>
Date:   Sun Oct 4 22:14:23 2009 +0200

    fix vm-frame-num-locals et al
    
    * libguile/frames.c: Fix not-yet-active frame heuristic to correspond to
      what new-frame actually pushes on the stack.

-----------------------------------------------------------------------

Summary of changes:
 libguile/frames.c |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/libguile/frames.c b/libguile/frames.c
index 37377e7..39f78e0 100644
--- a/libguile/frames.c
+++ b/libguile/frames.c
@@ -131,9 +131,9 @@ SCM_DEFINE (scm_vm_frame_num_locals, "vm-frame-num-locals", 
1, 0, 0,
 
   sp = SCM_VM_FRAME_SP (frame);
   p = SCM_FRAME_STACK_ADDRESS (SCM_VM_FRAME_FP (frame));
-  while (p < sp)
+  while (p <= sp)
     {
-      if (*p == (SCM)0)
+      if (p + 1 < sp && p[1] == (SCM)0)
         /* skip over not-yet-active frame */
         p += 3;
       else
@@ -161,9 +161,9 @@ SCM_DEFINE (scm_vm_frame_local_ref, "vm-frame-local-ref", 
2, 0, 0,
 
   sp = SCM_VM_FRAME_SP (frame);
   p = SCM_FRAME_STACK_ADDRESS (SCM_VM_FRAME_FP (frame));
-  while (p < sp)
+  while (p <= sp)
     {
-      if (*p == (SCM)0)
+      if (p + 1 < sp && p[1] == (SCM)0)
         /* skip over not-yet-active frame */
         p += 3;
       else if (n == i)
@@ -193,9 +193,9 @@ SCM_DEFINE (scm_vm_frame_local_set_x, 
"vm-frame-local-set!", 3, 0, 0,
 
   sp = SCM_VM_FRAME_SP (frame);
   p = SCM_FRAME_STACK_ADDRESS (SCM_VM_FRAME_FP (frame));
-  while (p < sp)
+  while (p <= sp)
     {
-      if (*p == (SCM)0)
+      if (p + 1 < sp && p[1] == (SCM)0)
         /* skip over not-yet-active frame */
         p += 3;
       else if (n == i)


hooks/post-receive
-- 
GNU Guile