groff-commit
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[groff] 13/18: src/roff/troff/input.cpp: Update diagnostics.


From: G. Branden Robinson
Subject: [groff] 13/18: src/roff/troff/input.cpp: Update diagnostics.
Date: Thu, 3 Jun 2021 11:03:24 -0400 (EDT)

gbranden pushed a commit to branch master
in repository groff.

commit 9be3f8e354f29f1929f3c35ff8fe6a47d1570741
Author: G. Branden Robinson <g.branden.robinson@gmail.com>
AuthorDate: Fri Jun 4 00:10:30 2021 +1000

    src/roff/troff/input.cpp: Update diagnostics.
    
    * src/roff/troff/input.cpp (else_request, while_request, pipe_source,
      open_request, opena_request, pipe_output, system_request): Update
      diagnostic messages to not presume the identities of the control or
      escape characters.
---
 ChangeLog                |  7 +++++++
 src/roff/troff/input.cpp | 14 +++++++-------
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index f716e9b..55ac136 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2021-06-03  G. Branden Robinson <g.branden.robinson@gmail.com>
+
+       * src/roff/troff/input.cpp (else_request, while_request,
+       pipe_source, open_request, opena_request, pipe_output,
+       system_request): Update diagnostic messages to not presume the
+       identities of the control or escape characters.
+
 2021-06-01  G. Branden Robinson <g.branden.robinson@gmail.com>
 
        * doc/groff.texi (Conventions Used in This Manual): Add node.
diff --git a/src/roff/troff/input.cpp b/src/roff/troff/input.cpp
index c2b2910..f861831 100644
--- a/src/roff/troff/input.cpp
+++ b/src/roff/troff/input.cpp
@@ -5855,7 +5855,7 @@ void if_request()
 void else_request()
 {
   if (if_else_stack.is_empty()) {
-    warning(WARN_EL, "unbalanced .el request");
+    warning(WARN_EL, "unbalanced 'el' request");
     skip_alternative();
   }
   else {
@@ -5905,7 +5905,7 @@ void while_request()
     }
   }
   if (level != 0)
-    error("unbalanced \\{ \\}");
+    error("unbalanced brace escape sequences");
   else {
     while_depth++;
     input_stack::add_boundary();
@@ -5997,7 +5997,7 @@ void source_quietly()
 void pipe_source()
 {
   if (!unsafe_flag) {
-    error(".pso request not allowed in safer mode");
+    error("'pso' request not allowed in safer mode");
     skip_line();
   }
   else {
@@ -6747,7 +6747,7 @@ void do_open(int append)
 void open_request()
 {
   if (!unsafe_flag) {
-    error(".open request not allowed in safer mode");
+    error("'open' request not allowed in safer mode");
     skip_line();
   }
   else
@@ -6757,7 +6757,7 @@ void open_request()
 void opena_request()
 {
   if (!unsafe_flag) {
-    error(".opena request not allowed in safer mode");
+    error("'opena' request not allowed in safer mode");
     skip_line();
   }
   else
@@ -7549,7 +7549,7 @@ char *read_string()
 void pipe_output()
 {
   if (!unsafe_flag) {
-    error(".pi request not allowed in safer mode");
+    error("'pi' request not allowed in safer mode");
     skip_line();
   }
   else {
@@ -7586,7 +7586,7 @@ static int system_status;
 void system_request()
 {
   if (!unsafe_flag) {
-    error(".sy request not allowed in safer mode");
+    error("'sy' request not allowed in safer mode");
     skip_line();
   }
   else {



reply via email to

[Prev in Thread] Current Thread [Next in Thread]