From 999d69731a5a64f928d4c666e270cdefa24ee0a5 Mon Sep 17 00:00:00 2001
From: rlar <rlar>
Date: Sat, 19 Feb 2011 14:49:07 +0000
Subject: [PATCH] numparm, 17 digit placeholders --> numparm__XXXXXXXX dummy
 symbols

---
 ChangeLog                        |  5 ++
 src/frontend/numparam/spicenum.c | 11 ++--
 src/frontend/numparam/xpressn.c  | 90 +++++++++++---------------------
 3 files changed, 43 insertions(+), 63 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 62d4981f6..e0e3027d9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-02-19  Robert Larice
+ * src/frontend/numparam/spicenum.c ,
+ * src/frontend/numparam/xpressn.c :
+    numparm, 17 digit placeholders --> numparm__XXXXXXXX dummy symbols
+
 2011-02-19  Robert Larice
  * src/frontend/numparam/xpressn.c :
     numparm, upgrade message() to accept format strings
diff --git a/src/frontend/numparam/spicenum.c b/src/frontend/numparam/spicenum.c
index d4e30a027..d7d82129d 100644
--- a/src/frontend/numparam/spicenum.c
+++ b/src/frontend/numparam/spicenum.c
@@ -59,13 +59,12 @@ extern int dynmaxline; /* inpcom.c:1529 */
   In Clean state, a lot of deckcopy operations come in and we
   overwrite any line pointers, or we start a new set after each sig=0 ?
   Anyway, we neutralize all & and .param lines  (category[] array!)
-  and we substitute all {} &() and &id placeholders by dummy numbers.
-  The placeholders are long long integers 10000000000000000+n (17 digits, n small).
+  and we substitute all {} &() and &id placeholders by dummy identifiers.
+  those look like numparm__XXXXXXXX (8 hexadecimal digits)
 
 */
 /**********  string handling ***********/
 
-#define PlaceHold 10000000000000000LL
 static long placeholder = 0;
 
 
@@ -135,7 +134,11 @@ stripbraces (SPICE_DSTRINGPTR dstr_p)
                 cadd (&tstr, ' ');
 
             cadd ( &tstr, ' ');
-            naddll( &tstr, PlaceHold + placeholder); /* placeholder has 17 digits */
+            {
+                char buf[17+1];
+                sprintf(buf, "numparm__%08lx", placeholder);
+                sadd( &tstr, buf );
+            }
             cadd ( &tstr, ' ');
 
             if (s[j] >= ' ')
diff --git a/src/frontend/numparam/xpressn.c b/src/frontend/numparam/xpressn.c
index 2f1815734..1d1d6cdf0 100644
--- a/src/frontend/numparam/xpressn.c
+++ b/src/frontend/numparam/xpressn.c
@@ -1444,9 +1444,18 @@ evaluate (tdico * dico, SPICE_DSTRINGPTR qstr_p, char *t, unsigned char mode)
 
     if (numeric)
     {
-        /*  set string to total length 17, mantissa after . is of length 9 
-            use sprintf with format string %17.10g */
-        strf (u, 17, 10, qstr_p);
+        /* we want *exactly* 17 chars, we have
+         *   sign, leading digit, '.', 'e', sign, upto 3 digits exponent
+         * ==> 8 chars, thus we have 9 left for precision
+         * don't print a leading '+', something choked
+         */
+
+        char buf[17+1];
+        if(snprintf(buf, sizeof(buf), "% 17.9le", u) != 17) {
+            fprintf(stderr, "internal ERROR in %s(%d)\n", __FUNCTION__, __LINE__);
+            exit(1);
+        }
+        scopys(qstr_p, buf);
     }
 
     return err;
@@ -1714,70 +1723,33 @@ static int
 insertnumber (tdico * dico, int i, char *s, SPICE_DSTRINGPTR ustr_p)
 /* insert u in string s in place of the next placeholder number */
 {
-    SPICE_DSTRING vstr ;			/* dynamic string */
-    char *v_p ;				/* value of vstr dyna string */
-    bool found;
-    int ls, k;
-    long long accu;
-    ls = length (s);
+    const char *u = spice_dstring_value(ustr_p);
 
-    spice_dstring_init(&vstr) ;
-    scopyd (&vstr, ustr_p) ;
-//    compactfloatnb (&vstr) ;
-
-    while ( spice_dstring_length (&vstr) < MAX_STRING_INSERT)
-        cadd (&vstr, ' ');
+    char buf[ACT_CHARACTS+1];
 
-    if ( spice_dstring_length (&vstr) > MAX_STRING_INSERT)
-        message (dico, " insertnumber fails: %s", spice_dstring_value(ustr_p));
+    long id = 0;
+    int  n  = 0;
 
-    found = 0;
+    char *p = strstr(s+i, "numparm__");
 
-    while ((!found) && (i < ls))
+    if( p &&
+        (1 == sscanf(p, "numparm__%8lx%n", &id, &n)) &&
+        (n == ACT_CHARACTS) &&
+        (id > 0) && (id < dynsubst + 1) &&
+        (snprintf(buf, sizeof(buf), "%-17s", u) == ACT_CHARACTS))
     {
-        found = (s[i] == '1');
-        k = 0;
-        accu = 0;
-
-        while (found && (k < 17))
-        {
-            /* parse a 17-digit number */
-            found = num (s[i + k]);
-
-            if (found)
-                accu = 10 * accu + s[i + k] - '0';
-
-            k++;
-        }
-
-        if (found)
-        {
-            accu = accu - 10000000000000000LL;	/* plausibility test */
-
-            found = (accu > 0) && (accu < dynsubst + 1); /* dynsubst numbers have been allocated */
-        }
-        i++;
+        memcpy(p, buf, ACT_CHARACTS);
+        return p - s + ACT_CHARACTS;
     }
 
-    if (found)
-    {
-        /* substitute at i-1 ongoing */
-        i--;
-        v_p = spice_dstring_value(&vstr) ;
-        for (k = 0; k < ACT_CHARACTS; k++)
-            s[i + k] = v_p[k];
-
-        i = i + MAX_STRING_INSERT;
+    message
+        ( dico,
+          "insertnumber: fails.\n"
+          "  s+i = \"%s\" u=\"%s\" id=%ld",
+          s+i, u, id );
 
-    }
-    else
-    {
-        i = ls;
-        fprintf (stderr, "xpressn.c--insertnumber:  i=%d  s=%s  u=%s\n", i, s,
-                 spice_dstring_value(ustr_p)) ;
-        message (dico, "insertnumber: missing slot ");
-    }
-    return i;
+    /* swallow everything on failure */
+    return i + strlen(s+i);
 }
 
 bool