gnustep-dev
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: Configure can't find Guile library


From: Adam Fedor
Subject: Re: Configure can't find Guile library
Date: Sat, 16 Nov 2002 21:58:40 -0700
User-agent: Mozilla/5.0 (X11; U; Linux ppc; en-US; rv:1.1) Gecko/20020905

Philip Mötteli wrote:
Hi


I try to install gnustep-guile. The configure script tells me

    checking for scm_newsmob in -lguile... no
    configure: error: Could not find guile library

But when I make

    # rpm -q guile
    guile-1.4-8


I think there were a bunch of changes in 1.4 that cause gnustep-guile not to work with it. Someone sent a patch in for this a while ago, but we haven't bothered to apply it because 1.4 wasn't in widesperead use up until now. I haven't even tried to see if the patch works...

--
Adam Fedor, Digital Optics Corp.      | I'm glad I hate spinach, because
http://www.doc.com                    | if I didn't, I'd eat it, and you
                                      | know how I hate the stuff.
diff -Naur ./dev-libs/guile/Library/gg_class.m 
./orig/dev-libs/guile/Library/gg_class.m
--- ./dev-libs/guile/Library/gg_class.m Wed May  1 03:09:26 2002
+++ ./orig/dev-libs/guile/Library/gg_class.m    Mon Jul 30 20:02:34 2001
@@ -69,7 +69,7 @@
 #define OBJC_CLASS_P(arg) ((SCM_TYP16(arg)) == gstep_scm_tc16_class)
 
 static SCM equal_gstep_class (SCM s1, SCM s2);
-//static scm_sizet free_gstep_class (SCM obj);
+static scm_sizet free_gstep_class (SCM obj);
 static int print_gstep_class (SCM exp, SCM port, scm_print_state *pstate);
 static SCM mark_gstep_class (SCM obj);
 
@@ -81,10 +81,10 @@
   void         *key;
   SCM          item;
 
-  if (SCM_GCMARKP (obj))
+  if (SCM_GC8MARKP (obj))
     return SCM_BOOL_F;
 
-  SCM_SETGCMARK (obj);
+  SCM_SETGC8MARK (obj);
 
   cls = (class_info*)gh_cdr(obj);
 
@@ -108,14 +108,13 @@
     return SCM_BOOL_F;
 }
 
-/*
 static scm_sizet
 free_gstep_class (SCM obj)
 {
   fprintf(stderr, "HELP - Garbage collector attacks class!\n");
   return (scm_sizet)0;
 }
-*/
+
 static int
 print_gstep_class (SCM exp, SCM port, scm_print_state *pstate)
 {
@@ -416,9 +415,9 @@
   data.selname = gh_str02scm((char*)selname);
   data.argslist = argsList;
 
-/*  val = gh_catch(SCM_BOOL_T, (scm_catch_body_t)proc_wrapper, (void*)&data,
+  val = gh_catch(SCM_BOOL_T, (scm_catch_body_t)proc_wrapper, (void*)&data,
                        (scm_catch_handler_t)proc_error, (void*)procname);
-*/
+
   /*
    *   Now decode the Guile return value into the correct ObjectiveC
    *   data type and return it.
@@ -730,7 +729,7 @@
                    mimp = gh_lookup((char*)name);
                    free(name);
                  }
-               scm_gc_protect_object(mimp);    // Protect from GC
+               scm_protect_object(mimp);       // Protect from GC
                if (instance == YES)
                  {
                    NSMapInsert(cls->instance_methods,
@@ -1067,7 +1066,7 @@
 #if    GUILE_MAKE_SMOB_TYPE
   gstep_scm_tc16_class = scm_make_smob_type ("gg_class", 0);
   scm_set_smob_mark(gstep_scm_tc16_class, mark_gstep_class);
- // scm_set_smob_free(gstep_scm_tc16_class, free_gstep_class);
+  scm_set_smob_free(gstep_scm_tc16_class, free_gstep_class);
   scm_set_smob_print(gstep_scm_tc16_class, print_gstep_class);
   scm_set_smob_equalp(gstep_scm_tc16_class, equal_gstep_class);
 #else
@@ -1084,10 +1083,10 @@
   /*
    *   Stuff to do with classes
    */
-  scm_c_make_gsubr(gstep_lookup_class_n, 1, 0, 0, gstep_lookup_class_fn);
-  scm_c_make_gsubr(gstep_classnames_n, 0, 0, 0, gstep_classnames_fn);
-  scm_c_make_gsubr(gstep_new_class_n, 5, 0, 0, gstep_new_class_fn);
-  scm_c_make_gsubr(gstep_class_methods_n, 2, 0, 0, gstep_class_methods_fn);
-  scm_c_make_gsubr(gstep_instance_methods_n, 2, 0, 0, 
gstep_instance_methods_fn);
+  scm_make_gsubr(gstep_lookup_class_n, 1, 0, 0, gstep_lookup_class_fn);
+  scm_make_gsubr(gstep_classnames_n, 0, 0, 0, gstep_classnames_fn);
+  scm_make_gsubr(gstep_new_class_n, 5, 0, 0, gstep_new_class_fn);
+  scm_make_gsubr(gstep_class_methods_n, 2, 0, 0, gstep_class_methods_fn);
+  scm_make_gsubr(gstep_instance_methods_n, 2, 0, 0, gstep_instance_methods_fn);
 }
 
diff -Naur ./dev-libs/guile/Library/gg_id.m 
./orig/dev-libs/guile/Library/gg_id.m
--- ./dev-libs/guile/Library/gg_id.m    Wed May  1 03:10:40 2002
+++ ./orig/dev-libs/guile/Library/gg_id.m       Mon Jul 30 20:02:34 2001
@@ -66,17 +66,17 @@
 static NSMapTable *knownObjects = 0;
 
 static SCM equal_gstep_id (SCM s1, SCM s2);
-//static scm_sizet free_gstep_id (SCM obj);
+static scm_sizet free_gstep_id (SCM obj);
 static int print_gstep_id (SCM exp, SCM port, scm_print_state *pstate);
 static SCM mark_gstep_id (SCM obj);
 
 static SCM 
 mark_gstep_id (SCM obj)
 {
-  if (SCM_GCMARKP (obj))
+  if (SCM_GC8MARKP (obj))
     return SCM_BOOL_F;
   
-  SCM_SETGCMARK (obj);
+  SCM_SETGC8MARK (obj);
   return SCM_BOOL_F;
 }
 
@@ -89,7 +89,6 @@
     return SCM_BOOL_F;
 }
 
-/*
 static scm_sizet 
 free_gstep_id (SCM obj)
 {
@@ -98,9 +97,9 @@
   if (o != nil)
     {
       CREATE_AUTORELEASE_POOL(pool);
-      */ /* Use an autorelease pool here because both `repondsTo:' and
+      /* Use an autorelease pool here because both `repondsTo:' and
         `release' could autorelease objects. */
-/*
+
       NSMapRemove(knownObjects, (void*)o);
       if ([o respondsToSelector: @selector(release)])
        {
@@ -110,7 +109,7 @@
     }
   return (scm_sizet)0;
 }
-*/
+
 static int
 print_gstep_id (SCM exp, SCM port, scm_print_state *pstate)
 {
@@ -909,7 +908,7 @@
 #if    GUILE_MAKE_SMOB_TYPE
   gstep_scm_tc16_id = scm_make_smob_type ("gg_id", 0);
   scm_set_smob_mark(gstep_scm_tc16_id, mark_gstep_id);
-  //scm_set_smob_free(gstep_scm_tc16_id, free_gstep_id);
+  scm_set_smob_free(gstep_scm_tc16_id, free_gstep_id);
   scm_set_smob_print(gstep_scm_tc16_id, print_gstep_id);
   scm_set_smob_equalp(gstep_scm_tc16_id, equal_gstep_id);
 #else
@@ -926,15 +925,15 @@
   /*
    *   Stuff to do with id's
    */
-  scm_c_make_gsubr(gstep_id_p_n, 1, 0, 0, gstep_scm_id_p);
-  scm_c_make_gsubr(gstep_get_nil_n, 0, 0, 0, gstep_get_nil_fn);
-  scm_c_make_gsubr(gstep_msg_send_n, 2, 0, 1, gstep_msg_send_fn);
-  scm_c_make_gsubr(gstep_sup_send_n, 2, 0, 1, gstep_sup_send_fn);
-  scm_c_make_gsubr(gstep_ivarnames_n, 1, 0, 0, gstep_ivarnames_fn);
-  scm_c_make_gsubr(gstep_methods_n, 1, 0, 0, gstep_methods_fn);
-  scm_c_make_gsubr(gstep_get_ivar_n, 2, 0, 0, gstep_get_ivar_fn);
-  scm_c_make_gsubr(gstep_ptr_ivar_n, 2, 0, 0, gstep_ptr_ivar_fn);
-  scm_c_make_gsubr(gstep_set_ivar_n, 3, 0, 0, gstep_set_ivar_fn);
+  scm_make_gsubr(gstep_id_p_n, 1, 0, 0, gstep_scm_id_p);
+  scm_make_gsubr(gstep_get_nil_n, 0, 0, 0, gstep_get_nil_fn);
+  scm_make_gsubr(gstep_msg_send_n, 2, 0, 1, gstep_msg_send_fn);
+  scm_make_gsubr(gstep_sup_send_n, 2, 0, 1, gstep_sup_send_fn);
+  scm_make_gsubr(gstep_ivarnames_n, 1, 0, 0, gstep_ivarnames_fn);
+  scm_make_gsubr(gstep_methods_n, 1, 0, 0, gstep_methods_fn);
+  scm_make_gsubr(gstep_get_ivar_n, 2, 0, 0, gstep_get_ivar_fn);
+  scm_make_gsubr(gstep_ptr_ivar_n, 2, 0, 0, gstep_ptr_ivar_fn);
+  scm_make_gsubr(gstep_set_ivar_n, 3, 0, 0, gstep_set_ivar_fn);
 
 }
 
diff -Naur ./dev-libs/guile/Library/gg_protocol.m 
./orig/dev-libs/guile/Library/gg_protocol.m
--- ./dev-libs/guile/Library/gg_protocol.m      Wed May  1 03:11:20 2002
+++ ./orig/dev-libs/guile/Library/gg_protocol.m Mon Jul 30 20:02:34 2001
@@ -214,7 +214,7 @@
 void
 gstep_init_protocol()
 {
-  scm_c_make_gsubr(gstep_lookup_protocol_n, 1, 0, 0, gstep_lookup_protocol_fn);
-  scm_c_make_gsubr(gstep_protocolnames_n, 0, 0, 0, gstep_protocolnames_fn);
+  scm_make_gsubr(gstep_lookup_protocol_n, 1, 0, 0, gstep_lookup_protocol_fn);
+  scm_make_gsubr(gstep_protocolnames_n, 0, 0, 0, gstep_protocolnames_fn);
 }
 
diff -Naur ./dev-libs/guile/Library/gg_voidp.m 
./orig/dev-libs/guile/Library/gg_voidp.m
--- ./dev-libs/guile/Library/gg_voidp.m Wed May  1 03:12:23 2002
+++ ./orig/dev-libs/guile/Library/gg_voidp.m    Mon Jul 30 20:02:34 2001
@@ -40,18 +40,18 @@
 int gstep_scm_tc16_voidp;
 
 static SCM equal_gstep_voidp (SCM s1, SCM s2);
-//static scm_sizet free_gstep_voidp (SCM obj);
+static scm_sizet free_gstep_voidp (SCM obj);
 static int print_gstep_voidp (SCM exp, SCM port, scm_print_state *pstate);
 static SCM mark_gstep_voidp (SCM obj);
 
 static SCM 
 mark_gstep_voidp (SCM obj)
 {
-  if (SCM_GCMARKP (obj))
+  if (SCM_GC8MARKP (obj))
     {
       return SCM_BOOL_F;
      } 
-  SCM_SETGCMARK (obj);
+  SCM_SETGC8MARK (obj);
   return SCM_BOOL_F;
 }
 
@@ -68,7 +68,7 @@
     }
 }
 
-/*static scm_sizet 
+static scm_sizet 
 free_gstep_voidp (SCM obj)
 {
   voidp        v = (voidp)gh_cdr(obj);
@@ -81,7 +81,7 @@
   
   return (scm_sizet)0;
 }
-*/
+
 static int
 print_gstep_voidp (SCM exp, SCM port, scm_print_state *pstate)
 {
@@ -542,7 +542,7 @@
 #if    GUILE_MAKE_SMOB_TYPE
   gstep_scm_tc16_voidp = scm_make_smob_type ("gg_voidp", 0);
   scm_set_smob_mark(gstep_scm_tc16_voidp, mark_gstep_voidp);
-  //scm_set_smob_free(gstep_scm_tc16_voidp, free_gstep_voidp);
+  scm_set_smob_free(gstep_scm_tc16_voidp, free_gstep_voidp);
   scm_set_smob_print(gstep_scm_tc16_voidp, print_gstep_voidp);
   scm_set_smob_equalp(gstep_scm_tc16_voidp, equal_gstep_voidp);
 #else
@@ -559,23 +559,23 @@
   /*
    *   Plain voidp functions.
    */
-  scm_c_make_gsubr(gstep_string_voidp_n, 1, 0, 0, gstep_string_voidp_fn);
-  scm_c_make_gsubr(gstep_voidp_p_n, 1, 0, 0, gstep_scm_voidp_p);
-  scm_c_make_gsubr(gstep_voidp_nil_n, 0, 0, 0, gstep_voidp_nil_fn);
-  scm_c_make_gsubr(gstep_voidp_set_n, 3, 0, 0, gstep_voidp_set_fn);
-  scm_c_make_gsubr(gstep_voidp_string_n, 3, 0, 0, gstep_voidp_string_fn);
-  scm_c_make_gsubr(gstep_voidp_length_n, 1, 0, 0, gstep_voidp_length_fn);
-  scm_c_make_gsubr(gstep_voidp_lengthp_n, 1, 0, 0, gstep_voidp_lengthp_fn);
-  scm_c_make_gsubr(gstep_voidp_setlength_n, 2, 0, 0, gstep_voidp_setlength_fn);
-  scm_c_make_gsubr(gstep_voidp_mallocp_n, 1, 0, 0, gstep_voidp_mallocp_fn);
-  scm_c_make_gsubr(gstep_voidp_setmalloc_n, 2, 0, 0, gstep_voidp_setmalloc_fn);
-  scm_c_make_gsubr(gstep_voidp_list_n, 3, 0, 0, gstep_voidp_list_fn);
-  scm_c_make_gsubr(gstep_list_voidp_n, 2, 0, 0, gstep_list_voidp_fn);
+  scm_make_gsubr(gstep_string_voidp_n, 1, 0, 0, gstep_string_voidp_fn);
+  scm_make_gsubr(gstep_voidp_p_n, 1, 0, 0, gstep_scm_voidp_p);
+  scm_make_gsubr(gstep_voidp_nil_n, 0, 0, 0, gstep_voidp_nil_fn);
+  scm_make_gsubr(gstep_voidp_set_n, 3, 0, 0, gstep_voidp_set_fn);
+  scm_make_gsubr(gstep_voidp_string_n, 3, 0, 0, gstep_voidp_string_fn);
+  scm_make_gsubr(gstep_voidp_length_n, 1, 0, 0, gstep_voidp_length_fn);
+  scm_make_gsubr(gstep_voidp_lengthp_n, 1, 0, 0, gstep_voidp_lengthp_fn);
+  scm_make_gsubr(gstep_voidp_setlength_n, 2, 0, 0, gstep_voidp_setlength_fn);
+  scm_make_gsubr(gstep_voidp_mallocp_n, 1, 0, 0, gstep_voidp_mallocp_fn);
+  scm_make_gsubr(gstep_voidp_setmalloc_n, 2, 0, 0, gstep_voidp_setmalloc_fn);
+  scm_make_gsubr(gstep_voidp_list_n, 3, 0, 0, gstep_voidp_list_fn);
+  scm_make_gsubr(gstep_list_voidp_n, 2, 0, 0, gstep_list_voidp_fn);
 
   /*
    *   Convert between voidp and id
    */
-  scm_c_make_gsubr(gstep_voidp_id_n, 1, 0, 0, gstep_voidp_id_fn);
-  scm_c_make_gsubr(gstep_id_voidp_n, 1, 0, 0, gstep_id_voidp_fn);
+  scm_make_gsubr(gstep_voidp_id_n, 1, 0, 0, gstep_voidp_id_fn);
+  scm_make_gsubr(gstep_id_voidp_n, 1, 0, 0, gstep_id_voidp_fn);
 }
 
diff -Naur ./dev-libs/guile/Library/link_base.m 
./orig/dev-libs/guile/Library/link_base.m
--- ./dev-libs/guile/Library/link_base.m        Wed May  1 03:16:49 2002
+++ ./orig/dev-libs/guile/Library/link_base.m   Mon Jul 30 20:02:34 2001
@@ -1022,55 +1022,55 @@
 static void
 gstep_base_functions()
 {
-    scm_c_make_gsubr(gstep_NSCreateZone_n, 3, 0, 0, gstep_NSCreateZone);
-    scm_c_make_gsubr(gstep_NSDefaultMallocZone_n, 0, 0, 0, 
gstep_NSDefaultMallocZone);
-    scm_c_make_gsubr(gstep_NSRecycleZone_n, 1, 0, 0, gstep_NSRecycleZone);
-    scm_c_make_gsubr(gstep_NSSetZoneName_n, 2, 0, 0, gstep_NSSetZoneName);
-    scm_c_make_gsubr(gstep_NSShouldRetainWithZone_n, 2, 0, 0, 
gstep_NSShouldRetainWithZone);
-    scm_c_make_gsubr(gstep_NSZoneCalloc_n, 3, 0, 0, gstep_NSZoneCalloc);
-    scm_c_make_gsubr(gstep_NSZoneFree_n, 2, 0, 0, gstep_NSZoneFree);
-    scm_c_make_gsubr(gstep_NSZoneFromPointer_n, 1, 0, 0, 
gstep_NSZoneFromPointer);
-    scm_c_make_gsubr(gstep_NSZoneMalloc_n, 2, 0, 0, gstep_NSZoneMalloc);
-    scm_c_make_gsubr(gstep_NSZoneName_n, 1, 0, 0, gstep_NSZoneName);
-    scm_c_make_gsubr(gstep_NSZoneRealloc_n, 3, 0, 0, gstep_NSZoneRealloc);
+    scm_make_gsubr(gstep_NSCreateZone_n, 3, 0, 0, gstep_NSCreateZone);
+    scm_make_gsubr(gstep_NSDefaultMallocZone_n, 0, 0, 0, 
gstep_NSDefaultMallocZone);
+    scm_make_gsubr(gstep_NSRecycleZone_n, 1, 0, 0, gstep_NSRecycleZone);
+    scm_make_gsubr(gstep_NSSetZoneName_n, 2, 0, 0, gstep_NSSetZoneName);
+    scm_make_gsubr(gstep_NSShouldRetainWithZone_n, 2, 0, 0, 
gstep_NSShouldRetainWithZone);
+    scm_make_gsubr(gstep_NSZoneCalloc_n, 3, 0, 0, gstep_NSZoneCalloc);
+    scm_make_gsubr(gstep_NSZoneFree_n, 2, 0, 0, gstep_NSZoneFree);
+    scm_make_gsubr(gstep_NSZoneFromPointer_n, 1, 0, 0, 
gstep_NSZoneFromPointer);
+    scm_make_gsubr(gstep_NSZoneMalloc_n, 2, 0, 0, gstep_NSZoneMalloc);
+    scm_make_gsubr(gstep_NSZoneName_n, 1, 0, 0, gstep_NSZoneName);
+    scm_make_gsubr(gstep_NSZoneRealloc_n, 3, 0, 0, gstep_NSZoneRealloc);
 
 
-    scm_c_make_gsubr(gstep_NSAllHashTableObjects_n, 1, 0, 0, 
gstep_NSAllHashTableObjects);
-    scm_c_make_gsubr(gstep_NSCompareHashTables_n, 2, 0, 0, 
gstep_NSCompareHashTables);
-    scm_c_make_gsubr(gstep_NSCopyHashTableWithZone_n, 2, 0, 0, 
gstep_NSCopyHashTableWithZone);
-    scm_c_make_gsubr(gstep_NSCountHashTable_n, 1, 0, 0, 
gstep_NSCountHashTable);
-    scm_c_make_gsubr(gstep_NSCreateHashTable_n, 2, 0, 0, 
gstep_NSCreateHashTable);
-    scm_c_make_gsubr(gstep_NSCreateHashTableWithZone_n, 3, 0, 0, 
gstep_NSCreateHashTableWithZone);
-    scm_c_make_gsubr(gstep_NSEnumerateHashTable_n, 1, 0, 0, 
gstep_NSEnumerateHashTable);
-    scm_c_make_gsubr(gstep_NSFreeHashTable_n, 1, 0, 0, gstep_NSFreeHashTable);
-    scm_c_make_gsubr(gstep_NSHashGet_n, 2, 0, 0, gstep_NSHashGet);
-    scm_c_make_gsubr(gstep_NSHashInsert_n, 2, 0, 0, gstep_NSHashInsert);
-    scm_c_make_gsubr(gstep_NSHashInsertIfAbsent_n, 2, 0, 0, 
gstep_NSHashInsertIfAbsent);
-    scm_c_make_gsubr(gstep_NSHashInsertKnownAbsent_n, 2, 0, 0, 
gstep_NSHashInsertKnownAbsent);
-    scm_c_make_gsubr(gstep_NSHashRemove_n, 2, 0, 0, gstep_NSHashRemove);
-    scm_c_make_gsubr(gstep_NSNextHashEnumeratorItem_n, 1, 0, 0, 
gstep_NSNextHashEnumeratorItem);
-    scm_c_make_gsubr(gstep_NSResetHashTable_n, 1, 0, 0, 
gstep_NSResetHashTable);
-    scm_c_make_gsubr(gstep_NSStringFromHashTable_n, 1, 0, 0, 
gstep_NSStringFromHashTable);
+    scm_make_gsubr(gstep_NSAllHashTableObjects_n, 1, 0, 0, 
gstep_NSAllHashTableObjects);
+    scm_make_gsubr(gstep_NSCompareHashTables_n, 2, 0, 0, 
gstep_NSCompareHashTables);
+    scm_make_gsubr(gstep_NSCopyHashTableWithZone_n, 2, 0, 0, 
gstep_NSCopyHashTableWithZone);
+    scm_make_gsubr(gstep_NSCountHashTable_n, 1, 0, 0, gstep_NSCountHashTable);
+    scm_make_gsubr(gstep_NSCreateHashTable_n, 2, 0, 0, 
gstep_NSCreateHashTable);
+    scm_make_gsubr(gstep_NSCreateHashTableWithZone_n, 3, 0, 0, 
gstep_NSCreateHashTableWithZone);
+    scm_make_gsubr(gstep_NSEnumerateHashTable_n, 1, 0, 0, 
gstep_NSEnumerateHashTable);
+    scm_make_gsubr(gstep_NSFreeHashTable_n, 1, 0, 0, gstep_NSFreeHashTable);
+    scm_make_gsubr(gstep_NSHashGet_n, 2, 0, 0, gstep_NSHashGet);
+    scm_make_gsubr(gstep_NSHashInsert_n, 2, 0, 0, gstep_NSHashInsert);
+    scm_make_gsubr(gstep_NSHashInsertIfAbsent_n, 2, 0, 0, 
gstep_NSHashInsertIfAbsent);
+    scm_make_gsubr(gstep_NSHashInsertKnownAbsent_n, 2, 0, 0, 
gstep_NSHashInsertKnownAbsent);
+    scm_make_gsubr(gstep_NSHashRemove_n, 2, 0, 0, gstep_NSHashRemove);
+    scm_make_gsubr(gstep_NSNextHashEnumeratorItem_n, 1, 0, 0, 
gstep_NSNextHashEnumeratorItem);
+    scm_make_gsubr(gstep_NSResetHashTable_n, 1, 0, 0, gstep_NSResetHashTable);
+    scm_make_gsubr(gstep_NSStringFromHashTable_n, 1, 0, 0, 
gstep_NSStringFromHashTable);
 
 
-    scm_c_make_gsubr(gstep_NSAllMapTableKeys_n, 1, 0, 0, 
gstep_NSAllMapTableKeys);
-    scm_c_make_gsubr(gstep_NSAllMapTableValues_n, 1, 0, 0, 
gstep_NSAllMapTableValues);
-    scm_c_make_gsubr(gstep_NSCompareMapTables_n, 2, 0, 0, 
gstep_NSCompareMapTables);
-    scm_c_make_gsubr(gstep_NSCopyMapTableWithZone_n, 2, 0, 0, 
gstep_NSCopyMapTableWithZone);
-    scm_c_make_gsubr(gstep_NSCountMapTable_n, 1, 0, 0, gstep_NSCountMapTable);
-    scm_c_make_gsubr(gstep_NSCreateMapTable_n, 3, 0, 0, 
gstep_NSCreateMapTable);
-    scm_c_make_gsubr(gstep_NSCreateMapTableWithZone_n, 4, 0, 0, 
gstep_NSCreateMapTableWithZone);
-    scm_c_make_gsubr(gstep_NSEnumerateMapTable_n, 1, 0, 0, 
gstep_NSEnumerateMapTable);
-    scm_c_make_gsubr(gstep_NSFreeMapTable_n, 1, 0, 0, gstep_NSFreeMapTable);
-    scm_c_make_gsubr(gstep_NSMapGet_n, 2, 0, 0, gstep_NSMapGet);
-    scm_c_make_gsubr(gstep_NSMapInsert_n, 3, 0, 0, gstep_NSMapInsert);
-    scm_c_make_gsubr(gstep_NSMapInsertIfAbsent_n, 3, 0, 0, 
gstep_NSMapInsertIfAbsent);
-    scm_c_make_gsubr(gstep_NSMapInsertKnownAbsent_n, 3, 0, 0, 
gstep_NSMapInsertKnownAbsent);
-    scm_c_make_gsubr(gstep_NSMapMember_n, 4, 0, 0, gstep_NSMapMember);
-    scm_c_make_gsubr(gstep_NSMapRemove_n, 2, 0, 0, gstep_NSMapRemove);
-    scm_c_make_gsubr(gstep_NSNextMapEnumeratorPair_n, 3, 0, 0, 
gstep_NSNextMapEnumeratorPair);
-    scm_c_make_gsubr(gstep_NSResetMapTable_n, 1, 0, 0, gstep_NSResetMapTable);
-    scm_c_make_gsubr(gstep_NSStringFromMapTable_n, 1, 0, 0, 
gstep_NSStringFromMapTable);
+    scm_make_gsubr(gstep_NSAllMapTableKeys_n, 1, 0, 0, 
gstep_NSAllMapTableKeys);
+    scm_make_gsubr(gstep_NSAllMapTableValues_n, 1, 0, 0, 
gstep_NSAllMapTableValues);
+    scm_make_gsubr(gstep_NSCompareMapTables_n, 2, 0, 0, 
gstep_NSCompareMapTables);
+    scm_make_gsubr(gstep_NSCopyMapTableWithZone_n, 2, 0, 0, 
gstep_NSCopyMapTableWithZone);
+    scm_make_gsubr(gstep_NSCountMapTable_n, 1, 0, 0, gstep_NSCountMapTable);
+    scm_make_gsubr(gstep_NSCreateMapTable_n, 3, 0, 0, gstep_NSCreateMapTable);
+    scm_make_gsubr(gstep_NSCreateMapTableWithZone_n, 4, 0, 0, 
gstep_NSCreateMapTableWithZone);
+    scm_make_gsubr(gstep_NSEnumerateMapTable_n, 1, 0, 0, 
gstep_NSEnumerateMapTable);
+    scm_make_gsubr(gstep_NSFreeMapTable_n, 1, 0, 0, gstep_NSFreeMapTable);
+    scm_make_gsubr(gstep_NSMapGet_n, 2, 0, 0, gstep_NSMapGet);
+    scm_make_gsubr(gstep_NSMapInsert_n, 3, 0, 0, gstep_NSMapInsert);
+    scm_make_gsubr(gstep_NSMapInsertIfAbsent_n, 3, 0, 0, 
gstep_NSMapInsertIfAbsent);
+    scm_make_gsubr(gstep_NSMapInsertKnownAbsent_n, 3, 0, 0, 
gstep_NSMapInsertKnownAbsent);
+    scm_make_gsubr(gstep_NSMapMember_n, 4, 0, 0, gstep_NSMapMember);
+    scm_make_gsubr(gstep_NSMapRemove_n, 2, 0, 0, gstep_NSMapRemove);
+    scm_make_gsubr(gstep_NSNextMapEnumeratorPair_n, 3, 0, 0, 
gstep_NSNextMapEnumeratorPair);
+    scm_make_gsubr(gstep_NSResetMapTable_n, 1, 0, 0, gstep_NSResetMapTable);
+    scm_make_gsubr(gstep_NSStringFromMapTable_n, 1, 0, 0, 
gstep_NSStringFromMapTable);
 }
 
 
diff -Naur ./dev-libs/guile/Library/private.m 
./orig/dev-libs/guile/Library/private.m
--- ./dev-libs/guile/Library/private.m  Wed May  1 03:18:34 2002
+++ ./orig/dev-libs/guile/Library/private.m     Mon Jul 30 20:02:34 2001
@@ -539,9 +539,9 @@
   SCM errsym;
   SCM str;
 
-  //errsym = gh_car(scm_intern ("error", 5));
+  errsym = gh_car(scm_intern ("error", 5));
   str = scm_makfrom0str (message);
-  //scm_throw (errsym, scm_cons (str, args));
+  scm_throw (errsym, scm_cons (str, args));
 }
 
 void
@@ -550,8 +550,8 @@
   SCM_ASSERT (SCM_NIMP (*objp) && SCM_STRINGP (*objp), *objp, SCM_ARG3, 
              "gstep_scm2str");
   if (out)
-    *out = SCM_STRING_CHARS (*objp);
+    *out = SCM_CHARS (*objp);
   if (len_out)
-    *len_out = SCM_STRING_LENGTH (*objp);
+    *len_out = SCM_LENGTH (*objp);
 }
 
diff -Naur ./dev-libs/guile/ScriptKit/Library/GuileInterpreter.m 
./orig/dev-libs/guile/ScriptKit/Library/GuileInterpreter.m
--- ./dev-libs/guile/ScriptKit/Library/GuileInterpreter.m       Thu May  2 
21:04:07 2002
+++ ./orig/dev-libs/guile/ScriptKit/Library/GuileInterpreter.m  Wed Jan  2 
19:30:42 2002
@@ -31,7 +31,7 @@
 #include <guile/gh.h>
 #undef id
 #include "GuileInterpreter.h"
-#include <gstep_guile.h>
+//#include <gstep_guile.h>
 // Needed for class list funcs
 #include <objc/objc-api.h>
 #include <Foundation/NSObjCRuntime.h>
@@ -41,7 +41,7 @@
 #include <Foundation/NSString.h>
 #include <Foundation/NSException.h>
 #include <Foundation/NSDictionary.h>
-#include <libguile/throw.h>
+
 #include <string.h>
 
 static GuileInterpreter *currentInterpreter = nil;
@@ -56,9 +56,9 @@
 {
   SCM_ASSERT (SCM_NIMP (*objp) && SCM_STRINGP (*objp), *objp, SCM_ARG3, 
"gscm_2_str");
   if (out)
-    *out = SCM_STRING_CHARS (*objp);
+    *out = SCM_CHARS (*objp);
   if (len_out)
-    *len_out = SCM_STRING_LENGTH (*objp);
+    *len_out = SCM_LENGTH (*objp);
 }
 //xxxend
 
@@ -163,19 +163,19 @@
   gh_eval_str("(use-modules (languages gstep-guile))");
   if (!proc_install)
     {
-      scm_c_define_gsubr(script_kit_lookup_n, 1, 0, 0, script_kit_lookup_fn);
-      scm_c_define_gsubr(script_kit_update_n, 2, 0, 0, script_kit_update_fn);
+      scm_make_gsubr(script_kit_lookup_n, 1, 0, 0, script_kit_lookup_fn);
+      scm_make_gsubr(script_kit_update_n, 2, 0, 0, script_kit_update_fn);
     }
 }
 
 + (void)scmError:(NSString *)message args:(SCM)args
 { 
-   // SCM errsym;
+    SCM errsym;
     SCM str;
 
-  //  errsym = gh_car (scm_intern ("error", 5));
+    errsym = gh_car (scm_intern ("error", 5));
     str = gh_str02scm ((char*)[message cString]);
-    //scm_throw (errsym, gh_cons (str, args));
+    scm_throw (errsym, gh_cons (str, args));
 }
 
 - (id)init
@@ -336,15 +336,16 @@
     c_script = (char *)[script cString];
     // [singleInterpreterLock lock];
     currentInterpreter = self;
+
     if (YES == [self isInBatchMode])
        {
-/*         // Raise NSException
+           // Raise NSException
            NS_DURING
                {
-                   ret = scm_catch_body_t(SCM_BOOL_T, 
-                                   eval_str_wrapper, 
+                   ret = gh_catch (SCM_BOOL_T, 
+                                   (scm_catch_body_t) eval_str_wrapper, 
                                    c_script, 
-                                   scm_catch_handler, gopenstep_batch_handler, 
+                                   (scm_catch_handler_t) 
gopenstep_batch_handler, 
                                    // Pass a script as nsstring to the handler
                                    script); 
                }
@@ -352,19 +353,18 @@
                {
                  [localException raise];
                }
-NS_ENDHANDLER;
-*/
+           NS_ENDHANDLER;
        }
     else                       // interactive
        {
            // Only print message
-/*         ret = gh_catch (SCM_BOOL_T, 
-                           (scm_catch_body_t), eval_str_wrapper, 
+           ret = gh_catch (SCM_BOOL_T, 
+                           (scm_catch_body_t) eval_str_wrapper, 
                            c_script, 
-                           (scm_catch_handler), gopenstep_interactive_handler, 
+                           (scm_catch_handler_t) 
gopenstep_interactive_handler, 
                            // Pass a script as cstring to the handler
                            c_script);
-*/     }
+       }
     // [singleInterpreterLock unlock];
 
     /* -scmWithSCM: accepts not only objc id but any type of variable.*/
diff -Naur ./dev-libs/guile/ScriptKit/Library/GuileSCM.m 
./orig/dev-libs/guile/ScriptKit/Library/GuileSCM.m
--- ./dev-libs/guile/ScriptKit/Library/GuileSCM.m       Thu May  2 21:07:10 2002
+++ ./orig/dev-libs/guile/ScriptKit/Library/GuileSCM.m  Mon Jul 30 20:02:34 2001
@@ -133,14 +133,15 @@
       }
 
     /* protect str from GC while we copy off its data */
-   /* scm_gc_protect_object (scm); */
-    str = SCM_STRING_CHARS (scm);
-    len = SCM_STRING_LENGTH (scm);
+    scm_protect_object (scm);
+
+    str = SCM_CHARS (scm);
+    len = SCM_LENGTH (scm);
 
     ret_str = [NSString stringWithCString:str length:len];
 
-   /* scm_gc_unprotect_object (scm);
-*/
+    scm_unprotect_object (scm);
+
     return ret_str;
 }
 
@@ -303,7 +304,7 @@
   if (write2str == SCM_BOOL_F)
     {
       write2str = gh_eval_str ("(lambda (x) (call-with-output-string (lambda 
(port) (write x port))))");
-      scm_gc_protect_object (write2str);
+      scm_protect_object (write2str);
     }
   
   tmpstr = gh_scm2newstr (gh_call1 (write2str, value), NULL);

reply via email to

[Prev in Thread] Current Thread [Next in Thread]