From d52d7bc121c9c761659b6ca3556f360d341ed6c8 Mon Sep 17 00:00:00 2001 From: Ori Bernstein Date: Sat, 25 Apr 2020 10:57:17 -0700 Subject: Backed out changeset 2737b9af622b not what I wanted to commit. --- sys/src/cmd/cpp/macro.c | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) (limited to 'sys/src/cmd/cpp/macro.c') diff --git a/sys/src/cmd/cpp/macro.c b/sys/src/cmd/cpp/macro.c index 85e544151..67af0bd0c 100644 --- a/sys/src/cmd/cpp/macro.c +++ b/sys/src/cmd/cpp/macro.c @@ -350,7 +350,7 @@ ispaste(Tokenrow *rtr, Token **ap, Token **an, int *ntok) void substargs(Nlist *np, Tokenrow *rtr, Tokenrow **atr) { - Tokenrow ttr, rp, rn; + Tokenrow ttr; Token *tp, *ap, *an, *pp, *pn; int ntok, argno, hs; @@ -369,25 +369,19 @@ substargs(Nlist *np, Tokenrow *rtr, Tokenrow **atr) insertrow(rtr, ntok, stringify(atr[argno])); } else if (ispaste(rtr, &ap, &an, &ntok)) { /* first token, just do the next one */ pp = ap; - rp.tp = nil; pn = an; - rn.tp = nil; if (ap && (argno = lookuparg(np, ap)) >= 0){ pp = nil; - rp = *atr[argno]; - if(rp.tp != rp.lp) - pp = --rp.lp; + if(atr[argno]->tp != atr[argno]->lp) + pp = atr[argno]->lp - 1; } if (an && (argno = lookuparg(np, an)) >= 0) { pn = nil; - rn = *atr[argno]; - if(rn.tp != rn.lp) - pn = rn.bp++; + if(atr[argno]->tp != atr[argno]->lp) + pn = atr[argno]->lp - 1; } glue(&ttr, pp, pn); - insertrow(rtr, 0, &rp); insertrow(rtr, ntok, &ttr); - insertrow(rtr, 0, &rn); free(ttr.bp); } else if (rtr->tp->type==NAME) { if((argno = lookuparg(np, rtr->tp)) >= 0) { -- cgit v1.2.3