guile/guile-core/libguile eval.c eval.h

[Marius Vollmer]

CVSROOT:        /cvs
Module name:    guile
Changes by:     Marius Vollmer <>       01/04/24 16:27:13

Modified files:
        guile-core/libguile: eval.c eval.h 

Log message:
        * eval.h, eval.c (scm_system_transformer): Deprecated by moving it
        into the conditionally compiled sections.
        * eval.c (scm_primitive_eval_x, scm_primitive_eval): Use
        scm_current_module_transformer instead of scm_system_transformer.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/guile/guile-core/libguile/eval.c.diff?cvsroot=OldCVS&tr1=1.215&tr2=1.216&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/guile/guile-core/libguile/eval.h.diff?cvsroot=OldCVS&tr1=1.51&tr2=1.52&r1=text&r2=text

Patches:
Index: guile/guile-core/libguile/eval.c
diff -u guile/guile-core/libguile/eval.c:1.215 
guile/guile-core/libguile/eval.c:1.216
--- guile/guile-core/libguile/eval.c:1.215      Thu Apr 19 07:46:01 2001
+++ guile/guile-core/libguile/eval.c    Tue Apr 24 16:27:13 2001
@@ -3909,8 +3909,6 @@
 
 */
 
-SCM scm_system_transformer;
-
 SCM 
 scm_i_eval_x (SCM exp, SCM env)
 {
@@ -3927,7 +3925,7 @@
 scm_primitive_eval_x (SCM exp)
 {
   SCM env;
-  SCM transformer = scm_fluid_ref (SCM_CDR (scm_system_transformer));
+  SCM transformer = scm_current_module_transformer ();
   if (SCM_NIMP (transformer))
     exp = scm_apply (transformer, exp, scm_listofnull);
   env = scm_top_level_env (scm_current_module_lookup_closure ());
@@ -3941,7 +3939,7 @@
 #define FUNC_NAME s_scm_primitive_eval
 {
   SCM env;
-  SCM transformer = scm_fluid_ref (SCM_CDR (scm_system_transformer));
+  SCM transformer = scm_current_module_transformer ();
   if (SCM_NIMP (transformer))
     exp = scm_apply (transformer, exp, scm_listofnull);
   env = scm_top_level_env (scm_current_module_lookup_closure ());
@@ -4027,6 +4025,7 @@
  */
 
 SCM scm_top_level_lookup_closure_var;
+SCM scm_system_transformer;
 
 /* Avoid using this functionality altogether (except for implementing
  * libguile, where you can use scm_i_eval or scm_i_eval_x).
@@ -4084,8 +4083,6 @@
   scm_set_smob_print (scm_tc16_promise, promise_print);
 
   scm_f_apply = scm_make_subr ("apply", scm_tc7_lsubr_2, scm_apply);
-  scm_system_transformer = scm_sysintern ("scm:eval-transformer",
-                                         scm_make_fluid ());
 
   scm_lisp_nil = scm_sysintern ("nil", SCM_UNDEFINED);
   SCM_SETCDR (scm_lisp_nil, SCM_CAR (scm_lisp_nil));
@@ -4100,6 +4097,8 @@
 #if SCM_DEBUG_DEPRECATED == 0
   scm_top_level_lookup_closure_var =
     scm_sysintern ("*top-level-lookup-closure*", scm_make_fluid ());
+  scm_system_transformer =
+    scm_sysintern ("scm:eval-transformer", scm_make_fluid ());
 #endif
 
 #ifndef SCM_MAGIC_SNARFER
Index: guile/guile-core/libguile/eval.h
diff -u guile/guile-core/libguile/eval.h:1.51 
guile/guile-core/libguile/eval.h:1.52
--- guile/guile-core/libguile/eval.h:1.51       Fri Mar 30 07:03:22 2001
+++ guile/guile-core/libguile/eval.h    Tue Apr 24 16:27:13 2001
@@ -137,9 +137,9 @@
 #if SCM_DEBUG_DEPRECATED == 0
 
 extern SCM scm_top_level_lookup_closure_var;
+extern SCM scm_system_transformer;
 #endif
 
-extern SCM scm_system_transformer;
 
 
 extern const char scm_s_expression[];