luke
/
ngspice
mirror of https://git.code.sf.net/p/ngspice/ngspice
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

numparam/spicenum.c, stripsomespace(), cleanup

This commit is contained in:
rlar 2016-04-30 11:49:38 +02:00
parent a9a8afa12d
commit cd260cf45a
1 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/frontend/numparam/spicenum.c
View File

@ -73,25 +73,21 @@ static void
stripsomespace(SPICE_DSTRINGPTR dstr_p, unsigned char incontrol) stripsomespace(SPICE_DSTRINGPTR dstr_p, unsigned char incontrol)
{ {
/* if s starts with one of some markers, strip leading space */ /* if s starts with one of some markers, strip leading space */
int i, ls;
char *sstr; /* string contained in s */
SPICE_DSTRING markers;
spice_dstring_init(&markers); const char *markers =
scopys(&markers, "*.&+#$"); incontrol
? "*.&+#$"
: "*.&+#$" "xX";
if (!incontrol) char *s = spice_dstring_value(dstr_p);
sadd(&markers, "xX"); int ls = spice_dstring_length(dstr_p);
sstr = spice_dstring_value(dstr_p); int i = 0;
ls = spice_dstring_length(dstr_p); while ((i < ls) && (s[i] <= ' '))
i = 0;
while ((i < ls) && (sstr[i] <= ' '))
i++; i++;
if ((i > 0) && (i < ls) && (cpos(sstr[i], spice_dstring_value(&markers)) >= 0)) if ((i > 0) && (i < ls) && strchr(markers, s[i]))
pscopy(dstr_p, sstr, i, ls); pscopy(dstr_p, s, i, ls);
} }
@ -293,7 +289,7 @@ modernizeex(SPICE_DSTRINGPTR dstr_p)
static char static char
transform(dico_t *dico, SPICE_DSTRINGPTR dstr_p, unsigned char nostripping, transform(dico_t *dico, SPICE_DSTRINGPTR dstr_p, unsigned char incontrol,
SPICE_DSTRINGPTR u_p) SPICE_DSTRINGPTR u_p)
/* line s is categorized and crippled down to basic Spice /* line s is categorized and crippled down to basic Spice
* returns in u control word following dot, if any * returns in u control word following dot, if any
@ -327,7 +323,7 @@ transform(dico_t *dico, SPICE_DSTRINGPTR dstr_p, unsigned char nostripping,
spice_dstring_init(&tstr); spice_dstring_init(&tstr);
spice_dstring_reinit(u_p); spice_dstring_reinit(u_p);
stripsomespace(dstr_p, nostripping); stripsomespace(dstr_p, incontrol);
modernizeex(dstr_p); /* required for stripbraces count */ modernizeex(dstr_p); /* required for stripbraces count */
s = spice_dstring_value(dstr_p); s = spice_dstring_value(dstr_p);