--- stack/stack.h	2002/03/14 10:39:11	1.14
+++ stack/stack.h	2003/08/04 11:22:02	1.22
@@ -22,6 +22,37 @@
 
 #define HASHTBLSIZE 2048
 
+#define CAR(X) ((X)->content.c->car)
+#define CDR(X) ((X)->content.c->cdr)
+
+/* printf, sscanf, fgets, fprintf, fopen, perror */
+#include <stdio.h>
+/* exit, EXIT_SUCCESS, malloc, free */
+#include <stdlib.h>
+/* NULL */
+#include <stddef.h>
+/* dlopen, dlsym, dlerror */
+#include <dlfcn.h>
+/* strcmp, strcpy, strlen, strcat, strdup */
+#include <string.h>
+/* getopt, STDIN_FILENO, STDOUT_FILENO, usleep */
+#include <unistd.h>
+/* EX_NOINPUT, EX_USAGE */
+#include <sysexits.h>
+/* assert */
+#include <assert.h>
+
+#ifdef __linux__
+/* mtrace, muntrace */
+#include <mcheck.h>
+/* ioctl */
+#include <sys/ioctl.h>
+/* KDMKTONE */
+#include <linux/kd.h>
+#endif /* __linux__ */
+
+
+
 /* First, define some types. */
 
 struct cons_struct;
@@ -30,12 +61,14 @@
 /* A value of some type */
 typedef struct {
   enum {
+    empty,			/* The empty list */
     integer,
     tfloat,
     string,
     func,			/* Function pointer */
     symb,			/* Symbol */
-    tcons			/* A pair of two values */
+    tcons,			/* A pair of two values */
+    port			/* An I/O port */
   } type:4;			/* Type of stack element */
 
   union {
@@ -50,6 +83,7 @@
     void *ptr;			/* Pointer to the content */
     struct cons_struct *c;	/* ...or a pointer to a cons cell */
     struct symbol_struct *sym;	/* ...or a pointer to a symbol */
+    FILE *p;			/* ...or an I/O stream */
     int i;			/* ...or an integer */
     float f;			/* ...or a floating point number */
   } content;			/* Stores a pointer or an integer */
@@ -67,7 +101,7 @@
 typedef struct cons_struct {	/* A pair of two values */
   value *car;
   value *cdr;
-} cons;
+} pair;
 
 /* A symbol with a name and possible value */
 /* (These do not need reference counters, they are kept unique by
@@ -84,9 +118,6 @@
 /* An environment; gives access to the stack and a hash table of
    defined symbols */
 typedef struct {
-  stackitem *gc_ref;
-  int gc_limit, gc_count;
-
   value *head;			/* Head of the stack */
   hashtbl symbols;		/* Hash table of all variable bindings */
   int err;			/* Error flag */
@@ -95,6 +126,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 */
@@ -107,8 +143,10 @@
 symbol **hash(hashtbl, const char*);
 value* new_val(environment*);
 void gc_mark(value*);
-void gc_maybe(environment *env);
+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);
@@ -116,14 +154,19 @@
 char *mangle_str(const char*);
 extern void mangle(environment*);
 void push_sym(environment*, const char*);
-extern void nl();
+extern void nl(environment*);
+extern void nlport(environment*);
 extern void type(environment*);
-void print_h(value*, int);
+void print_val(environment *, value*, int, stackitem*, FILE*);
 extern void print_(environment*);
 extern void print(environment*);
 extern void princ_(environment*);
 extern void princ(environment*);
-void print_st(value*, long);
+extern void printport_(environment*);
+extern void printport(environment*);
+extern void princport_(environment*);
+extern void princport(environment*);
+void print_st(environment*, value*, long);
 extern void printstack(environment*);
 extern void swap(environment*);
 extern void rot(environment*);
@@ -145,25 +188,40 @@
 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 readlineport(environment*);
+void readlinestream(environment*, FILE*);
 extern void sx_72656164(environment*);
-extern void foreach(environment*);
-void protect(value*);
-void unprotect(value*);
+extern void readport(environment*);
+void readstream(environment*, FILE*);
+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_3c(environment*);
-extern void sx_3c3d(environment*);
-extern void sx_3e3d(environment*);
 extern void sx_646976(environment*);
-extern void then(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);
+extern void sx_646f(environment *);
+extern void sx_6f70656e(environment*);
+extern void sx_636c6f7365(environment*);