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, translate(), #6/8 cleanup

This commit is contained in:
rlar 2016-11-20 20:09:45 +01:00
parent 2a4c34c401
commit 49947e0279
1 changed files with 7 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/frontend/subckt.c
View File

@ -1011,33 +1011,33 @@ translate(struct line *deck, char *formal, char *actual, char *scname, const cha
case '[': case '[':
case ']': case ']':
case '~': case '~':
bxx_printf(&buffer, "%s ", name); bxx_put_cstring(&buffer, name);
break; break;
case '%': case '%':
bxx_printf(&buffer, "%%"); bxx_putc(&buffer, '%');
/* don't translate the port type identifier */ /* don't translate the port type identifier */
if (name) if (name)
tfree(name); tfree(name);
name = next_name; name = next_name;
next_name = MIFgettok(&s); next_name = MIFgettok(&s);
bxx_printf(&buffer, "%s ", name); bxx_put_cstring(&buffer, name);
break; break;
default: default:
/* must be a node name at this point, so translate it */ /* must be a node name at this point, so translate it */
translate_node_name(&buffer, scname, name, NULL); translate_node_name(&buffer, scname, name, NULL);
bxx_putc(&buffer, ' ');
break; break;
} /* switch */ } /* switch */
bxx_putc(&buffer, ' ');
} /* while */ } /* while */
/* copy in the last token, which is the model name */ /* copy in the last token, which is the model name */
if (name) { if (name) {
bxx_printf(&buffer, "%s", name); bxx_put_cstring(&buffer, name);
tfree(name); tfree(name);
} }
break; /* case 'a' */ break; /* case 'a' */
@ -1137,26 +1137,10 @@ translate(struct line *deck, char *formal, char *actual, char *scname, const cha
goto quit; goto quit;
} }
if ((dev_type == 'f') || (dev_type == 'h')) { if ((dev_type == 'f') || (dev_type == 'h'))
/* Handle voltage source name */
#ifdef TRACE
/* SDB debug statement */
printf("In translate, found type f or h\n");
#endif
translate_inst_name(&buffer, scname, name, NULL); translate_inst_name(&buffer, scname, name, NULL);
/* From Vsense and Urefdes creates V.Urefdes.sense */ else
} else { /* Handle netname */
#ifdef TRACE
/* SDB debug statement */
printf("In translate, found type e or g\n");
#endif
translate_node_name(&buffer, scname, name, NULL); translate_node_name(&buffer, scname, name, NULL);
}
tfree(name); tfree(name);
bxx_putc(&buffer, ' '); bxx_putc(&buffer, ' ');
} /* while (nnodes--. . . . */ } /* while (nnodes--. . . . */