guile/guile-core/srfi srfi-14.scm srfi-14.h srf...

[Marius Vollmer]

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

Modified files:
        guile-core/srfi: srfi-14.scm srfi-14.h srfi-14.c srfi-13.scm 
                         srfi-13.c 

Log message:
        Avoid using module operations from C.
        
        * srfi-13.c (scm_init_srfi_13_14): Removed.
        * srfi-14.h, srfi-14.c (scm_c_init_srfi_14): New.  Contains
        initializations needed by C clients of srfi-14.
        (scm_init_srfi_13, scm_init_srfi_14): Call it.
        * srfi-13.scm: Call "scm_init_srf_13" instead of
        "scm_init_srfi_13_14".
        * srfi-14.scm: Call "scm_init_srf_14" instead of
        "scm_init_srfi_13_14".

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/guile/guile-core/srfi/srfi-14.scm.diff?cvsroot=OldCVS&tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/guile/guile-core/srfi/srfi-14.h.diff?cvsroot=OldCVS&tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/guile/guile-core/srfi/srfi-14.c.diff?cvsroot=OldCVS&tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/guile/guile-core/srfi/srfi-13.scm.diff?cvsroot=OldCVS&tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/guile/guile-core/srfi/srfi-13.c.diff?cvsroot=OldCVS&tr1=1.8&tr2=1.9&r1=text&r2=text

Patches:
Index: guile/guile-core/srfi/srfi-13.c
diff -u guile/guile-core/srfi/srfi-13.c:1.8 guile/guile-core/srfi/srfi-13.c:1.9
--- guile/guile-core/srfi/srfi-13.c:1.8 Thu May 10 06:53:28 2001
+++ guile/guile-core/srfi/srfi-13.c     Fri May 18 17:17:05 2001
@@ -3026,30 +3026,8 @@
 void
 scm_init_srfi_13 (void)
 {
+  scm_c_init_srfi_14 ();
 #ifndef SCM_MAGIC_SNARFER
 #include "srfi/srfi-13.x"
 #endif
-}
-
-
-void
-scm_init_srfi_13_14 (void)
-{
-  static int initialized = 0;
-
-  if (!initialized)
-    {
-      SCM srfi_13_module = scm_make_module (scm_read_0str ("(srfi srfi-13)"));
-      SCM srfi_14_module = scm_make_module (scm_read_0str ("(srfi srfi-14)"));
-      SCM old_module;
-
-      initialized = 1;
-
-      old_module = scm_set_current_module (srfi_13_module);
-      scm_init_srfi_13 ();
-      scm_set_current_module (srfi_14_module);
-      scm_init_srfi_14 ();
-
-      scm_set_current_module (old_module);
-    }
 }
Index: guile/guile-core/srfi/srfi-13.scm
diff -u guile/guile-core/srfi/srfi-13.scm:1.3 
guile/guile-core/srfi/srfi-13.scm:1.4
--- guile/guile-core/srfi/srfi-13.scm:1.3       Thu Apr 26 12:54:48 2001
+++ guile/guile-core/srfi/srfi-13.scm   Fri May 18 17:17:05 2001
@@ -110,7 +110,7 @@
  string-delete
  )
 
-(dynamic-call "scm_init_srfi_13_14" (dynamic-link "libguile-srfi-srfi-13-14"))
+(dynamic-call "scm_init_srfi_13" (dynamic-link "libguile-srfi-srfi-13-14"))
 
 (define string-hash
   (lambda (s . rest)
Index: guile/guile-core/srfi/srfi-14.c
diff -u guile/guile-core/srfi/srfi-14.c:1.4 guile/guile-core/srfi/srfi-14.c:1.5
--- guile/guile-core/srfi/srfi-14.c:1.4 Wed May  2 14:47:36 2001
+++ guile/guile-core/srfi/srfi-14.c     Fri May 18 17:17:05 2001
@@ -1348,13 +1348,24 @@
 
 
 void
-scm_init_srfi_14 (void)
+scm_c_init_srfi_14 (void)
 {
-  scm_tc16_charset = scm_make_smob_type ("character-set", 
-                                        SCM_CHARSET_SIZE * sizeof (long));
-  scm_set_smob_free (scm_tc16_charset, charset_free);
-  scm_set_smob_print (scm_tc16_charset, charset_print);
+  static initialized = 0;
+
+  if (!initialized)
+    {
+      scm_tc16_charset = scm_make_smob_type ("character-set", 
+                                            SCM_CHARSET_SIZE * sizeof (long));
+      scm_set_smob_free (scm_tc16_charset, charset_free);
+      scm_set_smob_print (scm_tc16_charset, charset_print);
+      initialized = 1;
+    }
+}
 
+void
+scm_init_srfi_14 (void)
+{
+  scm_c_init_srfi_14 ();
 #ifndef SCM_MAGIC_SNARFER
 #include "srfi/srfi-14.x"
 #endif
Index: guile/guile-core/srfi/srfi-14.h
diff -u guile/guile-core/srfi/srfi-14.h:1.2 guile/guile-core/srfi/srfi-14.h:1.3
--- guile/guile-core/srfi/srfi-14.h:1.2 Wed Apr 25 07:28:11 2001
+++ guile/guile-core/srfi/srfi-14.h     Fri May 18 17:17:05 2001
@@ -56,6 +56,7 @@
 /* Smob type code for character sets.  */
 extern int scm_tc16_charset;
 
+void scm_c_init_srfi_14 (void);
 void scm_init_srfi_14 (void);
 
 SCM scm_char_set_p (SCM obj);
Index: guile/guile-core/srfi/srfi-14.scm
diff -u guile/guile-core/srfi/srfi-14.scm:1.1 
guile/guile-core/srfi/srfi-14.scm:1.2
--- guile/guile-core/srfi/srfi-14.scm:1.1       Mon Apr 23 13:21:01 2001
+++ guile/guile-core/srfi/srfi-14.scm   Fri May 18 17:17:05 2001
@@ -90,7 +90,7 @@
  char-set:full
  )
 
-(dynamic-call "scm_init_srfi_13_14" (dynamic-link "libguile-srfi-srfi-13-14"))
+(dynamic-call "scm_init_srfi_14" (dynamic-link "libguile-srfi-srfi-13-14"))
 
 (define (->char-set x)
   (cond