Upgrade to latest released SIPB version I can find. (Unfortunately, the

original releases were not numbered.)

1 files changed, 263 insertions, 145 deletions

diff --git a/usr.bin/compile_et/compile_et.c b/usr.bin/compile_et/compile_et.c
index 25be70b..8e3f492 100644
--- a/usr.bin/compile_et/compile_et.c
+++ b/usr.bin/compile_et/compile_et.c
@@ -1,17 +1,30 @@
 /*
  *
- * Copyright 1986, 1987 by MIT Student Information Processing Board
- * For copyright info, see "Copyright.SIPB".
+ * Copyright 1986, 1987, 1988
+ * by MIT Student Information Processing Board.
+ *
+ * For copyright info, see "mit-sipb-copyright.h".
  *
- *	$Id: compile_et.c,v 1.2 1994/07/19 19:21:24 g89r4222 Exp $
  */
 
 #include <stdio.h>
 #include <sys/file.h>
-#include <strings.h>
+#include <string.h>
 #include <sys/param.h>
+#include "mit-sipb-copyright.h"
+#include "compiler.h"
+
+#ifndef __STDC__
+#define const
+#endif
+
+#ifndef lint
+static const char copyright[] =
+    "Copyright 1987,1988 by MIT Student Information Processing Board";
 
-static char copyright[] = "Copyright 1987 by MIT Student Information Processing Board";
+static const char rcsid_compile_et_c[] =
+    "$Header: /afs/rel-eng.athena.mit.edu/project/release/current/source/athena/athena.lib/et/RCS/compile_et.c,v 1.3 91/02/28 15:15:23 epeisach Exp $";
+#endif
 
 extern char *gensym();
 extern char *current_token;
@@ -19,154 +32,259 @@ extern int table_number, current;
 char buffer[BUFSIZ];
 char *table_name = (char *)NULL;
 FILE *hfile, *cfile;
-     
+
 /* C library */
 extern char *malloc();
 extern int errno;
-     
+
 /* lex stuff */
 extern FILE *yyin;
 extern int yylineno;
-     
+
+char * xmalloc (size) unsigned int size; {
+    char * p = malloc (size);
+    if (!p) {
+	perror (whoami);
+	exit (1);
+    }
+    return p;
+}
+
+static int check_arg (str_list, arg) char const *const *str_list, *arg; {
+    while (*str_list)
+	if (!strcmp(arg, *str_list++))
+	    return 1;
+    return 0;
+}
+
+static const char *const debug_args[] = {
+    "d",
+    "debug",
+    0,
+};
+
+static const char *const lang_args[] = {
+    "lang",
+    "language",
+    0,
+};
+
+static const char *const language_names[] = {
+    "C",
+    "K&R C",
+    "C++",
+    0,
+};
+
+static const char * const c_src_prolog[] = {
+    "static const char * const text[] = {\n",
+    0,
+};
+
+static const char * const krc_src_prolog[] = {
+    "#ifdef __STDC__\n",
+    "#define NOARGS void\n",
+    "#else\n",
+    "#define NOARGS\n",
+    "#define const\n",
+    "#endif\n\n",
+    "static const char * const text[] = {\n",
+    0,
+};
+
+static const char *const struct_def[] = {
+    "struct error_table {\n",
+    "    char const * const * msgs;\n",
+    "    long base;\n",
+    "    int n_msgs;\n",
+    "};\n",
+    "struct et_list {\n",
+    "    struct et_list *next;\n",
+    "    const struct error_table * table;\n",
+    "};\n",
+    "extern struct et_list *_et_list;\n",
+    "\n", 0,
+};
+
+static const char warning[] =
+    "/*\n * %s:\n * This file is automatically generated; please do not edit it.\n */\n";
+
 /* pathnames */
-char c_file[MAXPATHLEN];	/* temporary file */
+char c_file[MAXPATHLEN];	/* output file */
 char h_file[MAXPATHLEN];	/* output */
-char o_file[MAXPATHLEN];	/* output */
-char et_file[MAXPATHLEN];	/* input */
-
-main(argc, argv)
-     int argc;
-     char **argv;
-{
-     register char *p;
-     int n_flag = 0, debug = 0;
-     
-     while (argc > 2) {
-	  register char *arg, ch;
-	  arg = argv[--argc];
-	  if (strlen(arg) != 2 || arg[0] != '-')
-	       goto usage;
-	  ch = arg[1];
-	  if (ch == 'n')
-	       n_flag++;
-	  else if (ch == 'd')
-	       debug++;
-	  else
-	       goto usage;
-     }
-
-     if (argc != 2) {
-     usage:
-	  fprintf(stderr, "Usage:  %s et_file [-n]\n", argv[0]);
-	  exit(1);
-     }
-     
-     strcpy(et_file, argv[1]);
-     p = rindex(et_file, '/');
-     if (p == (char *)NULL)
-	  p = et_file;
-     else
-	  p++;
-     p = rindex(p, '.');
-     if (!strcmp(p, ".et"))
-	  *++p = '\0';
-     else {
-	  if (!p)
-	       p = et_file;
-	  while (*p)
-	       p++;
-	  *p++ = '.';
-	  *p = '\0';
-     }
-     /* p points at null where suffix should be */
-     strcpy(p, "et.c");
-     strcpy(c_file, et_file);
-     p[0] = 'h';
-     p[1] = '\0';
-     strcpy(h_file, et_file);
-     p[0] = 'o';
-     strcpy(o_file, et_file);
-     p[0] = 'e';
-     p[1] = 't';
-     p[2] = '\0';
-
-     yyin = fopen(et_file, "r");
-     if (!yyin) {
-	  perror(et_file);
-	  exit(1);
-     }
-     
-     hfile = fopen(h_file, "w");
-     if (hfile == (FILE *)NULL) {
-	  perror(h_file);
-	  exit(1);
-     }
-     
-     cfile = fopen(c_file, "w");
-     if (cfile == (FILE *)NULL) {
-	  perror("Can't open temp file");
-	  exit(1);
-     }
-     
-     /* parse it */
-     fputs("#define NULL 0\n", cfile);
-     fputs("static char *_et[] = {\n", cfile);
-     
-     yyparse();
-     fclose(yyin);		/* bye bye input file */
-     
-     fputs("\t(char *)0\n};\n", cfile);
-     fputs("extern int init_error_table();\n\n", cfile);
-     fprintf(cfile, "int %s_err_base = %d;\n\n", table_name, table_number);
-     fprintf(cfile, "int\ninit_%s_err_tbl()\n", table_name);
-     fprintf(cfile, "{\n\treturn(init_error_table(_et, %d, %d));\n}\n",
-	     table_number, current);
-     fclose(cfile);
-     
-     fputs("extern int init_", hfile);
-     fputs(table_name, hfile);
-     fputs("_err_tbl();\nextern int ", hfile);
-     fputs(table_name, hfile);
-     fputs("_err_base;\n", hfile);
-     fclose(hfile);		/* bye bye hfile */
-     
-     if (n_flag)
-	  exit(0);
-
-     if (!fork()) {
-	  p = rindex(c_file, '/');
-	  if (p) {
-	       *p++ = '\0';
-	       chdir(c_file);
-	  }
-	  else
-	       p = c_file;
-	  execlp("cc", "cc", "-c", "-R", "-O", p, 0);
-	  perror("cc");
-	  exit(1);
-     }
-     else wait(0);
-
-     if (!debug)
-	  (void) unlink(c_file);
-     /* make it .o file name */
-     c_file[strlen(c_file)-1] = 'o';
-     if (!fork()) {
-	  execlp("cp", "cp", c_file, o_file, 0);
-	  perror("cp");
-	  exit(1);
-     }
-     else wait(0);
-     if (!debug)
-	  (void) unlink(c_file);
-
-     exit(0);
+
+static void usage () {
+    fprintf (stderr, "%s: usage: %s ERROR_TABLE\n",
+	     whoami, whoami);
+    exit (1);
+}
+
+static void dup_err (type, one, two) char const *type, *one, *two; {
+    fprintf (stderr, "%s: multiple %s specified: `%s' and `%s'\n",
+	     whoami, type, one, two);
+    usage ();
+}
+
+int main (argc, argv) int argc; char **argv; {
+    char *p, *ename;
+    int len;
+    char const * const *cpp;
+    int got_language = 0;
+
+    /* argument parsing */
+    debug = 0;
+    filename = 0;
+    whoami = argv[0];
+    p = strrchr (whoami, '/');
+    if (p)
+	whoami = p+1;
+    while (argv++, --argc) {
+	char *arg = *argv;
+	if (arg[0] != '-') {
+	    if (filename)
+		dup_err ("filenames", filename, arg);
+	    filename = arg;
+	}
+	else {
+	    arg++;
+	    if (check_arg (debug_args, arg))
+		debug++;
+	    else if (check_arg (lang_args, arg)) {
+		got_language++;
+		arg = *++argv, argc--;
+		if (!arg)
+		    usage ();
+		if (language)
+		    dup_err ("languanges", language_names[(int)language], arg);
+#define check_lang(x,v) else if (!strcasecmp(arg,x)) language = v
+		check_lang ("c", lang_C);
+		check_lang ("ansi_c", lang_C);
+		check_lang ("ansi-c", lang_C);
+		check_lang ("krc", lang_KRC);
+		check_lang ("kr_c", lang_KRC);
+		check_lang ("kr-c", lang_KRC);
+		check_lang ("k&r-c", lang_KRC);
+		check_lang ("k&r_c", lang_KRC);
+		check_lang ("c++", lang_CPP);
+		check_lang ("cplusplus", lang_CPP);
+		check_lang ("c-plus-plus", lang_CPP);
+#undef check_lang
+		else {
+		    fprintf (stderr, "%s: unknown language name `%s'\n",
+			     whoami, arg);
+		    fprintf (stderr, "\tpick one of: C K&R-C\n");
+		    exit (1);
+		}
+	    }
+	    else {
+		fprintf (stderr, "%s: unknown control argument -`%s'\n",
+			 whoami, arg);
+		usage ();
+	    }
+	}
+    }
+    if (!filename)
+	usage ();
+    if (!got_language)
+	language = lang_KRC;
+    else if (language == lang_CPP) {
+	fprintf (stderr, "%s: Sorry, C++ support is not yet finished.\n",
+		 whoami);
+	exit (1);
+    }
+
+    p = xmalloc (strlen (filename) + 5);
+    strcpy (p, filename);
+    filename = p;
+    p = strrchr(filename, '/');
+    if (p == (char *)NULL)
+	p = filename;
+    else
+	p++;
+    ename = p;
+    len = strlen (ename);
+    p += len - 3;
+    if (strcmp (p, ".et"))
+	p += 3;
+    *p++ = '.';
+    /* now p points to where "et" suffix should start */
+    /* generate new filenames */
+    strcpy (p, "c");
+    strcpy (c_file, ename);
+    *p = 'h';
+    strcpy (h_file, ename);
+    strcpy (p, "et");
+
+    yyin = fopen(filename, "r");
+    if (!yyin) {
+	perror(filename);
+	exit(1);
+    }
+
+    hfile = fopen(h_file, "w");
+    if (hfile == (FILE *)NULL) {
+	perror(h_file);
+	exit(1);
+    }
+    fprintf (hfile, warning, h_file);
+
+    cfile = fopen(c_file, "w");
+    if (cfile == (FILE *)NULL) {
+	perror(c_file);
+	exit(1);
+    }
+    fprintf (cfile, warning, c_file);
+
+    /* prologue */
+    if (language == lang_C)
+	cpp = c_src_prolog;
+    else if (language == lang_KRC)
+	cpp = krc_src_prolog;
+    else
+	abort ();
+    while (*cpp)
+	fputs (*cpp++, cfile);
+
+    /* parse it */
+    yyparse();
+    fclose(yyin);		/* bye bye input file */
+
+    fputs ("    0\n};\n\n", cfile);
+    for (cpp = struct_def; *cpp; cpp++)
+	fputs (*cpp, cfile);
+    fprintf(cfile,
+	    "static const struct error_table et = { text, %ldL, %d };\n\n",
+	    table_number, current);
+    fputs("static struct et_list link = { 0, 0 };\n\n",
+	  cfile);
+    fprintf(cfile, "void initialize_%s_error_table (%s) {\n",
+	    table_name, (language == lang_C) ? "void" : "NOARGS");
+    fputs("    if (!link.table) {\n", cfile);
+    fputs("        link.next = _et_list;\n", cfile);
+    fputs("        link.table = &et;\n", cfile);
+    fputs("        _et_list = &link;\n", cfile);
+    fputs("    }\n", cfile);
+    fputs("}\n", cfile);
+    fclose(cfile);
+
+    fprintf (hfile, "extern void initialize_%s_error_table ();\n",
+	     table_name);
+    fprintf (hfile, "#define ERROR_TABLE_BASE_%s (%ldL)\n",
+	     table_name, table_number);
+    /* compatibility... */
+    fprintf (hfile, "\n/* for compatibility with older versions... */\n");
+    fprintf (hfile, "#define init_%s_err_tbl initialize_%s_error_table\n",
+	     table_name, table_name);
+    fprintf (hfile, "#define %s_err_base ERROR_TABLE_BASE_%s\n", table_name,
+	     table_name);
+    fclose(hfile);		/* bye bye include file */
+
+    return 0;
 }
 
-yyerror(s)
-     char *s;
-{
-     fputs(s, stderr);
-     fprintf(stderr, "\nLine number %d; last token was '%s'\n",
-	     yylineno, current_token);
+int yyerror(s) char *s; {
+    fputs(s, stderr);
+    fprintf(stderr, "\nLine number %d; last token was '%s'\n",
+	    yylineno, current_token);
 }
+