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

Retain the param: section after removing the optional: section from a Pspice subckt declaration.

This commit is contained in:
Brian Taylor 2022-05-23 14:25:08 -07:00 committed by Holger Vogt
parent 69ef28de4a
commit 9b390c1ca9
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/frontend/inpcom.c
View File

@ -8337,7 +8337,7 @@ static struct card *u_instances(struct card *startcard)
int udev_ok = 0, udev_not_ok = 0; int udev_ok = 0, udev_not_ok = 0;
BOOL create_called = FALSE, repeat_pass = FALSE; BOOL create_called = FALSE, repeat_pass = FALSE;
BOOL skip_next = FALSE; BOOL skip_next = FALSE;
char *tmp = NULL, *pos, *new_str = NULL; char *tmp = NULL, *pos, *posp, *new_str = NULL;
card = startcard; card = startcard;
while (card) { while (card) {
@ -8361,11 +8361,25 @@ static struct card *u_instances(struct card *startcard)
initialize_udevice(subcktcard->line); initialize_udevice(subcktcard->line);
create_called = TRUE; create_called = TRUE;
} else { } else {
/* Pspice definition of .subckt card:
.SUBCKT <name> [node]*
+ [OPTIONAL: < <interface node> = <default value> >*]
+ [PARAMS: < <name> = <value> >* ]
+ [TEXT: < <name> = <text value> >* ]
...
.ENDS
*/
tmp = TMALLOC(char, strlen(cut_line) + 1); tmp = TMALLOC(char, strlen(cut_line) + 1);
(void) memcpy(tmp, cut_line, strlen(cut_line) + 1); (void) memcpy(tmp, cut_line, strlen(cut_line) + 1);
pos = strstr(tmp, "optional:"); pos = strstr(tmp, "optional:");
posp = strstr(tmp, "params:");
/* If there is an optional: and a param: then posp > pos */
if (pos) { if (pos) {
/* Remove the optional: section if present */
*pos = '\0'; *pos = '\0';
if (posp) {
strcat(tmp, posp);
}
} }
new_str = copy(tmp); new_str = copy(tmp);
tfree(tmp); tfree(tmp);