gbranden pushed a commit to branch master
in repository groff.
commit 930560a4a6724139b62e67866f450891ed41a8b9
Author: G. Branden Robinson <[email protected]>
AuthorDate: Wed May 8 01:53:54 2024 -0500
[troff]: Trivially refactor (`pop` -> `divlevel`).
* src/roff/troff/node.cpp: Trivially refactor. Rename member function
argument indicating the diversion level to be used when constructing a
`node` struct from "pop" (a word that suggests action, or a Boolean
indicator, to me) to "divlevel", as is already used in the
constructors in "node.h".
(charinfo_node::charinfo_node, glyph_node::glyph_node)
(ligature_node::ligature_node, kern_pair_node::kern_pair_node)
(dbreak_node::dbreak_node)
(italic_corrected_node::italic_corrected_node)
(break_char_node::break_char_node)
(extra_size_node::extra_size_node)
(vertical_size_node::vertical_size_node)
(vmotion_node::vmotion_node, hline_node::hline_node)
(vline_node::vline_node, zero_width_node::zero_width_node)
(overstrike_node::overstrike_node, bracket_node::bracket_node)
(space_node::space_node)
(diverted_space_node::diverted_space_node)
(diverted_copy_file_node::diverted_copy_file_node)
(space_char_hmotion_node::space_char_hmotion_node)
(special_node::special_node)
(suppress_node::suppress_node, tag_node::tag_node)
(composite_node::composite_node)
(word_space_node::word_space_node)
(unbreakable_space_node::unbreakable_space_node)
(draw_node::draw_node)
(left_italic_corrected_node::left_italic_corrected_node): Do it.
---
ChangeLog | 29 +++++++++++
src/roff/troff/node.cpp | 133 ++++++++++++++++++++++++++----------------------
2 files changed, 101 insertions(+), 61 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 7a1eb7804..cf0433895 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,32 @@
+2024-05-08 G. Branden Robinson <[email protected]>
+
+ * src/roff/troff/node.cpp: Trivially refactor. Rename member
+ function argument indicating the diversion level to be used when
+ constructing a `node` struct from "pop" (a word that suggests
+ action, or a Boolean indicator, to me) to "divlevel", as is
+ already used in the constructors in "node.h".
+ (charinfo_node::charinfo_node, glyph_node::glyph_node)
+ (ligature_node::ligature_node, kern_pair_node::kern_pair_node)
+ (dbreak_node::dbreak_node)
+ (italic_corrected_node::italic_corrected_node)
+ (break_char_node::break_char_node)
+ (extra_size_node::extra_size_node)
+ (vertical_size_node::vertical_size_node)
+ (vmotion_node::vmotion_node, hline_node::hline_node)
+ (vline_node::vline_node, zero_width_node::zero_width_node)
+ (overstrike_node::overstrike_node, bracket_node::bracket_node)
+ (space_node::space_node)
+ (diverted_space_node::diverted_space_node)
+ (diverted_copy_file_node::diverted_copy_file_node)
+ (space_char_hmotion_node::space_char_hmotion_node)
+ (special_node::special_node)
+ (suppress_node::suppress_node, tag_node::tag_node)
+ (composite_node::composite_node)
+ (word_space_node::word_space_node)
+ (unbreakable_space_node::unbreakable_space_node)
+ (draw_node::draw_node)
+ (left_italic_corrected_node::left_italic_corrected_node): Do it.
+
2024-05-07 G. Branden Robinson <[email protected]>
* src/roff/troff/env.cpp (print_nodes_from_input_line): Fix
diff --git a/src/roff/troff/node.cpp b/src/roff/troff/node.cpp
index 72ac67494..5cd34277e 100644
--- a/src/roff/troff/node.cpp
+++ b/src/roff/troff/node.cpp
@@ -1844,8 +1844,9 @@ public:
int overlaps_horizontally();
};
-charinfo_node::charinfo_node(charinfo *c, statem *s, int pop, node *x)
-: node(x, s, pop), ci(c)
+charinfo_node::charinfo_node(charinfo *c, statem *s, int divlevel,
+ node *x)
+: node(x, s, divlevel), ci(c)
{
}
@@ -2004,8 +2005,8 @@ void ligature_node::operator delete(void *p)
}
glyph_node::glyph_node(charinfo *c, tfont *t, color *gc, color *fc,
- statem *s, int pop, node *x)
-: charinfo_node(c, s, pop, x), tf(t), gcol(gc), fcol(fc)
+ statem *s, int divlevel, node *x)
+: charinfo_node(c, s, divlevel, x), tf(t), gcol(gc), fcol(fc)
{
#ifdef STORE_WIDTH
wid = tf->get_width(ci);
@@ -2015,8 +2016,8 @@ glyph_node::glyph_node(charinfo *c, tfont *t, color *gc,
color *fc,
#ifdef STORE_WIDTH
glyph_node::glyph_node(charinfo *c, tfont *t,
color *gc, color *fc, hunits w,
- statem *s, int pop, node *x)
-: charinfo_node(c, s, pop, x), tf(t), gcol(gc), fcol(fc), wid(w)
+ statem *s, int divlevel, node *x)
+: charinfo_node(c, s, divlevel, x), tf(t), gcol(gc), fcol(fc), wid(w)
{
}
#endif
@@ -2200,16 +2201,16 @@ void glyph_node::dump_node()
ligature_node::ligature_node(charinfo *c, tfont *t, color *gc, color *fc,
node *gn1, node *gn2, statem *s,
- int pop, node *x)
-: glyph_node(c, t, gc, fc, s, pop, x), n1(gn1), n2(gn2)
+ int divlevel, node *x)
+: glyph_node(c, t, gc, fc, s, divlevel, x), n1(gn1), n2(gn2)
{
}
#ifdef STORE_WIDTH
ligature_node::ligature_node(charinfo *c, tfont *t, color *gc, color *fc,
hunits w, node *gn1, node *gn2, statem *s,
- int pop, node *x)
-: glyph_node(c, t, gc, fc, w, s, pop, x), n1(gn1), n2(gn2)
+ int divlevel, node *x)
+: glyph_node(c, t, gc, fc, w, s, divlevel, x), n1(gn1), n2(gn2)
{
}
#endif
@@ -2253,13 +2254,14 @@ node *ligature_node::add_self(node *n, hyphen_list **p)
}
kern_pair_node::kern_pair_node(hunits n, node *first, node *second,
- statem* s, int pop, node *x)
-: node(x, s, pop), amount(n), n1(first), n2(second)
+ statem* s, int divlevel, node *x)
+: node(x, s, divlevel), amount(n), n1(first), n2(second)
{
}
-dbreak_node::dbreak_node(node *n, node *p, statem *s, int pop, node *x)
-: node(x, s, pop), none(n), pre(p), post(0)
+dbreak_node::dbreak_node(node *n, node *p, statem *s, int divlevel,
+ node *x)
+: node(x, s, divlevel), none(n), pre(p), post(0)
{
}
@@ -2662,8 +2664,8 @@ node *node::add_italic_correction(hunits *wd)
}
italic_corrected_node::italic_corrected_node(node *nn, hunits xx, statem *s,
- int pop, node *p)
-: node(p, s, pop), n(nn), x(xx)
+ int divlevel, node *p)
+: node(p, s, divlevel), n(nn), x(xx)
{
assert(n != 0 /* nullptr */);
}
@@ -2799,8 +2801,9 @@ break_char_node::break_char_node(node *n, int bc, int
pbc, color *c, node *x)
}
break_char_node::break_char_node(node *n, int bc, int pbc, color *c,
- statem *s, int pop, node *x)
-: node(x, s, pop), ch(n), break_code(bc), prev_break_code(pbc), col(c)
+ statem *s, int divlevel, node *x)
+: node(x, s, divlevel), ch(n), break_code(bc), prev_break_code(pbc),
+ col(c)
{
}
@@ -2927,8 +2930,8 @@ node *extra_size_node::copy()
return new extra_size_node(n, state, div_nest_level);
}
-extra_size_node::extra_size_node(vunits i, statem *s, int pop)
-: node(0, s, pop), n(i)
+extra_size_node::extra_size_node(vunits i, statem *s, int divlevel)
+: node(0, s, divlevel), n(i)
{
}
@@ -2942,8 +2945,9 @@ node *vertical_size_node::copy()
return new vertical_size_node(n, state, div_nest_level);
}
-vertical_size_node::vertical_size_node(vunits i, statem *s, int pop)
-: node(0, s, pop), n(i)
+vertical_size_node::vertical_size_node(vunits i, statem *s,
+ int divlevel)
+: node(0, s, divlevel), n(i)
{
}
@@ -2967,8 +2971,8 @@ vmotion_node::vmotion_node(vunits i, color *c)
{
}
-vmotion_node::vmotion_node(vunits i, color *c, statem *s, int pop)
-: node(0, s, pop), n(i), col(c)
+vmotion_node::vmotion_node(vunits i, color *c, statem *s, int divlevel)
+: node(0, s, divlevel), n(i), col(c)
{
}
@@ -2998,8 +3002,9 @@ hline_node::hline_node(hunits i, node *c, node *nxt)
{
}
-hline_node::hline_node(hunits i, node *c, statem *s, int pop, node *nxt)
-: node(nxt, s, pop), x(i), n(c)
+hline_node::hline_node(hunits i, node *c, statem *s, int divlevel,
+ node *nxt)
+: node(nxt, s, divlevel), x(i), n(c)
{
}
@@ -3018,8 +3023,9 @@ vline_node::vline_node(vunits i, node *c, node *nxt)
{
}
-vline_node::vline_node(vunits i, node *c, statem *s, int pop, node *nxt)
-: node(nxt, s, pop), x(i), n(c)
+vline_node::vline_node(vunits i, node *c, statem *s,
+ int divlevel, node *nxt)
+: node(nxt, s, divlevel), x(i), n(c)
{
}
@@ -3039,8 +3045,8 @@ hunits vline_node::width()
return n == 0 ? H0 : n->width();
}
-zero_width_node::zero_width_node(node *nd, statem *s, int pop)
-: node(0, s, pop), n(nd)
+zero_width_node::zero_width_node(node *nd, statem *s, int divlevel)
+: node(0, s, divlevel), n(nd)
{
}
@@ -3100,8 +3106,8 @@ overstrike_node::overstrike_node()
{
}
-overstrike_node::overstrike_node(statem *s, int pop)
-: node(0, s, pop), list(0), max_width(H0)
+overstrike_node::overstrike_node(statem *s, int divlevel)
+: node(0, s, divlevel), list(0), max_width(H0)
{
}
@@ -3142,8 +3148,8 @@ bracket_node::bracket_node()
{
}
-bracket_node::bracket_node(statem *s, int pop)
-: node(0, s, pop), list(0), max_width(H0)
+bracket_node::bracket_node(statem *s, int divlevel)
+: node(0, s, divlevel), list(0), max_width(H0)
{
}
@@ -3202,8 +3208,8 @@ space_node::space_node(hunits nn, color *c, node *p)
}
space_node::space_node(hunits nn, int s, int flag, color *c, statem *st,
- int pop, node *p)
-: node(p, st, pop), n(nn), set(s), was_escape_colon(flag), col(c)
+ int divlevel, node *p)
+: node(p, st, divlevel), n(nn), set(s), was_escape_colon(flag), col(c)
{
}
@@ -3284,9 +3290,9 @@ void space_node::is_escape_colon()
was_escape_colon = 1;
}
-diverted_space_node::diverted_space_node(vunits d, statem *s, int pop,
- node *p)
-: node(p, s, pop), n(d)
+diverted_space_node::diverted_space_node(vunits d, statem *s,
+ int divlevel, node *p)
+: node(p, s, divlevel), n(d)
{
}
@@ -3301,8 +3307,8 @@ node *diverted_space_node::copy()
}
diverted_copy_file_node::diverted_copy_file_node(symbol s, statem *st,
- int pop, node *p)
-: node(p, st, pop), filename(s)
+ int divlevel, node *p)
+: node(p, st, divlevel), filename(s)
{
}
@@ -3604,9 +3610,10 @@ void hmotion_node::asciify(macro *m)
}
space_char_hmotion_node::space_char_hmotion_node(hunits i, color *c,
- statem *s, int pop,
+ statem *s,
+ int divlevel,
node *nxt)
-: hmotion_node(i, c, s, pop, nxt)
+: hmotion_node(i, c, s, divlevel, nxt)
{
}
@@ -3875,9 +3882,10 @@ special_node::special_node(const macro &m, int n)
special_node::special_node(const macro &m, tfont *t,
color *gc, color *fc,
- statem *s, int pop,
+ statem *s, int divlevel,
int n)
-: node(0, s, pop), mac(m), tf(t), gcol(gc), fcol(fc), no_init_string(n)
+: node(0, s, divlevel), mac(m), tf(t), gcol(gc), fcol(fc),
+ no_init_string(n)
{
is_special = 1;
}
@@ -3953,9 +3961,9 @@ suppress_node::suppress_node(symbol f, char p, int id)
suppress_node::suppress_node(int issue_limits, int on_or_off,
symbol f, char p, int id,
- statem *s, int pop)
-: node(0, s, pop), is_on(on_or_off), emit_limits(issue_limits), filename(f),
- position(p), image_id(id)
+ statem *s, int divlevel)
+: node(0, s, divlevel), is_on(on_or_off), emit_limits(issue_limits),
+ filename(f), position(p), image_id(id)
{
}
@@ -3993,8 +4001,8 @@ tag_node::tag_node(string s, int delay)
is_special = !delay;
}
-tag_node::tag_node(string s, statem *st, int pop, int delay)
-: node(0, st, pop), tag_string(s), delayed(delay)
+tag_node::tag_node(string s, statem *st, int divlevel, int delay)
+: node(0, st, divlevel), tag_string(s), delayed(delay)
{
is_special = !delay;
}
@@ -4266,8 +4274,8 @@ public:
};
composite_node::composite_node(node *p, charinfo *c, tfont *t, statem *s,
- int pop, node *x)
-: charinfo_node(c, s, pop, x), n(p), tf(t)
+ int divlevel, node *x)
+: charinfo_node(c, s, divlevel, x), n(p), tf(t)
{
}
@@ -4400,9 +4408,10 @@ word_space_node::word_space_node(hunits d, color *c,
width_list *w, node *x)
{
}
-word_space_node::word_space_node(hunits d, int s, color *c, width_list *w,
- int flag, statem *st, int pop, node *x)
-: space_node(d, s, 0, c, st, pop, x), orig_width(w), unformat(flag)
+word_space_node::word_space_node(hunits d, int s, color *c,
+ width_list *w, int flag, statem *st,
+ int divlevel, node *x)
+: space_node(d, s, 0, c, st, divlevel, x), orig_width(w), unformat(flag)
{
}
@@ -4462,9 +4471,10 @@ unbreakable_space_node::unbreakable_space_node(hunits d,
color *c, node *x)
}
unbreakable_space_node::unbreakable_space_node(hunits d, int s,
- color *c, statem *st, int pop,
+ color *c, statem *st,
+ int divlevel,
node *x)
-: word_space_node(d, s, c, 0, 0, st, pop, x)
+: word_space_node(d, s, c, 0, 0, st, divlevel, x)
{
}
@@ -4518,8 +4528,8 @@ draw_node::draw_node(char c, hvpair *p, int np, font_size
s,
}
draw_node::draw_node(char c, hvpair *p, int np, font_size s,
- color *gc, color *fc, statem *st, int pop)
-: node(0, st, pop), npoints(np), sz(s), gcol(gc), fcol(fc), code(c)
+ color *gc, color *fc, statem *st, int divlevel)
+: node(0, st, divlevel), npoints(np), sz(s), gcol(gc), fcol(fc), code(c)
{
point = new hvpair[npoints];
for (int i = 0; i < npoints; i++)
@@ -5436,9 +5446,10 @@
left_italic_corrected_node::left_italic_corrected_node(node *xx)
{
}
-left_italic_corrected_node::left_italic_corrected_node(statem *s, int pop,
+left_italic_corrected_node::left_italic_corrected_node(statem *s,
+ int divlevel,
node *xx)
-: node(xx, s, pop), n(0)
+: node(xx, s, divlevel), n(0)
{
}
_______________________________________________
Groff-commit mailing list
[email protected]
https://lists.gnu.org/mailman/listinfo/groff-commit
