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

This commit is contained in:
rlar 2016-11-20 18:21:29 +01:00
parent 476c41f436
commit e40485b8a3
1 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/frontend/subckt.c
View File

@ -914,7 +914,7 @@ translate(struct line *deck, char *formal, char *actual, char *scname, const cha
{ {
struct line *c; struct line *c;
struct bxx_buffer buffer; struct bxx_buffer buffer;
char *next_name, dev_type, *name, *s, *t, *nametofree, *paren_ptr; char *next_name, *name, *t, *nametofree, *paren_ptr;
int nnodes, i, dim; int nnodes, i, dim;
int rtn = 0; int rtn = 0;
@ -936,16 +936,16 @@ translate(struct line *deck, char *formal, char *actual, char *scname, const cha
/* now iterate through the .subckt deck and translate the cards. */ /* now iterate through the .subckt deck and translate the cards. */
for (c = deck; c; c = c->li_next) { for (c = deck; c; c = c->li_next) {
dev_type = *(c->li_line); char *s = c->li_line;
s = c->li_line; char dev_type = tolower_c(s[0]);
bxx_rewind(&buffer); bxx_rewind(&buffer);
#ifdef TRACE #ifdef TRACE
/* SDB debug statement */ /* SDB debug statement */
printf("\nIn translate, examining line (dev_type: %c, subname: %s, instance: %s) %s \n", dev_type, subname, scname, c->li_line); printf("\nIn translate, examining line (dev_type: %c, subname: %s, instance: %s) %s \n", dev_type, subname, scname, s);
#endif #endif
if (ciprefix(".ic", c->li_line) || ciprefix(".nodeset", c->li_line)) { if (ciprefix(".ic", s) || ciprefix(".nodeset", s)) {
while ((paren_ptr = strchr(s, '(')) != NULL) { while ((paren_ptr = strchr(s, '(')) != NULL) {
name = paren_ptr + 1; name = paren_ptr + 1;
@ -981,7 +981,6 @@ translate(struct line *deck, char *formal, char *actual, char *scname, const cha
/* since they have a more involved and variable length node syntax */ /* since they have a more involved and variable length node syntax */
case 'a': case 'a':
case 'A':
/* translate the instance name according to normal rules */ /* translate the instance name according to normal rules */
name = MIFgettok(&s); name = MIFgettok(&s);
@ -1056,13 +1055,9 @@ translate(struct line *deck, char *formal, char *actual, char *scname, const cha
* changes were made in here. * changes were made in here.
* 4.21.2003 -- SDB. mailto:sdb@cloud9.net * 4.21.2003 -- SDB. mailto:sdb@cloud9.net
*/ */
case 'E':
case 'e': case 'e':
case 'F':
case 'f': case 'f':
case 'G':
case 'g': case 'g':
case 'H':
case 'h': case 'h':
t = name = gettok(&s); /* name points to the refdes */ t = name = gettok(&s); /* name points to the refdes */
@ -1146,10 +1141,7 @@ translate(struct line *deck, char *formal, char *actual, char *scname, const cha
goto quit; goto quit;
} }
if ((dev_type == 'f') || if ((dev_type == 'f') || (dev_type == 'h')) {
(dev_type == 'F') ||
(dev_type == 'h') ||
(dev_type == 'H')) {
/* Handle voltage source name */ /* Handle voltage source name */