[groff] 01/15: [troff]: Trivially refactor; rename and boolify.

[G. Branden Robinson]

gbranden pushed a commit to branch master
in repository groff.

commit c0a18a32a68c3899f3bed1b863b476494f2df137
Author: G. Branden Robinson <g.branden.robinson@gmail.com>
AuthorDate: Thu Feb 1 00:28:45 2024 -0600

    [troff]: Trivially refactor; rename and boolify.
    
    * src/roff/troff/env.h (class environment): Demote member function
      `do_input_trap`'s parameter type from `int` to `bool`.
    
    * src/roff/troff/env.h (class environment):
    * src/roff/troff/env.cpp (class environment): Demote member variable
      `continued_input_trap` from `int` to `bool`.  Update
    
    * src/roff/troff/env.cpp (class environment): Initialize member variable
      `continued_input_trap` with Boolean, not integer, literals.
    
    * src/roff/troff/env.cpp (do_input_trap): Demote argument from `int` to
      `bool` in definition...
    * src/roff/troff/env.h (class environment): ...and friend function
      declaration.
    
    * src/roff/troff/env.cpp (do_input_trap): ...and rename it from
      `continued` to `respect_continuation`.  Assign to
      `continued_input_trap` using Boolean literals.
    
      (input_trap, input_trap_continued): Call `do_input_trap` with Boolean
      literals.
---
 ChangeLog              | 26 ++++++++++++++++++++++++++
 src/roff/troff/env.cpp | 18 +++++++++---------
 src/roff/troff/env.h   |  6 +++---
 3 files changed, 38 insertions(+), 12 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 2c26e0eb3..24f034aa0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,29 @@
+2024-02-01  G. Branden Robinson <g.branden.robinson@gmail.com>
+
+       [troff]: Trivially refactor; rename and boolify.
+
+       * src/roff/troff/env.h (class environment): Demote member
+       function `do_input_trap`'s parameter type from `int` to `bool`.
+
+       * src/roff/troff/env.h (class environment):
+       * src/roff/troff/env.cpp (class environment): Demote member
+       variable `continued_input_trap` from `int` to `bool`.  Update
+
+       * src/roff/troff/env.cpp (class environment): Initialize member
+       variable `continued_input_trap` with Boolean, not integer,
+       literals.
+
+       * src/roff/troff/env.cpp (do_input_trap): Demote argument from
+       `int` to `bool` in definition...
+       * src/roff/troff/env.h (class environment): ...and friend
+       function declaration.
+
+       * src/roff/troff/env.cpp (do_input_trap): ...and rename it from
+       `continued` to `respect_continuation`.  Assign to
+       `continued_input_trap` using Boolean literals.
+       (input_trap, input_trap_continued): Call `do_input_trap` with
+       Boolean literals.
+
 2024-01-31  G. Branden Robinson <g.branden.robinson@gmail.com>
 
        * doc/GMPfront.t: Save and restore the type size.  The effective
diff --git a/src/roff/troff/env.cpp b/src/roff/troff/env.cpp
index 14295b08f..ea3f0d9cf 100644
--- a/src/roff/troff/env.cpp
+++ b/src/roff/troff/env.cpp
@@ -692,7 +692,7 @@ environment::environment(symbol nm)
   underline_lines(0),
   underline_spaces(0),
   input_trap_count(0),
-  continued_input_trap(0),
+  continued_input_trap(false),
   line(0),
   prev_text_length(0),
   width_total(0),
@@ -785,7 +785,7 @@ environment::environment(const environment *e)
   underline_lines(0),
   underline_spaces(0),
   input_trap_count(0),
-  continued_input_trap(0),
+  continued_input_trap(false),
   line(0),
   prev_text_length(e->prev_text_length),
   width_total(0),
@@ -866,7 +866,7 @@ void environment::copy(const environment *e)
   underline_lines = 0;
   underline_spaces = 0;
   input_trap_count = 0;
-  continued_input_trap = 0;
+  continued_input_trap = false;
   prev_text_length = e->prev_text_length;
   width_total = 0;
   space_total = 0;
@@ -2587,13 +2587,13 @@ void no_adjust()
   skip_line();
 }
 
-void do_input_trap(int continued)
+void do_input_trap(bool respect_continuation)
 {
   curenv->input_trap_count = 0;
-  if (continued)
-    curenv->continued_input_trap = 1;
+  if (respect_continuation)
+    curenv->continued_input_trap = true;
   else
-    curenv->continued_input_trap = 0;
+    curenv->continued_input_trap = false;
   int n;
   if (has_arg() && get_integer(&n)) {
     if (n <= 0)
@@ -2612,12 +2612,12 @@ void do_input_trap(int continued)
 
 void input_trap()
 {
-  do_input_trap(0);
+  do_input_trap(false);
 }
 
 void input_trap_continued()
 {
-  do_input_trap(1);
+  do_input_trap(true);
 }
 
 /* tabs */
diff --git a/src/roff/troff/env.h b/src/roff/troff/env.h
index 9dabf90ed..65b9f0103 100644
--- a/src/roff/troff/env.h
+++ b/src/roff/troff/env.h
@@ -116,7 +116,7 @@ void line_length();
 void indent();
 void temporary_indent();
 void do_underline(int);
-void do_input_trap(int);
+void do_input_trap(bool);
 void set_tabs();
 void margin_character();
 void no_number();
@@ -180,7 +180,7 @@ class environment {
   int underline_spaces;
   symbol input_trap;
   int input_trap_count;
-  int continued_input_trap;
+  bool continued_input_trap;
   node *line;                  // in reverse order
   hunits prev_text_length;
   hunits width_total;
@@ -377,7 +377,7 @@ public:
   friend void indent();
   friend void temporary_indent();
   friend void do_underline(int);
-  friend void do_input_trap(int);
+  friend void do_input_trap(bool);
   friend void set_tabs();
   friend void margin_character();
   friend void no_number();