[Guile-commits] GNU Guile branch, master, updated. v2.1.0-291-gd6fbf0c

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

The branch, master has been updated
       via  d6fbf0c00e913ab2726f98f70b3026aafb7fcdc6 (commit)
      from  0720f70ed7e9de2685409abfe4e2c0dd01f81b74 (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 d6fbf0c00e913ab2726f98f70b3026aafb7fcdc6
Author: Andy Wingo <address@hidden>
Date:   Sun Oct 27 11:25:18 2013 +0100

    Fix toplevel-ref with named modules before boot in stack VM
    
    * libguile/vm.c (resolve_variable): Fix, as in
      e23f9e4423bbbe8521d13e1c9a223612a5e86762.

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

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

diff --git a/libguile/vm.c b/libguile/vm.c
index ff9ea35..5a2aef7 100644
--- a/libguile/vm.c
+++ b/libguile/vm.c
@@ -641,7 +641,17 @@ resolve_variable (SCM what, SCM module)
       sym = SCM_CADR (what);
       public = SCM_CADDR (what);
 
-      if (scm_is_true (public))
+      if (!scm_module_system_booted_p)
+        {
+#ifdef VM_ENABLE_PARANOID_ASSERTIONS
+          ASSERT (scm_is_false (public));
+          ASSERT (scm_is_true
+                  (scm_equal_p (modname,
+                                scm_list_1 (scm_from_utf8_symbol ("guile")))));
+#endif
+          return scm_lookup (sym);
+        }
+      else if (scm_is_true (public))
         return scm_public_lookup (modname, sym);
       else
         return scm_private_lookup (modname, sym);


hooks/post-receive
-- 
GNU Guile