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

save within subcircuit 

enable V(a,b) as v(a) v(b)
This commit is contained in:
Holger Vogt 2021-10-20 20:06:31 +02:00
parent e90b3e711b
commit bde0639bc4
1 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/frontend/subckt.c
View File

@ -1179,6 +1179,8 @@ translate(struct card *deck, char *formal, char *actual, char *scname, const cha
if (ciprefix(".save", s)) { if (ciprefix(".save", s)) {
while ((paren_ptr = strchr(s, '(')) != NULL) { while ((paren_ptr = strchr(s, '(')) != NULL) {
bool curr = FALSE; bool curr = FALSE;
char* comma_ptr = NULL;
if (ciprefix(" i(", paren_ptr - 2)) if (ciprefix(" i(", paren_ptr - 2))
curr = TRUE; curr = TRUE;
@ -1189,13 +1191,27 @@ translate(struct card *deck, char *formal, char *actual, char *scname, const cha
goto quit; goto quit;
} }
bxx_put_substring(&buffer, s, name); comma_ptr = strchr(s, ',');
if (curr)
translate_inst_name(&buffer, scname, name, paren_ptr);
else
translate_node_name(&buffer, scname, name, paren_ptr);
s = paren_ptr; bxx_put_substring(&buffer, s, name);
/* i(Vxx) */
if (curr) {
translate_inst_name(&buffer, scname, name, paren_ptr);
s = paren_ptr;
}
/* V(a,b) */
else if (comma_ptr && comma_ptr < paren_ptr) {
translate_node_name(&buffer, scname, name, comma_ptr);
bxx_putc(&buffer, ',');
name = comma_ptr + 1;
translate_node_name(&buffer, scname, name, paren_ptr);
s = paren_ptr;
}
/* V(a) */
else {
translate_node_name(&buffer, scname, name, paren_ptr);
s = paren_ptr;
}
} }
bxx_put_cstring(&buffer, s); /* rest of line */ bxx_put_cstring(&buffer, s); /* rest of line */
break; break;