[groff] 04/23: src/roff/troff/input.cpp: Recast diagnostics.

[G. Branden Robinson]

gbranden pushed a commit to branch master
in repository groff.

commit dd717661f3ee8850826998eb32809087c7ae051a
Author: G. Branden Robinson <g.branden.robinson@gmail.com>
AuthorDate: Mon Jul 25 14:15:32 2022 -0500

    src/roff/troff/input.cpp: Recast diagnostics.
    
    * src/roff/troff/input.cpp (token::usable_as_delimiter):
      (do_non_interpreted, interpolate_arg): Recast diagnostic messages for
      clarity.
---
 ChangeLog                |  6 ++++++
 src/roff/troff/input.cpp | 10 +++++-----
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 098c07201..5355a4d41 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,12 @@
        greek characters only slant if the glyp is sourced from a
        special font, not if the regular font contains greek glyphs.
 
+2022-07-25  G. Branden Robinson <g.branden.robinson@gmail.com>
+
+       * src/roff/troff/input.cpp (token::usable_as_delimiter):
+       (do_non_interpreted, interpolate_arg): Recast diagnostic
+       messages for clarity.
+
 2022-07-25  G. Branden Robinson <g.branden.robinson@gmail.com>
 
        * tmac/e.tmac: Initialize section number registers. Fixes
diff --git a/src/roff/troff/input.cpp b/src/roff/troff/input.cpp
index c485b15a6..f47c86981 100644
--- a/src/roff/troff/input.cpp
+++ b/src/roff/troff/input.cpp
@@ -2363,7 +2363,7 @@ bool token::usable_as_delimiter(bool report_error)
     case ')':
     case '.':
       if (report_error)
-        error("cannot use character '%1' as a starting delimiter",
+        error("character '%1' not allowed as starting delimiter",
              char(c));
       return false;
     default:
@@ -2381,7 +2381,7 @@ bool token::usable_as_delimiter(bool report_error)
   case TOKEN_TAB:
   case TOKEN_NEWLINE:
     if (report_error)
-      error("cannot use %1 as a starting delimiter", description());
+      error("%1 not allowed as starting delimiter", description());
     return false;
   default:
     return true;
@@ -4353,7 +4353,7 @@ static void interpolate_arg(symbol nm)
 {
   const char *s = nm.contents();
   if (!s || *s == '\0')
-    copy_mode_error("missing argument name");
+    copy_mode_error("missing positional argument number");
   else if (s[1] == 0 && csdigit(s[0]))
     input_stack::push(input_stack::get_arg(s[0] - '0'));
   else if (s[0] == '*' && s[1] == '\0') {
@@ -4421,7 +4421,7 @@ static void interpolate_arg(symbol nm)
     for (p = s; *p && csdigit(*p); p++)
       ;
     if (*p)
-      copy_mode_error("bad argument name '%1'", s);
+      copy_mode_error("invalid positional argument number '%1'", s);
     else
       input_stack::push(input_stack::get_arg(atoi(s)));
   }
@@ -5399,7 +5399,7 @@ static node *do_non_interpreted()
     else
       mac.append(c);
   if (c == EOF || c == '\n') {
-    error("missing \\?");
+    error("unterminated transparent embedding escape sequence");
     return 0;
   }
   return new non_interpreted_node(mac);