diff -ruN klic-3.003-2002-02-20b/include/klic/gd_macro.h klic-3.003-2002-02-20c/include/klic/gd_macro.h
--- klic-3.003-2002-02-20b/include/klic/gd_macro.h	Mon Feb 18 16:21:58 2002
+++ klic-3.003-2002-02-20c/include/klic/gd_macro.h	Wed Feb 20 14:10:04 2002
@@ -52,8 +52,6 @@
   G_error("Failure", "active unification", "data", GD_CLASS_NAME_STRING)
 #define GD_ERROR_IN_NEW(errmsg) \
   G_error((errmsg), "creation", "data", GD_CLASS_NAME_STRING)
-#define GD_ERROR_IN_UNIFY(errmsg) \
-  G_error((errmsg), "unification", "data", GD_CLASS_NAME_STRING)
 #define GD_ERROR_IN_METHOD(errmsg, methodname) \
   G_error((errmsg), (methodname), "data", GD_CLASS_NAME_STRING)
 
@@ -165,32 +163,6 @@
   } \
 }while(0)
 
-#define GD_DEREF_AND_HOOK(obj,method_functor,argv) \
-do{ \
-  while (1) { \
-    if (!isstruct(obj)) { \
-      if (atomicnotref(obj)) { \
-	break; \
-      } else { \
-	q temp0 = derefone(obj); \
-	if(isref(temp0) && (obj) == derefone(temp0)) { \
-          struct goalrec *goal; \
-          g_allocp = \
-	    GD_MAKE_GENERIC_GOAL(&goal, (obj), (method_functor), (argv), g_allocp); \
-          set_heapp(g_allocp); \
-          G_SUSPEND((obj), goal); \
-	  g_allocp = heapp(); \
-          GD_RETURN; \
-	} else { \
-	  (obj) = temp0; \
-	} \
-      } \
-    } else { \
-      break; \
-    } \
-  } \
-}while(0)
-
 #define GD_DEREF(x) \
 do{ \
   while (1) { \
@@ -401,22 +373,11 @@
 
 #define GD_COPY_KL1_TERM_TO_NEWGEN(from,to) G_COPY_KL1_TERM_TO_NEWGEN(from,to) 
 
-#define GDDEF_REGIST() \
-  static long \
-  GD_rappend(regist) (GD_SELF,g_allocp) \
-    GD_OBJ_TYPE * GD_SELF; \
-    q *g_allocp;
-
 #define GDDEF_DEALLOCATE() \
   static void \
   GD_rappend(deallocate) (GD_SELF) \
     GD_OBJ_TYPE* GD_SELF;
 
-#define GDDEF_CLOSE() \
-  static q * \
-  GD_rappend(close) (GD_SELF) \
-    GD_OBJ_TYPE * GD_SELF; \
-
 #define GDDEF_GENERIC() \
 static q * \
  GD_rappend(generic) (GD_SELF,g_method_functor,GD_ARGV,g_allocp) \
@@ -435,8 +396,6 @@
     q GD_ARGV[];
 
 #define GD_SWITCH_ON_GMETHOD switch(g_method_functor)
-#define GD_GMETHOD_CASE_DIRECT \
-  case (long) G_functor(fa)
 #define GD_GMETHOD_CASE(fa) \
   case (long) G_functor(fa): \
   { \
@@ -469,17 +428,6 @@
   (var) = G_INTVAL(argv_i); \
 }while(0)
 
-#define GDSET_INTARG(var,argv_i) \
-do{ \
-  while (!G_ISINT(argv_i)) { \
-    if (!G_ISREF(argv_i)) { \
-      GD_ERROR_IN_METHOD("Non-integer paramter", 0); \
-    } \
-    GD_DEREF(argv_i); \
-  } \
-  (var) = G_INTVAL(argv_i); \
-}while(0)
-
 #define GDSET_SYMARG_FOR_NEW(var, arg) \
 do{ \
   while (!G_ISSYM(arg)) { \
@@ -489,15 +437,6 @@
   (var) = (arg); \
 }while(0)
 
-#define GDSET_SYMARG(var, arg) \
-do{ \
-  while (!G_ISSYM(arg)) { \
-    if (!G_ISREF(arg)) GD_ERROR_IN_METHOD("Non-atom paramter", 0); \
-    GD_DEREF(arg); \
-  } \
-  (var) = (arg); \
-}while(0)
-
 #define GDSET_INTARG_WITHIN_RANGE(var,argv_i,llim,ulim) \
 do{ \
   while (!G_ISINT(argv_i)) { \
@@ -526,15 +465,6 @@
 #define GD_CALL_GMETHOD(obj,method,argv) \
   ((q) ((((struct data_object *)functorp(obj))->method_table)->g_generic) \
          ((struct data_object *)functorp(obj), G_functor(method), (argv)))
-
-#define GD_CALL_METHOD(obj,method,argv) \
-  (g_allocp = ((((struct data_object *)functorp(obj))-> \
-		  method_table)->body_generic) \
-		  ((struct data_object *)functorp(obj), \
-                        G_functor(method), (argv), g_allocp))
-
-#define GD_NEW(class,argc,argv) \
-  ((q) GD_rappend(class,new) ((argc), (argv), g_allocp))
 
 
 #define GDDEF_ENCODE() \