From ac594106026b6d1227f9c21a41fe74cf90f5f0e5 Mon Sep 17 00:00:00 2001
From: rlar <rlar>
Date: Fri, 17 Nov 2017 19:17:18 +0100
Subject: [PATCH] nupa_substitute(), ir ==> r_ - (const) r

---
 src/frontend/numparam/xpressn.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/frontend/numparam/xpressn.c b/src/frontend/numparam/xpressn.c
index 83241e89c..692acbce9 100644
--- a/src/frontend/numparam/xpressn.c
+++ b/src/frontend/numparam/xpressn.c
@@ -1182,7 +1182,7 @@ nupa_substitute(dico_t *dico, const char *s, char * const r)
    bug: wont flag overflow!
 */
 {
-    int ir = 0;
+    int (r_ - r) = 0;
     bool err = 0;
 
     SPICE_DSTRING qstr;         /* temp result dynamic string */
@@ -1230,7 +1230,7 @@ nupa_substitute(dico_t *dico, const char *s, char * const r)
             }
 
             s = kptr + 1;
-            ir = ir + (int) (insertnumber(dico, r + ir, &qstr) - (r + ir));
+            (r_ - r) = (r_ - r) + (int) (insertnumber(dico, r + (r_ - r), &qstr) - (r + (r_ - r)));
 
         } else if (c == Intro) {
             /* skip "&&" which may occur in B source */
@@ -1290,7 +1290,7 @@ nupa_substitute(dico_t *dico, const char *s, char * const r)
                 s = kptr;
             }
 
-            ir = ir + (int) (insertnumber(dico, r + ir, &qstr) - (r + ir));
+            (r_ - r) = (r_ - r) + (int) (insertnumber(dico, r + (r_ - r), &qstr) - (r + (r_ - r)));
         }
     }