diff -ruN klic-3.003-2002-02-20c/include/klic/gg_macro.h klic-3.003-2002-02-20d/include/klic/gg_macro.h
--- klic-3.003-2002-02-20c/include/klic/gg_macro.h	Mon Feb 18 16:20:13 2002
+++ klic-3.003-2002-02-20d/include/klic/gg_macro.h	Wed Feb 20 14:36:54 2002
@@ -15,7 +15,6 @@
 
 /* runtime/unify.c */
 extern void do_shallow_unify(q x, q y);
-extern void do_shallow_unify_value(q x, q y);
 
 
 /* runtime/generic.c */
@@ -29,7 +28,6 @@
 
 
 #define GG_rappend(pref) G_rappend0(GG_CLASS_NAME(),pref)
-#define GG_body(fa) G_body0(GG_CLASS_NAME(),fa)
 
 #define GG_OBJ_SIZE G_SIZE_IN_Q(GG_OBJ_TYPE)
 
@@ -37,28 +35,11 @@
 
 #define GG_method_table GG_method_table0(GG_CLASS_NAME())
 
-#define GG_USE_CLASS(class) \
-extern struct generator_object_method_table GG_method_table0(class)
-
 #define GG_CLASS_NAME_STRING G_stringify(GG_CLASS_NAME())
 
 #define GG_FAIL(errmsg) fatal(errmsg)
-#define GG_ERROR_IN_NEW(errmsg) \
-  G_error((errmsg), "creation", "generator", GG_CLASS_NAME_STRING)
-#define GG_SUCCEEDED GENERIC_SUCCEEDED
 #define GG_GCREQUEST GENERIC_GCREQUEST
 #define GG_RETURN  do{ return g_allocp; }while(0)
-/* GG_RETUTN_FROM_GENERIC ? */
-
-#define GG_DEREF_AND_TEST(x, susplab) \
-do{ \
-  q temp0 = derefone(x); \
-  if(!isref(temp0) || (x) != derefone(temp0)) { \
-    (x) = temp0; \
-  } else { \
-    goto susp; \
-  } \
-}while(0)
 
 #define GG_TERMINATE  do{ return g_allocp; }while(0)
 
@@ -129,9 +110,6 @@
   } \
 }while(0)
 
-#define GG_UNIFY(x,y) \
-  (set_heapp(g_allocp), do_shallow_unify((x), (y)), g_allocp = heapp())
-
 /**************************************************************************/
 
 #define GGset_myself_for_new \
@@ -193,17 +171,6 @@
   return (var); \
 }while(0)
 
-/****************************************************/
-#define GGSET_NEWOBJ(newgobj) \
-do{ \
-  GD_ALLOC_AREA((newgobj), (GG_OBJ_TYPE *), GG_OBJ_SIZE); \
-  (newgobj)->method_able = GG_SELF->method_table; \
-}while(0)
-
-/* temporary */
-#define GG_SUSPEND_GOAL(var,goal) \
-do{ g_allocp = GC_suspend_goal((var), (goal), g_allocp); }while(0)
-
 /**********************************************************************/
 
 #define GGDEF_UNIFY() \
@@ -225,12 +192,6 @@
   GG_OBJ_TYPE *GG_SELF; \
   q *g_allocp;
 
-#define GG_PRINT(x) klic_fprintf(g_fp, (x))
-
-#define GG_PUTC(x)  klic_fputc((x), g_fp)
-
-#define GG_RETURN_FROM_PRINT  do{ return 1L; }while(0)
-
 #define GGDEF_PRINT() \
   static \
   long \
@@ -240,16 +201,6 @@
     unsigned long g_depth; \
     unsigned long g_length;
 
-#define GG_PRINT_KL1_TERMS(x,b,s) \
-do{ \
-  int i; \
-  general_print((((q *)(x))+(b)),g_fp,g_depth,g_length); \
-  for(i=(b)+1; i<(b)+(s); i++){ \
-    klic_fprintf(g_fp,","); \
-    general_print((((q *)(x))+i),g_fp,g_depth,g_length); \
-  } \
-}while(0)
-
 /******************************************************************/
 
 
@@ -276,30 +227,11 @@
   return(((q *)(newgobj))); \
 }while(0)
 
-#define GGDEF_REGIST() \
-  static \
-  long \
-  GG_rappend(regist) (GG_SELF,g_allocp) \
-    GG_OBJ_TYPE *GG_SELF; \
-    q *g_allocp;
-
 #define GGDEF_DEALLOCATE() \
   static void \
   GG_rappend(deallocate) (GG_SELF) \
     GG_OBJ_TYPE* GG_SELF;
 
-#define GGDEF_CLOSE() \
-  static q * \
-  GG_rappend(close) (GG_SELF) \
-    GG_OBJ_TYPE *GG_SELF;
-
-#define GGDEF_GENERIC() \
-static q *\
- GG_rappend(active_unify) (GG_SELF,GG_TERM,g_allocp) \
-    GG_OBJ_TYPE *GG_SELF; \
-    q GG_TERM; \
-    q *g_allocp;
-
 /*******************************************/
 
 #define GGSET_INTARG_FOR_NEW(var,argv_i) \
@@ -308,25 +240,6 @@
   if(!G_ISINT(argv_i)) GG_FAIL("not integer"); \
   (var) = G_INTVAL(argv_i); \
 }while(0)
-
-#define GGSET_INTARG(var,argv_i) \
-do{ \
-  GG_DEREF(argv_i); \
-  if(!G_ISINT(argv_i)) GG_FAIL("not integer"); \
-  (var) = G_INTVAL(argv_i); \
-}while(0)
-
-#define GGSET_INTARG_WITHIN_RANGE(var,argv_i,llim,ulim) \
-do{ \
-  GG_DEREF(argv_i); \
-  if(!G_ISINT(argv_i)) GG_FAIL("not integer"); \
-  (var) = G_INTVAL(argv_i); \
-  if((var) < (llim) || (ulim) <= (var)) GG_FAIL("out of range"); \
-}while(0)
-
-#define GGSET_NEW_CONS(var)  G_HEAPALLOC((var), 2, makecons)
-
-#define GGSET_VAR(self)  ((self) = G_MAKEREF(&(self)))
 
 extern struct predicate predicate_unify__term__dcode_xunify__goal_2;
 #define GG_KL1_UNIFY(x, y) \