--- stack/stack.h	2002/03/07 03:28:29	1.4
+++ stack/stack.h	2002/03/21 03:19:32	1.19
@@ -24,25 +24,52 @@
 
 /* First, define some types. */
 
+struct cons_struct;
+struct symbol_struct;
+
 /* A value of some type */
 typedef struct {
   enum {
+    empty,			/* The empty list */
     integer,
+    tfloat,
     string,
     func,			/* Function pointer */
-    symb, 
-    list
-  } type:3;			/* Type of stack element */
+    symb,			/* Symbol */
+    tcons			/* A pair of two values */
+  } type:4;			/* Type of stack element */
 
-  int gc_garb:1;
+  union {
+    struct {
+      unsigned int mark:1;	/* Used internally in the GC */
+      unsigned int protect:1;	/* Protect from GC */
+    } flag;
+    unsigned int no_gc:2;	/* Both flags as one integer */
+  } gc;				/* Garbage collector stuff */
 
   union {
     void *ptr;			/* Pointer to the content */
-    int val;			/* ...or an integer */
+    struct cons_struct *c;	/* ...or a pointer to a cons cell */
+    struct symbol_struct *sym;	/* ...or a pointer to a symbol */
+    int i;			/* ...or an integer */
+    float f;			/* ...or a floating point number */
   } content;			/* Stores a pointer or an integer */
 
 } value;
 
+/* An item (value) on a stack */
+typedef struct stackitem_struct
+{
+  value *item;                 /* The value on the stack */
+                               /* (This is never NULL) */
+  struct stackitem_struct *next; /* Next item */
+} stackitem;
+
+typedef struct cons_struct {	/* A pair of two values */
+  value *car;
+  value *cdr;
+} pair;
+
 /* A symbol with a name and possible value */
 /* (These do not need reference counters, they are kept unique by
    hashing.) */
@@ -55,22 +82,10 @@
 /* A type for a hash table for symbols */
 typedef symbol *hashtbl[HASHTBLSIZE]; /* Hash table declaration */
 
-/* An item (value) on a stack */
-typedef struct stackitem_struct
-{
-  value *item;			/* The value on the stack */
-				/* (This is never NULL) */
-  struct stackitem_struct *next; /* Next item */
-} stackitem;
-
 /* An environment; gives access to the stack and a hash table of
    defined symbols */
 typedef struct {
-  stackitem *gc_ref;
-  stackitem *gc_protect;
-  int gc_limit, gc_count;
-
-  stackitem *head;		/* Head of the stack */
+  value *head;			/* Head of the stack */
   hashtbl symbols;		/* Hash table of all variable bindings */
   int err;			/* Error flag */
   char *in_string;		/* Input pending to be read */
@@ -78,6 +93,11 @@
 				   read from in_string */
   FILE *inputstream;		/* stdin or a file, most likely */
   int interactive;		/* print prompts, stack, etc */
+
+  /* Garbage Collector stuff*/
+  stackitem *gc_ref;		/* Stack of all allocated values */
+  int gc_limit;			/* Run GC when this much is allocated */
+  int gc_count;			/* Amount currently allocated */
 } environment;
 
 /* A type for pointers to external functions */
@@ -90,21 +110,25 @@
 symbol **hash(hashtbl, const char*);
 value* new_val(environment*);
 void gc_mark(value*);
+void gc_maybe(environment*);
 extern void gc_init(environment*);
+void protect(value*);
+void unprotect(value*);
 void push_val(environment*, value*);
 void push_int(environment*, int);
+void push_float(environment*, float);
 void push_cstring(environment*, const char*);
 char *mangle_str(const char*);
 extern void mangle(environment*);
 void push_sym(environment*, const char*);
 extern void nl();
 extern void type(environment*);
-void print_h(stackitem*, int);
+void print_val(value*, int, stackitem*);
 extern void print_(environment*);
 extern void print(environment*);
 extern void princ_(environment*);
 extern void princ(environment*);
-void print_st(stackitem*, long);
+void print_st(value*, long);
 extern void printstack(environment*);
 extern void swap(environment*);
 extern void rot(environment*);
@@ -126,17 +150,33 @@
 extern void sx_2b(environment*);
 extern void sx_2d(environment*);
 extern void sx_3e(environment*);
+extern void sx_3c(environment*);
+extern void sx_3c3d(environment*);
+extern void sx_3e3d(environment*);
 value *copy_val(environment*, value*);
 extern void sx_647570(environment*);
 extern void sx_6966(environment*);
 extern void ifelse(environment*);
+extern void sx_656c7365(environment*);
+extern void then(environment*);
 extern void sx_7768696c65(environment*);
 extern void sx_666f72(environment*);
+extern void foreach(environment*);
 extern void to(environment*);
 extern void readline(environment*);
 extern void sx_72656164(environment*);
-extern void foreach(environment*);
-void protect(environment*, value*);
-void unprotect(environment*);
-extern void copying(environment *env);
-extern void warranty(environment *env);
+extern void beep(environment*);
+extern void sx_77616974(environment*);
+extern void copying(environment*);
+extern void warranty(environment*);
+extern void sx_2a(environment*);
+extern void sx_2f(environment*);
+extern void mod(environment*);
+extern void sx_646976(environment*);
+extern void setcar(environment*);
+extern void setcdr(environment*);
+extern void car(environment*);
+extern void cdr(environment*);
+extern void cons(environment*);
+extern void assq(environment*);
+void assocgen(environment*, funcp);