diff options
| author |   Ingo Schwarze <schwarze@openbsd.org> | 2017-07-07 17:16:17 +0000 |
|---|---|---|
| committer | Ingo Schwarze <schwarze@openbsd.org> | 2017-07-07 17:16:17 +0000 |
| commit | 38e2a45080d5a19afd623a8711f0ed15b6143ee5 (patch) | |
| tree | 96578d502e93e60a7bfa4d85dc55895290eaf9a7 | |
| parent | 2dfd3c7a70b99f3bd8219bc8a8365900a9bf0673 (diff) | |
| download | mandoc-38e2a45080d5a19afd623a8711f0ed15b6143ee5.tar.gz mandoc-38e2a45080d5a19afd623a8711f0ed15b6143ee5.tar.zst mandoc-38e2a45080d5a19afd623a8711f0ed15b6143ee5.zip | |
simplify the eqn_box_makebinary() function by removing the trivial pos
parameter; also minus two lines of code; no functional change
| -rw-r--r-- | eqn.c | 24 |
1 files changed, 11 insertions, 13 deletions
@@ -1,4 +1,4 @@ -/* $Id: eqn.c,v 1.74 2017/07/06 00:19:54 schwarze Exp $ */ +/* $Id: eqn.c,v 1.75 2017/07/07 17:16:17 schwarze Exp $ */ /* * Copyright (c) 2011, 2014 Kristaps Dzonsons <kristaps@bsd.lv> * Copyright (c) 2014, 2015, 2017 Ingo Schwarze <schwarze@openbsd.org> @@ -286,7 +286,7 @@ enum parse_mode { static struct eqn_box *eqn_box_alloc(struct eqn_node *, struct eqn_box *); static void eqn_box_free(struct eqn_box *); static struct eqn_box *eqn_box_makebinary(struct eqn_node *, - enum eqn_post, struct eqn_box *); + struct eqn_box *); static void eqn_def(struct eqn_node *); static struct eqn_def *eqn_def_find(struct eqn_node *); static void eqn_delim(struct eqn_node *); @@ -541,8 +541,7 @@ eqn_box_alloc(struct eqn_node *ep, struct eqn_box *parent) * The new EQN_SUBEXPR will have a two-child limit. */ static struct eqn_box * -eqn_box_makebinary(struct eqn_node *ep, - enum eqn_post pos, struct eqn_box *parent) +eqn_box_makebinary(struct eqn_node *ep, struct eqn_box *parent) { struct eqn_box *b, *newb; @@ -554,7 +553,6 @@ eqn_box_makebinary(struct eqn_node *ep, parent->last = b->prev; b->prev = NULL; newb = eqn_box_alloc(ep, parent); - newb->pos = pos; newb->type = EQN_SUBEXPR; newb->expectargs = 2; newb->args = 1; @@ -669,7 +667,6 @@ eqn_parse(struct eqn_node *ep, struct eqn_box *parent) const char *cp, *cpn; char *p; enum eqn_tok tok; - enum eqn_post pos; enum { CCL_LET, CCL_DIG, CCL_PUN } ccl, ccln; int size; @@ -728,7 +725,7 @@ next_tok: cur->type = EQN_TEXT; cur->text = mandoc_strdup(""); } - parent = eqn_box_makebinary(ep, EQNPOS_NONE, parent); + parent = eqn_box_makebinary(ep, parent); parent->type = EQN_LIST; parent->expectargs = 1; parent->font = EQNFONT_ROMAN; @@ -865,23 +862,23 @@ next_tok: parent->pos = EQNPOS_FROMTO; break; } + parent = eqn_box_makebinary(ep, parent); switch (tok) { case EQN_TOK_FROM: - pos = EQNPOS_FROM; + parent->pos = EQNPOS_FROM; break; case EQN_TOK_TO: - pos = EQNPOS_TO; + parent->pos = EQNPOS_TO; break; case EQN_TOK_SUP: - pos = EQNPOS_SUP; + parent->pos = EQNPOS_SUP; break; case EQN_TOK_SUB: - pos = EQNPOS_SUB; + parent->pos = EQNPOS_SUB; break; default: abort(); } - parent = eqn_box_makebinary(ep, pos, parent); break; case EQN_TOK_SQRT: while (parent->args == parent->expectargs) @@ -913,7 +910,8 @@ next_tok: parent = parent->parent; while (EQN_SUBEXPR == parent->type) parent = parent->parent; - parent = eqn_box_makebinary(ep, EQNPOS_OVER, parent); + parent = eqn_box_makebinary(ep, parent); + parent->pos = EQNPOS_OVER; break; case EQN_TOK_RIGHT: case EQN_TOK_BRACE_CLOSE: |