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

treat ( ) , like spaces, that is ignore them during 

switch parameter conversion
This commit is contained in:
Holger Vogt 2018-07-26 18:21:34 +02:00
parent d1761f8d6e
commit 0c94ab948b
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/frontend/inpcom.c
View File

@ -7234,7 +7234,9 @@ pspice_compat(struct card *oldcard)
} }
for (i = 0; i < 4; i++) { for (i = 0; i < 4; i++) {
equalptr[i] = skip_back_ws(equalptr[i], str); equalptr[i] = skip_back_ws(equalptr[i], str);
equalptr[i] = skip_back_non_ws(equalptr[i], str); while (*(equalptr[i]) != '(' && !isspace_c(*(equalptr[i])) && *(equalptr[i]) != ',')
(equalptr[i])--;
(equalptr[i])++;
} }
for (i = 0; i < 3; i++) for (i = 0; i < 3; i++)
modpar[i] = copy_substring(equalptr[i], equalptr[i + 1] - 1); modpar[i] = copy_substring(equalptr[i], equalptr[i + 1] - 1);
@ -7293,7 +7295,7 @@ pspice_compat(struct card *oldcard)
int i; int i;
char *stoks[6]; char *stoks[6];
for (i = 0; i < 6; i++) for (i = 0; i < 6; i++)
stoks[i] = gettok(&cut_line); stoks[i] = gettok_node(&cut_line);
/* rewrite s line and replace it if a model is found */ /* rewrite s line and replace it if a model is found */
if ((nesting > 0) && find_a_model(modelsfound, stoks[5], subcktline->line)) { if ((nesting > 0) && find_a_model(modelsfound, stoks[5], subcktline->line)) {
tfree(card->line); tfree(card->line);