From 47db5661811273cb9e00ebff175de9972492e97e Mon Sep 17 00:00:00 2001 From: rlar Date: Sat, 18 Nov 2017 12:08:48 +0100 Subject: [PATCH] getexpress(), cleanup --- src/frontend/numparam/xpressn.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/frontend/numparam/xpressn.c b/src/frontend/numparam/xpressn.c index 86d350361..8bb02f3b2 100644 --- a/src/frontend/numparam/xpressn.c +++ b/src/frontend/numparam/xpressn.c @@ -1358,14 +1358,14 @@ getexpress(const char * const s, SPICE_DSTRINGPTR tstr_p, const char **pi) ia_ptr++; p = ia_ptr - 1; - while (((p + 1) < ls_ptr) && ((p + 1)[-1] != '"')) + while (((p + 1) < ls_ptr) && (*p != '"')) p++; tpe = NUPA_STRING; do p++; - while (((p + 1) <= ls_ptr) && ((p + 1)[-1] <= ' ')); + while (((p + 1) <= ls_ptr) && (*p <= ' ')); } else { @@ -1381,7 +1381,7 @@ getexpress(const char * const s, SPICE_DSTRINGPTR tstr_p, const char **pi) if ((p + 1) > ls_ptr) c = ';'; else - c = (p + 1)[-1]; + c = *p; if (c == '(') { /* sub-formula */ @@ -1393,7 +1393,7 @@ getexpress(const char * const s, SPICE_DSTRINGPTR tstr_p, const char **pi) if ((p + 1) > ls_ptr) d = '\0'; else - d = (p + 1)[-1]; + d = *p; if (d == '(') level++; @@ -1410,7 +1410,7 @@ getexpress(const char * const s, SPICE_DSTRINGPTR tstr_p, const char **pi) pscopy(tstr_p, ia_ptr - 1, 0, (int) (p + 1 - ia_ptr)); - if ((p + 1)[-1] == '}') + if (*p == '}') p++; if (tpe == NUPA_STRING)