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

defsubckt(), cleanup

This commit is contained in:
rlar 2017-11-18 17:22:49 +01:00
parent 9a64579db6
commit 44a17a14f7
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/frontend/numparam/xpressn.c
View File

@ -516,24 +516,24 @@ defsubckt(dico_t *dico, struct card *card, nupa_type categ)
const char *i_ptr, *j_ptr; const char *i_ptr, *j_ptr;
i_ptr = s; i_ptr = s;
while (((i_ptr - s) < (ls_ptr - s)) && (s[(i_ptr - s)] != '.')) while ((i_ptr < ls_ptr) && (*i_ptr != '.'))
i_ptr++; /* skip 1st dotword */ i_ptr++; /* skip 1st dotword */
while (((i_ptr - s) < (ls_ptr - s)) && (s[(i_ptr - s)] > ' ')) while ((i_ptr < ls_ptr) && (*i_ptr > ' '))
i_ptr++; i_ptr++;
while (((i_ptr - s) < (ls_ptr - s)) && (s[(i_ptr - s)] <= ' ')) while ((i_ptr < ls_ptr) && (*i_ptr <= ' '))
i_ptr++; /* skip blank */ i_ptr++; /* skip blank */
j_ptr = i_ptr; j_ptr = i_ptr;
while (((j_ptr - s) < (ls_ptr - s)) && (s[(j_ptr - s)] > ' ')) while ((j_ptr < ls_ptr) && (*j_ptr > ' '))
j_ptr++; j_ptr++;
if ((j_ptr - s) > (i_ptr - s)) { if (j_ptr > i_ptr) {
SPICE_DSTRING ustr; /* temp user string */ SPICE_DSTRING ustr; /* temp user string */
spice_dstring_init(&ustr); spice_dstring_init(&ustr);
pscopy_up(&ustr, s, (int) (i_ptr - s), (int) (j_ptr - s) - (int) (i_ptr - s)); pscopy_up(&ustr, s, (int) (i_ptr - s), (int) (j_ptr - i_ptr));
err = nupa_define(dico, spice_dstring_value(&ustr), ' ', categ, 0.0, w, NULL); err = nupa_define(dico, spice_dstring_value(&ustr), ' ', categ, 0.0, w, NULL);
spice_dstring_free(&ustr); spice_dstring_free(&ustr);
} else { } else {