RFC: [guile] GDL2 Update

[David Ayers]

Hello,

I'm finally at a point where I want to submit some EOKeyValueCoding 
patches for GDL2.  But before I would like to submit the testcases I 
have setup.  To do this I need to provide a custom class in the guile 
library.  So here is the first batch of patches I'm aiming to commit 
tomorrow, if there are no objections.

I have regenerated configure with autoconf 2.53.  I had done this before 
but I believe it was Richard that commited another reconfigure with. 
2.13 again.  Was this intentional?

       * configure.in: Check for EOF libraries more selectively and base
       inclusion of any EOF support on availablity of EOControl instead
       of EOAccess.
       * configure: Regenerated with autoconf 2.5.
       * config.h.in: Sorted entries according to dependancy.
       * EOF.make.in: Allow for more selective configuration.
       * Library/link_gdl2.m (EOKVCTester): Added class to support
       testing.
       (gstep_gdl2_classes): Added test class and reordered classes to
       reflect hierarchical dependancy.


Cheers,
Dave


Index: dev-libs/guile/configure.in
===================================================================
RCS file: /cvsroot/gnustep/gnustep/dev-libs/guile/configure.in,v
retrieving revision 1.14
diff -u -r1.14 configure.in
--- dev-libs/guile/configure.in 16 Mar 2003 07:31:59 -0000      1.14
+++ dev-libs/guile/configure.in 26 Mar 2003 17:29:18 -0000
@@ -31,12 +31,12 @@
 CPPFLAGS="$CPPFLAGS -I$GNUSTEP_SYSTEM_ROOT/Headers 
-I$GNUSTEP_SYSTEM_ROOT/Headers/gnustep 
-I$GNUSTEP_SYSTEM_ROOT/Headers/$GNUSTEP_HOST_CPU/$GNUSTEP_HOST_OS"
 AC_CHECK_HEADERS(AppKit/AppKit.h)
 AC_SUBST(ac_cv_header_AppKit_AppKit_h)
-AC_CHECK_HEADERS(EOAccess/EOAccess.h)
-AC_SUBST(ac_cv_header_EOAccess_EOAccess_h)
 AC_CHECK_HEADERS(EOControl/EOControl.h)
+AC_SUBST(ac_cv_header_EOControl_EOControl_h)
+AC_CHECK_HEADERS(EOAccess/EOAccess.h)
 AC_SUBST(ac_cv_header_EOAccess_EOAccess_h)
 AC_CHECK_HEADERS(EOInterface/EOInterface.h)
-AC_SUBST(ac_cv_header_EOAccess_EOAccess_h)
+AC_SUBST(ac_cv_header_EOInterface_EOInterface_h)
 CPPFLAGS="$save_CPPFLAGS"
 
 AC_CONFIG_SUBDIRS(Greg ScriptKit)
Index: dev-libs/guile/config.h.in
===================================================================
RCS file: /cvsroot/gnustep/gnustep/dev-libs/guile/config.h.in,v
retrieving revision 1.4
diff -u -r1.4 config.h.in
--- dev-libs/guile/config.h.in  15 Mar 2003 07:28:35 -0000      1.4
+++ dev-libs/guile/config.h.in  26 Mar 2003 17:29:18 -0000
@@ -18,8 +18,8 @@
 /* Define if you have the <AppKit/AppKit.h> header file.  */
 #undef HAVE_APPKIT_APPKIT_H
 
-/* Define if you have the GDL2 header file.  */
-#undef HAVE_EOACCESS_EOACCESS_H
+/* Define if you have the EOF header files.  */
 #undef HAVE_EOCONTROL_EOCONTROL_H
+#undef HAVE_EOACCESS_EOACCESS_H
 #undef HAVE_EOINTERFACE_EOINTERFACE_H
 
Index: dev-libs/guile/EOF.make.in
===================================================================
RCS file: /cvsroot/gnustep/gnustep/dev-libs/guile/EOF.make.in,v
retrieving revision 1.1
diff -u -r1.1 EOF.make.in
--- dev-libs/guile/EOF.make.in  4 Feb 2003 15:41:27 -0000       1.1
+++ dev-libs/guile/EOF.make.in  26 Mar 2003 17:29:18 -0000
@@ -1 +1,5 @@
-HAVE_EOF = @ac_cv_header_EOAccess_EOAccess_h@
+HAVE_EOCONTROL   = @ac_cv_header_EOControl_EOControl_h@
+HAVE_EOACCESS    = @ac_cv_header_EOAccess_EOAccess_h@
+HAVE_EOINTERFACE = @ac_cv_header_EOInterface_EOInterface_h@
+
+HAVE_EOF = @ac_cv_header_EOControl_EOControl_h@
Index: dev-libs/guile/Library/link_gdl2.m
===================================================================
RCS file: /cvsroot/gnustep/gnustep/dev-libs/guile/Library/link_gdl2.m,v
retrieving revision 1.4
diff -u -r1.4 link_gdl2.m
--- dev-libs/guile/Library/link_gdl2.m  16 Mar 2003 11:45:04 -0000      1.4
+++ dev-libs/guile/Library/link_gdl2.m  26 Mar 2003 17:29:18 -0000
@@ -38,6 +38,75 @@
 
 
 
address@hidden EOKVCTester : NSObject
+{ 
+  id  obj_iv;
+  id  _obj_iv;
+  id  _other_obj_iv;
+
+  id _objGet;
+
+  int _int_iv;
+  int _other_int_iv;
+}
address@hidden
address@hidden EOKVCTester
+- (NSString *)description
+{
+  return [NSString stringWithFormat:
+                    @"obj_iv = '%@'\n_obj_iv = '%@'\n_other_obj_iv = 
'%@'\n_int_iv = %d\n_other_int_iv = %d",
+                  obj_iv, _obj_iv, _other_obj_iv,
+                  _int_iv, _other_int_iv];
+}
+- (void)unableToSetNullForKey: (NSString *)key
+{
+  if ([key isEqualToString: @"int_iv"])
+    {
+      _int_iv = 0;
+    }
+  else
+    {
+      [super unableToSetNullForKey: key];
+    }
+}
+- (id)getObjGet
+{
+  return [[_objGet description]
+          stringByAppendingFormat: @"|%@", NSStringFromSelector(_cmd)];
+}
+- (void)setObjGet:(id)val
+{
+  [_objGet autorelease];
+  _objGet = [[val description]
+          stringByAppendingFormat: @"|%@", NSStringFromSelector(_cmd)];
+  [_objGet retain];
+}
+- (id)_getObjGet
+{
+  return [[_objGet description]
+          stringByAppendingFormat: @"|%@", NSStringFromSelector(_cmd)];
+}
+- (void)_setObjGet:(id)val
+{
+  [_objGet autorelease];
+  _objGet = [[val description]
+          stringByAppendingFormat: @"|%@", NSStringFromSelector(_cmd)];
+  [_objGet retain];
+}
+- (id)objGet
+{
+  return [[_objGet description]
+          stringByAppendingFormat: @"|%@", NSStringFromSelector(_cmd)];
+}
+- (id)_objGet
+{
+  return [[_objGet description]
+          stringByAppendingFormat: @"|%@", NSStringFromSelector(_cmd)];
+}
address@hidden
+
+
+
 static void
 gstep_gdl2_numeric_constants()
 {
@@ -142,29 +211,6 @@
 {
   NSAutoreleasePool    *arp = [NSAutoreleasePool new];
 
-  /*EOAccess*/
-#if    HAVE_EOACCESS_EOACCESS_H
-  CCLS(EOAdaptor);
-  CCLS(EOAdaptorChannel);
-  CCLS(EOAdaptorContext);
-  CCLS(EOAdaptorOperation);
-  CCLS(EOAttribute);
-  CCLS(EODatabase);
-  CCLS(EODatabaseChannel);
-  CCLS(EODatabaseContext);
-  CCLS(EODatabaseDataSource);
-  CCLS(EODatabaseOperation);
-  CCLS(EOEntity);
-  CCLS(EOJoin);
-  CCLS(EOModel);
-  CCLS(EOModelGroup);
-  CCLS(EORelationship);
-  CCLS(EOStoredProcedure);
-  CCLS(EOSQLExpression);
-  CCLS(EOSQLQualifier);
-
-#endif
-
 #if    HAVE_EOCONTROL_EOCONTROL_H
   /*EOControl*/
   CCLS(EOSortOrdering);
@@ -195,6 +241,29 @@
   CCLS(EODelayedObserverQueue);
   CCLS(EOObserverProxy);
 
+  CCLS(EOKVCTester);
+#endif
+
+  /*EOAccess*/
+#if    HAVE_EOACCESS_EOACCESS_H
+  CCLS(EOAdaptor);
+  CCLS(EOAdaptorChannel);
+  CCLS(EOAdaptorContext);
+  CCLS(EOAdaptorOperation);
+  CCLS(EOAttribute);
+  CCLS(EODatabase);
+  CCLS(EODatabaseChannel);
+  CCLS(EODatabaseContext);
+  CCLS(EODatabaseDataSource);
+  CCLS(EODatabaseOperation);
+  CCLS(EOEntity);
+  CCLS(EOJoin);
+  CCLS(EOModel);
+  CCLS(EOModelGroup);
+  CCLS(EORelationship);
+  CCLS(EOStoredProcedure);
+  CCLS(EOSQLExpression);
+  CCLS(EOSQLQualifier);
 #endif
 
   [arp release];