[Guile-commits] GNU Guile branch, master, updated. v2.1.0-202-gc8ab29a

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

The branch, master has been updated
       via  c8ab29ac8e32f3f68efe1652e27d4a4cb2d90f4e (commit)
       via  a8004dcb4d7148ec66cbaa109a18715d757700eb (commit)
       via  da03005a2a362847db2ac7e876cd9e31b20f9c73 (commit)
       via  1be6c7d34d7e1e40e78c8983bd8b40b3fbf7d01c (commit)
       via  47153f29b02cee6324aec523cfa44b48e1cb29b9 (commit)
       via  c05805a4ea764dec5a0559edefcdfb9761191d07 (commit)
      from  01e909d90a130f4987b70edae2dbd5a2b33edae7 (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 c8ab29ac8e32f3f68efe1652e27d4a4cb2d90f4e
Merge: 01e909d a8004dc
Author: Andy Wingo <address@hidden>
Date:   Mon Mar 26 00:56:29 2012 +0200

    Merge remote-tracking branch 'origin/stable-2.0'
    
    Conflicts:
        libguile/procprop.c
        libguile/smob.c
        libguile/smob.h
        libguile/vm.c
        module/language/tree-il/primitives.scm

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

Summary of changes:
 module/language/tree-il/primitives.scm |   14 +++++++++-----
 test-suite/tests/tree-il.test          |   10 +++++++++-
 2 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/module/language/tree-il/primitives.scm 
b/module/language/tree-il/primitives.scm
index 3c6769d..8aecb85 100644
--- a/module/language/tree-il/primitives.scm
+++ b/module/language/tree-il/primitives.scm
@@ -267,11 +267,15 @@
        ((<module-ref> src mod name public?)
         ;; for the moment, we're disabling primitive resolution for
         ;; public refs because resolve-interface can raise errors.
-        (let ((m (and (not public?) (resolve-module mod))))
-          (and m 
-               (and=> (hashq-ref *interesting-primitive-vars*
-                                 (module-variable m name))
-                      (lambda (name) (make-primitive-ref src name))))))
+        (and=> (and=> (resolve-module mod)
+                      (if public?
+                          module-public-interface
+                          identity))
+               (lambda (m)
+                 (and=> (hashq-ref *interesting-primitive-vars*
+                                   (module-variable m name))
+                        (lambda (name)
+                          (make-primitive-ref src name))))))
        ((<call> src proc args)
         (and (primitive-ref? proc)
              (make-primcall src (primitive-ref-name proc) args)))
diff --git a/test-suite/tests/tree-il.test b/test-suite/tests/tree-il.test
index 4dbe310..47289c3 100644
--- a/test-suite/tests/tree-il.test
+++ b/test-suite/tests/tree-il.test
@@ -1598,7 +1598,15 @@
    (lambda _
      (lambda-case
       (((x y) #f #f #f () (_ _))
-       _)))))
+       _))))
+
+  (pass-if-peval resolve-primitives
+   ((@ (guile) car) '(1 2))
+   (const 1))
+
+  (pass-if-peval resolve-primitives
+   ((@@ (guile) car) '(1 2))
+   (const 1)))
 
 
 


hooks/post-receive
-- 
GNU Guile