X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/mLib/blobdiff_plain/d66299dc49059ec3047a39c8fc576a2700b1eb48..8656dc507aee9c5dcb3a6ad876565f5fcac425ae:/testrig.c

diff --git a/testrig.c b/testrig.c
index 0531e73..4b69801 100644
--- a/testrig.c
+++ b/testrig.c
@@ -1,6 +1,6 @@
 /* -*-c-*-
  *
- * $Id: testrig.c,v 1.6 1999/11/16 15:03:23 mdw Exp $
+ * $Id: testrig.c,v 1.10 2004/04/08 01:36:13 mdw Exp $
  *
  * Generic test driver
  *
@@ -27,31 +27,6 @@
  * MA 02111-1307, USA.
  */
 
-/*----- Revision history --------------------------------------------------* 
- *
- * $Log: testrig.c,v $
- * Revision 1.6  1999/11/16 15:03:23  mdw
- * Mark test types as constant.
- *
- * Revision 1.5  1999/05/21 22:14:30  mdw
- * Take advantage of the new dynamic string macros.
- *
- * 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.
- *
- * Revision 1.2  1999/05/05 18:50:31  mdw
- * Change licensing conditions to LGPL.
- *
- * Revision 1.1.1.1  1998/06/17 23:44:42  mdw
- * Initial version of mLib
- *
- */
-
 /*----- Header files ------------------------------------------------------*/
 
 #include <ctype.h>
@@ -67,7 +42,7 @@
 
 /*----- Static variables --------------------------------------------------*/
 
-static dstr tok;
+static dstr tok = DSTR_INIT;
 
 enum {
   TOK_EOF = 0x100,
@@ -167,29 +142,42 @@ again:
       return (TOK_WORD);
     }
 
-    /* --- Anything else is either a word or self-delimiting --- */
+    /* --- Self-delimiting things --- */
+
+    case ';':
+    case '{':
+    case '}':
+      return (ch);
+
+    /* --- Anything else is a word --- */
 
     default:
-      if (isalnum((unsigned char)ch)) {
-	for (;;) {
-	  DPUTC(&tok, ch);
+      for (;;) {
+	DPUTC(&tok, ch);
+	ch = getc(fp);
+	switch (ch) {
+	  case EOF:
+	  case ';':
+	  case '{':
+	  case '}':
+	  case '\"':
+	  case '\'':
+	  case '`':
+	    goto done;
+	  default:
+	    if (isspace((unsigned char)ch))
+	      goto done;
+	}
+	if (ch == '\\') {
 	  ch = getc(fp);
-	  if (ch == EOF ||
-	      ch == ';' ||
-	      ch == '\"' || ch == '\'' || ch == '`' ||
-	      isspace((unsigned char)ch))
-	    break;
-	  if (ch == '\\') {
-	    ch = getc(fp);
-	    if (ch == EOF)
-	      ch = '\\';
-	  }
+	  if (ch == EOF)
+	    ch = '\\';
 	}
-	ungetc(ch, fp);
-	DPUTZ(&tok);
-	return (TOK_WORD);
-      } else
-	return (ch);
+      }
+    done:
+      ungetc(ch, fp);
+      DPUTZ(&tok);
+      return (TOK_WORD);
   }
 }
 
@@ -239,17 +227,62 @@ const test_type type_string = { cvt_string, dump_string };
 
 static void cvt_int(const char *s, dstr *d)
 {
-  DENSURE(d, sizeof(long));
-  sscanf(s, "%i", (int *)d->buf + d->len);
+  DENSURE(d, sizeof(int));
+  sscanf(s, "%i", (int *)d->buf);
 }
 
 static void dump_int(dstr *d, FILE *fp)
 {
-  fprintf(fp, "%i", *(int *)(d->buf));
+  fprintf(fp, "%i", *(int *)d->buf);
 }
 
 const test_type type_int = { cvt_int, dump_int };
 
+/* --- @type_long@ --- */
+
+static void cvt_long(const char *s, dstr *d)
+{
+  DENSURE(d, sizeof(long));
+  *(long *)d->buf = strtol(s, 0, 0);
+}
+
+static void dump_long(dstr *d, FILE *fp)
+{
+  fprintf(fp, "%li", *(long *)d->buf);
+}
+
+const test_type type_long = { cvt_long, dump_long };
+
+/* --- @type_ulong@ --- */
+
+static void cvt_ulong(const char *s, dstr *d)
+{
+  DENSURE(d, sizeof(unsigned long));
+  *(unsigned long *)d->buf = strtoul(s, 0, 0);
+}
+
+static void dump_ulong(dstr *d, FILE *fp)
+{
+  fprintf(fp, "%lu", *(unsigned long *)d->buf);
+}
+
+const test_type type_ulong = { cvt_ulong, dump_ulong };
+
+/* --- @type_uint32@ --- */
+
+static void cvt_uint32(const char *buf, dstr *d)
+{
+  DENSURE(d, sizeof(uint32));
+  *(uint32 *)d->buf = strtoul(buf, 0, 0);
+}
+
+static void dump_uint32(dstr *d, FILE *fp)
+{
+  fprintf(fp, "%lu\n", (unsigned long)*(uint32 *)d->buf);
+}
+
+const test_type type_uint32 = { cvt_uint32, dump_uint32 };
+
 /* --- @test_run@ --- *
  *
  * Arguments:	@int argc@ = number of command line arguments
@@ -351,7 +384,7 @@ void test_run(int argc, char *argv[],
     /* --- Past the open brace to the first chunk --- */
 
     if ((t = gettok(fp)) != '{')
-      die(1, "expected '{'; found `%s'", decode(t));
+      die(1, "expected `{'; found `%s'", decode(t));
 
     /* --- Start on the test data now --- */