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

subckt.c, finishLine(), #8/9, fuse two if's with the same conditional expr

This commit is contained in:
rlar 2017-03-22 20:52:10 +01:00
parent 99d788cd12
commit dc092c4ebc
1 changed files with 16 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/frontend/subckt.c
View File

@ -1330,26 +1330,7 @@ finishLine(struct bxx_buffer *t, char *src, char *scname)
bxx_putc(t, '.'); bxx_putc(t, '.');
bxx_put_substring(t, buf, buf_end); bxx_put_substring(t, buf, buf_end);
} }
} else { /* translate the reference node, as in the "2" in "v(4,2)" */
/*
i(vname) -> i(v.subckt.vname)
i(ename) -> i(e.subckt.ename)
i(hname) -> i(h.subckt.hname)
i(bname) -> i(b.subckt.hname)
*/
if (buf[0] == 'v' || buf[0] == 'V' || buf[0] == 'e' || buf[0] == 'h'
|| buf[0] == 'b' || buf[0] == 'B') {
bxx_putc(t, buf[0]);
bxx_putc(t, '.');
}
bxx_put_cstring(t, scname);
bxx_putc(t, '.');
bxx_put_substring(t, buf, buf_end);
}
/* translate the reference node, as in the "2" in "v(4,2)" */
if ((which == 'v') || (which == 'V')) {
while (*src && (isspace_c(*src) || *src == ',')) { while (*src && (isspace_c(*src) || *src == ',')) {
src++; src++;
} }
@ -1366,6 +1347,21 @@ finishLine(struct bxx_buffer *t, char *src, char *scname)
bxx_put_substring(t, buf, buf_end); bxx_put_substring(t, buf, buf_end);
} }
} }
} else {
/*
i(vname) -> i(v.subckt.vname)
i(ename) -> i(e.subckt.ename)
i(hname) -> i(h.subckt.hname)
i(bname) -> i(b.subckt.hname)
*/
if (buf[0] == 'v' || buf[0] == 'V' || buf[0] == 'e' || buf[0] == 'h'
|| buf[0] == 'b' || buf[0] == 'B') {
bxx_putc(t, buf[0]);
bxx_putc(t, '.');
}
bxx_put_cstring(t, scname);
bxx_putc(t, '.');
bxx_put_substring(t, buf, buf_end);
} }
} }
} }