/* -*-c-*-
*
- * $Id: testrig.c,v 1.4 1999/05/19 19:02:17 mdw Exp $
+ * $Id: testrig.c,v 1.5 1999/05/21 22:14:30 mdw Exp $
*
* Generic test driver
*
/*----- Revision history --------------------------------------------------*
*
* $Log: testrig.c,v $
+ * 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
/* --- Clear the token accumulator --- */
- dstr_reset(&tok);
+ DRESET(&tok);
/* --- Prime the lookahead character --- */
static void dump_string(dstr *d, FILE *fp)
{
- dstr_write(d, fp);
+ DWRITE(d, fp);
}
test_type type_string = { cvt_string, dump_string };
ego(argv[0]);
for (i = 0; i < TEST_FIELDMAX; i++)
- dstr_create(&dv[i]);
+ DCREATE(&dv[i]);
/* --- Parse command line arguments --- */
/* --- Otherwise I expect a list of words --- */
for (i = 0; cch->f[i]; i++) {
- dstr_reset(&dv[i]);
+ DRESET(&dv[i]);
if (t != TOK_WORD)
die(1, "expected <word>; found `%s'", decode(t));
cch->f[i]->cvt(tok.buf, &dv[i]);