epilectrik
/
pyNgSpice
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Do not add line number 0, but the number of the original 

.probe command to linenum_orig.
pre-master-46
Holger Vogt 2 years ago
parent
e151b691fb
commit
89b25c5d58
1 changed files with 15 additions and 15 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 30
      src/frontend/inpc_probe.c

30
src/frontend/inpc_probe.c
View File

@ -284,7 +284,7 @@ void inp_probe(struct card* deck)
tfree(card->line); tfree(card->line);
card->line = newline; card->line = newline;
card = insert_new_line(card, vline, 0, 0);
card = insert_new_line(card, vline, 0, card->linenum_orig);
tfree(strnode1); tfree(strnode1);
tfree(strnode2); tfree(strnode2);
@ -320,11 +320,11 @@ void inp_probe(struct card* deck)
continue; continue;
} }
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, card->linenum_orig);
/* special for KiCad: add shunt resistor if thisnode contains 'unconnected' */ /* special for KiCad: add shunt resistor if thisnode contains 'unconnected' */
if (*instname == 'x' && strstr(thisnode, "unconnected")) { if (*instname == 'x' && strstr(thisnode, "unconnected")) {
char *rline = tprintf("R%s %s 0 1e15", thisnode, thisnode); char *rline = tprintf("R%s %s 0 1e15", thisnode, thisnode);
card = insert_new_line(card, rline, 0, 0);
card = insert_new_line(card, rline, 0, card->linenum_orig);
} }
char* nodesaves = tprintf("%s:%s#branch", instname, nodename); char* nodesaves = tprintf("%s:%s#branch", instname, nodename);
allsaves = wl_cons(nodesaves, allsaves); allsaves = wl_cons(nodesaves, allsaves);
@ -342,7 +342,7 @@ void inp_probe(struct card* deck)
char* newline = wl_flatten(allsaves); char* newline = wl_flatten(allsaves);
wl_free(allsaves); wl_free(allsaves);
allsaves = NULL; allsaves = NULL;
card = insert_new_line(card, newline, 0, 0);
card = insert_new_line(card, newline, 0, card->linenum_orig);
} }
} }
} }
@ -396,7 +396,7 @@ void inp_probe(struct card* deck)
tfree(strnode1); tfree(strnode1);
tfree(strnode2); tfree(strnode2);
tmpcard1 = deck->nextcard; tmpcard1 = deck->nextcard;
tmpcard1 = insert_new_line(tmpcard1, newline, 0, 0);
tmpcard1 = insert_new_line(tmpcard1, newline, 0, card->linenum_orig);
} }
continue; continue;
} }
@ -431,7 +431,7 @@ void inp_probe(struct card* deck)
allsaves = wl_cons(nodesaves, allsaves); allsaves = wl_cons(nodesaves, allsaves);
tfree(strnode1); tfree(strnode1);
tfree(strnode2); tfree(strnode2);
tmpcard1 = insert_new_line(tmpcard1, newline, 0, 0);
tmpcard1 = insert_new_line(tmpcard1, newline, 0, card->linenum_orig);
continue; continue;
} }
/* node containing ':' /* node containing ':'
@ -584,7 +584,7 @@ void inp_probe(struct card* deck)
char *newline = tprintf("Ediff%d_%s_%s vd_%s:%s_%s:%s 0 %s %s 1", ee, instname1, instname2, instname1, nodename1, instname2, nodename2, strnode1, strnode2); char *newline = tprintf("Ediff%d_%s_%s vd_%s:%s_%s:%s 0 %s %s 1", ee, instname1, instname2, instname1, nodename1, instname2, nodename2, strnode1, strnode2);
char* nodesaves = tprintf("vd_%s:%s_%s:%s", instname1, nodename1, instname2, nodename2); char* nodesaves = tprintf("vd_%s:%s_%s:%s", instname1, nodename1, instname2, nodename2);
allsaves = wl_cons(nodesaves, allsaves); allsaves = wl_cons(nodesaves, allsaves);
tmpcard1 = insert_new_line(tmpcard1, newline, 0, 0);
tmpcard1 = insert_new_line(tmpcard1, newline, 0, card->linenum_orig);
tfree(strnode1); tfree(strnode1);
tfree(strnode2); tfree(strnode2);
tfree(nodename1); tfree(nodename1);
@ -706,7 +706,7 @@ void inp_probe(struct card* deck)
char* newline = tprintf("Ediff%d_%s vd_%s:%s:%s 0 %s %s 1", ee, instname1, instname1, nodename1, nodename2, strnode1, strnode2); char* newline = tprintf("Ediff%d_%s vd_%s:%s:%s 0 %s %s 1", ee, instname1, instname1, nodename1, nodename2, strnode1, strnode2);
char* nodesaves = tprintf("vd_%s:%s:%s", instname1, nodename1, nodename2); char* nodesaves = tprintf("vd_%s:%s:%s", instname1, nodename1, nodename2);
allsaves = wl_cons(nodesaves, allsaves); allsaves = wl_cons(nodesaves, allsaves);
tmpcard1 = insert_new_line(tmpcard1, newline, 0, 0);
tmpcard1 = insert_new_line(tmpcard1, newline, 0, card->linenum_orig);
tfree(strnode1); tfree(strnode1);
tfree(strnode2); tfree(strnode2);
tfree(nodename1); tfree(nodename1);
@ -791,7 +791,7 @@ void inp_probe(struct card* deck)
tfree(tmpcard->line); tfree(tmpcard->line);
tmpcard->line = newline; tmpcard->line = newline;
tmpcard = insert_new_line(tmpcard, vline, 0, 0);
tmpcard = insert_new_line(tmpcard, vline, 0, card->linenum_orig);
tfree(strnode2); tfree(strnode2);
tfree(newnode); tfree(newnode);
@ -846,7 +846,7 @@ void inp_probe(struct card* deck)
tfree(tmpcard->line); tfree(tmpcard->line);
tmpcard->line = newline; tmpcard->line = newline;
tmpcard = insert_new_line(tmpcard, vline, 0, 0);
tmpcard = insert_new_line(tmpcard, vline, 0, card->linenum_orig);
char* nodesaves = tprintf("%s:%s#branch", instname, nodename1); char* nodesaves = tprintf("%s:%s#branch", instname, nodename1);
allsaves = wl_cons(nodesaves, allsaves); allsaves = wl_cons(nodesaves, allsaves);
@ -911,7 +911,7 @@ void inp_probe(struct card* deck)
wl_free(allsaves); wl_free(allsaves);
allsaves = NULL; allsaves = NULL;
card = deck->nextcard; card = deck->nextcard;
card = insert_new_line(card, newline, 0, 0);
card = insert_new_line(card, newline, 0, card->linenum_orig);
} }
} }
@ -1379,7 +1379,7 @@ static int setallvsources(struct card *tmpcard, NGHASHPTR instances, char *instn
card = tmpcard->nextcard; card = tmpcard->nextcard;
card = insert_new_line(card, vline, 0, 0);
card = insert_new_line(card, vline, 0, card->linenum_orig);
if (power) { if (power) {
/* For example V(1)+V(2)+V(3)*/ /* For example V(1)+V(2)+V(3)*/
@ -1422,14 +1422,14 @@ static int setallvsources(struct card *tmpcard, NGHASHPTR instances, char *instn
wl_free(allsaves); wl_free(allsaves);
allsaves = NULL; allsaves = NULL;
card = tmpcard->nextcard; card = tmpcard->nextcard;
card = insert_new_line(card, newsaveline, 0, 0);
card = insert_new_line(card, newsaveline, 0, card->linenum_orig);
} }
if (power) { if (power) {
cadd(&BVrefline, ')'); cadd(&BVrefline, ')');
card = tmpcard->nextcard; card = tmpcard->nextcard;
card = insert_new_line(card, copy(ds_get_buf(&BVrefline)), 0, 0);
card = insert_new_line(card, copy(ds_get_buf(&Bpowerline)), 0, 0);
card = insert_new_line(card, copy(ds_get_buf(&BVrefline)), 0, card->linenum_orig);
card = insert_new_line(card, copy(ds_get_buf(&Bpowerline)), 0, card->linenum_orig);
} }
ds_free(&BVrefline); ds_free(&BVrefline);

Write Preview
Loading…
Cancel
Save