guile/guile-core/libguile ChangeLog environment...

[Dirk Herrmann]

CVSROOT:        /cvs
Module name:    guile
Changes by:     Dirk Herrmann <address@hidden>  00/12/15 15:21:06

Modified files:
        guile-core/libguile: ChangeLog environments.c environments.h 
                             init.c 

Log message:
        * New environment variable scm_system_environment to replace 
scm_symhash.

CVSWeb URLs:
http://subversions.gnu.org/cgi-bin/cvsweb/guile/guile-core/libguile/ChangeLog.diff?r1=1.1209&r2=1.1210
http://subversions.gnu.org/cgi-bin/cvsweb/guile/guile-core/libguile/environments.c.diff?r1=1.10&r2=1.11
http://subversions.gnu.org/cgi-bin/cvsweb/guile/guile-core/libguile/environments.h.diff?r1=1.4&r2=1.5
http://subversions.gnu.org/cgi-bin/cvsweb/guile/guile-core/libguile/init.c.diff?r1=1.108&r2=1.109

Patches:
Index: guile/guile-core/libguile/ChangeLog
diff -u guile/guile-core/libguile/ChangeLog:1.1209 
guile/guile-core/libguile/ChangeLog:1.1210
--- guile/guile-core/libguile/ChangeLog:1.1209  Fri Dec 15 06:00:18 2000
+++ guile/guile-core/libguile/ChangeLog Fri Dec 15 15:21:06 2000
@@ -1,3 +1,14 @@
+2000-12-16  Dirk Herrmann  <address@hidden>
+
+       * environments.[ch] (scm_system_environment):  New variable, will
+       replace scm_symhash soon.  We may decide for a better name and
+       also to split this up into a set of environments later.
+
+       (scm_environments_prehistory):  Initialize scm_system_environment.
+
+       * init.c (scm_init_guile_1):  scm_environments_prehistory requires
+       storage to be initialized.
+
 2000-12-15  Dirk Herrmann  <address@hidden>
 
        * eval.c (change_environment, inner_eval, restore_environment):
Index: guile/guile-core/libguile/environments.c
diff -u guile/guile-core/libguile/environments.c:1.10 
guile/guile-core/libguile/environments.c:1.11
--- guile/guile-core/libguile/environments.c:1.10       Fri Dec  8 09:32:56 2000
+++ guile/guile-core/libguile/environments.c    Fri Dec 15 15:21:06 2000
@@ -60,6 +60,8 @@
 scm_bits_t scm_tc16_observer;
 #define DEFAULT_OBARRAY_SIZE 137
 
+SCM scm_system_environment;
+
 
 
 /* error conditions */
@@ -2304,6 +2306,10 @@
   scm_tc16_observer = scm_make_smob_type ("observer", 0);
   scm_set_smob_mark (scm_tc16_observer, observer_mark);
   scm_set_smob_print (scm_tc16_observer, observer_print);
+
+  /* create system environment */
+  scm_system_environment = scm_make_leaf_environment ();
+  scm_permanent_object (scm_system_environment);
 }
 
 
Index: guile/guile-core/libguile/environments.h
diff -u guile/guile-core/libguile/environments.h:1.4 
guile/guile-core/libguile/environments.h:1.5
--- guile/guile-core/libguile/environments.h:1.4        Fri Dec  8 09:32:56 2000
+++ guile/guile-core/libguile/environments.h    Fri Dec 15 15:21:06 2000
@@ -121,6 +121,8 @@
 #define SCM_OBSERVER_PROC(x) \
   ((scm_environment_observer) SCM_CELL_WORD_3 (x))
 
+extern SCM scm_system_environment;
+
 extern void scm_error_environment_unbound (const char *, SCM, SCM) 
SCM_NORETURN;
 extern void scm_error_environment_immutable_binding (const char *, SCM, SCM) 
SCM_NORETURN;
 extern void scm_error_environment_immutable_location (const char *, SCM, SCM) 
SCM_NORETURN;
Index: guile/guile-core/libguile/init.c
diff -u guile/guile-core/libguile/init.c:1.108 
guile/guile-core/libguile/init.c:1.109
--- guile/guile-core/libguile/init.c:1.108      Wed Dec 13 03:38:30 2000
+++ guile/guile-core/libguile/init.c    Fri Dec 15 15:21:06 2000
@@ -469,13 +469,13 @@
   scm_debug_malloc_prehistory ();
 #endif
   scm_init_storage ();
-  scm_struct_prehistory ();    /* requires storage */
-  scm_symbols_prehistory ();    /* requires storage */
-  scm_weaks_prehistory ();     /* requires storage */
+  scm_struct_prehistory ();      /* requires storage */
+  scm_symbols_prehistory ();      /* requires storage */
+  scm_weaks_prehistory ();       /* requires storage */
   scm_init_subr_table ();
-  scm_environments_prehistory (); /* create the root environment */
+  scm_environments_prehistory (); /* requires storage */
   scm_init_continuations ();
-  scm_init_root ();            /* requires continuations */
+  scm_init_root ();              /* requires continuations */
 #ifdef USE_THREADS
   scm_init_threads (base);
 #endif