xundump: Polish error messages

Signed-off-by: Markus Armbruster <armbru@pond.sub.org>

diff --git a/src/lib/common/xundump.c b/src/lib/common/xundump.c
index 31a3dcb0e28c141f63945562c36cd793287b3d6f..99ceef4bcc64108eb86eac2b06172055862a2fc2 100644 (file)
--- a/src/lib/common/xundump.c
+++ b/src/lib/common/xundump.c
@@ -202,12 +202,11 @@ tbl_end(void)
 static void *
 tbl_seek(int id)
 {
-    struct empfile *ep = &empfile[cur_type];
     void *obj;
 
     if (id >= ef_nelem(cur_type)) {
        if (!ef_ensure_space(cur_type, id, 1)) {
-           gripe("Can't put ID %d into table %s", id, ep->name);
+           gripe("can't grow table to hold this row");
            return NULL;
        }
     }
@@ -275,13 +274,13 @@ tbl_part_done(void)
                    return -1;
            } else {
                if (!can_fill_gaps(cur_type))
-                   return gripe("Expected %d more rows",
+                   return gripe("expected %d more rows",
                                 ep->fids - (cur_id + 1));
                omit_ids(cur_id + 1, ep->fids);
            }
        } else {
            if (expected_id(cur_id + 1, ep->fids) >= 0)
-               return gripe("Table's first part has more rows");
+               return gripe("table's first part has more rows");
        }
     }
 
@@ -299,7 +298,7 @@ static struct castr *
 getfld(int fldno, int *idx)
 {
     if (fldno >= nflds) {
-       gripe("Too many fields, expected only %d", nflds);
+       gripe("too many fields, expected only %d", nflds);
        return NULL;
     }
     if (CANT_HAPPEN(fldno < 0))
@@ -354,13 +353,13 @@ rowid(void)
        return cur_id + 1;
 
     if (id != cur_id + 1 && !can_fill_gaps(cur_type))
-       return gripe("Expected %d in field %d",
+       return gripe("expected %d in field %d",
                     cur_id + 1, fldno + 1);
     if (id <= cur_id)
-       return gripe("Field %d must be > %d", fldno + 1, cur_id);
+       return gripe("field %d must be > %d", fldno + 1, cur_id);
     max_id = ef_id_limit(cur_type);
     if (id > max_id)
-       return gripe("Field %d must be <= %d", fldno + 1, max_id);
+       return gripe("field %d must be <= %d", fldno + 1, max_id);
 
     return id;
 }
@@ -409,7 +408,7 @@ rowid_sect(void)
     /* Note: reporting values out of range left to putnum() */
     if (id <= cur_id) {
        sctoff2xy(&x, &y, cur_id);
-       return gripe("Coordinates in fields %d,%d must be > %d,%d",
+       return gripe("coordinates in fields %d,%d must be > %d,%d",
                     fldno_x + 1, fldno_y + 1, x, y);
     }
     return id;
@@ -437,14 +436,14 @@ rowid_realm(void)
     realm = (long)fldval[fldno_realm].val_as.dbl;
     cnum = (long)fldval[fldno_cnum].val_as.dbl;
     if (cnum < 0 || cnum >= MAXNOC)
-       return gripe("Field %d must be between 0 and %d",
+       return gripe("field %d must be between 0 and %d",
                     fldno_cnum, MAXNOC);
     if (realm < 0 || realm >= MAXNOR)
-       return gripe("Field %d must be between 0 and %d",
+       return gripe("field %d must be between 0 and %d",
                     fldno_realm, MAXNOR);
     id = realm + cnum * MAXNOR;
     if (id <= cur_id)
-       return gripe("Fields %d,%d must be > (%d,%d)",
+       return gripe("fields %d,%d must be > (%d,%d)",
                     fldno_cnum + 1, fldno_realm + 1,
                     cur_id / MAXNOR, cur_id % MAXNOR);
     return id;
@@ -465,7 +464,7 @@ rowobj(void)
     if (partno) {
        id = expected_id(cur_id + 1, empfile[cur_type].fids);
        if (id < 0) {
-           gripe("Table's first part doesn't have this row");
+           gripe("table's first part doesn't have this row");
            return NULL;
        }
     } else if (ca0_is_id(cur_type)) {
@@ -483,7 +482,7 @@ rowobj(void)
     } else
        id = last_id + 1;
     if (id > ef_id_limit(cur_type)) {
-       gripe("Too many rows");
+       gripe("too many rows");
        return NULL;
     }
 
@@ -583,13 +582,13 @@ putnum(void *obj, int fldno, double dbl)
        new = ((time_t *)memb_ptr)[idx] = (time_t)dbl;
        break;
     default:
-       return gripe("Field %d doesn't take numbers", fldno + 1);
+       return gripe("field %d doesn't take numbers", fldno + 1);
     }
 
     if (fldval_must_match(fldno) && old != dbl)
-       return gripe("Value for field %d must be %g", fldno + 1, old);
+       return gripe("value for field %d must be %g", fldno + 1, old);
     if (new != dbl)
-       return gripe("Field %d can't hold this value", fldno + 1);
+       return gripe("field %d can't hold this value", fldno + 1);
 
     return 0;
 }
@@ -625,12 +624,12 @@ putstr(void *obj, int fldno, char *str)
        if (CANT_HAPPEN(idx))
            return -1;
        if (!str)
-           return gripe("Field %d doesn't take nil", fldno + 1);
+           return gripe("field %d doesn't take nil", fldno + 1);
        /* Wart: if ca_len <= 1, the terminating null may be omitted */
        sz = ca->ca_len;
        len = sz > 1 ? sz - 1 : sz;
        if (strlen(str) > len)
-           return gripe("Field %d takes at most %d characters",
+           return gripe("field %d takes at most %d characters",
                         fldno + 1, (int)len);
        old = memb_ptr;
        if (must_match)
@@ -639,15 +638,15 @@ putstr(void *obj, int fldno, char *str)
            strncpy(memb_ptr, str, sz);
        break;
     default:
-       return gripe("Field %d doesn't take strings", fldno + 1);
+       return gripe("field %d doesn't take strings", fldno + 1);
     }
 
     if (mismatch) {
        if (old)
-           return gripe("Value for field %d must be \"%.*s\"",
+           return gripe("value for field %d must be \"%.*s\"",
                         fldno + 1, (int)len, old);
        else
-           return gripe("Value for field %d must be nil", fldno + 1);
+           return gripe("value for field %d must be nil", fldno + 1);
     }
 
     return 0;
@@ -764,7 +763,7 @@ xufldname(FILE *fp, int i)
     ch = skipfs(fp);
     switch (ch) {
     case EOF:
-       return gripe("Unexpected EOF");
+       return gripe("unexpected EOF");
     case '\n':
        nflds = i - (ellipsis != 0);
        if (chkflds() < 0)
@@ -773,19 +772,19 @@ xufldname(FILE *fp, int i)
        return 0;
     case '.':
        if (getc(fp) != '.' || getc(fp) != '.')
-           return gripe("Junk in header field %d", i + 1);
+           return gripe("junk in header field %d", i + 1);
        if (i == 0)
-           return gripe("Header fields expected");
+           return gripe("header fields expected");
        ellipsis = 1;
        ch = skipfs(fp);
        if (ch != EOF && ch != '\n')
-           return gripe("Junk after ...");
+           return gripe("junk after ...");
        ungetc(ch, fp);
        return 1;
     default:
        ungetc(ch, fp);
        if (getid(fp, buf) < 0)
-           return gripe("Junk in header field %d", i + 1);
+           return gripe("junk in header field %d", i + 1);
        ch = getc(fp);
        if (ch != '(') {
            ungetc(ch, fp);
@@ -795,20 +794,20 @@ xufldname(FILE *fp, int i)
        ungetc(ch, fp);
        if (isdigit(ch) || ch == '-' || ch == '+') {
            if (fscanf(fp, "%d", &idx) != 1)
-               return gripe("Malformed number in index of header field %d",
+               return gripe("malformed number in index of header field %d",
                             i + 1);
            if (idx < 0)
-               return gripe("Index must not be negative in header field %d",
+               return gripe("index must not be negative in header field %d",
                             i + 1);
        } else {
            if (getid(fp, buf) < 0)
-               return gripe("Malformed index in header field %d", i + 1);
-           return gripe("Symbolic index in header field %d not yet implemented",
+               return gripe("malformed index in header field %d", i + 1);
+           return gripe("symbolic index in header field %d not yet implemented",
                         i + 1);
        }
        ch = getc(fp);
        if (ch != ')')
-           return gripe("Malformed index in header field %d", i + 1);
+           return gripe("malformed index in header field %d", i + 1);
        return deffld(i, buf, idx);
     }
 }
@@ -829,15 +828,15 @@ xufld(FILE *fp, int i)
     ch = skipfs(fp);
     switch (ch) {
     case EOF:
-       return gripe("Unexpected EOF");
+       return gripe("unexpected EOF");
     case '\n':
        CANT_HAPPEN(i > nflds);
        for (j = i; j < nflds; j++) {
            if (CA_IS_ARRAY(fldca[j]))
-               gripe("Field %s(%d) missing",
+               gripe("field '%s(%d)' missing",
                      fldca[j]->ca_name, fldidx[j]);
            else
-               gripe("Field %s missing", fldca[j]->ca_name);
+               gripe("field '%s' missing", fldca[j]->ca_name);
        }
        if (i != nflds || putrow() < 0)
            return -1;
@@ -848,7 +847,7 @@ xufld(FILE *fp, int i)
     case '5': case '6': case '7': case '8': case '9':
        ungetc(ch, fp);
        if (fscanf(fp, "%lg", &dbl) != 1)
-           return gripe("Malformed number in field %d", i + 1);
+           return gripe("malformed number in field %d", i + 1);
        return setnum(i, dbl);
     case '"':
        ch = getc(fp);
@@ -857,9 +856,9 @@ xufld(FILE *fp, int i)
        else {
            ungetc(ch, fp);
            if (fscanf(fp, "%1023[^\"\n]", buf) != 1 || getc(fp) != '"')
-               return gripe("Malformed string in field %d", i + 1);
+               return gripe("malformed string in field %d", i + 1);
            if (!xuesc(buf))
-               return gripe("Invalid escape sequence in field %d",
+               return gripe("invalid escape sequence in field %d",
                             i + 1);
        }
        return setstr(i, buf);
@@ -869,12 +868,12 @@ xufld(FILE *fp, int i)
        for (;;) {
            ch = skipfs(fp);
            if (ch == EOF || ch == '\n')
-               return gripe("Unmatched '(' in field %d", i + 1);
+               return gripe("unmatched '(' in field %d", i + 1);
            if (ch == ')')
                break;
            ungetc(ch, fp);
            if (getid(fp, buf) < 0)
-               return gripe("Junk in field %d", i + 1);
+               return gripe("junk in field %d", i + 1);
            if (add2symset(i, &set, buf) < 0)
                return -1;
        }
@@ -882,7 +881,7 @@ xufld(FILE *fp, int i)
     default:
        ungetc(ch, fp);
        if (getid(fp, buf) < 0)
-           return gripe("Junk in field %d", i + 1);
+           return gripe("junk in field %d", i + 1);
        if (!strcmp(buf, "nil"))
            return setstr(i, NULL);
        else
@@ -910,7 +909,7 @@ xuflds(FILE *fp, int (*parse)(FILE *, int))
        if (ch == '\n')
            ungetc(ch, fp);
        else if (ch != ' ' && ch != '\t')
-           return gripe("Bad field separator after field %d", i + 1);
+           return gripe("bad field separator after field %d", i + 1);
     }
 }
 
@@ -930,30 +929,28 @@ deffld(int fldno, char *name, int idx)
     res = stmtch(name, ca, offsetof(struct castr, ca_name),
                 sizeof(struct castr));
     if (res < 0)
-       return gripe("Header %s of field %d is %s", name, fldno + 1,
-                    res == M_NOTUNIQUE ? "ambiguous" : "unknown");
+       return gripe("%s header '%s' in field %d",
+                    res == M_NOTUNIQUE ? "ambiguous" : "unknown",
+                    name, fldno + 1);
     if ((ca[res].ca_flags & NSC_EXTRA) || CANT_HAPPEN(ca[res].ca_get))
-       return gripe("Extraneous header %s in field %d", name, fldno + 1);
+       return gripe("extraneous header '%s' in field %d", name, fldno + 1);
     if (CA_IS_ARRAY(&ca[res])) {
        if (idx < 0)
-           return gripe("Header %s requires an index in field %d",
+           return gripe("header '%s' requires an index in field %d",
                         ca[res].ca_name, fldno + 1);
+       if (idx != caflds[res] && idx < ca[res].ca_len)
+           return gripe("expected header '%s(%d)' in field %d",
+                        ca[res].ca_name, caflds[res], fldno + 1);
        if (idx >= ca[res].ca_len)
-           return gripe("Header %s(%d) index out of bounds in field %d",
+           return gripe("unexpected header '%s(%d)' in field %d",
                         ca[res].ca_name, idx, fldno + 1);
-       if (idx < caflds[res])
-           return gripe("Duplicate header %s(%d) in field %d",
-                        ca[res].ca_name, idx, fldno + 1);
-       if (idx > caflds[res])
-           return gripe("Expected header %s(%d) in field %d",
-                        ca[res].ca_name, caflds[res], fldno + 1);
     } else {
        if (idx >= 0)
-           return gripe("Header %s doesn't take an index in field %d",
+           return gripe("header '%s' doesn't take an index in field %d",
                         ca[res].ca_name, fldno + 1);
        idx = 0;
        if (caflds[res])
-           return gripe("Duplicate header %s in field %d",
+           return gripe("duplicate header '%s' in field %d",
                         ca[res].ca_name, fldno + 1);
     }
     fldca[fldno] = &ca[res];
@@ -982,12 +979,12 @@ chkflds(void)
            continue;
        len = CA_ARRAY_LEN(&ca[i]);
        if (!len && !cafldsmax)
-           res = gripe("Header field %s missing", ca[i].ca_name);
+           res = gripe("header '%s' missing", ca[i].ca_name);
        else if (len && cafldsmax == len - 1)
-           res = gripe("Header field %s(%d) missing",
+           res = gripe("header '%s(%d)' missing",
                        ca[i].ca_name, len - 1);
        else if (len && cafldsmax < len - 1)
-           res = gripe("Header fields %s(%d) ... %s(%d) missing",
+           res = gripe("header '%s(%d)' ... '%s(%d)' missing",
                        ca[i].ca_name, cafldsmax, ca[i].ca_name, len - 1);
     }
 
@@ -1036,8 +1033,8 @@ xunsymbol(char *id, struct castr *ca, int n)
 {
     int i = ef_elt_byname(ca->ca_table, id);
     if (i < 0)
-       return gripe("%s %s symbol `%s' in field %d",
-                    i == M_NOTUNIQUE ? "Ambiguous" : "Unknown",
+       return gripe("%s %s symbol '%s' in field %d",
+                    i == M_NOTUNIQUE ? "ambiguous" : "unknown",
                     ca->ca_name, id, n + 1);
     return i;
 }
@@ -1073,7 +1070,7 @@ setsym(int fldno, char *sym)
        return -1;
 
     if (ca->ca_table == EF_BAD || (ca->ca_flags & NSC_BITS))
-       return gripe("Field %d doesn't take symbols", fldno + 1);
+       return gripe("field %d doesn't take symbols", fldno + 1);
 
     i = xunsymbol(sym, ca, fldno);
     if (i < 0)
@@ -1096,7 +1093,7 @@ mtsymset(int fldno, long *set)
 
     if (ca->ca_table == EF_BAD || ef_cadef(ca->ca_table) != symbol_ca
        || !(ca->ca_flags & NSC_BITS))
-       return gripe("Field %d doesn't take symbol sets", fldno + 1);
+       return gripe("field %d doesn't take symbol sets", fldno + 1);
     *set = 0;
     return 0;
 }
@@ -1149,23 +1146,23 @@ xuheader(FILE *fp, int expected_table)
         ? fscanf(fp, "config%*[ \t]%63[^ \t#\n]%n", name, &res) != 1
         : fscanf(fp, "XDUMP%*[ \t]%63[^ \t#\n]%*[ \t]%*[^ \t#\n]%n",
                  name, &res) != 1) || res < 0)
-       return gripe("Expected xdump header");
+       return gripe("expected xdump header");
 
     type = ef_byname(name);
     if (type < 0)
-       return gripe("Unknown table `%s'", name);
+       return gripe("unknown table '%s'", name);
     if (expected_table != EF_BAD && expected_table != type)
-       return gripe("Expected table `%s', not `%s'",
+       return gripe("expected table '%s', not '%s'",
                     ef_nameof(expected_table), name);
 
     if (!empfile[type].file
        || !ef_cadef(type) || !(ef_flags(type) & EFF_MEM)) {
        CANT_HAPPEN(expected_table != EF_BAD);
-       return gripe("Table `%s' is not permitted here", name);
+       return gripe("table '%s' is not permitted here", name);
     }
 
     if (skipfs(fp) != '\n')
-       return gripe("Junk after xdump header");
+       return gripe("junk after xdump header");
     lineno++;
 
     return type;
@@ -1231,16 +1228,15 @@ xufooter(FILE *fp, struct castr ca[], int recs)
     res = -1;
     if (human) {
        if (fscanf(fp, "config%n", &res) != 0 || res < 0)
-           return gripe("Malformed table footer");
+           return gripe("malformed table footer");
     } else {
        if (fscanf(fp, "%d", &n) != 1)
-           return gripe("Malformed table footer");
+           return gripe("malformed table footer");
        if (recs != n)
-           return gripe("Read %d rows, which doesn't match footer "
-                        "%d rows", recs, n);
+           return gripe("expected footer /%d", recs);
     }
     if (skipfs(fp) != '\n')
-       return gripe("Junk after table footer");
+       return gripe("junk after table footer");
     if (tbl_part_done() < 0)
        return -1;
     lineno++;

diff --git a/tests/empdump/errors.err b/tests/empdump/errors.err
index 01f71735258bb26c135b8345ddf8f5b180fa6e1b..e5439a1c789819aabd814c348531f2533c9c4ed6 100644 (file)
--- a/tests/empdump/errors.err
+++ b/tests/empdump/errors.err
@@ -1,100 +1,129 @@
-tests/empdump/xundump-errors/colhdr-amb:2: Header m of field 3 is ambiguous
-tests/empdump/xundump-errors/colhdr-dup:2: Duplicate header name in field 2
-tests/empdump/xundump-errors/colhdr-dup2:6: Duplicate header name in field 3
-tests/empdump/xundump-errors/colhdr-dup3:2: Duplicate header pkg(0) in field 8
-tests/empdump/xundump-errors/colhdr-ellipsis:2: Header fields expected
-tests/empdump/xundump-errors/colhdr-ellipsis2:2: Junk after ...
-tests/empdump/xundump-errors/colhdr-eof:2: Unexpected EOF
-tests/empdump/xundump-errors/colhdr-idxbig:2: Header pkg(99) index out of bounds in field 7
-tests/empdump/xundump-errors/colhdr-idxneg:2: Index must not be negative in header field 7
-tests/empdump/xundump-errors/colhdr-idxreq:2: Header pkg requires an index in field 7
-tests/empdump/xundump-errors/colhdr-junk:2: Junk in header field 1
-tests/empdump/xundump-errors/colhdr-junk2:2: Junk in header field 1
-tests/empdump/xundump-errors/colhdr-junk3:2: Junk in header field 1
-tests/empdump/xundump-errors/colhdr-malidx:2: Malformed number in index of header field 1
-tests/empdump/xundump-errors/colhdr-malidx2:2: Malformed index in header field 1
-tests/empdump/xundump-errors/colhdr-malidx3:2: Malformed index in header field 1
-tests/empdump/xundump-errors/colhdr-miss:2: Header field uid missing
-tests/empdump/xundump-errors/colhdr-miss:2: Header field ctype(2) missing
-tests/empdump/xundump-errors/colhdr-miss:2: Header fields camt(0) ... camt(2) missing
-tests/empdump/xundump-errors/colhdr-miss:2: Header field nllag missing
-tests/empdump/xundump-errors/colhdr-miss2:21: Header fields ctype(0) ... ctype(2) missing
-tests/empdump/xundump-errors/colhdr-miss2:21: Header fields camt(0) ... camt(2) missing
-tests/empdump/xundump-errors/colhdr-miss2:21: Header field type missing
-tests/empdump/xundump-errors/colhdr-miss2:21: Header field level missing
-tests/empdump/xundump-errors/colhdr-miss2:21: Header field cost missing
-tests/empdump/xundump-errors/colhdr-miss2:21: Header field nrndx missing
-tests/empdump/xundump-errors/colhdr-miss2:21: Header field nrdep missing
-tests/empdump/xundump-errors/colhdr-miss2:21: Header field nlndx missing
-tests/empdump/xundump-errors/colhdr-miss2:21: Header field nlmin missing
-tests/empdump/xundump-errors/colhdr-miss2:21: Header field nllag missing
-tests/empdump/xundump-errors/colhdr-noidx:2: Header name doesn't take an index in field 1
-tests/empdump/xundump-errors/colhdr-sep:2: Bad field separator after field 1
-tests/empdump/xundump-errors/colhdr-symidx:2: Symbolic index in header field 1 not yet implemented
-tests/empdump/xundump-errors/colhdr-unexp2:2: Expected header pkg(0) in field 7
-tests/empdump/xundump-errors/colhdr-unk:2: Header xxx of field 1 is unknown
-tests/empdump/xundump-errors/fld-ambsym:2: Ambiguous flags symbol `s' in field 29
-tests/empdump/xundump-errors/fld-badnum:3: Field 2 can't hold this value
-tests/empdump/xundump-errors/fld-constnum:3: Value for field 1 must be 0
-tests/empdump/xundump-errors/fld-conststr:3: Value for field 1 must be "road network"
-tests/empdump/xundump-errors/fld-conststr2:8: Value for field 2 must be nil
-tests/empdump/xundump-errors/fld-eof:2: Unexpected EOF
-tests/empdump/xundump-errors/fld-invesc:2: Invalid escape sequence in field 1
-tests/empdump/xundump-errors/fld-invid:3: Field 1 can't hold this value
-tests/empdump/xundump-errors/fld-invid1:3: Expected 0 in field 1
-tests/empdump/xundump-errors/fld-invid2:3: Field 1 must be > -1
-tests/empdump/xundump-errors/fld-invid3:4: Field 1 must be > 2
-tests/empdump/xundump-errors/fld-invid4:3: Field 1 must be <= 98
-tests/empdump/xundump-errors/fld-invid5:4: Coordinates in fields 1,2 must be > 2,0
-tests/empdump/xundump-errors/fld-invid6:3: Field 0 must be between 0 and 99
-tests/empdump/xundump-errors/fld-invid7:3: Field 1 must be between 0 and 50
-tests/empdump/xundump-errors/fld-invid8:4: Fields 1,2 must be > (0,1)
-tests/empdump/xundump-errors/fld-junk:2: Junk in field 1
-tests/empdump/xundump-errors/fld-junk2:2: Junk in field 19
-tests/empdump/xundump-errors/fld-malnum:2: Malformed number in field 1
-tests/empdump/xundump-errors/fld-malstr:2: Malformed string in field 1
-tests/empdump/xundump-errors/fld-many:2: Too many fields, expected only 6
-tests/empdump/xundump-errors/fld-miss:2: Field name missing
-tests/empdump/xundump-errors/fld-miss:2: Field mnem missing
-tests/empdump/xundump-errors/fld-miss:2: Field value missing
-tests/empdump/xundump-errors/fld-miss:2: Field sell missing
-tests/empdump/xundump-errors/fld-miss:2: Field lbs missing
-tests/empdump/xundump-errors/fld-miss:2: Field pkg(0) missing
-tests/empdump/xundump-errors/fld-miss:2: Field pkg(1) missing
-tests/empdump/xundump-errors/fld-miss:2: Field pkg(2) missing
-tests/empdump/xundump-errors/fld-miss:2: Field pkg(3) missing
-tests/empdump/xundump-errors/fld-miss:2: Field pkg(4) missing
-tests/empdump/xundump-errors/fld-miss:2: Field melt_denom missing
-tests/empdump/xundump-errors/fld-miss2:3: Field ctype(0) missing
-tests/empdump/xundump-errors/fld-nonil:3: Field 19 doesn't take nil
-tests/empdump/xundump-errors/fld-nonum:3: Field 2 doesn't take numbers
-tests/empdump/xundump-errors/fld-nostr:3: Field 1 doesn't take strings
-tests/empdump/xundump-errors/fld-nosym:2: Field 1 doesn't take symbols
-tests/empdump/xundump-errors/fld-nosymset:2: Field 1 doesn't take symbol sets
-tests/empdump/xundump-errors/fld-sep:2: Bad field separator after field 1
-tests/empdump/xundump-errors/fld-strbig:3: Field 19 takes at most 9 characters
-tests/empdump/xundump-errors/fld-unexpid:6: Table's first part doesn't have this row
-tests/empdump/xundump-errors/fld-unexpid1:7: Value for field 1 must be 2
-tests/empdump/xundump-errors/fld-unksym:2: Unknown level symbol `xxx' in field 11
-tests/empdump/xundump-errors/fld-unparen:2: Unmatched '(' in field 19
-tests/empdump/xundump-errors/ftr-fewrows:2: Expected 34 more rows
-tests/empdump/xundump-errors/ftr-fewrows2:4: Expected 13 more rows
-tests/empdump/xundump-errors/ftr-fewrows3:4: Expected 1 more rows
-tests/empdump/xundump-errors/ftr-fewrows4:7: Table's first part has more rows
-tests/empdump/xundump-errors/ftr-junk:2: Junk after table footer
-tests/empdump/xundump-errors/ftr-mal:2: Malformed table footer
-tests/empdump/xundump-errors/ftr-mal2:6: Malformed table footer
-tests/empdump/xundump-errors/ftr-manyrows:5: Too many rows
-tests/empdump/xundump-errors/ftr-manyrows2:17: Too many rows
-tests/empdump/xundump-errors/ftr-mismatch:2: Read 0 rows, which doesn't match footer 2 rows
-tests/empdump/xundump-errors/hdr-extra:2: Extraneous header timestamp in field 1
-tests/empdump/xundump-errors/hdr-extra2:2: Extraneous header uid in field 1
-tests/empdump/xundump-errors/hdr-junk:1: Junk after xdump header
-tests/empdump/xundump-errors/hdr-none:1: Expected xdump header
-tests/empdump/xundump-errors/hdr-noperm:1: Table `map' is not permitted here
-tests/empdump/xundump-errors/hdr-noperm2:1: Table `table' is not permitted here
-tests/empdump/xundump-errors/hdr-unexp:4: Expected table `ship', not `plane'
-tests/empdump/xundump-errors/hdr-unktab:1: Unknown table `xxx'
+tests/empdump/xundump-errors/colhdr-amb:2: ambiguous header 'm' in field 3
+tests/empdump/xundump-errors/colhdr-dup:2: duplicate header 'name' in field 2
+tests/empdump/xundump-errors/colhdr-dup2:6: duplicate header 'name' in field 3
+tests/empdump/xundump-errors/colhdr-dup3:2: expected header 'pkg(1)' in field 8
+tests/empdump/xundump-errors/colhdr-ellipsis:2: header fields expected
+tests/empdump/xundump-errors/colhdr-ellipsis2:2: junk after ...
+tests/empdump/xundump-errors/colhdr-eof:2: unexpected EOF
+tests/empdump/xundump-errors/colhdr-idxbig:2: unexpected header 'pkg(99)' in field 12
+tests/empdump/xundump-errors/colhdr-idxneg:2: index must not be negative in header field 7
+tests/empdump/xundump-errors/colhdr-idxreq:2: header 'pkg' requires an index in field 7
+tests/empdump/xundump-errors/colhdr-junk:2: junk in header field 1
+tests/empdump/xundump-errors/colhdr-junk2:2: junk in header field 1
+tests/empdump/xundump-errors/colhdr-junk3:2: junk in header field 1
+tests/empdump/xundump-errors/colhdr-malidx:2: malformed number in index of header field 1
+tests/empdump/xundump-errors/colhdr-malidx2:2: malformed index in header field 1
+tests/empdump/xundump-errors/colhdr-malidx3:2: malformed index in header field 1
+tests/empdump/xundump-errors/colhdr-miss:2: header 'uid' missing
+tests/empdump/xundump-errors/colhdr-miss:2: header 'ctype(2)' missing
+tests/empdump/xundump-errors/colhdr-miss:2: header 'camt(0)' ... 'camt(2)' missing
+tests/empdump/xundump-errors/colhdr-miss:2: header 'nllag' missing
+tests/empdump/xundump-errors/colhdr-miss2:21: header 'ctype(0)' ... 'ctype(2)' missing
+tests/empdump/xundump-errors/colhdr-miss2:21: header 'camt(0)' ... 'camt(2)' missing
+tests/empdump/xundump-errors/colhdr-miss2:21: header 'type' missing
+tests/empdump/xundump-errors/colhdr-miss2:21: header 'level' missing
+tests/empdump/xundump-errors/colhdr-miss2:21: header 'cost' missing
+tests/empdump/xundump-errors/colhdr-miss2:21: header 'nrndx' missing
+tests/empdump/xundump-errors/colhdr-miss2:21: header 'nrdep' missing
+tests/empdump/xundump-errors/colhdr-miss2:21: header 'nlndx' missing
+tests/empdump/xundump-errors/colhdr-miss2:21: header 'nlmin' missing
+tests/empdump/xundump-errors/colhdr-miss2:21: header 'nllag' missing
+tests/empdump/xundump-errors/colhdr-noidx:2: header 'name' doesn't take an index in field 1
+tests/empdump/xundump-errors/colhdr-sep:2: bad field separator after field 1
+tests/empdump/xundump-errors/colhdr-symidx:2: symbolic index in header field 1 not yet implemented
+tests/empdump/xundump-errors/colhdr-unexp2:2: expected header 'pkg(0)' in field 7
+tests/empdump/xundump-errors/colhdr-unk:2: unknown header 'xxx' in field 1
+tests/empdump/xundump-errors/fld-ambsym:2: ambiguous flags symbol 's' in field 29
+tests/empdump/xundump-errors/fld-badnum:3: field 2 can't hold this value
+tests/empdump/xundump-errors/fld-constnum:3: value for field 1 must be 0
+tests/empdump/xundump-errors/fld-conststr:3: value for field 1 must be "road network"
+tests/empdump/xundump-errors/fld-conststr2:8: value for field 2 must be nil
+tests/empdump/xundump-errors/fld-eof:2: field 'name' missing
+tests/empdump/xundump-errors/fld-eof:2: field 'civil' missing
+tests/empdump/xundump-errors/fld-eof:2: field 'milit' missing
+tests/empdump/xundump-errors/fld-eof:2: field 'shell' missing
+tests/empdump/xundump-errors/fld-eof:2: field 'gun' missing
+tests/empdump/xundump-errors/fld-eof:2: field 'petrol' missing
+tests/empdump/xundump-errors/fld-eof:2: field 'iron' missing
+tests/empdump/xundump-errors/fld-eof:2: field 'dust' missing
+tests/empdump/xundump-errors/fld-eof:2: field 'bar' missing
+tests/empdump/xundump-errors/fld-eof:2: field 'food' missing
+tests/empdump/xundump-errors/fld-eof:2: field 'oil' missing
+tests/empdump/xundump-errors/fld-eof:2: field 'lcm' missing
+tests/empdump/xundump-errors/fld-eof:2: field 'hcm' missing
+tests/empdump/xundump-errors/fld-eof:2: field 'uw' missing
+tests/empdump/xundump-errors/fld-eof:2: field 'rad' missing
+tests/empdump/xundump-errors/fld-eof:2: field 'l_build' missing
+tests/empdump/xundump-errors/fld-eof:2: field 'h_build' missing
+tests/empdump/xundump-errors/fld-eof:2: field 'armor' missing
+tests/empdump/xundump-errors/fld-eof:2: field 'speed' missing
+tests/empdump/xundump-errors/fld-eof:2: field 'visib' missing
+tests/empdump/xundump-errors/fld-eof:2: field 'vrnge' missing
+tests/empdump/xundump-errors/fld-eof:2: field 'frnge' missing
+tests/empdump/xundump-errors/fld-eof:2: field 'glim' missing
+tests/empdump/xundump-errors/fld-eof:2: field 'nxlight' missing
+tests/empdump/xundump-errors/fld-eof:2: field 'nchoppers' missing
+tests/empdump/xundump-errors/fld-eof:2: field 'tech' missing
+tests/empdump/xundump-errors/fld-eof:2: field 'cost' missing
+tests/empdump/xundump-errors/fld-eof:2: field 'flags' missing
+tests/empdump/xundump-errors/fld-eof:2: field 'nplanes' missing
+tests/empdump/xundump-errors/fld-eof:2: field 'nland' missing
+tests/empdump/xundump-errors/fld-invesc:2: invalid escape sequence in field 1
+tests/empdump/xundump-errors/fld-invid:3: field 1 can't hold this value
+tests/empdump/xundump-errors/fld-invid1:3: expected 0 in field 1
+tests/empdump/xundump-errors/fld-invid2:3: field 1 must be > -1
+tests/empdump/xundump-errors/fld-invid3:4: field 1 must be > 2
+tests/empdump/xundump-errors/fld-invid4:3: field 1 must be <= 98
+tests/empdump/xundump-errors/fld-invid5:4: coordinates in fields 1,2 must be > 2,0
+tests/empdump/xundump-errors/fld-invid6:3: field 0 must be between 0 and 99
+tests/empdump/xundump-errors/fld-invid7:3: field 1 must be between 0 and 50
+tests/empdump/xundump-errors/fld-invid8:4: fields 1,2 must be > (0,1)
+tests/empdump/xundump-errors/fld-junk:2: junk in field 1
+tests/empdump/xundump-errors/fld-junk2:2: junk in field 19
+tests/empdump/xundump-errors/fld-malnum:2: malformed number in field 1
+tests/empdump/xundump-errors/fld-malstr:2: malformed string in field 1
+tests/empdump/xundump-errors/fld-many:2: too many fields, expected only 6
+tests/empdump/xundump-errors/fld-miss:2: field 'name' missing
+tests/empdump/xundump-errors/fld-miss:2: field 'mnem' missing
+tests/empdump/xundump-errors/fld-miss:2: field 'value' missing
+tests/empdump/xundump-errors/fld-miss:2: field 'sell' missing
+tests/empdump/xundump-errors/fld-miss:2: field 'lbs' missing
+tests/empdump/xundump-errors/fld-miss:2: field 'pkg(0)' missing
+tests/empdump/xundump-errors/fld-miss:2: field 'pkg(1)' missing
+tests/empdump/xundump-errors/fld-miss:2: field 'pkg(2)' missing
+tests/empdump/xundump-errors/fld-miss:2: field 'pkg(3)' missing
+tests/empdump/xundump-errors/fld-miss:2: field 'pkg(4)' missing
+tests/empdump/xundump-errors/fld-miss:2: field 'melt_denom' missing
+tests/empdump/xundump-errors/fld-miss2:3: field 'ctype(0)' missing
+tests/empdump/xundump-errors/fld-nonil:3: field 19 doesn't take nil
+tests/empdump/xundump-errors/fld-nonum:3: field 2 doesn't take numbers
+tests/empdump/xundump-errors/fld-nostr:3: field 1 doesn't take strings
+tests/empdump/xundump-errors/fld-nosym:2: field 1 doesn't take symbols
+tests/empdump/xundump-errors/fld-nosymset:2: field 1 doesn't take symbol sets
+tests/empdump/xundump-errors/fld-sep:2: bad field separator after field 1
+tests/empdump/xundump-errors/fld-strbig:3: field 19 takes at most 9 characters
+tests/empdump/xundump-errors/fld-unexpid:6: table's first part doesn't have this row
+tests/empdump/xundump-errors/fld-unexpid1:7: value for field 1 must be 2
+tests/empdump/xundump-errors/fld-unksym:2: unknown level symbol 'xxx' in field 11
+tests/empdump/xundump-errors/fld-unparen:2: unmatched '(' in field 19
+tests/empdump/xundump-errors/ftr-fewrows:2: expected 34 more rows
+tests/empdump/xundump-errors/ftr-fewrows2:4: expected 13 more rows
+tests/empdump/xundump-errors/ftr-fewrows3:4: expected 1 more rows
+tests/empdump/xundump-errors/ftr-fewrows4:7: table's first part has more rows
+tests/empdump/xundump-errors/ftr-junk:2: junk after table footer
+tests/empdump/xundump-errors/ftr-mal:2: malformed table footer
+tests/empdump/xundump-errors/ftr-mal2:6: malformed table footer
+tests/empdump/xundump-errors/ftr-manyrows:5: too many rows
+tests/empdump/xundump-errors/ftr-manyrows2:17: too many rows
+tests/empdump/xundump-errors/ftr-mismatch:2: expected footer /0
+tests/empdump/xundump-errors/hdr-extra:2: extraneous header 'timestamp' in field 1
+tests/empdump/xundump-errors/hdr-extra2:2: extraneous header 'uid' in field 1
+tests/empdump/xundump-errors/hdr-junk:1: junk after xdump header
+tests/empdump/xundump-errors/hdr-none:1: expected xdump header
+tests/empdump/xundump-errors/hdr-noperm:1: table 'map' is not permitted here
+tests/empdump/xundump-errors/hdr-noperm2:1: table 'table' is not permitted here
+tests/empdump/xundump-errors/hdr-unexp:4: expected table 'ship', not 'plane'
+tests/empdump/xundump-errors/hdr-unktab:1: unknown table 'xxx'
 File plane uid 0 field flags: bit 8 is not in symbol table plane-flags
 File plane uid 1 field mission: value 99 is not in symbol table missions
 File plane uid 2 field owner: value 255 indexes table nat out of bounds 0..99

diff --git a/tests/empdump/xundump-errors/colhdr-amb b/tests/empdump/xundump-errors/colhdr-amb
index ed0049963da4a0b3c8c74e928a0ded3356b0d409..7275dd0e738bd0d76be201eb06432cfc666546f9 100644 (file)
--- a/tests/empdump/xundump-errors/colhdr-amb
+++ b/tests/empdump/xundump-errors/colhdr-amb
@@ -1,4 +1,4 @@
 config sect-chr
 uid name m
-# Header m of field 3 is ambiguous
+# ambiguous header 'm' in field 3
 /config

diff --git a/tests/empdump/xundump-errors/colhdr-dup b/tests/empdump/xundump-errors/colhdr-dup
index 6edfa2d461abb740d54ac4c57f2711101e28029d..c8b7f478201f6bd3ddf311938e1923040040f4a0 100644 (file)
--- a/tests/empdump/xundump-errors/colhdr-dup
+++ b/tests/empdump/xundump-errors/colhdr-dup
@@ -1,3 +1,3 @@
 config ship-chr
 name name
-# Duplicate header name in field 2
+# duplicate header 'name' in field 2

diff --git a/tests/empdump/xundump-errors/colhdr-dup2 b/tests/empdump/xundump-errors/colhdr-dup2
index 2fb2be71450702cc2c507f85fbff07ca25f2891d..9db257d12f38c901f2afbd118041f724a060442f 100644 (file)
--- a/tests/empdump/xundump-errors/colhdr-dup2
+++ b/tests/empdump/xundump-errors/colhdr-dup2
@@ -4,5 +4,5 @@ type name ...
 
 config ship-chr
 type name name
-# Duplicate header name in field 3
+# duplicate header 'name' in field 3
 /config

diff --git a/tests/empdump/xundump-errors/colhdr-dup3 b/tests/empdump/xundump-errors/colhdr-dup3
index bef172d63a60af2f81edaf4508d572dc3ce0f942..7c0fd9c9757155397a60df7afa0f33f97f4afaea 100644 (file)
--- a/tests/empdump/xundump-errors/colhdr-dup3
+++ b/tests/empdump/xundump-errors/colhdr-dup3
@@ -1,4 +1,4 @@
 config item
 uid name mnem value sell lbs pkg(0) pkg(0)
-# Duplicate header pkg(0) in field 8
+# expected header 'pkg(1)' in field 8
 /config

diff --git a/tests/empdump/xundump-errors/colhdr-ellipsis b/tests/empdump/xundump-errors/colhdr-ellipsis
index f23f0c8ea82aabeedc2813b907d88ea2955d28a2..4e1c3464abc4442a5fc8796698cf9c14c881a5f9 100644 (file)
--- a/tests/empdump/xundump-errors/colhdr-ellipsis
+++ b/tests/empdump/xundump-errors/colhdr-ellipsis
@@ -1,3 +1,3 @@
 config product
 ...
-# Header fields expected
+# header fields expected

diff --git a/tests/empdump/xundump-errors/colhdr-ellipsis2 b/tests/empdump/xundump-errors/colhdr-ellipsis2
index 6d202d80f34add166fe6a7c1546359ae82194097..3b31c92dcf4339d6632e5b7ac2597ed733c3725d 100644 (file)
--- a/tests/empdump/xundump-errors/colhdr-ellipsis2
+++ b/tests/empdump/xundump-errors/colhdr-ellipsis2
@@ -1,3 +1,3 @@
 config item
 uid ... name
-# Junk after ...
+# junk after ...

diff --git a/tests/empdump/xundump-errors/colhdr-eof b/tests/empdump/xundump-errors/colhdr-eof
index ee64c5e40dece537e0a525fa4e0d28593195b9b5..ee196d3d5a9b3049fc8569db74981d7dd1e064a9 100644 (file)
--- a/tests/empdump/xundump-errors/colhdr-eof
+++ b/tests/empdump/xundump-errors/colhdr-eof
@@ -1 +1 @@
-config ship-chr # Unexpected EOF
+config ship-chr # unexpected EOF

diff --git a/tests/empdump/xundump-errors/colhdr-idxbig b/tests/empdump/xundump-errors/colhdr-idxbig
index fdbecd3d0a57c8d360fb859c63a991005113ecc1..de603a9e4c508dd70203ce422be47d6179f7f426 100644 (file)
--- a/tests/empdump/xundump-errors/colhdr-idxbig
+++ b/tests/empdump/xundump-errors/colhdr-idxbig
@@ -1,3 +1,3 @@
 config item
-uid name mnem value sell lbs pkg(99)
-# Header pkg(99) index out of bounds in field 7
+uid name mnem value sell lbs pkg(0) pkg(1) pkg(2) pkg(3) pkg(4) pkg(99)
+# unexpected header 'pkg(99)' in field 12

diff --git a/tests/empdump/xundump-errors/colhdr-idxneg b/tests/empdump/xundump-errors/colhdr-idxneg
index 3ae1ca46d5cc21b8130e37a922b8c5a959c0f678..7eb62cc5eebf600380d32563c376fcd0351108c4 100644 (file)
--- a/tests/empdump/xundump-errors/colhdr-idxneg
+++ b/tests/empdump/xundump-errors/colhdr-idxneg
@@ -1,3 +1,3 @@
 config item
 uid name mnem value sell lbs pkg(-1)
-# Index must not be negative in header field 7
+# index must not be negative in header field 7

diff --git a/tests/empdump/xundump-errors/colhdr-idxreq b/tests/empdump/xundump-errors/colhdr-idxreq
index 1cc33944be55e8d61d5807574c803caa6bc9a982..9aa9b09c4b525aad299c8aa41f975139b7ec11f9 100644 (file)
--- a/tests/empdump/xundump-errors/colhdr-idxreq
+++ b/tests/empdump/xundump-errors/colhdr-idxreq
@@ -1,3 +1,3 @@
 config item
 uid name mnem value sell lbs pkg
-# Header pkg requires an index in field 7
+# header 'pkg' requires an index in field 7

diff --git a/tests/empdump/xundump-errors/colhdr-junk b/tests/empdump/xundump-errors/colhdr-junk
index f9e544d92e33f8e10386848073d91ebb23004927..d37e55f1ab2628a9c4f2227f3079431cd8c67490 100644 (file)
--- a/tests/empdump/xundump-errors/colhdr-junk
+++ b/tests/empdump/xundump-errors/colhdr-junk
@@ -1,3 +1,3 @@
 config item
 0
-# Junk in header field 1
+# junk in header field 1

diff --git a/tests/empdump/xundump-errors/colhdr-junk2 b/tests/empdump/xundump-errors/colhdr-junk2
index 3e3f0c9525d52528cf5ae1a76076c33ddf30ed66..67bdf957f6910191435e2a2fa69e984a555be8d1 100644 (file)
--- a/tests/empdump/xundump-errors/colhdr-junk2
+++ b/tests/empdump/xundump-errors/colhdr-junk2
@@ -1,3 +1,3 @@
 config item
 /config
-# Junk in header field 1
+# junk in header field 1

diff --git a/tests/empdump/xundump-errors/colhdr-junk3 b/tests/empdump/xundump-errors/colhdr-junk3
index 25838bded3889987d47f569a73f51a39812f4e2d..505923bea96e5300fa9f25256db934ba4c807426 100644 (file)
--- a/tests/empdump/xundump-errors/colhdr-junk3
+++ b/tests/empdump/xundump-errors/colhdr-junk3
@@ -1,3 +1,3 @@
 config item
 .a
-# Junk in header field 1
+# junk in header field 1

diff --git a/tests/empdump/xundump-errors/colhdr-malidx b/tests/empdump/xundump-errors/colhdr-malidx
index aafaa8aba836f419bba255373a51f15423a7de0b..24bc9bbae3fba34bd99f01f3d0355471afc85438 100644 (file)
--- a/tests/empdump/xundump-errors/colhdr-malidx
+++ b/tests/empdump/xundump-errors/colhdr-malidx
@@ -1,3 +1,3 @@
 config item
 x(-
-# Malformed number in index of header field 1
+# malformed number in index of header field 1

diff --git a/tests/empdump/xundump-errors/colhdr-malidx2 b/tests/empdump/xundump-errors/colhdr-malidx2
index 54b92f1a7cbb924fe1d9b93a6df5d5c5ce8ad1b9..23fc888845f347380e89aee5efb759a4da50f089 100644 (file)
--- a/tests/empdump/xundump-errors/colhdr-malidx2
+++ b/tests/empdump/xundump-errors/colhdr-malidx2
@@ -1,3 +1,3 @@
 config item
 x(!
-# Malformed index in header field 1
+# malformed index in header field 1

diff --git a/tests/empdump/xundump-errors/colhdr-malidx3 b/tests/empdump/xundump-errors/colhdr-malidx3
index 46e399917665c2ec6b9bb748f8f7bebad71dc01d..b59d90fea894fe3995dc448eb22f4b7bfe2e666d 100644 (file)
--- a/tests/empdump/xundump-errors/colhdr-malidx3
+++ b/tests/empdump/xundump-errors/colhdr-malidx3
@@ -1,3 +1,3 @@
 config item
 x(0 y
-# Malformed index in header field 1
+# malformed index in header field 1

diff --git a/tests/empdump/xundump-errors/colhdr-miss b/tests/empdump/xundump-errors/colhdr-miss
index c00f56682720d291bc35a67e001f1369b89cb7e9..37aff5e5c0cac17c94bf735ae2626505b1830b10 100644 (file)
--- a/tests/empdump/xundump-errors/colhdr-miss
+++ b/tests/empdump/xundump-errors/colhdr-miss
@@ -1,7 +1,7 @@
 config product
 name sname ctype(0) ctype(1) type level cost nrndx nrdep nlndx nlmin
-# Header field uid missing
-# Header field ctype(2) missing
-# Header fields camt(0) ... camt(2) missing
-# Header field nllag missing
+# header 'uid' missing
+# header 'ctype(2)' missing
+# header 'camt(0)' ... 'camt(2)' missing
+# header 'nllag' missing
 /config

diff --git a/tests/empdump/xundump-errors/colhdr-miss2 b/tests/empdump/xundump-errors/colhdr-miss2
index 119489694247079d12139d77c628adc0301a4f47..b49a7f274f450d80d1e875f20a2f47bf33e338fe 100644 (file)
--- a/tests/empdump/xundump-errors/colhdr-miss2
+++ b/tests/empdump/xundump-errors/colhdr-miss2
@@ -19,13 +19,13 @@ uid sname ...
 
 config product
 name
-# Header fields ctype(0) ... ctype(2) missing
-# Header fields camt(0) ... camt(2) missing
-# Header field type missing
-# Header field level missing
-# Header field cost missing
-# Header field nrndx missing
-# Header field nrdep missing
-# Header field nlndx missing
-# Header field nlmin missing
-# Header field nllag missing
+# header 'ctype(0)' ... 'ctype(2)' missing
+# header 'camt(0)' ... 'camt(2)' missing
+# header 'type' missing
+# header 'level' missing
+# header 'cost' missing
+# header 'nrndx' missing
+# header 'nrdep' missing
+# header 'nlndx' missing
+# header 'nlmin' missing
+# header 'nllag' missing

diff --git a/tests/empdump/xundump-errors/colhdr-noidx b/tests/empdump/xundump-errors/colhdr-noidx
index ec0bec27ecb95202a439f5690e359690bafc8c53..5391750d1bc694846399eab2067668212a40f8f8 100644 (file)
--- a/tests/empdump/xundump-errors/colhdr-noidx
+++ b/tests/empdump/xundump-errors/colhdr-noidx
@@ -1,3 +1,3 @@
 config ship-chr
 name(0)
-# Header name doesn't take an index in field 1
+# header 'name' doesn't take an index in field 1

diff --git a/tests/empdump/xundump-errors/colhdr-sep b/tests/empdump/xundump-errors/colhdr-sep
index 7cc9bedfe7c789d8d23db056261f99b48073b58e..39261327a772b4ed8065c78fe55accc5deafc895 100644 (file)
--- a/tests/empdump/xundump-errors/colhdr-sep
+++ b/tests/empdump/xundump-errors/colhdr-sep
@@ -1,3 +1,3 @@
 config item
 u=
-# Bad field separator after field 1
+# bad field separator after field 1

diff --git a/tests/empdump/xundump-errors/colhdr-symidx b/tests/empdump/xundump-errors/colhdr-symidx
index 1d6bb922f934a627ef1d234df3670ca6fcb277ac..70c9fc40f50a8758d5afbd165e13660fe12386e1 100644 (file)
--- a/tests/empdump/xundump-errors/colhdr-symidx
+++ b/tests/empdump/xundump-errors/colhdr-symidx
@@ -1,3 +1,3 @@
 config item
 f(x)
-# Symbolic index in header field 1 not yet implemented
+# symbolic index in header field 1 not yet implemented

diff --git a/tests/empdump/xundump-errors/colhdr-unexp2 b/tests/empdump/xundump-errors/colhdr-unexp2
index aa09d1a658779fc2bcd9d6f5a552115fbef1eee9..b90b2b84665e483564f77a507365a4e7e48bf7bc 100644 (file)
--- a/tests/empdump/xundump-errors/colhdr-unexp2
+++ b/tests/empdump/xundump-errors/colhdr-unexp2
@@ -1,4 +1,4 @@
 config item
 uid name mnem value sell lbs pkg(1)
-# Expected header pkg(0) in field 7
+# expected header 'pkg(0)' in field 7
 /config

diff --git a/tests/empdump/xundump-errors/colhdr-unk b/tests/empdump/xundump-errors/colhdr-unk
index a5295014f7908e11c7f443946b95b17513d0d8e5..23bc98e3597b3ba5aec32323523561acbf3f7452 100644 (file)
--- a/tests/empdump/xundump-errors/colhdr-unk
+++ b/tests/empdump/xundump-errors/colhdr-unk
@@ -1,4 +1,4 @@
 config ship-chr
 xxx
-# Header xxx of field 1 is unknown
+# unknown header 'xxx' in field 1
 /config

diff --git a/tests/empdump/xundump-errors/fld-ambsym b/tests/empdump/xundump-errors/fld-ambsym
index e100d256ef749573eb6109262be31343a2ee6e17..bd1ae3edb17955336f18f422afe82b86fe9512e1 100644 (file)
--- a/tests/empdump/xundump-errors/fld-ambsym
+++ b/tests/empdump/xundump-errors/fld-ambsym
@@ -1,3 +1,3 @@
 XDUMP ship-chr 1
 0 "ft\040\040\040fishing\040trawler" 300 10 0 0 0 0 0 0 900 0 0 0 15 0 25 15 10 25 15 2 0 0 0 0 35 300 (sw s) 0 0
-# Ambiguous flags symbol `s' in field 29
+# ambiguous flags symbol 's' in field 29

diff --git a/tests/empdump/xundump-errors/fld-badnum b/tests/empdump/xundump-errors/fld-badnum
index f0bfe261fd367b865515ce992855a391c070b43d..fb500421269da2f96e4dce4174157b90b17fc19e 100644 (file)
--- a/tests/empdump/xundump-errors/fld-badnum
+++ b/tests/empdump/xundump-errors/fld-badnum
@@ -1,4 +1,4 @@
 config land
 uid owner ...
 0 1.1
-# Field 2 can't hold this value
+# field 2 can't hold this value

diff --git a/tests/empdump/xundump-errors/fld-constnum b/tests/empdump/xundump-errors/fld-constnum
index 9317c0f37f289539ee4710e485195859870b6c2c..d1f1652994a8e13559c9d94d7f755862b27d18d1 100644 (file)
--- a/tests/empdump/xundump-errors/fld-constnum
+++ b/tests/empdump/xundump-errors/fld-constnum
@@ -1,4 +1,4 @@
 config sect
 xloc yloc ...
 64 0
-# Value for field 1 must be 0
+# value for field 1 must be 0

diff --git a/tests/empdump/xundump-errors/fld-conststr b/tests/empdump/xundump-errors/fld-conststr
index b2501ae5deb5967cab6190577ef694b91a005d54..dfbbafd2af296e038ce37ea29e099963ba9189bc 100644 (file)
--- a/tests/empdump/xundump-errors/fld-conststr
+++ b/tests/empdump/xundump-errors/fld-conststr
@@ -1,4 +1,4 @@
 config infrastructure
 name lcms hcms dcost mcost enable
 "lala" 1 1 1 1 1
-# Value for field 1 must be "road network"
+# value for field 1 must be "road network"

diff --git a/tests/empdump/xundump-errors/fld-conststr2 b/tests/empdump/xundump-errors/fld-conststr2
index c5a4a071bf48fb8c5cd275ac5c8a22523a9be542..fc76c452d400eaa0930f80b903f79694125fd15b 100644 (file)
--- a/tests/empdump/xundump-errors/fld-conststr2
+++ b/tests/empdump/xundump-errors/fld-conststr2
@@ -6,4 +6,4 @@ type name ...
 config ship-chr
 type name ...
 0 "non-nil"
-# Value for field 2 must be nil
+# value for field 2 must be nil

diff --git a/tests/empdump/xundump-errors/fld-eof b/tests/empdump/xundump-errors/fld-eof
index 5ec23829c9e687cf393c54977647b74f3766d5bc..5a738a776792f9f485b899381df49ce542c8ee50 100644 (file)
--- a/tests/empdump/xundump-errors/fld-eof
+++ b/tests/empdump/xundump-errors/fld-eof
@@ -1,2 +1,2 @@
 XDUMP ship-chr 0
-0 # Unexpected EOF
\ No newline at end of file
+0 # unexpected EOF

diff --git a/tests/empdump/xundump-errors/fld-invesc b/tests/empdump/xundump-errors/fld-invesc
index ba24795f0094a6eb842749bbd17874b0f8fdbe37..b510c8ef313331908ef45d127482a51ac47d848c 100644 (file)
--- a/tests/empdump/xundump-errors/fld-invesc
+++ b/tests/empdump/xundump-errors/fld-invesc
@@ -1,3 +1,3 @@
 XDUMP infrastructure 0
 "lala\0"
-# Invalid escape sequence in field 1
+# invalid escape sequence in field 1

diff --git a/tests/empdump/xundump-errors/fld-invid b/tests/empdump/xundump-errors/fld-invid
index 4860a5ab87f328f36351e7ddf0b77fcfae940b6a..4d77a3f5f922fbcc0009413384cd91176c6a99ba 100644 (file)
--- a/tests/empdump/xundump-errors/fld-invid
+++ b/tests/empdump/xundump-errors/fld-invid
@@ -1,4 +1,4 @@
 config ship
 uid ...
 0.1
-# Field 1 can't hold this value
+# field 1 can't hold this value

diff --git a/tests/empdump/xundump-errors/fld-invid1 b/tests/empdump/xundump-errors/fld-invid1
index 2a59fcf97dd99a98c479e6ff9b9c14b9dfab8d87..607f7e9f749fe1ebec33f6413efb3ce69b2fce18 100644 (file)
--- a/tests/empdump/xundump-errors/fld-invid1
+++ b/tests/empdump/xundump-errors/fld-invid1
@@ -1,4 +1,4 @@
 config item
 uid ...
 1
-# Expected 0 in field 1
+# expected 0 in field 1

diff --git a/tests/empdump/xundump-errors/fld-invid2 b/tests/empdump/xundump-errors/fld-invid2
index 5b40538a61db550f92c039bcae9ee2b6157cc594..f04f783748ac6fdbd81d917977a7d8c4bbfc92e1 100644 (file)
--- a/tests/empdump/xundump-errors/fld-invid2
+++ b/tests/empdump/xundump-errors/fld-invid2
@@ -1,4 +1,4 @@
 config ship
 uid ...
 -1
-# Field 1 must be > -1
+# field 1 must be > -1

diff --git a/tests/empdump/xundump-errors/fld-invid3 b/tests/empdump/xundump-errors/fld-invid3
index 17675dcd8a87d8752e1d54448febfe0ce4dbaa37..adfa6dbb93b62d42a7b4bf48592f3583d9fd3470 100644 (file)
--- a/tests/empdump/xundump-errors/fld-invid3
+++ b/tests/empdump/xundump-errors/fld-invid3
@@ -2,4 +2,4 @@ config ship
 uid ...
 2
 0
-# Field 1 must be > 2
+# field 1 must be > 2

diff --git a/tests/empdump/xundump-errors/fld-invid4 b/tests/empdump/xundump-errors/fld-invid4
index 7343785efb1a722697fbea67e4c09b7181961dd3..c881802d574abf39d94a416e1ebfd57ffac6ef2f 100644 (file)
--- a/tests/empdump/xundump-errors/fld-invid4
+++ b/tests/empdump/xundump-errors/fld-invid4
@@ -1,4 +1,4 @@
 config nat
 cnum ...
 100
-# Field 1 must be <= 98
+# field 1 must be <= 98

diff --git a/tests/empdump/xundump-errors/fld-invid5 b/tests/empdump/xundump-errors/fld-invid5
index 99f03997ede87ea8bfac765060baf03286efc021..b50145323e586dce0e32ccdb51bb5c7450d8bae4 100644 (file)
--- a/tests/empdump/xundump-errors/fld-invid5
+++ b/tests/empdump/xundump-errors/fld-invid5
@@ -2,4 +2,4 @@ config sect
 xloc yloc ...
 2 0
 0 0
-# Coordinates in fields 1,2 must be > 2,0
+# coordinates in fields 1,2 must be > 2,0

diff --git a/tests/empdump/xundump-errors/fld-invid6 b/tests/empdump/xundump-errors/fld-invid6
index af877ba35e6713a3f446b1491a96f6c14cfb7336..6babee618a101a271f5f6d2e0e100566caaaa0d2 100644 (file)
--- a/tests/empdump/xundump-errors/fld-invid6
+++ b/tests/empdump/xundump-errors/fld-invid6
@@ -1,4 +1,4 @@
 config realm
 cnum realm ...
 100 0
-# Field 0 must be between 0 and 99
+# field 0 must be between 0 and 99

diff --git a/tests/empdump/xundump-errors/fld-invid7 b/tests/empdump/xundump-errors/fld-invid7
index 491df9b29f4b8795dc0c85d76d19b5ef293cdd9c..ed193e2ecfa47134c3c81a41fa1585b886042287 100644 (file)
--- a/tests/empdump/xundump-errors/fld-invid7
+++ b/tests/empdump/xundump-errors/fld-invid7
@@ -1,4 +1,4 @@
 config realm
 cnum realm ...
 0 100
-# Field 1 must be between 0 and 50
+# field 1 must be between 0 and 50

diff --git a/tests/empdump/xundump-errors/fld-invid8 b/tests/empdump/xundump-errors/fld-invid8
index 6a69789a29af47ef44fc9fcbf21c715ad546a6d7..a9f489f2c2b289762f38513db5858f34c1b003d8 100644 (file)
--- a/tests/empdump/xundump-errors/fld-invid8
+++ b/tests/empdump/xundump-errors/fld-invid8
@@ -2,4 +2,4 @@ config realm
 cnum realm ...
 0 1
 0 0
-# Fields 1,2 must be > (0,1)
+# fields 1,2 must be > (0,1)

diff --git a/tests/empdump/xundump-errors/fld-junk b/tests/empdump/xundump-errors/fld-junk
index f3e16f45b48c89744f06b2d97ebaaeee2ba82de2..9e873fa59da71f62d04bced689b34cf4434feaab 100644 (file)
--- a/tests/empdump/xundump-errors/fld-junk
+++ b/tests/empdump/xundump-errors/fld-junk
@@ -1,3 +1,3 @@
 XDUMP infrastructure 0
 !
-# Junk in field 1
+# junk in field 1

diff --git a/tests/empdump/xundump-errors/fld-junk2 b/tests/empdump/xundump-errors/fld-junk2
index f8726ee5e55ea314bfa698f100b078463ff54fa6..1275f725eae3ee68d06d1676d6d2c76a1d196095 100644 (file)
--- a/tests/empdump/xundump-errors/fld-junk2
+++ b/tests/empdump/xundump-errors/fld-junk2
@@ -1,3 +1,3 @@
 XDUMP plane 0
 0 1 0 0 0 0 0 0 0 0 0 0 0 "" 0 -1 -1 0 (!
-# Junk in field 19
+# junk in field 19

diff --git a/tests/empdump/xundump-errors/fld-malnum b/tests/empdump/xundump-errors/fld-malnum
index 5495e5b9149a8767c97b1fe10c0c445a944612b1..1d513e588e54ccfceea02fb27b9883b14add6a12 100644 (file)
--- a/tests/empdump/xundump-errors/fld-malnum
+++ b/tests/empdump/xundump-errors/fld-malnum
@@ -1,3 +1,3 @@
 XDUMP infrastructure 0
 +
-# Malformed number in field 1
+# malformed number in field 1

diff --git a/tests/empdump/xundump-errors/fld-malstr b/tests/empdump/xundump-errors/fld-malstr
index d2f039a666dc7493a6162f091177794665166798..d56d8016564eddb742829ca71be293248b1fbd91 100644 (file)
--- a/tests/empdump/xundump-errors/fld-malstr
+++ b/tests/empdump/xundump-errors/fld-malstr
@@ -1,3 +1,3 @@
 XDUMP infrastructure 0
 "lala
-# Malformed string in field 1
+# malformed string in field 1

diff --git a/tests/empdump/xundump-errors/fld-many b/tests/empdump/xundump-errors/fld-many
index aaa9e78ed69697d02c87ce3bc62471afe9047c84..6af7941b5ef3de1c68e4b45165c273b545dbf67b 100644 (file)
--- a/tests/empdump/xundump-errors/fld-many
+++ b/tests/empdump/xundump-errors/fld-many
@@ -1,3 +1,3 @@
 XDUMP realm 0
 0 0 2 3 4 5 6 7 8 9 a b c d e f 0 1 2 3 4 5 6 7 8 9 a b c d e f 0 1 2 3 4 5 6 7 8 9 a b c d e f 0 1 2 3 4 5 6 7 8 9 a b c d e f 0 1 2 3 4 5 6 7 8 9 a b c d e f 0 1 2 3 4 5 6 7 8 9 a b c d e f 0 1 2 3 4 5 6 7 8 9 a b c d e f 0 1 2 3 4 5 6 7 8 9 a b c d e f 0 1 2 3 4 5 6 7 8 9 a b c d e f 0 1 2 3 4 5 6 7 8 9 a b c d e f 0 1 2 3 4 5 6 7 8 9 a b c d e f 0 1 2 3 4 5 6 7 8 9 a b c d e f 0 1 2 3 4 5 6 7 8 9 a b c d e f 0 1 2 3 4 5 6 7 8 9 a b c d e f 0 1 2 3 4 5 6 7 8 9 a b c d e f 0 1 2 3 4 5 6 7 8 9 a b c d e f
-# Too many fields, expected only 6
+# too many fields, expected only 6

diff --git a/tests/empdump/xundump-errors/fld-miss b/tests/empdump/xundump-errors/fld-miss
index b90739311f8e03eec3b628a5cefacd4baf4c2f73..b1bc504aae1cf5899bd84e0545f50cf19451a57c 100644 (file)
--- a/tests/empdump/xundump-errors/fld-miss
+++ b/tests/empdump/xundump-errors/fld-miss
@@ -1,13 +1,13 @@
 XDUMP item 0
 0
-# Field name missing
-# Field mnem missing
-# Field value missing
-# Field sell missing
-# Field lbs missing
-# Field pkg(0) missing
-# Field pkg(1) missing
-# Field pkg(2) missing
-# Field pkg(3) missing
-# Field pkg(4) missing
-# Field melt_denom missing
+# field 'name' missing
+# field 'mnem' missing
+# field 'value' missing
+# field 'sell' missing
+# field 'lbs' missing
+# field 'pkg(0)' missing
+# field 'pkg(1)' missing
+# field 'pkg(2)' missing
+# field 'pkg(3)' missing
+# field 'pkg(4)' missing
+# field 'melt_denom' missing

diff --git a/tests/empdump/xundump-errors/fld-miss2 b/tests/empdump/xundump-errors/fld-miss2
index 586f6ef01ca327fc973151c98a48afb6d02194bb..d2b27f67a04be1f7ea9c36b470bf6bf371151db0 100644 (file)
--- a/tests/empdump/xundump-errors/fld-miss2
+++ b/tests/empdump/xundump-errors/fld-miss2
@@ -1,4 +1,4 @@
 config product
 uid name sname ct(0) ...
 0 "iron\040ore" "iron"
-# Field ctype(0) missing
+# field 'ctype(0)' missing

diff --git a/tests/empdump/xundump-errors/fld-nonil b/tests/empdump/xundump-errors/fld-nonil
index d1b65fce4e6500a74b48c63abc782602895146e3..d050d45ca6904c7f617eed9cf943e6bef37ce8ff 100644 (file)
--- a/tests/empdump/xundump-errors/fld-nonil
+++ b/tests/empdump/xundump-errors/fld-nonil
@@ -1,4 +1,4 @@
 config land
 uid owner xloc yloc type effic mobil off tech opx opy mission radius army ship harden retreat rflags rpath ...
 0 1 0 0 0 100 0 0 100 0 0 0 0 "" -1 0 42 0 nil
-# Field 19 doesn't take nil
+# field 19 doesn't take nil

diff --git a/tests/empdump/xundump-errors/fld-nonum b/tests/empdump/xundump-errors/fld-nonum
index 85d3d73e2b7e4229915675d39cfb1078b6a0a80d..c2a2613948cb0bcf7f84b9973d8d09382a2457fe 100644 (file)
--- a/tests/empdump/xundump-errors/fld-nonum
+++ b/tests/empdump/xundump-errors/fld-nonum
@@ -1,4 +1,4 @@
 config item
 uid name ...
 0 0
-# Field 2 doesn't take numbers
+# field 2 doesn't take numbers

diff --git a/tests/empdump/xundump-errors/fld-nostr b/tests/empdump/xundump-errors/fld-nostr
index b8fb9df5694398504f1f4642cdf77656b04879df..61d84d5dc49fa132d95ff3fba5cabe87559ec1c9 100644 (file)
--- a/tests/empdump/xundump-errors/fld-nostr
+++ b/tests/empdump/xundump-errors/fld-nostr
@@ -1,4 +1,4 @@
 config item
 uid ...
 ""
-# Field 1 doesn't take strings
+# field 1 doesn't take strings

diff --git a/tests/empdump/xundump-errors/fld-nosym b/tests/empdump/xundump-errors/fld-nosym
index b9e2b07081276960c5a72e9bae286246606a223f..a04c2d3d7c88a4e00b5f5f85bc5ee3ca688a8883 100644 (file)
--- a/tests/empdump/xundump-errors/fld-nosym
+++ b/tests/empdump/xundump-errors/fld-nosym
@@ -1,3 +1,3 @@
 XDUMP infrastructure 0
 xxx
-# Field 1 doesn't take symbols
+# field 1 doesn't take symbols

diff --git a/tests/empdump/xundump-errors/fld-nosymset b/tests/empdump/xundump-errors/fld-nosymset
index 579e4ac4f36041367def73507bef9d45ece721f2..a734a634bebb80dc06183199229a6fc755580904 100644 (file)
--- a/tests/empdump/xundump-errors/fld-nosymset
+++ b/tests/empdump/xundump-errors/fld-nosymset
@@ -1,3 +1,3 @@
 XDUMP infrastructure 0
 ()
-# Field 1 doesn't take symbol sets
+# field 1 doesn't take symbol sets

diff --git a/tests/empdump/xundump-errors/fld-sep b/tests/empdump/xundump-errors/fld-sep
index 9d423379821be85fc2996827f9070b272134a313..7ae68602574b39f7c77b18fd47678a40c7c43046 100644 (file)
--- a/tests/empdump/xundump-errors/fld-sep
+++ b/tests/empdump/xundump-errors/fld-sep
@@ -1,3 +1,3 @@
 XDUMP ship-chr 0
 0!
-# Bad field separator after field 1
+# bad field separator after field 1

diff --git a/tests/empdump/xundump-errors/fld-strbig b/tests/empdump/xundump-errors/fld-strbig
index 49967346df0e2e8e4de49e9e68cfb4231e48692b..6d797d677a5cc6bb32eae714294c571b0d9590ef 100644 (file)
--- a/tests/empdump/xundump-errors/fld-strbig
+++ b/tests/empdump/xundump-errors/fld-strbig
@@ -1,4 +1,4 @@
 config land
 uid owner xloc yloc type effic mobil off tech opx opy mission radius army ship harden retreat rflags rpath ...
 0 1 0 0 0 100 0 0 100 0 0 0 0 "" -1 0 42 0 "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
-# Field 19 takes at most 9 characters
+# field 19 takes at most 9 characters

diff --git a/tests/empdump/xundump-errors/fld-unexpid b/tests/empdump/xundump-errors/fld-unexpid
index 3b85502dd7318c5994e4a97ee5819daa55666eab..86290f420a54dee8bab318973999fccf21eb94d8 100644 (file)
--- a/tests/empdump/xundump-errors/fld-unexpid
+++ b/tests/empdump/xundump-errors/fld-unexpid
@@ -4,5 +4,5 @@ uid ...
 config ship
 uid ...
 2
-# Table's first part doesn't have this row
+# table's first part doesn't have this row
 /config

diff --git a/tests/empdump/xundump-errors/fld-unexpid1 b/tests/empdump/xundump-errors/fld-unexpid1
index 14f4f48521bc687626f35af05742e15e341649e8..83c122c5ec7ab2e8d697b848acabb67d2be47862 100644 (file)
--- a/tests/empdump/xundump-errors/fld-unexpid1
+++ b/tests/empdump/xundump-errors/fld-unexpid1
@@ -5,5 +5,5 @@ uid ...
 config ship
 uid ...
 1
-# Value for field 1 must be 2
+# value for field 1 must be 2
 /config

diff --git a/tests/empdump/xundump-errors/fld-unksym b/tests/empdump/xundump-errors/fld-unksym
index 29d31a0d168ee7b1ae14bb175c77fae1909279c9..e6800ecb1706499df5491f678096c1bc7d3af64d 100644 (file)
--- a/tests/empdump/xundump-errors/fld-unksym
+++ b/tests/empdump/xundump-errors/fld-unksym
@@ -1,3 +1,3 @@
 XDUMP product 1
 0 "iron ore" "iron" 0 0 0 0 0 0 0 xxx
-# Unknown level symbol `xxx' in field 11
+# unknown level symbol 'xxx' in field 11

diff --git a/tests/empdump/xundump-errors/fld-unparen b/tests/empdump/xundump-errors/fld-unparen
index 68f56b5fdd2b9fffa1ae9bd8be81bc33cde9cb0d..024b577e18ab866efa2c88f8fcbf80575cc17484 100644 (file)
--- a/tests/empdump/xundump-errors/fld-unparen
+++ b/tests/empdump/xundump-errors/fld-unparen
@@ -1,3 +1,3 @@
 XDUMP plane 0
 0 1 0 0 0 0 0 0 0 0 0 0 0 "" 0 -1 -1 0 (launched sync
-# Unmatched '(' in field 19
+# unmatched '(' in field 19

diff --git a/tests/empdump/xundump-errors/ftr-fewrows b/tests/empdump/xundump-errors/ftr-fewrows
index b1fbff52991add6c092b8278b1a465fe6fcb842f..2c43be7a924df839774a2e82ca9eb97587b3a9d2 100644 (file)
--- a/tests/empdump/xundump-errors/ftr-fewrows
+++ b/tests/empdump/xundump-errors/ftr-fewrows
@@ -1,3 +1,3 @@
 XDUMP sect-chr 0
 /0
-# Expected 34 more rows
+# expected 34 more rows

diff --git a/tests/empdump/xundump-errors/ftr-fewrows2 b/tests/empdump/xundump-errors/ftr-fewrows2
index bb63ac57f40d5730ae46df86e49f0766841ff2eb..a2304fca27c804384c883395e92e11a319da873c 100644 (file)
--- a/tests/empdump/xundump-errors/ftr-fewrows2
+++ b/tests/empdump/xundump-errors/ftr-fewrows2
@@ -2,4 +2,4 @@ config item
 uid ...
 0
 /config
-# Expected 13 more rows
+# expected 13 more rows

diff --git a/tests/empdump/xundump-errors/ftr-fewrows3 b/tests/empdump/xundump-errors/ftr-fewrows3
index 58bd59002f5e8f070f6297baed00f5ae9fcd2beb..89f9e4d33b26ec1eee2b1a1f4b375c91193fa1cc 100644 (file)
--- a/tests/empdump/xundump-errors/ftr-fewrows3
+++ b/tests/empdump/xundump-errors/ftr-fewrows3
@@ -2,4 +2,4 @@ XDUMP infrastructure 1133466732
 "road\040network" 2 2 2 1 1
 "rail\040network" 1 1 1 1 1
 /2
-# Expected 1 more rows
+# expected 1 more rows

diff --git a/tests/empdump/xundump-errors/ftr-fewrows4 b/tests/empdump/xundump-errors/ftr-fewrows4
index 55a1400e4b8419d889b86107983831a9e79a7adc..b22e789099aae2884a7167f3ef476fbb08c8d3ed 100644 (file)
--- a/tests/empdump/xundump-errors/ftr-fewrows4
+++ b/tests/empdump/xundump-errors/ftr-fewrows4
@@ -5,4 +5,4 @@ uid ...
 config ship
 uid ...
 /config
-# Table's first part has more rows
+# table's first part has more rows

diff --git a/tests/empdump/xundump-errors/ftr-junk b/tests/empdump/xundump-errors/ftr-junk
index fd8bc3acddd08ba42279b3771069c6d8191e18b9..6bcbae39a0d3b450a6651b8ff5dbd79253778e22 100644 (file)
--- a/tests/empdump/xundump-errors/ftr-junk
+++ b/tests/empdump/xundump-errors/ftr-junk
@@ -1,3 +1,3 @@
 XDUMP ship-chr 1130359236
 /0x
-# Junk after table footer
+# junk after table footer

diff --git a/tests/empdump/xundump-errors/ftr-mal b/tests/empdump/xundump-errors/ftr-mal
index 07799940e593e80f1a2ce65e98cb48d5bed21b33..d4cdab7b2d045b440a686bcdbd2c4775436181d2 100644 (file)
--- a/tests/empdump/xundump-errors/ftr-mal
+++ b/tests/empdump/xundump-errors/ftr-mal
@@ -1,3 +1,3 @@
 XDUMP ship-chr 1130359236
 /x
-# Malformed table footer
+# malformed table footer

diff --git a/tests/empdump/xundump-errors/ftr-mal2 b/tests/empdump/xundump-errors/ftr-mal2
index fd50c36b9d03bf8bf61996be7311747ad7fd54c3..fa3ac45aaa6d2650944c5b6767bf9581c5304b59 100644 (file)
--- a/tests/empdump/xundump-errors/ftr-mal2
+++ b/tests/empdump/xundump-errors/ftr-mal2
@@ -4,4 +4,4 @@ name             lcm hcm dcost mcost enab
 "rail network"     1   1     1     1   1
 "defense factor"   1   1     1     1   0
 /con
-# Malformed table footer
+# malformed table footer

diff --git a/tests/empdump/xundump-errors/ftr-manyrows b/tests/empdump/xundump-errors/ftr-manyrows
index 659643227c9a4b0a577d3aa4e4643205428048ac..6b3036ea544baffc83ab57d18f1b6b7318fbe19f 100644 (file)
--- a/tests/empdump/xundump-errors/ftr-manyrows
+++ b/tests/empdump/xundump-errors/ftr-manyrows
@@ -3,5 +3,5 @@ XDUMP infrastructure 1133466732
 "rail\040network" 1 1 1 1 1
 "defense\040factor" 1 1 1 1 0
 "lala" 1 1 1 1 1
-# Too many rows
+# too many rows
 /4

diff --git a/tests/empdump/xundump-errors/ftr-manyrows2 b/tests/empdump/xundump-errors/ftr-manyrows2
index 957868bd330ea3e6e331402039c0afc86c0dc6c0..0c3e90851f24e9b6d857eb896db96cb73013e241 100644 (file)
--- a/tests/empdump/xundump-errors/ftr-manyrows2
+++ b/tests/empdump/xundump-errors/ftr-manyrows2
@@ -15,4 +15,4 @@ lbs ...
 12
 13
 14
-# Too many rows
+# too many rows

diff --git a/tests/empdump/xundump-errors/ftr-mismatch b/tests/empdump/xundump-errors/ftr-mismatch
index 81159c7dc74f3142e795afc1b4a488f1ac6a94b3..967207afdf5a62c9db32f4fc73c92dafc16cd0c0 100644 (file)
--- a/tests/empdump/xundump-errors/ftr-mismatch
+++ b/tests/empdump/xundump-errors/ftr-mismatch
@@ -1,3 +1,3 @@
 XDUMP ship-chr 1130359236
 /2
-# Read 0 rows, which doesn't match footer 2 rows
+# expected footer /0

diff --git a/tests/empdump/xundump-errors/hdr-extra b/tests/empdump/xundump-errors/hdr-extra
index c856f3db91047dff0736e99981860d142c58225f..238e12701dc5051ec4292db9f4fc3b9e87163d99 100644 (file)
--- a/tests/empdump/xundump-errors/hdr-extra
+++ b/tests/empdump/xundump-errors/hdr-extra
@@ -1,3 +1,3 @@
 config news
 timestamp
-# Extraneous header timestamp in field 1
+# extraneous header 'timestamp' in field 1

diff --git a/tests/empdump/xundump-errors/hdr-extra2 b/tests/empdump/xundump-errors/hdr-extra2
index fa27ebb8f38635a2147fb4f2e8054b938c4642b7..f672792a594819643c061c7d5af4d90c1e8a9c2b 100644 (file)
--- a/tests/empdump/xundump-errors/hdr-extra2
+++ b/tests/empdump/xundump-errors/hdr-extra2
@@ -1,3 +1,3 @@
 config sect
 uid ...
-# Extraneous header uid in field 1
+# extraneous header 'uid' in field 1

diff --git a/tests/empdump/xundump-errors/hdr-junk b/tests/empdump/xundump-errors/hdr-junk
index fde9308309f996945b316627ab030bfddd0d4170..3c2e6da0b8e6873ec3e9bd241b67f1f91925f0d2 100644 (file)
--- a/tests/empdump/xundump-errors/hdr-junk
+++ b/tests/empdump/xundump-errors/hdr-junk
@@ -1,3 +1,3 @@
 XDUMP ship 1130359236 junk
-# Junk after xdump header
+# junk after xdump header
 /0

diff --git a/tests/empdump/xundump-errors/hdr-none b/tests/empdump/xundump-errors/hdr-none
index 700ef86553f39b180ac4193a3d14a3165929bcf4..b588ce84b17beb90982794ef578c854eb69d9875 100644 (file)
--- a/tests/empdump/xundump-errors/hdr-none
+++ b/tests/empdump/xundump-errors/hdr-none
@@ -1,2 +1,2 @@
 junk
-# Expected xdump header
+# expected xdump header

diff --git a/tests/empdump/xundump-errors/hdr-noperm b/tests/empdump/xundump-errors/hdr-noperm
index 3f5e46aade460659e2e2997280f949c542c6a92c..03ba4a2699af518bb578520969b2bec57c50c15c 100644 (file)
--- a/tests/empdump/xundump-errors/hdr-noperm
+++ b/tests/empdump/xundump-errors/hdr-noperm
@@ -1,2 +1,2 @@
 config map
-# Table `map' is not permitted here
+# table 'map' is not permitted here

diff --git a/tests/empdump/xundump-errors/hdr-noperm2 b/tests/empdump/xundump-errors/hdr-noperm2
index 3bf4d47fcfd4d3273d1c19671caf4ed01b3d4ee1..ca5fc1cbbf69b2119ab6caa47dd35b18e9c29010 100644 (file)
--- a/tests/empdump/xundump-errors/hdr-noperm2
+++ b/tests/empdump/xundump-errors/hdr-noperm2
@@ -1,2 +1,2 @@
 config table
-# Table `table' is not permitted here
+# table 'table' is not permitted here

diff --git a/tests/empdump/xundump-errors/hdr-unexp b/tests/empdump/xundump-errors/hdr-unexp
index dd8ab024fc0d409880bd0d7be6628dcb1cb7dcbe..899ea620b9597c0461cb81cf739f9268dae23c82 100644 (file)
--- a/tests/empdump/xundump-errors/hdr-unexp
+++ b/tests/empdump/xundump-errors/hdr-unexp
@@ -2,4 +2,4 @@ config ship
 uid ...
 /config
 config plane
-# Expected table `ship', not `plane'
+# expected table 'ship', not 'plane'

diff --git a/tests/empdump/xundump-errors/hdr-unktab b/tests/empdump/xundump-errors/hdr-unktab
index 632f51aece81fc17009ba92951f6d0a1e710ff07..4323d5093defc669d806b47d8c7db105864c839b 100644 (file)
--- a/tests/empdump/xundump-errors/hdr-unktab
+++ b/tests/empdump/xundump-errors/hdr-unktab
@@ -1,2 +1,2 @@
 XDUMP xxx 1
-# Unknown table `xxx'
+# unknown table 'xxx'