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

[Marius Vollmer]

CVSROOT:        /cvs
Module name:    guile
Changes by:     Marius Vollmer <address@hidden> 01/05/18 17:27:22

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

Log message:
        (scm_init_rdelim_builtins): Renamed from
        scm_init_rdelim.  Do not switch explicetly create/switch modules.
        Return SCM_UNSPECIFIED.
        (scm_init_rdelim): Only register `%init-rdelim-builtins'
        procedure.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/guile/guile-core/libguile/rdelim.h.diff?cvsroot=OldCVS&tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/guile/guile-core/libguile/rdelim.c.diff?cvsroot=OldCVS&tr1=1.4&tr2=1.5&r1=text&r2=text

Patches:
Index: guile/guile-core/libguile/rdelim.c
diff -u guile/guile-core/libguile/rdelim.c:1.4 
guile/guile-core/libguile/rdelim.c:1.5
--- guile/guile-core/libguile/rdelim.c:1.4      Tue Apr  3 06:19:04 2001
+++ guile/guile-core/libguile/rdelim.c  Fri May 18 17:27:22 2001
@@ -282,28 +282,32 @@
 }
 #undef FUNC_NAME
 
-void 
-scm_init_rdelim (void)
+SCM
+scm_init_rdelim_builtins (void)
 {
-  SCM rdelim_module = scm_make_module (scm_read_0str ("(ice-9 rdelim)"));
-  SCM old_module = scm_set_current_module (rdelim_module);
-
 #ifndef SCM_MAGIC_SNARFER
 #include "libguile/rdelim.x"
 #endif
 
-  scm_set_current_module (old_module);
-
 #if DEBUG_DEPRECATED == 0
   {
+    SCM old_module = scm_current_module ();
     const char expr[] = "\
 (define-module (guile) :use-module (ice-9 rdelim))\
 (define-module (guile-user) :use-module (ice-9 rdelim))";
 
     scm_eval_string (scm_makfromstr (expr, (sizeof expr) - 1, 0));
+    scm_set_current_module (old_module);
   }
-  scm_set_current_module (old_module);
 #endif
+
+  return SCM_UNSPECIFIED;
+}
+
+void
+scm_init_rdelim (void)
+{
+  scm_make_gsubr ("%init-rdelim-builtins", 0, 0, 0, scm_init_rdelim_builtins);
 }
 
 /*
Index: guile/guile-core/libguile/rdelim.h
diff -u guile/guile-core/libguile/rdelim.h:1.1 
guile/guile-core/libguile/rdelim.h:1.2
--- guile/guile-core/libguile/rdelim.h:1.1      Wed Jan 24 13:45:09 2001
+++ guile/guile-core/libguile/rdelim.h  Fri May 18 17:27:22 2001
@@ -50,6 +50,8 @@
                                 SCM offset, SCM length);
 extern SCM scm_read_line (SCM port);
 extern SCM scm_write_line (SCM obj, SCM port);
+extern SCM scm_init_rdelim_builtins (void);
+
 void scm_init_rdelim (void);
 
 #endif