Aesthetic changes: fix spelling of `initialize'; use uppercase token

constants; abandon old double-underscore convention for internal
functions and variables.

diff --git a/testrig.c b/testrig.c
index de93155cef13894ce891a75ecd632551449a49f6..01ffa8413dde9046bb3aa35e0e8b847bee0a782b 100644 (file)
--- a/testrig.c
+++ b/testrig.c
@@ -1,6 +1,6 @@
 /* -*-c-*-
  *
- * $Id: testrig.c,v 1.3 1999/05/06 19:51:35 mdw Exp $
+ * $Id: testrig.c,v 1.4 1999/05/19 19:02:17 mdw Exp $
  *
  * Generic test driver
  *
@@ -30,6 +30,11 @@
 /*----- Revision history --------------------------------------------------* 
  *
  * $Log: testrig.c,v $
+ * Revision 1.4  1999/05/19 19:02:17  mdw
+ * Aesthetic changes: fix spelling of `initialize'; use uppercase token
+ * constants; abandon old double-underscore convention for internal
+ * functions and variables.
+ *
  * Revision 1.3  1999/05/06 19:51:35  mdw
  * Reformatted the LGPL notice a little bit.
  *
@@ -56,16 +61,16 @@
 
 /*----- Static variables --------------------------------------------------*/
 
-static dstr test__tok;
+static dstr tok;
 
 enum {
-  tok_eof = 0x100,
-  tok_word
+  TOK_EOF = 0x100,
+  TOK_WORD
 };
 
 /*----- Main code ---------------------------------------------------------*/
 
-/* --- @test__decode@ --- *
+/* --- @decode@ --- *
  *
  * Arguments:  @int tok@ = token type to decode
  *
@@ -74,24 +79,24 @@ enum {
  * Use:                Produces a readable representation of a token.
  */
 
-static const char *test__decode(int tok)
+static const char *decode(int t)
 {
   static char buf[4];
 
-  switch (tok) {
-    case tok_eof:
+  switch (t) {
+    case TOK_EOF:
       return ("<eof>");
-    case tok_word:
-      return (test__tok.buf);
+    case TOK_WORD:
+      return (tok.buf);
     default:
-      buf[0] = tok;
+      buf[0] = t;
       buf[1] = 0;
       return (buf);
   }
   return ("<buggy-program>");
 }
 
-/* --- @test__gettok@ --- *
+/* --- @gettok@ --- *
  *
  * Arguments:  @FILE *fp@ = file handle to read from
  *
@@ -100,13 +105,13 @@ static const char *test__decode(int tok)
  * Use:                Reads a token from the input stream.
  */
 
-static int test__gettok(FILE *fp)
+static int gettok(FILE *fp)
 {
   int ch;
 
   /* --- Clear the token accumulator --- */
 
-  dstr_reset(&test__tok);
+  dstr_reset(&tok);
 
   /* --- Prime the lookahead character --- */
 
@@ -131,7 +136,7 @@ again:
     /* --- End of file --- */
       
     case EOF:
-      return (tok_eof);
+      return (TOK_EOF);
 
     /* --- Quote characters --- */
 
@@ -150,10 +155,10 @@ again:
          if (ch == EOF)
            ch = '\\';
        }
-       DPUTC(&test__tok, ch);
+       DPUTC(&tok, ch);
       }
-      DPUTZ(&test__tok);
-      return (tok_word);
+      DPUTZ(&tok);
+      return (TOK_WORD);
     }
 
     /* --- Anything else is either a word or self-delimiting --- */
@@ -161,7 +166,7 @@ again:
     default:
       if (isalnum((unsigned char)ch)) {
        for (;;) {
-         DPUTC(&test__tok, ch);
+         DPUTC(&tok, ch);
          ch = getc(fp);
          if (ch == EOF ||
              ch == ';' ||
@@ -175,8 +180,8 @@ again:
          }
        }
        ungetc(ch, fp);
-       DPUTZ(&test__tok);
-       return (tok_word);
+       DPUTZ(&tok);
+       return (TOK_WORD);
       } else
        return (ch);
   }
@@ -263,7 +268,7 @@ void test_run(int argc, char *argv[],
   int fail = 0, ok = 1;
   int sofar = 0;
 
-  /* --- Silly bits of initialisation --- */
+  /* --- Silly bits of initialization --- */
 
   ego(argv[0]);
 
@@ -316,31 +321,31 @@ void test_run(int argc, char *argv[],
     die(1, "couldn't open test vector file `%s': %s", vec, strerror(errno));
 
   for (;;) {
-    int tok = test__gettok(fp);
+    int t = gettok(fp);
 
     /* --- This is a reasonable place to stop --- */
 
-    if (tok == tok_eof)
+    if (t == TOK_EOF)
       break;
 
     /* --- Pick out the chunk name --- */
 
-    if (tok != tok_word)
-      die(1, "expected <word>; found `%s'", test__decode(tok));
+    if (t != TOK_WORD)
+      die(1, "expected <word>; found `%s'", decode(t));
 
     /* --- Find the right chunk block --- */
 
     for (cch = chunk; ; cch++) {
       if (!cch->name)
        goto skip_chunk;
-      if (strcmp(test__tok.buf, cch->name) == 0)
+      if (strcmp(tok.buf, cch->name) == 0)
        break;
     }
 
     /* --- Past the open brace to the first chunk --- */
 
-    if ((tok = test__gettok(fp)) != '{')
-      die(1, "expected '{'; found `%s'", test__decode(tok));
+    if ((t = gettok(fp)) != '{')
+      die(1, "expected '{'; found `%s'", decode(t));
 
     /* --- Start on the test data now --- */
 
@@ -350,27 +355,27 @@ void test_run(int argc, char *argv[],
     ok = 1;
 
     for (;;) {
-      tok = test__gettok(fp);
+      t = gettok(fp);
 
       /* --- Accept a close brace --- */
 
-      if (tok == '}')
+      if (t == '}')
        break;
 
       /* --- Otherwise I expect a list of words --- */
 
       for (i = 0; cch->f[i]; i++) {
        dstr_reset(&dv[i]);
-       if (tok != tok_word)
-         die(1, "expected <word>; found `%s'", test__decode(tok));
-       cch->f[i]->cvt(test__tok.buf, &dv[i]);
-       tok = test__gettok(fp);
+       if (t != TOK_WORD)
+         die(1, "expected <word>; found `%s'", decode(t));
+       cch->f[i]->cvt(tok.buf, &dv[i]);
+       t = gettok(fp);
       }
 
       /* --- And a terminating semicolon --- */
 
-      if (tok != ';')
-       die(1, "expected `;'; found `%s'", test__decode(tok));
+      if (t != ';')
+       die(1, "expected `;'; found `%s'", decode(t));
 
       /* --- Run the test code --- */
 
@@ -389,16 +394,16 @@ void test_run(int argc, char *argv[],
     continue;
 
   skip_chunk:
-    if ((tok = test__gettok(fp)) != '{')
-      die(1, "expected '{'; found `%s'", test__decode(tok));
+    if ((t = gettok(fp)) != '{')
+      die(1, "expected '{'; found `%s'", decode(t));
     for (;;) {
-      tok = test__gettok(fp);
-      if (tok == '}')
+      t = gettok(fp);
+      if (t == '}')
        break;
-      while (tok == tok_word)
-       tok = test__gettok(fp);
-      if (tok != ';')
-       die(1, "expected `;'; found `%s'", test__decode(tok));
+      while (t == TOK_WORD)
+       t = gettok(fp);
+      if (t != ';')
+       die(1, "expected `;'; found `%s'", decode(t));
     }      
   }