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(), #1/9, trivial cleanup

This commit is contained in:
rlar 2016-11-19 10:25:37 +01:00
parent f12ff5464e
commit 0502e83fba
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/frontend/subckt.c
View File

@ -1321,14 +1321,15 @@ finishLine(struct bxx_buffer *t, char *src, char *scname)
src++; src++;
buf_end = src; buf_end = src;
if ((which == 'v') || (which == 'V')) if ((which == 'v') || (which == 'V')) {
s = gettrans(buf, buf_end); s = gettrans(buf, buf_end);
else } else {
s = NULL; s = NULL;
}
if (s) { if (s) {
bxx_put_cstring(t, s); bxx_put_cstring(t, s);
} else { /* just a normal netname . . . . */ } else {
/* /*
i(vname) -> i(v.subckt.vname) i(vname) -> i(v.subckt.vname)
i(ename) -> i(e.subckt.ename) i(ename) -> i(e.subckt.ename)
@ -1340,10 +1341,7 @@ finishLine(struct bxx_buffer *t, char *src, char *scname)
|| buf[0] == 'b' || buf[0] == 'B')) { || buf[0] == 'b' || buf[0] == 'B')) {
bxx_putc(t, buf[0]); bxx_putc(t, buf[0]);
bxx_putc(t, '.'); bxx_putc(t, '.');
/*i = 1; */ }
} /* else {
i = 0;
} */
bxx_put_cstring(t, scname); bxx_put_cstring(t, scname);
bxx_putc(t, '.'); bxx_putc(t, '.');
bxx_put_substring(t, buf, buf_end); bxx_put_substring(t, buf, buf_end);
@ -1358,8 +1356,8 @@ finishLine(struct bxx_buffer *t, char *src, char *scname)
if (*src && *src != ')') { if (*src && *src != ')') {
for (buf = src; *src && !isspace_c(*src) && (*src != ')'); ) for (buf = src; *src && !isspace_c(*src) && (*src != ')'); )
src++; src++;
s = gettrans(buf, buf_end = src);
bxx_putc(t, ','); bxx_putc(t, ',');
s = gettrans(buf, buf_end = src);
if (s) { if (s) {
bxx_put_cstring(t, s); bxx_put_cstring(t, s);
} else { } else {