mirror of
https://git.savannah.gnu.org/git/guile.git
synced 2025-05-19 03:00:25 +02:00
Don't load modules explicitly at initialization.
This commit is contained in:
parent
4b24d33c61
commit
b4ea62efd8
2 changed files with 2 additions and 11 deletions
|
@ -220,7 +220,7 @@ SCM_DEFINE (scm_env_define, "env-define", 3, 0, 0,
|
||||||
void
|
void
|
||||||
scm_init_envs (void)
|
scm_init_envs (void)
|
||||||
{
|
{
|
||||||
SCM mod, old;
|
SCM mod;
|
||||||
|
|
||||||
scm_tc16_env = scm_make_smob_type ("env", 0);
|
scm_tc16_env = scm_make_smob_type ("env", 0);
|
||||||
scm_set_smob_mark (scm_tc16_env, env_mark);
|
scm_set_smob_mark (scm_tc16_env, env_mark);
|
||||||
|
@ -228,19 +228,15 @@ scm_init_envs (void)
|
||||||
|
|
||||||
env_table = scm_permanent_object (scm_c_make_hash_table (51));
|
env_table = scm_permanent_object (scm_c_make_hash_table (51));
|
||||||
|
|
||||||
mod = scm_resolve_module (scm_read_0str ("(system base module)"));
|
|
||||||
old = scm_set_current_module (mod);
|
|
||||||
|
|
||||||
#ifndef SCM_MAGIC_SNARFER
|
#ifndef SCM_MAGIC_SNARFER
|
||||||
#include "envs.x"
|
#include "envs.x"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
mod = scm_current_module ();
|
||||||
load_env = scm_eval_closure_lookup (scm_standard_eval_closure (mod),
|
load_env = scm_eval_closure_lookup (scm_standard_eval_closure (mod),
|
||||||
scm_str2symbol ("load-env"),
|
scm_str2symbol ("load-env"),
|
||||||
SCM_BOOL_T);
|
SCM_BOOL_T);
|
||||||
load_env = SCM_VARVCELL (load_env);
|
load_env = SCM_VARVCELL (load_env);
|
||||||
|
|
||||||
scm_set_current_module (old);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
5
src/vm.c
5
src/vm.c
|
@ -571,9 +571,6 @@ SCM_DEFINE (scm_vm_load, "vm-load", 2, 0, 0,
|
||||||
void
|
void
|
||||||
scm_init_vm (void)
|
scm_init_vm (void)
|
||||||
{
|
{
|
||||||
SCM mod = scm_resolve_module (scm_read_0str ("(system vm core)"));
|
|
||||||
mod = scm_set_current_module (mod);
|
|
||||||
|
|
||||||
scm_init_instructions ();
|
scm_init_instructions ();
|
||||||
scm_init_programs ();
|
scm_init_programs ();
|
||||||
|
|
||||||
|
@ -592,8 +589,6 @@ scm_init_vm (void)
|
||||||
#ifndef SCM_MAGIC_SNARFER
|
#ifndef SCM_MAGIC_SNARFER
|
||||||
#include "vm.x"
|
#include "vm.x"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
scm_set_current_module (mod);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue