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, introduce translate_inst_name() 

to abstract the instance name translation during netlist flattening
This commit is contained in:
rlar 2016-11-19 11:50:44 +01:00
parent a54a535dd5
commit c653161666
1 changed files with 22 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
src/frontend/subckt.c
View File

@ -893,6 +893,22 @@ translate_node_name(struct bxx_buffer *buffer, const char *scname, const char *n
}
static void
translate_inst_name(struct bxx_buffer *buffer, const char *scname, const char *name, const char *name_e)
{
if (!name_e)
name_e = strchr(name, '\0');
if (tolower_c(*name) != 'x') {
bxx_putc(buffer, *name);
bxx_putc(buffer, '.');
}
bxx_put_cstring(buffer, scname);
bxx_putc(buffer, '.');
bxx_put_substring(buffer, name, name_e);
}
static int
translate(struct line *deck, char *formal, char *actual, char *scname, const char *subname, struct subs *subs, wordlist const *modnames)
{
@ -974,10 +990,7 @@ translate(struct line *deck, char *formal, char *actual, char *scname, const cha
name = MIFgettok(&s);
bxx_rewind(&buffer);
if (name[0] != 'x')
bxx_printf(&buffer, "%c.%s.%s", name[0], scname, name);
else
bxx_printf(&buffer, "%s.%s", scname, name);
translate_inst_name(&buffer, scname, name, NULL);
bxx_putc(&buffer, ' ');
@ -1069,10 +1082,7 @@ translate(struct line *deck, char *formal, char *actual, char *scname, const cha
* and stick the translated name into buffer.
*/
bxx_rewind(&buffer);
if (name[0] != 'x')
bxx_printf(&buffer, "%c.%s.%s", name[0], scname, name);
else
bxx_printf(&buffer, "%s.%s", scname, name);
translate_inst_name(&buffer, scname, name, NULL);
tfree(t);
bxx_putc(&buffer, ' ');
@ -1154,10 +1164,7 @@ translate(struct line *deck, char *formal, char *actual, char *scname, const cha
printf("In translate, found type f or h\n");
#endif
if (name[0] != 'x')
bxx_printf(&buffer, "%c.%s.%s", name[0], scname, name);
else
bxx_printf(&buffer, "%s.%s", scname, name);
translate_inst_name(&buffer, scname, name, NULL);
/* From Vsense and Urefdes creates V.Urefdes.sense */
} else { /* Handle netname */
@ -1195,11 +1202,7 @@ translate(struct line *deck, char *formal, char *actual, char *scname, const cha
bxx_rewind(&buffer);
if (name[0] != 'x')
bxx_printf(&buffer, "%c.%s.%s", name[0], scname, name);
else
bxx_printf(&buffer, "%s.%s", scname, name);
translate_inst_name(&buffer, scname, name, NULL);
tfree(nametofree);
bxx_putc(&buffer, ' ');
@ -1229,11 +1232,7 @@ translate(struct line *deck, char *formal, char *actual, char *scname, const cha
goto quit;
}
if (name[0] != 'x')
bxx_printf(&buffer, "%c.%s.%s", name[0], scname, name);
else
bxx_printf(&buffer, "%s.%s", scname, name);
translate_inst_name(&buffer, scname, name, NULL);
tfree(t);
bxx_putc(&buffer, ' ');
} /* while (nnodes--. . . . */
@ -1328,13 +1327,7 @@ finishLine(struct bxx_buffer *t, char *src, char *scname)
/*
* i(instance_name) --> i(instance_name[0].subckt.instance_name)
*/
if (buf[0] != 'x') {
bxx_putc(t, buf[0]);
bxx_putc(t, '.');
}
bxx_put_cstring(t, scname);
bxx_putc(t, '.');
bxx_put_substring(t, buf, buf_end);
translate_inst_name(t, scname, buf, buf_end);
}
}
}