mirror of
https://git.savannah.gnu.org/git/guile.git
synced 2025-06-10 05:50:26 +02:00
Fix toplevel-ref with named modules before boot in stack VM
* libguile/vm.c (resolve_variable): Fix, as in
e23f9e4423
.
This commit is contained in:
parent
0720f70ed7
commit
d6fbf0c00e
1 changed files with 11 additions and 1 deletions
|
@ -641,7 +641,17 @@ resolve_variable (SCM what, SCM module)
|
||||||
sym = SCM_CADR (what);
|
sym = SCM_CADR (what);
|
||||||
public = SCM_CADDR (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);
|
return scm_public_lookup (modname, sym);
|
||||||
else
|
else
|
||||||
return scm_private_lookup (modname, sym);
|
return scm_private_lookup (modname, sym);
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue