From b4ea62efd836c9e990a935e4c60848bde746665d Mon Sep 17 00:00:00 2001 From: Keisuke Nishida Date: Wed, 4 Apr 2001 18:46:11 +0000 Subject: [PATCH] Don't load modules explicitly at initialization. --- src/envs.c | 8 ++------ src/vm.c | 5 ----- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/src/envs.c b/src/envs.c index a6c12bdea..e1e2e36a1 100644 --- a/src/envs.c +++ b/src/envs.c @@ -220,7 +220,7 @@ SCM_DEFINE (scm_env_define, "env-define", 3, 0, 0, void scm_init_envs (void) { - SCM mod, old; + SCM mod; scm_tc16_env = scm_make_smob_type ("env", 0); 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)); - mod = scm_resolve_module (scm_read_0str ("(system base module)")); - old = scm_set_current_module (mod); - #ifndef SCM_MAGIC_SNARFER #include "envs.x" #endif + mod = scm_current_module (); load_env = scm_eval_closure_lookup (scm_standard_eval_closure (mod), scm_str2symbol ("load-env"), SCM_BOOL_T); load_env = SCM_VARVCELL (load_env); - - scm_set_current_module (old); } /* diff --git a/src/vm.c b/src/vm.c index e82c1cb7f..2d31bcddd 100644 --- a/src/vm.c +++ b/src/vm.c @@ -571,9 +571,6 @@ SCM_DEFINE (scm_vm_load, "vm-load", 2, 0, 0, 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_programs (); @@ -592,8 +589,6 @@ scm_init_vm (void) #ifndef SCM_MAGIC_SNARFER #include "vm.x" #endif - - scm_set_current_module (mod); } /*