[SCM] gawk branch, gawk-5.1-stable, updated. gawk-4.1.0-4004-g8136d3d

[Arnold Robbins]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "gawk".

The branch, gawk-5.1-stable has been updated
       via  8136d3d5824f666a6da09460c4654a9ef856ad47 (commit)
      from  37b758783c35d5b205103a47a9f963baae1f97b1 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.sv.gnu.org/cgit/gawk.git/commit/?id=8136d3d5824f666a6da09460c4654a9ef856ad47

commit 8136d3d5824f666a6da09460c4654a9ef856ad47
Author: Arnold D. Robbins <arnold@skeeve.com>
Date:   Tue Jun 30 15:39:49 2020 +0300

    Make debug.c messages more consistent.

diff --git a/ChangeLog b/ChangeLog
index 05db8c4..26dfd0e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2020-06-29         Arnold D. Robbins     <arnold@skeeve.com>
+
+       * debug.c: Cleanup messages. Error messages start with lower
+       case letter.
+       * TODO: Updated.
+
 2020-06-14         Arnold D. Robbins     <arnold@skeeve.com>
 
        Disallow SYMTAB and FUNCTAB as destination arguments to builtin
diff --git a/TODO b/TODO
index 51bb496..f2b3e1b 100644
--- a/TODO
+++ b/TODO
@@ -1,4 +1,4 @@
-Sun Jun 28 08:49:16 IDT 2020
+Mon Jun 29 11:16:12 IDT 2020
 ============================
 
 There were too many files tracking different thoughts and ideas for
@@ -31,9 +31,6 @@ Minor Cleanups and Code Improvements
        about genuine errors.
 
        Message cleanup:
-       * Messages in debug.c start with capital letters, but not in
-         other files.
-
        * Messages are inconsistent about final punctuation (periods etc.)
 
 Minor New Features
diff --git a/debug.c b/debug.c
index 26a6755..61e21a5 100644
--- a/debug.c
+++ b/debug.c
@@ -539,7 +539,7 @@ print_lines(char *src, int start_line, int nlines)
        }
 
        if (fstat(s->fd, &sbuf) == 0 && s->mtime < sbuf.st_mtime) {
-               fprintf(out_fp, _("WARNING: source file `%s' modified since 
program compilation.\n"),
+               fprintf(out_fp, _("warning: source file `%s' modified since 
program compilation.\n"),
                                src);
                efree(s->line_offset);
                s->line_offset = NULL;
@@ -775,7 +775,7 @@ do_info(CMDARG *arg, int cmd ATTRIBUTE_UNUSED)
                                                b->number, disp, (b->flags & 
BP_ENABLE) != 0 ? "yes" : "no",
                                                b->src, b->bpi->source_line);
                                if (b->hit_count > 0)
-                                       gprintf(out_fp, _("\tno of hits = 
%ld\n"), b->hit_count);
+                                       gprintf(out_fp, _("\tnumber of hits = 
%ld\n"), b->hit_count);
                                if ((b->flags & BP_IGNORE) != 0)
                                        gprintf(out_fp, _("\tignore next %ld 
hit(s)\n"), b->ignore_count);
                                if (b->cndn.code != NULL)
@@ -1129,7 +1129,7 @@ print_subscript(NODE *arr, char *arr_name, CMDARG *a, int 
count)
        subs = a->a_node;
        r = in_array(arr, subs);
        if (r == NULL)
-               fprintf(out_fp, _("[\"%.*s\"] not in array `%s'\n"), (int) 
subs->stlen, subs->stptr, arr_name);
+               fprintf(out_fp, _("subscript \"%.*s\" is not in array `%s'\n"), 
(int) subs->stlen, subs->stptr, arr_name);
        else if (r->type == Node_var_array) {
                if (count > 1)
                        print_subscript(r, r->vname, a->next, count - 1);
@@ -1181,7 +1181,7 @@ do_print_var(CMDARG *arg, int cmd ATTRIBUTE_UNUSED)
                                        subs = a->a_node;
                                        value = in_array(r, subs);
                                        if (value == NULL) {
-                                               fprintf(out_fp, _("[\"%.*s\"] 
not in array `%s'\n"),
+                                               fprintf(out_fp, _("subscript 
\"%.*s\" is not in array `%s'\n"),
                                                                        (int) 
subs->stlen, subs->stptr, name);
                                                break;
                                        } else if (value->type != 
Node_var_array) {
@@ -1511,10 +1511,10 @@ do_delete_item(struct list_item *list, CMDARG *arg)
                        if ((d = find_item(list, arg->a_int)) == NULL) {
                                /* split into two for easier message 
translation */
                                if (list == &display_list)
-                                       d_error(_("No display item numbered 
%ld"),
+                                       d_error(_("no display item numbered 
%ld"),
                                                arg->a_int);
                                else
-                                       d_error(_("No watch item numbered %ld"),
+                                       d_error(_("no watch item numbered %ld"),
                                                arg->a_int);
                        } else
                                delete_item(d);
@@ -1540,7 +1540,7 @@ display(struct list_item *d)
                        sub = d->subs[i];
                        r = in_array(symbol, sub);
                        if (r == NULL) {
-                               fprintf(out_fp, _("%d: [\"%.*s\"] not in array 
`%s'\n"),
+                               fprintf(out_fp, _("%d: subscript \"%.*s\" is 
not in array `%s'\n"),
                                                        d->number, (int) 
sub->stlen, sub->stptr, d->sname);
                                break;
                        }
@@ -2383,7 +2383,7 @@ set_breakpoint(CMDARG *arg, bool temporary)
        case D_int:             /* break lineno */
                lineno = (int) arg->a_int;
                if (lineno <= 0 || lineno > s->srclines)
-                       d_error(_("line number %d in file `%s' out of range"), 
lineno, src);
+                       d_error(_("line number %d in file `%s' is out of 
range"), lineno, src);
                else {
                        rp = find_rule(src, lineno);
                        if (rp == NULL)
@@ -2966,7 +2966,7 @@ do_run(CMDARG *arg ATTRIBUTE_UNUSED, int cmd 
ATTRIBUTE_UNUSED)
                restart(true);  /* does not return */
        }
 
-       fprintf(out_fp, _("Starting program: \n"));
+       fprintf(out_fp, _("Starting program:\n"));
 
        prog_running = true;
        fatal_tag_valid = 1;
@@ -3228,7 +3228,7 @@ do_finish(CMDARG *arg ATTRIBUTE_UNUSED, int cmd)
        }
        stop.fcall_count = fcall_count - cur_frame - 1;
        assert(stop.fcall_count >= 0);
-       fprintf(out_fp, _("Run till return from "));
+       fprintf(out_fp, _("Run until return from "));
        print_numbered_frame(cur_frame);
        stop.check_func = check_finish;
        stop.command = cmd;
@@ -5752,7 +5752,7 @@ static void
 check_symbol(NODE *r)
 {
        invalid_symbol++;
-       d_error(_("No symbol `%s' in current context"), r->vname);
+       d_error(_("no symbol `%s' in current context"), r->vname);
        /* install anyway, but keep track of it */
        append_symbol(r);
 }
diff --git a/test/ChangeLog b/test/ChangeLog
index ca213e8..9b04355 100644
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -1,3 +1,8 @@
+2020-06-29         Arnold D. Robbins     <arnold@skeeve.com>
+
+       * dbugeval2.ok, dbugtypedre1.ok, dbugtypedre2.ok, symtab10.ok,
+       watchpoint1.ok: Updated after code changes.
+
 2020-06-10         Arnold D. Robbins     <arnold@skeeve.com>
 
        Miscellanious fixes from Michael Builov <mbuilov@gmail.com>.
diff --git a/test/dbugeval2.ok b/test/dbugeval2.ok
index 4d64526..38cd7bb 100644
--- a/test/dbugeval2.ok
+++ b/test/dbugeval2.ok
@@ -1,5 +1,5 @@
 Breakpoint 1 set at file `dbugeval2.awk', line 3
-Starting program: 
+Starting program:
 Stopping in BEGIN ...
 Breakpoint 1, main() at `dbugeval2.awk':3
 3              b = 3
diff --git a/test/dbugtypedre1.ok b/test/dbugtypedre1.ok
index dffee0e..ae89ff4 100644
--- a/test/dbugtypedre1.ok
+++ b/test/dbugtypedre1.ok
@@ -1,5 +1,5 @@
 Watchpoint 1: e
-Starting program: 
+Starting program:
 number
 untyped
 regexp
diff --git a/test/dbugtypedre2.ok b/test/dbugtypedre2.ok
index 9c04e1e..ab70fb9 100644
--- a/test/dbugtypedre2.ok
+++ b/test/dbugtypedre2.ok
@@ -1,5 +1,5 @@
 Watchpoint 1: x
-Starting program: 
+Starting program:
 Stopping in BEGIN ...
 Watchpoint 1: x
   Old value: untyped variable
diff --git a/test/symtab10.ok b/test/symtab10.ok
index b0cabd7..9ab3855 100644
--- a/test/symtab10.ok
+++ b/test/symtab10.ok
@@ -1,5 +1,5 @@
 Watchpoint 1: y
-Starting program: 
+Starting program:
 Stopping in BEGIN ...
 Watchpoint 1: y
   Old value: untyped variable
diff --git a/test/watchpoint1.ok b/test/watchpoint1.ok
index b1e7e53..ec8e598 100644
--- a/test/watchpoint1.ok
+++ b/test/watchpoint1.ok
@@ -17,7 +17,7 @@ Watchpoint 1: c
 2: nr = untyped variable
 3: NR = 0
 Breakpoint 2 set at file `watchpoint1.awk', line 6
-Starting program: 
+Starting program:
 Stopping in Rule ...
 Watchpoint 1: c
   Old value: untyped variable

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog            |  6 ++++++
 TODO                 |  5 +----
 debug.c              | 22 +++++++++++-----------
 test/ChangeLog       |  5 +++++
 test/dbugeval2.ok    |  2 +-
 test/dbugtypedre1.ok |  2 +-
 test/dbugtypedre2.ok |  2 +-
 test/symtab10.ok     |  2 +-
 test/watchpoint1.ok  |  2 +-
 9 files changed, 28 insertions(+), 20 deletions(-)


hooks/post-receive
-- 
gawk