[Guile-commits] GNU Guile branch, wip-rtl-halloween, updated. v2.1.0-356-gf41accb

[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=f41accb9c26e3b4df4170bda04b8860ee962657f

The branch, wip-rtl-halloween has been updated
       via  f41accb9c26e3b4df4170bda04b8860ee962657f (commit)
       via  d547e1c9a647c8218bdf64b00e8c11af1f7d5a0a (commit)
      from  b0ed216b6f17f9f63fbf1d9542c0722241317837 (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 f41accb9c26e3b4df4170bda04b8860ee962657f
Author: Andy Wingo <address@hidden>
Date:   Fri Nov 8 13:29:03 2013 +0100

    Fix procedure-arguments on RTL programs, and tweak session.test
    
    * module/ice-9/session.scm (procedure-arguments): Add an rtl-program?
      case.
    
    * module/system/vm/debug.scm (arity-arguments-alist): Use the order that
      session.test expects.
    
    * test-suite/tests/session.test ("procedure-arguments"): Adapt tests
      with keywords for the new starting-with-the-procedure numbering of
      locals.

commit d547e1c9a647c8218bdf64b00e8c11af1f7d5a0a
Author: Andy Wingo <address@hidden>
Date:   Fri Nov 8 13:25:08 2013 +0100

    Fix make-vector peval test
    
    * test-suite/tests/peval.test ("partial evaluation"): Fix to expect a
      primcall.

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

Summary of changes:
 module/ice-9/session.scm      |    5 +++--
 module/system/vm/debug.scm    |    4 ++--
 test-suite/tests/peval.test   |    2 +-
 test-suite/tests/session.test |    6 +++---
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/module/ice-9/session.scm b/module/ice-9/session.scm
index ce1bcac..ff11147 100644
--- a/module/ice-9/session.scm
+++ b/module/ice-9/session.scm
@@ -1,5 +1,5 @@
 ;;;; Copyright (C) 1997, 2000, 2001, 2003, 2006, 2009, 2010, 2011,
-;;;;    2012 Free Software Foundation, Inc.
+;;;;    2012, 2013 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
@@ -522,7 +522,8 @@ The alist keys that are currently defined are `required', 
`optional',
            (rest . ,rest)))))
    ((procedure-source proc)
     => cadr)
-   (((@ (system vm program) program?) proc)
+   ((or ((@ (system vm program) program?) proc)
+        ((@ (system vm program) rtl-program?) proc))
     ((@ (system vm program) program-arguments-alist) proc))
    (else #f)))
 
diff --git a/module/system/vm/debug.scm b/module/system/vm/debug.scm
index 5611432..09bc161 100644
--- a/module/system/vm/debug.scm
+++ b/module/system/vm/debug.scm
@@ -340,12 +340,12 @@ section of the ELF image.  Returns an ELF symbol, or 
@code{#f}."
     (and (not (is-case-lambda? flags))
          `((required . ,(load-symbols 0 nreq))
            (optional . ,(load-symbols nreq nopt))
-           (rest . ,(and (has-rest? flags) (load-symbol (+ nreq nopt))))
            (keyword . ,(if (has-keyword-args? flags)
                            (load-non-immediate
                             (+ nreq nopt (if (has-rest? flags) 1 0)))
                            '()))
-           (allow-other-keys? . ,(allow-other-keys? flags))))))
+           (allow-other-keys? . ,(allow-other-keys? flags))
+           (rest . ,(and (has-rest? flags) (load-symbol (+ nreq nopt))))))))
 
 (define (find-first-arity context base addr)
   (let* ((bv (elf-bytes (debug-context-elf context)))
diff --git a/test-suite/tests/peval.test b/test-suite/tests/peval.test
index 0949ddf..730808b 100644
--- a/test-suite/tests/peval.test
+++ b/test-suite/tests/peval.test
@@ -582,7 +582,7 @@
       (lambda (n)
         (vector-set! v n n)))
     (let (v) (_)
-         ((call (toplevel make-vector) (const 6) (const #f)))
+         ((primcall make-vector (const 6) (const #f)))
          (lambda ()
            (lambda-case
             (((n) #f #f #f () (_))
diff --git a/test-suite/tests/session.test b/test-suite/tests/session.test
index c9aa4a0..f6fd389 100644
--- a/test-suite/tests/session.test
+++ b/test-suite/tests/session.test
@@ -77,17 +77,17 @@
   (pass-if-valid-arguments "lambda* with keywords"
     (lambda* (a b #:key (k 42) l) #f)
     ((required . (a b)) (optional)
-     (keyword . ((#:k . 2) (#:l . 3))) (allow-other-keys? . #f)
+     (keyword . ((#:k . 3) (#:l . 4))) (allow-other-keys? . #f)
      (rest . #f)))
   (pass-if-valid-arguments "lambda* with keywords and a-o-k"
     (lambda* (a b #:key (k 42) #:allow-other-keys) #f)
     ((required . (a b)) (optional)
-     (keyword . ((#:k . 2))) (allow-other-keys? . #t)
+     (keyword . ((#:k . 3))) (allow-other-keys? . #t)
      (rest . #f)))
   (pass-if-valid-arguments "lambda* with optionals, keys, and rest"
     (lambda* (a b #:optional o p #:key k l #:rest r) #f)
     ((required . (a b)) (optional . (o p))
-     (keyword . ((#:k . 5) (#:l . 6))) (allow-other-keys? . #f)
+     (keyword . ((#:k . 6) (#:l . 7))) (allow-other-keys? . #f)
      (rest . r)))
 
   (pass-if "aok? is preserved"


hooks/post-receive
-- 
GNU Guile