[groff] 10/26: [troff]: Trivially refactor (rename arg decoders).

[G. Branden Robinson]

gbranden pushed a commit to branch master
in repository groff.

commit e9878069c504d293c6b836b261a4e04f2c24483e
Author: G. Branden Robinson <g.branden.robinson@gmail.com>
AuthorDate: Tue Nov 12 07:30:28 2024 -0600

    [troff]: Trivially refactor (rename arg decoders).
    
    * src/roff/troff/input.cpp: Trivially refactor.
    
      (decode_args): Rename this...
      (decode_macro_call_arguments): ...to this.
    
      (decode_string_args): ...and this...
      (decode_escape_sequence_arguments): ...to this.
    
      (macro::invoke, composite_glyph_name, read_request)
      (interpolate_string_with_args): Update call sites.
---
 ChangeLog                | 10 ++++++++++
 src/roff/troff/input.cpp | 13 ++++++-------
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 65edb9ed5..37da1a70f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2024-11-12  G. Branden Robinson <g.branden.robinson@gmail.com>
+
+       * src/roff/troff/input.cpp: Trivially refactor.
+       (decode_args): Rename this...
+       (decode_macro_call_arguments): ...to this.
+       (decode_string_args): ...and this...
+       (decode_escape_sequence_arguments): ...to this.
+       (macro::invoke, composite_glyph_name, read_request)
+       (interpolate_string_with_args): Update call sites.
+
 2024-11-12  G. Branden Robinson <g.branden.robinson@gmail.com>
 
        * src/roff/troff/input.cpp (decode_args, decode_string_args):
diff --git a/src/roff/troff/input.cpp b/src/roff/troff/input.cpp
index 3959f9fae..c7fc21e44 100644
--- a/src/roff/troff/input.cpp
+++ b/src/roff/troff/input.cpp
@@ -4076,7 +4076,7 @@ static void interpolate_macro(symbol nm, bool 
do_not_want_next_token)
   }
 }
 
-static void decode_args(macro_iterator *mi)
+static void decode_macro_call_arguments(macro_iterator *mi)
 {
   if (!tok.is_newline() && !tok.is_eof()) {
     node *n;
@@ -4130,8 +4130,7 @@ static void decode_args(macro_iterator *mi)
   }
 }
 
-// XXX: This is a misnomer.  It's used to read stuff like `\[e aa]` too.
-static void decode_string_args(macro_iterator *mi)
+static void decode_escape_sequence_arguments(macro_iterator *mi)
 {
   node *n;
   int c = get_copy(&n);
@@ -4186,7 +4185,7 @@ static void decode_string_args(macro_iterator *mi)
 void macro::invoke(symbol nm, bool do_not_want_next_token)
 {
   macro_iterator *mi = new macro_iterator(nm, *this);
-  decode_args(mi);
+  decode_macro_call_arguments(mi);
   input_stack::push(mi);
   // we must delay tok.next() in case the function has been called by
   // do_request to assure proper handling of want_att_compat
@@ -4287,7 +4286,7 @@ static void map_composite_character()
 static symbol composite_glyph_name(symbol nm)
 {
   macro_iterator *mi = new macro_iterator();
-  decode_string_args(mi);
+  decode_escape_sequence_arguments(mi);
   input_stack::push(mi);
   const char *nc = nm.contents();
   const char *gn = glyph_name_to_unicode(nc);
@@ -4415,7 +4414,7 @@ void read_request()
     }
     if (c == ' ') {
       tok.make_space();
-      decode_args(mi);
+      decode_macro_call_arguments(mi);
     }
   }
   if (reading_from_terminal) {
@@ -4636,7 +4635,7 @@ static void interpolate_string_with_args(symbol nm)
     error("cannot interpolate request '%1'", nm.contents());
   else {
     macro_iterator *mi = new macro_iterator(nm, *m);
-    decode_string_args(mi);
+    decode_escape_sequence_arguments(mi);
     input_stack::push(mi);
   }
 }