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

nupa_subcktcall(), simplify

This commit is contained in:
rlar 2016-05-16 21:40:50 +02:00
parent 1157142dfd
commit 1298eacdb2
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1655,13 +1655,14 @@ nupa_subcktcall(dico_t *dico, char *s, char * const x, char * const inst_name)
char * const u_p = spice_dstring_value(&ustr); char * const u_p = spice_dstring_value(&ustr);
if (u_p[0]) { if (u_p[0]) {
char *dollar = strchr(spice_dstring_value(&idlist), '$'); char * const idlist_p = spice_dstring_value(&idlist);
char *dollar = strchr(idlist_p, '$');
if (dollar) { if (dollar) {
int kk = (int) (dollar - spice_dstring_value(&idlist)); int kk = (int) (dollar - idlist_p);
/* replace dollar with expression string u */ /* replace dollar with expression string u */
pscopy(&vstr, spice_dstring_value(&idlist), 0, kk); pscopy(&vstr, idlist_p, 0, kk);
sadd(&vstr, spice_dstring_value(&ustr)); sadd(&vstr, spice_dstring_value(&ustr));
sadd(&vstr, spice_dstring_value(&idlist) + kk + 1); sadd(&vstr, idlist_p + kk + 1);
scopyd(&idlist, &vstr); scopyd(&idlist, &vstr);
} }
narg++; narg++;