diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | TODO | 5 | ||||
| -rw-r--r-- | awkgram.c | 2 | ||||
| -rw-r--r-- | awkgram.y | 2 | ||||
| -rw-r--r-- | builtin.c | 2 | ||||
| -rw-r--r-- | command.c | 90 | ||||
| -rw-r--r-- | command.y | 90 | ||||
| -rw-r--r-- | debug.c | 22 | ||||
| -rw-r--r-- | gawkapi.c | 10 | ||||
| -rw-r--r-- | io.c | 8 | ||||
| -rw-r--r-- | node.c | 2 | ||||
| -rw-r--r-- | test/ChangeLog | 4 | ||||
| -rw-r--r-- | test/mbstr1.ok | 2 | ||||
| -rw-r--r-- | test/mbstr2.ok | 2 |
14 files changed, 128 insertions, 120 deletions
@@ -1,3 +1,10 @@ +2020-08-24 Arnold D. Robbins <arnold@skeeve.com> + + * awkgram.y, builtin.c, command.y, debug.c, gawkapi.c, + io.c, node.c: Make all messages consistent: Remove final periods + from messages that had them. + * TODO: Updated. + 2020-08-20 Arnold D. Robbins <arnold@skeeve.com> * awk.h (NODE): Move valref completely out of the union. Fixes @@ -1,4 +1,4 @@ -Tue Jul 28 20:45:09 IDT 2020 +Thu Aug 20 12:18:22 IDT 2020 ============================ There were too many files tracking different thoughts and ideas for @@ -30,9 +30,6 @@ Minor Cleanups and Code Improvements Lint option which would allow extensions and only complain about genuine errors. - Message cleanup: - * Messages are inconsistent about final punctuation (periods etc.) - Go through the FIXMEs in the manual and fix as many as possible. Minor New Features @@ -7468,7 +7468,7 @@ shadow_funcs() /* End with fatal if the user requested it. */ if (shadow && lintfunc == r_fatal) - lintwarn(_("there were shadowed variables.")); + lintwarn(_("there were shadowed variables")); } @@ -4966,7 +4966,7 @@ shadow_funcs() /* End with fatal if the user requested it. */ if (shadow && lintfunc == r_fatal) - lintwarn(_("there were shadowed variables.")); + lintwarn(_("there were shadowed variables")); } @@ -4154,7 +4154,7 @@ do_typeof(int nargs) /* fall through */ default: if (res == NULL) { - warning(_("typeof detected invalid flags combination `%s'; please file a bug report."), flags2str(arg->flags)); + warning(_("typeof detected invalid flags combination `%s'; please file a bug report"), flags2str(arg->flags)); res = "unknown"; } break; @@ -1766,7 +1766,7 @@ yyreduce: #line 321 "command.y" { if (in_cmd_src(yyvsp[0]->a_string)) - yyerror(_("source: `%s': already sourced."), yyvsp[0]->a_string); + yyerror(_("source: `%s': already sourced"), yyvsp[0]->a_string); } #line 1772 "command.c" break; @@ -1775,7 +1775,7 @@ yyreduce: #line 326 "command.y" { if (! input_from_tty) - yyerror(_("save: `%s': command not permitted."), yyvsp[0]->a_string); + yyerror(_("save: `%s': command not permitted"), yyvsp[0]->a_string); } #line 1781 "command.c" break; @@ -2537,93 +2537,93 @@ append_statement(CMDARG *stmt_list, char *stmt) struct cmdtoken cmdtab[] = { { "backtrace", "bt", D_backtrace, D_BACKTRACE, do_backtrace, - gettext_noop("backtrace [N] - print trace of all or N innermost (outermost if N < 0) frames.") }, + gettext_noop("backtrace [N] - print trace of all or N innermost (outermost if N < 0) frames") }, { "break", "b", D_break, D_BREAK, do_breakpoint, - gettext_noop("break [[filename:]N|function] - set breakpoint at the specified location.") }, + gettext_noop("break [[filename:]N|function] - set breakpoint at the specified location") }, { "clear", "", D_clear, D_CLEAR, do_clear, - gettext_noop("clear [[filename:]N|function] - delete breakpoints previously set.") }, + gettext_noop("clear [[filename:]N|function] - delete breakpoints previously set") }, { "commands", "", D_commands, D_COMMANDS, do_commands, - gettext_noop("commands [num] - starts a list of commands to be executed at a breakpoint(watchpoint) hit.") }, + gettext_noop("commands [num] - starts a list of commands to be executed at a breakpoint(watchpoint) hit") }, { "condition", "", D_condition, D_CONDITION, do_condition, - gettext_noop("condition num [expr] - set or clear breakpoint or watchpoint condition.") }, + gettext_noop("condition num [expr] - set or clear breakpoint or watchpoint condition") }, { "continue", "c", D_continue, D_CONTINUE, do_continue, - gettext_noop("continue [COUNT] - continue program being debugged.") }, + gettext_noop("continue [COUNT] - continue program being debugged") }, { "delete", "d", D_delete, D_DELETE, do_delete_breakpoint, - gettext_noop("delete [breakpoints] [range] - delete specified breakpoints.") }, + gettext_noop("delete [breakpoints] [range] - delete specified breakpoints") }, { "disable", "", D_disable, D_DISABLE, do_disable_breakpoint, - gettext_noop("disable [breakpoints] [range] - disable specified breakpoints.") }, + gettext_noop("disable [breakpoints] [range] - disable specified breakpoints") }, { "display", "", D_display, D_DISPLAY, do_display, - gettext_noop("display [var] - print value of variable each time the program stops.") }, + gettext_noop("display [var] - print value of variable each time the program stops") }, { "down", "", D_down, D_DOWN, do_down, - gettext_noop("down [N] - move N frames down the stack.") }, + gettext_noop("down [N] - move N frames down the stack") }, { "dump", "", D_dump, D_DUMP, do_dump_instructions, - gettext_noop("dump [filename] - dump instructions to file or stdout.") }, + gettext_noop("dump [filename] - dump instructions to file or stdout") }, { "enable", "e", D_enable, D_ENABLE, do_enable_breakpoint, - gettext_noop("enable [once|del] [breakpoints] [range] - enable specified breakpoints.") }, + gettext_noop("enable [once|del] [breakpoints] [range] - enable specified breakpoints") }, { "end", "", D_end, D_END, do_commands, - gettext_noop("end - end a list of commands or awk statements.") }, + gettext_noop("end - end a list of commands or awk statements") }, { "eval", "", D_eval, D_EVAL, do_eval, - gettext_noop("eval stmt|[p1, p2, ...] - evaluate awk statement(s).") }, + gettext_noop("eval stmt|[p1, p2, ...] - evaluate awk statement(s)") }, { "exit", "", D_quit, D_QUIT, do_quit, - gettext_noop("exit - (same as quit) exit debugger.") }, + gettext_noop("exit - (same as quit) exit debugger") }, { "finish", "", D_finish, D_FINISH, do_finish, - gettext_noop("finish - execute until selected stack frame returns.") }, + gettext_noop("finish - execute until selected stack frame returns") }, { "frame", "f", D_frame, D_FRAME, do_frame, - gettext_noop("frame [N] - select and print stack frame number N.") }, + gettext_noop("frame [N] - select and print stack frame number N") }, { "help", "h", D_help, D_HELP, do_help, - gettext_noop("help [command] - print list of commands or explanation of command.") }, + gettext_noop("help [command] - print list of commands or explanation of command") }, { "ignore", "", D_ignore, D_IGNORE, do_ignore_breakpoint, - gettext_noop("ignore N COUNT - set ignore-count of breakpoint number N to COUNT.") }, + gettext_noop("ignore N COUNT - set ignore-count of breakpoint number N to COUNT") }, { "info", "i", D_info, D_INFO, do_info, - gettext_noop("info topic - source|sources|variables|functions|break|frame|args|locals|display|watch.") }, + gettext_noop("info topic - source|sources|variables|functions|break|frame|args|locals|display|watch") }, { "list", "l", D_list, D_LIST, do_list, - gettext_noop("list [-|+|[filename:]lineno|function|range] - list specified line(s).") }, + gettext_noop("list [-|+|[filename:]lineno|function|range] - list specified line(s)") }, { "next", "n", D_next, D_NEXT, do_next, - gettext_noop("next [COUNT] - step program, proceeding through subroutine calls.") }, + gettext_noop("next [COUNT] - step program, proceeding through subroutine calls") }, { "nexti", "ni", D_nexti, D_NEXTI, do_nexti, - gettext_noop("nexti [COUNT] - step one instruction, but proceed through subroutine calls.") }, + gettext_noop("nexti [COUNT] - step one instruction, but proceed through subroutine calls") }, { "option", "o", D_option, D_OPTION, do_option, - gettext_noop("option [name[=value]] - set or display debugger option(s).") }, + gettext_noop("option [name[=value]] - set or display debugger option(s)") }, { "print", "p", D_print, D_PRINT, do_print_var, - gettext_noop("print var [var] - print value of a variable or array.") }, + gettext_noop("print var [var] - print value of a variable or array") }, { "printf", "", D_printf, D_PRINTF, do_print_f, - gettext_noop("printf format, [arg], ... - formatted output.") }, + gettext_noop("printf format, [arg], ... - formatted output") }, { "quit", "q", D_quit, D_QUIT, do_quit, - gettext_noop("quit - exit debugger.") }, + gettext_noop("quit - exit debugger") }, { "return", "", D_return, D_RETURN, do_return, - gettext_noop("return [value] - make selected stack frame return to its caller.") }, + gettext_noop("return [value] - make selected stack frame return to its caller") }, { "run", "r", D_run, D_RUN, do_run, - gettext_noop("run - start or restart executing program.") }, + gettext_noop("run - start or restart executing program") }, #ifdef HAVE_LIBREADLINE { "save", "", D_save, D_SAVE, do_save, - gettext_noop("save filename - save commands from the session to file.") }, + gettext_noop("save filename - save commands from the session to file") }, #endif { "set", "", D_set, D_SET, do_set_var, - gettext_noop("set var = value - assign value to a scalar variable.") }, + gettext_noop("set var = value - assign value to a scalar variable") }, { "silent", "", D_silent, D_SILENT, do_commands, - gettext_noop("silent - suspends usual message when stopped at a breakpoint/watchpoint.") }, + gettext_noop("silent - suspends usual message when stopped at a breakpoint/watchpoint") }, { "source", "", D_source, D_SOURCE, do_source, - gettext_noop("source file - execute commands from file.") }, + gettext_noop("source file - execute commands from file") }, { "step", "s", D_step, D_STEP, do_step, - gettext_noop("step [COUNT] - step program until it reaches a different source line.") }, + gettext_noop("step [COUNT] - step program until it reaches a different source line") }, { "stepi", "si", D_stepi, D_STEPI, do_stepi, - gettext_noop("stepi [COUNT] - step one instruction exactly.") }, + gettext_noop("stepi [COUNT] - step one instruction exactly") }, { "tbreak", "t", D_tbreak, D_TBREAK, do_tmp_breakpoint, - gettext_noop("tbreak [[filename:]N|function] - set a temporary breakpoint.") }, + gettext_noop("tbreak [[filename:]N|function] - set a temporary breakpoint") }, { "trace", "", D_trace, D_TRACE, do_trace_instruction, - gettext_noop("trace on|off - print instruction before executing.") }, + gettext_noop("trace on|off - print instruction before executing") }, { "undisplay", "", D_undisplay, D_UNDISPLAY, do_undisplay, - gettext_noop("undisplay [N] - remove variable(s) from automatic display list.") }, + gettext_noop("undisplay [N] - remove variable(s) from automatic display list") }, { "until", "u", D_until, D_UNTIL, do_until, - gettext_noop("until [[filename:]N|function] - execute until program reaches a different line or line N within current frame.") }, + gettext_noop("until [[filename:]N|function] - execute until program reaches a different line or line N within current frame") }, { "unwatch", "", D_unwatch, D_UNWATCH, do_unwatch, - gettext_noop("unwatch [N] - remove variable(s) from watch list.") }, + gettext_noop("unwatch [N] - remove variable(s) from watch list") }, { "up", "", D_up, D_UP, do_up, - gettext_noop("up [N] - move N frames up the stack.") }, + gettext_noop("up [N] - move N frames up the stack") }, { "watch", "w", D_watch, D_WATCH, do_watch, - gettext_noop("watch var - set a watchpoint for a variable.") }, + gettext_noop("watch var - set a watchpoint for a variable") }, { "where", "", D_backtrace, D_BACKTRACE, do_backtrace, - gettext_noop("where [N] - (same as backtrace) print trace of all or N innermost (outermost if N < 0) frames.") }, + gettext_noop("where [N] - (same as backtrace) print trace of all or N innermost (outermost if N < 0) frames") }, { NULL, NULL, D_illegal, 0, (Func_cmd) 0, NULL }, }; @@ -320,12 +320,12 @@ command | D_SOURCE D_STRING { if (in_cmd_src($2->a_string)) - yyerror(_("source: `%s': already sourced."), $2->a_string); + yyerror(_("source: `%s': already sourced"), $2->a_string); } | D_SAVE D_STRING { if (! input_from_tty) - yyerror(_("save: `%s': command not permitted."), $2->a_string); + yyerror(_("save: `%s': command not permitted"), $2->a_string); } | D_COMMANDS commands_arg { @@ -816,93 +816,93 @@ append_statement(CMDARG *stmt_list, char *stmt) struct cmdtoken cmdtab[] = { { "backtrace", "bt", D_backtrace, D_BACKTRACE, do_backtrace, - gettext_noop("backtrace [N] - print trace of all or N innermost (outermost if N < 0) frames.") }, + gettext_noop("backtrace [N] - print trace of all or N innermost (outermost if N < 0) frames") }, { "break", "b", D_break, D_BREAK, do_breakpoint, - gettext_noop("break [[filename:]N|function] - set breakpoint at the specified location.") }, + gettext_noop("break [[filename:]N|function] - set breakpoint at the specified location") }, { "clear", "", D_clear, D_CLEAR, do_clear, - gettext_noop("clear [[filename:]N|function] - delete breakpoints previously set.") }, + gettext_noop("clear [[filename:]N|function] - delete breakpoints previously set") }, { "commands", "", D_commands, D_COMMANDS, do_commands, - gettext_noop("commands [num] - starts a list of commands to be executed at a breakpoint(watchpoint) hit.") }, + gettext_noop("commands [num] - starts a list of commands to be executed at a breakpoint(watchpoint) hit") }, { "condition", "", D_condition, D_CONDITION, do_condition, - gettext_noop("condition num [expr] - set or clear breakpoint or watchpoint condition.") }, + gettext_noop("condition num [expr] - set or clear breakpoint or watchpoint condition") }, { "continue", "c", D_continue, D_CONTINUE, do_continue, - gettext_noop("continue [COUNT] - continue program being debugged.") }, + gettext_noop("continue [COUNT] - continue program being debugged") }, { "delete", "d", D_delete, D_DELETE, do_delete_breakpoint, - gettext_noop("delete [breakpoints] [range] - delete specified breakpoints.") }, + gettext_noop("delete [breakpoints] [range] - delete specified breakpoints") }, { "disable", "", D_disable, D_DISABLE, do_disable_breakpoint, - gettext_noop("disable [breakpoints] [range] - disable specified breakpoints.") }, + gettext_noop("disable [breakpoints] [range] - disable specified breakpoints") }, { "display", "", D_display, D_DISPLAY, do_display, - gettext_noop("display [var] - print value of variable each time the program stops.") }, + gettext_noop("display [var] - print value of variable each time the program stops") }, { "down", "", D_down, D_DOWN, do_down, - gettext_noop("down [N] - move N frames down the stack.") }, + gettext_noop("down [N] - move N frames down the stack") }, { "dump", "", D_dump, D_DUMP, do_dump_instructions, - gettext_noop("dump [filename] - dump instructions to file or stdout.") }, + gettext_noop("dump [filename] - dump instructions to file or stdout") }, { "enable", "e", D_enable, D_ENABLE, do_enable_breakpoint, - gettext_noop("enable [once|del] [breakpoints] [range] - enable specified breakpoints.") }, + gettext_noop("enable [once|del] [breakpoints] [range] - enable specified breakpoints") }, { "end", "", D_end, D_END, do_commands, - gettext_noop("end - end a list of commands or awk statements.") }, + gettext_noop("end - end a list of commands or awk statements") }, { "eval", "", D_eval, D_EVAL, do_eval, - gettext_noop("eval stmt|[p1, p2, ...] - evaluate awk statement(s).") }, + gettext_noop("eval stmt|[p1, p2, ...] - evaluate awk statement(s)") }, { "exit", "", D_quit, D_QUIT, do_quit, - gettext_noop("exit - (same as quit) exit debugger.") }, + gettext_noop("exit - (same as quit) exit debugger") }, { "finish", "", D_finish, D_FINISH, do_finish, - gettext_noop("finish - execute until selected stack frame returns.") }, + gettext_noop("finish - execute until selected stack frame returns") }, { "frame", "f", D_frame, D_FRAME, do_frame, - gettext_noop("frame [N] - select and print stack frame number N.") }, + gettext_noop("frame [N] - select and print stack frame number N") }, { "help", "h", D_help, D_HELP, do_help, - gettext_noop("help [command] - print list of commands or explanation of command.") }, + gettext_noop("help [command] - print list of commands or explanation of command") }, { "ignore", "", D_ignore, D_IGNORE, do_ignore_breakpoint, - gettext_noop("ignore N COUNT - set ignore-count of breakpoint number N to COUNT.") }, + gettext_noop("ignore N COUNT - set ignore-count of breakpoint number N to COUNT") }, { "info", "i", D_info, D_INFO, do_info, - gettext_noop("info topic - source|sources|variables|functions|break|frame|args|locals|display|watch.") }, + gettext_noop("info topic - source|sources|variables|functions|break|frame|args|locals|display|watch") }, { "list", "l", D_list, D_LIST, do_list, - gettext_noop("list [-|+|[filename:]lineno|function|range] - list specified line(s).") }, + gettext_noop("list [-|+|[filename:]lineno|function|range] - list specified line(s)") }, { "next", "n", D_next, D_NEXT, do_next, - gettext_noop("next [COUNT] - step program, proceeding through subroutine calls.") }, + gettext_noop("next [COUNT] - step program, proceeding through subroutine calls") }, { "nexti", "ni", D_nexti, D_NEXTI, do_nexti, - gettext_noop("nexti [COUNT] - step one instruction, but proceed through subroutine calls.") }, + gettext_noop("nexti [COUNT] - step one instruction, but proceed through subroutine calls") }, { "option", "o", D_option, D_OPTION, do_option, - gettext_noop("option [name[=value]] - set or display debugger option(s).") }, + gettext_noop("option [name[=value]] - set or display debugger option(s)") }, { "print", "p", D_print, D_PRINT, do_print_var, - gettext_noop("print var [var] - print value of a variable or array.") }, + gettext_noop("print var [var] - print value of a variable or array") }, { "printf", "", D_printf, D_PRINTF, do_print_f, - gettext_noop("printf format, [arg], ... - formatted output.") }, + gettext_noop("printf format, [arg], ... - formatted output") }, { "quit", "q", D_quit, D_QUIT, do_quit, - gettext_noop("quit - exit debugger.") }, + gettext_noop("quit - exit debugger") }, { "return", "", D_return, D_RETURN, do_return, - gettext_noop("return [value] - make selected stack frame return to its caller.") }, + gettext_noop("return [value] - make selected stack frame return to its caller") }, { "run", "r", D_run, D_RUN, do_run, - gettext_noop("run - start or restart executing program.") }, + gettext_noop("run - start or restart executing program") }, #ifdef HAVE_LIBREADLINE { "save", "", D_save, D_SAVE, do_save, - gettext_noop("save filename - save commands from the session to file.") }, + gettext_noop("save filename - save commands from the session to file") }, #endif { "set", "", D_set, D_SET, do_set_var, - gettext_noop("set var = value - assign value to a scalar variable.") }, + gettext_noop("set var = value - assign value to a scalar variable") }, { "silent", "", D_silent, D_SILENT, do_commands, - gettext_noop("silent - suspends usual message when stopped at a breakpoint/watchpoint.") }, + gettext_noop("silent - suspends usual message when stopped at a breakpoint/watchpoint") }, { "source", "", D_source, D_SOURCE, do_source, - gettext_noop("source file - execute commands from file.") }, + gettext_noop("source file - execute commands from file") }, { "step", "s", D_step, D_STEP, do_step, - gettext_noop("step [COUNT] - step program until it reaches a different source line.") }, + gettext_noop("step [COUNT] - step program until it reaches a different source line") }, { "stepi", "si", D_stepi, D_STEPI, do_stepi, - gettext_noop("stepi [COUNT] - step one instruction exactly.") }, + gettext_noop("stepi [COUNT] - step one instruction exactly") }, { "tbreak", "t", D_tbreak, D_TBREAK, do_tmp_breakpoint, - gettext_noop("tbreak [[filename:]N|function] - set a temporary breakpoint.") }, + gettext_noop("tbreak [[filename:]N|function] - set a temporary breakpoint") }, { "trace", "", D_trace, D_TRACE, do_trace_instruction, - gettext_noop("trace on|off - print instruction before executing.") }, + gettext_noop("trace on|off - print instruction before executing") }, { "undisplay", "", D_undisplay, D_UNDISPLAY, do_undisplay, - gettext_noop("undisplay [N] - remove variable(s) from automatic display list.") }, + gettext_noop("undisplay [N] - remove variable(s) from automatic display list") }, { "until", "u", D_until, D_UNTIL, do_until, - gettext_noop("until [[filename:]N|function] - execute until program reaches a different line or line N within current frame.") }, + gettext_noop("until [[filename:]N|function] - execute until program reaches a different line or line N within current frame") }, { "unwatch", "", D_unwatch, D_UNWATCH, do_unwatch, - gettext_noop("unwatch [N] - remove variable(s) from watch list.") }, + gettext_noop("unwatch [N] - remove variable(s) from watch list") }, { "up", "", D_up, D_UP, do_up, - gettext_noop("up [N] - move N frames up the stack.") }, + gettext_noop("up [N] - move N frames up the stack") }, { "watch", "w", D_watch, D_WATCH, do_watch, - gettext_noop("watch var - set a watchpoint for a variable.") }, + gettext_noop("watch var - set a watchpoint for a variable") }, { "where", "", D_backtrace, D_BACKTRACE, do_backtrace, - gettext_noop("where [N] - (same as backtrace) print trace of all or N innermost (outermost if N < 0) frames.") }, + gettext_noop("where [N] - (same as backtrace) print trace of all or N innermost (outermost if N < 0) frames") }, { NULL, NULL, D_illegal, 0, (Func_cmd) 0, NULL }, }; @@ -254,19 +254,19 @@ static int history_size = DEFAULT_HISTSIZE; /* max # of lines in history file * static const struct dbg_option option_list[] = { {"history_size", &history_size, NULL, &set_history_size, - gettext_noop("set or show the number of lines to keep in history file.") }, + gettext_noop("set or show the number of lines to keep in history file") }, {"listsize", &list_size, NULL, &set_listsize, - gettext_noop("set or show the list command window size.") }, + gettext_noop("set or show the list command window size") }, {"outfile", NULL, &output_file, &set_gawk_output, - gettext_noop("set or show gawk output file.") }, + gettext_noop("set or show gawk output file") }, {"prompt", NULL, &dgawk_prompt, &set_prompt, - gettext_noop("set or show debugger prompt."), }, + gettext_noop("set or show debugger prompt"), }, {"save_history", &do_save_history, NULL, &set_save_history, - gettext_noop("(un)set or show saving of command history (value=on|off).") }, + gettext_noop("(un)set or show saving of command history (value=on|off)") }, {"save_options", &do_save_options, NULL, &set_save_options, - gettext_noop("(un)set or show saving of options (value=on|off).") }, + gettext_noop("(un)set or show saving of options (value=on|off)") }, {"trace", &do_trace, NULL, &set_trace, - gettext_noop("(un)set or show instruction tracing (value=on|off).") }, + gettext_noop("(un)set or show instruction tracing (value=on|off)") }, {0, NULL, NULL, NULL, 0}, }; @@ -355,7 +355,7 @@ if (--val) \ #define CHECK_PROG_RUNNING() \ do { \ if (! prog_running) { \ - d_error(_("program not running.")); \ + d_error(_("program not running")); \ return false; \ } \ } while (false) @@ -490,7 +490,7 @@ source_find(char *src) int errno_val = 0; if (src == NULL || *src == '\0') { - d_error(_("no current source file.")); + d_error(_("no current source file")); return NULL; } @@ -3031,7 +3031,7 @@ do_continue(CMDARG *arg, int cmd ATTRIBUTE_UNUSED) } b = find_breakpoint(stop.break_point); if (b == NULL) { - d_error(_("invalid breakpoint number %d."), stop.break_point); + d_error(_("invalid breakpoint number %d"), stop.break_point); return false; } b->flags |= BP_IGNORE; @@ -4864,7 +4864,7 @@ unserialize_list(int type) field_cnt++; if (field_cnt == MAX_FIELD) #ifdef GAWKDEBUG - fatal("Increase MAX_FIELD and recompile."); + fatal("Increase MAX_FIELD and recompile"); #else return; #endif @@ -511,7 +511,7 @@ assign_number(NODE *node, awk_value_t *val) val->num_ptr = &node->mpg_i; break; default: - fatal(_("node_to_awk_value: detected invalid numeric flags combination `%s'; please file a bug report."), flags2str(node->flags)); + fatal(_("node_to_awk_value: detected invalid numeric flags combination `%s'; please file a bug report"), flags2str(node->flags)); break; } #endif @@ -598,7 +598,7 @@ node_to_awk_value(NODE *node, awk_value_t *val, awk_valtype_t wanted) } /* fall through */ default: - warning(_("node_to_awk_value detected invalid flags combination `%s'; please file a bug report."), flags2str(node->flags)); + warning(_("node_to_awk_value detected invalid flags combination `%s'; please file a bug report"), flags2str(node->flags)); val->val_type = AWK_UNDEFINED; break; } @@ -632,7 +632,7 @@ node_to_awk_value(NODE *node, awk_value_t *val, awk_valtype_t wanted) } /* fall through */ default: - warning(_("node_to_awk_value detected invalid flags combination `%s'; please file a bug report."), flags2str(node->flags)); + warning(_("node_to_awk_value detected invalid flags combination `%s'; please file a bug report"), flags2str(node->flags)); val->val_type = AWK_UNDEFINED; break; } @@ -659,7 +659,7 @@ node_to_awk_value(NODE *node, awk_value_t *val, awk_valtype_t wanted) } /* fall through */ default: - warning(_("node_to_awk_value detected invalid flags combination `%s'; please file a bug report."), flags2str(node->flags)); + warning(_("node_to_awk_value detected invalid flags combination `%s'; please file a bug report"), flags2str(node->flags)); val->val_type = AWK_UNDEFINED; break; } @@ -692,7 +692,7 @@ node_to_awk_value(NODE *node, awk_value_t *val, awk_valtype_t wanted) } /* fall through */ default: - warning(_("node_to_awk_value detected invalid flags combination `%s'; please file a bug report."), flags2str(node->flags)); + warning(_("node_to_awk_value detected invalid flags combination `%s'; please file a bug report"), flags2str(node->flags)); val->val_type = AWK_UNDEFINED; break; } @@ -1166,7 +1166,7 @@ close_one() rp->flag |= RED_USED; errno = 0; if (rp->output.gawk_fclose(rp->output.fp, rp->output.opaque) != 0) - warning(_("close of `%s' failed: %s."), + warning(_("close of `%s' failed: %s"), rp->value, strerror(errno)); rp->output.fp = NULL; break; @@ -1454,13 +1454,13 @@ flush_io() messagefunc = r_warning; if ((rp->flag & RED_PIPE) != 0) - messagefunc(_("pipe flush of `%s' failed: %s."), + messagefunc(_("pipe flush of `%s' failed: %s"), rp->value, strerror(errno)); else if ((rp->flag & RED_TWOWAY) != 0) - messagefunc(_("co-process flush of pipe to `%s' failed: %s."), + messagefunc(_("co-process flush of pipe to `%s' failed: %s"), rp->value, strerror(errno)); else - messagefunc(_("file flush of `%s' failed: %s."), + messagefunc(_("file flush of `%s' failed: %s"), rp->value, strerror(errno)); status++; } @@ -777,7 +777,7 @@ str2wstr(NODE *n, size_t **ptr) /* Warn the user something's wrong */ if (! warned) { warned = true; - warning(_("Invalid multibyte data detected. There may be a mismatch between your data and your locale.")); + warning(_("Invalid multibyte data detected. There may be a mismatch between your data and your locale")); } /* diff --git a/test/ChangeLog b/test/ChangeLog index 6cc960bd..7b1184a6 100644 --- a/test/ChangeLog +++ b/test/ChangeLog @@ -1,3 +1,7 @@ +2020-08-24 Arnold D. Robbins <arnold@skeeve.com> + + * mbstr1.ok, mbstr2.ok: Updated after code changes. + 2020-08-20 Arnold D. Robbins <arnold@skeeve.com> * profile14.ok: Updated. Somehow it was not done right to diff --git a/test/mbstr1.ok b/test/mbstr1.ok index 3fd1bf8e..73c021bf 100644 --- a/test/mbstr1.ok +++ b/test/mbstr1.ok @@ -1,3 +1,3 @@ -gawk: mbstr1.awk:2: warning: Invalid multibyte data detected. There may be a mismatch between your data and your locale. +gawk: mbstr1.awk:2: warning: Invalid multibyte data detected. There may be a mismatch between your data and your locale 4 1 diff --git a/test/mbstr2.ok b/test/mbstr2.ok index 29ac876a..429ea91b 100644 --- a/test/mbstr2.ok +++ b/test/mbstr2.ok @@ -1,5 +1,5 @@ 2007 -gawk: mbstr2.awk:1: (FILENAME=- FNR=2) warning: Invalid multibyte data detected. There may be a mismatch between your data and your locale. +gawk: mbstr2.awk:1: (FILENAME=- FNR=2) warning: Invalid multibyte data detected. There may be a mismatch between your data and your locale 2007 2007 2007 |