@@@ misc mess

[mLib] / test / tvec-core.c

diff --git a/test/tvec-core.c b/test/tvec-core.c
index e4f9f843ad53b1c7a12a3032f0646c62009404b5..fc1b413005d336cbc8b3e10c25bbbff68fcd8d9d 100644 (file)
--- a/test/tvec-core.c
+++ b/test/tvec-core.c
@@ -318,7 +318,7 @@ int tvec_syntax_v(struct tvec_state *tv, int ch,
   dstr_destroy(&d); return (-1);
 }
 
   dstr_destroy(&d); return (-1);
 }
 

-/* --- @tvec_unkreg@ --- *
+/* --- @tvec_unkregerr@ --- *

  *
  * Arguments:  @struct tvec_state *tv@ = test-vector state
  *             @const char *name@ = register or pseudoregister name
  *
  * Arguments:  @struct tvec_state *tv@ = test-vector state
  *             @const char *name@ = register or pseudoregister name


@@ -329,13 +329,13 @@ int tvec_syntax_v(struct tvec_state *tv, int ch,
  *             unrecognized.
  */
 
  *             unrecognized.
  */
 

-int tvec_unkreg(struct tvec_state *tv, const char *name)
+int tvec_unkregerr(struct tvec_state *tv, const char *name)

 {
   return (tvec_error(tv, "unknown special register `%s' for test `%s'",
                     name, tv->test->name));
 }
 
 {
   return (tvec_error(tv, "unknown special register `%s' for test `%s'",
                     name, tv->test->name));
 }
 

-/* --- @tvec_dupreg@ --- *
+/* --- @tvec_dupregerr@ --- *

  *
  * Arguments:  @struct tvec_state *tv@ = test-vector state
  *             @const char *name@ = register or pseudoregister name
  *
  * Arguments:  @struct tvec_state *tv@ = test-vector state
  *             @const char *name@ = register or pseudoregister name


@@ -346,7 +346,7 @@ int tvec_unkreg(struct tvec_state *tv, const char *name)
  *             assigned already in the current test.
  */
 
  *             assigned already in the current test.
  */
 

-int tvec_dupreg(struct tvec_state *tv, const char *name)
+int tvec_dupregerr(struct tvec_state *tv, const char *name)

   { return (tvec_error(tv, "register `%s' is already set", name)); }
 
 /* --- @tvec_skipspc@ --- *
   { return (tvec_error(tv, "register `%s' is already set", name)); }
 
 /* --- @tvec_skipspc@ --- *


@@ -956,7 +956,7 @@ static int core_setvar(struct tvec_state *tv, const char *name,
   struct groupstate *g = ctx;
 
   if (STRCMP(name, ==, "@outcome")) {
   struct groupstate *g = ctx;
 
   if (STRCMP(name, ==, "@outcome")) {

-    if (g->f&GRPF_SETOUTC) return (tvec_dupreg(tv, name));
+    if (g->f&GRPF_SETOUTC) return (tvec_dupregerr(tv, name));

     if (rv->u == XFAIL) tvec_xfail(tv);
     g->f |= GRPF_SETOUTC;
   } else assert(!"unknown var");
     if (rv->u == XFAIL) tvec_xfail(tv);
     g->f |= GRPF_SETOUTC;
   } else assert(!"unknown var");


@@ -1113,7 +1113,7 @@ int tvec_read(struct tvec_state *tv, const char *infile, FILE *fp)
              vd = env->findvar(tv, d.buf, &varctx, g.ctx);
                if (vd) goto found_var;
            }
              vd = env->findvar(tv, d.buf, &varctx, g.ctx);
                if (vd) goto found_var;
            }

-           tvec_unkreg(tv, d.buf); goto flush_line;
+           tvec_unkregerr(tv, d.buf); goto flush_line;

          found_var:
            rd = &vd->def;
          } else {
          found_var:
            rd = &vd->def;
          } else {


@@ -1130,7 +1130,7 @@ int tvec_read(struct tvec_state *tv, const char *infile, FILE *fp)
            /* Complain if the register is already set. */
            r = TVEC_REG(tv, in, rd->i);
            if (r->f&TVRF_SEEN)
            /* Complain if the register is already set. */
            r = TVEC_REG(tv, in, rd->i);
            if (r->f&TVRF_SEEN)

-             { tvec_dupreg(tv, rd->name); goto flush_line; }
+             { tvec_dupregerr(tv, rd->name); goto flush_line; }

          }
 
          /* If there's no test, then report an error.  Set the muffle flag,
          }
 
          /* If there's no test, then report an error.  Set the muffle flag,