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

Remove inner couple {...} from {{...}} only when instance is not 

a behavioral source which will be translated to a B source.
This commit is contained in:
Holger Vogt 2022-07-06 18:46:47 +02:00
parent 86dedbd1f5
commit 905b1eae8c
1 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/frontend/inpcom.c
View File

@ -7623,24 +7623,27 @@ static void inp_quote_params(struct card *c, struct card *end_c,
}
}
/* Now check if we have nested {..{ }...}, which is not accepted by numparam code.
Replace the inner { } by ( ) */
Replace the inner { } by ( ). Do this only when this is not a behavioral device
which will become a B source. B source handling is special in inp.c. */
char* cut_line = c->line;
cut_line = strchr(cut_line, '{');
if (cut_line) {
int level = 1;
cut_line++;
while (*cut_line != '\0') {
if (*cut_line == '{') {
level++;
if (level > 1)
*cut_line = '(';
}
else if (*cut_line == '}') {
if (level > 1)
*cut_line = ')';
level--;
}
if (!b_transformation_wanted(cut_line)) {
cut_line = strchr(cut_line, '{');
if (cut_line) {
int level = 1;
cut_line++;
while (*cut_line != '\0') {
if (*cut_line == '{') {
level++;
if (level > 1)
*cut_line = '(';
}
else if (*cut_line == '}') {
if (level > 1)
*cut_line = ')';
level--;
}
cut_line++;
}
}
}
}