--- stack/stack.h	2002/03/17 11:26:35	1.16
+++ stack/stack.h	2003/08/18 14:39:16	1.28
@@ -22,22 +22,69 @@
 
 #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>
+/* waitpid */
+#include <sys/wait.h>
+/* va_list, va_start, va_arg, va_end */
+#include <stdarg.h>
+/* time */
+#include <time.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;
 struct symbol_struct;
+struct environment_struct;
+
+/* A type for pointers to external functions */
+typedef void (*funcp)(struct environment_struct*); 
+/* funcp is a pointer to a void function (environment *) */
+
+enum type_enum {
+  unknown,
+  empty,			/* The empty list */
+  integer,
+  tfloat,
+  string,
+  func,			/* Function pointer */
+  symb,			/* Symbol */
+  tcons,			/* A pair of two values */
+  port			/* An I/O port */
+};			/* Type of stack element */
+
 
 /* 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 */
-  } type:4;			/* Type of stack element */
+  enum type_enum type:4;
 
   union {
     struct {
@@ -51,8 +98,11 @@
     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 */
+    funcp func;                 /* ...or a function pointer */
+    char *string;               /* ...or a string */
   } content;			/* Stores a pointer or an integer */
 
 } value;
@@ -88,6 +138,7 @@
   value *head;			/* Head of the stack */
   hashtbl symbols;		/* Hash table of all variable bindings */
   int err;			/* Error flag */
+  char *errsymb;
   char *in_string;		/* Input pending to be read */
   char *free_string;		/* Free this string when all input is
 				   read from in_string */
@@ -100,18 +151,17 @@
   int gc_count;			/* Amount currently allocated */
 } environment;
 
-/* A type for pointers to external functions */
-typedef void (*funcp)(environment*); /* funcp is a pointer to a void
-					 function (environment *) */
 
 void init_env(environment*);
-void printerr(const char*);
+void printerr(environment*);
 extern void toss(environment*);
 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);
@@ -119,14 +169,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*);
@@ -148,25 +203,41 @@
 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*);
+int check_args(environment*, int, ...);