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

Remove the special handling of X... device names. 

Subcircuit devices are saved with leading X in their names.
This commit is contained in:
Holger Vogt 2022-04-25 15:18:25 +02:00
parent 519915202f
commit 6153f2c887
1 changed files with 7 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
src/frontend/inpc_probe.c
View File

@ -269,15 +269,8 @@ void inp_probe(struct card* deck)
char* vline = tprintf("vcurr_%s:%s:%s_%s %s %s 0", instname, nodename, thisnode, nodebuf, thisnode, newnode); char* vline = tprintf("vcurr_%s:%s:%s_%s %s %s 0", instname, nodename, thisnode, nodebuf, thisnode, newnode);
card = insert_new_line(card, vline, 0, 0); card = insert_new_line(card, vline, 0, 0);
/* special treatment for xlines: keep the x if next char is a number */ char* nodesaves = tprintf("%s:%s#branch", instname, nodename);
if (*instname == 'x' && !isdigit_c(instname[1])) { allsaves = wl_cons(nodesaves, allsaves);
char* nodesaves = tprintf("%s:%s#branch", instname + 1, nodename);
allsaves = wl_cons(nodesaves, allsaves);
}
else {
char* nodesaves = tprintf("%s:%s#branch", instname, nodename);
allsaves = wl_cons(nodesaves, allsaves);
}
tfree(newnode); tfree(newnode);
tfree(nodename); tfree(nodename);
@ -792,15 +785,8 @@ void inp_probe(struct card* deck)
tmpcard = insert_new_line(tmpcard, vline, 0, 0); tmpcard = insert_new_line(tmpcard, vline, 0, 0);
/* special treatment for xlines: keep the x if next char is a number */ char* nodesaves = tprintf("%s:%s#branch", instname, nodename1);
if (*instname == 'x' && !isdigit_c(instname[1])) { allsaves = wl_cons(nodesaves, allsaves);
char* nodesaves = tprintf("%s:%s#branch", instname + 1, nodename1);
allsaves = wl_cons(nodesaves, allsaves);
}
else {
char* nodesaves = tprintf("%s:%s#branch", instname, nodename1);
allsaves = wl_cons(nodesaves, allsaves);
}
tfree(begstr); tfree(begstr);
tfree(strnode1); tfree(strnode1);
@ -1182,16 +1168,7 @@ void modprobenames(INPtables* tab) {
GENinstance* GENinst; GENinstance* GENinst;
for (GENinst = tab->defVmod->GENinstances; GENinst; GENinst = GENinst->GENnextInstance) { for (GENinst = tab->defVmod->GENinstances; GENinst; GENinst = GENinst->GENnextInstance) {
char* name = GENinst->GENname; char* name = GENinst->GENname;
/* Do not inlude the x in the new name, XU1 -> U1 */ if (prefix("vcurr_", name)) {
if (prefix("vcurr_x", name) && !isdigit_c(name[7])) {
/* copy from char no. 7 to (and excluding) second colon */
char* endname = strchr(name, ':');
endname = strchr(endname + 1, ':');
char* newname = copy_substring(name + 7, endname);
memcpy(name, newname, strlen(newname) + 1);
tfree(newname);
}
else if (prefix("vcurr_", name)) {
/* copy from char no. 6 to (and excluding) second colon */ /* copy from char no. 6 to (and excluding) second colon */
char* endname = strchr(name, ':'); char* endname = strchr(name, ':');
char* endname2 = strchr(endname + 1, ':'); char* endname2 = strchr(endname + 1, ':');
@ -1291,16 +1268,8 @@ static int setallvsources(struct card *tmpcard, NGHASHPTR instances, char *instn
card = insert_new_line(card, vline, 0, 0); card = insert_new_line(card, vline, 0, 0);
char* nodesaves; char* nodesaves = tprintf("%s:%s#branch", instname, nodename1);
/* special treatment for xlines: keep the x if next char is a number */ allsaves = wl_cons(nodesaves, allsaves);
if (*instname == 'x' && !isdigit_c(instname[1])) {
nodesaves = tprintf("%s:%s#branch", instname + 1, nodename1);
allsaves = wl_cons(nodesaves, allsaves);
}
else {
nodesaves = tprintf("%s:%s#branch", instname, nodename1);
allsaves = wl_cons(nodesaves, allsaves);
}
if (power) { if (power) {
/* For example V(1)+V(2)+V(3)*/ /* For example V(1)+V(2)+V(3)*/