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, emphasize instance_name translation 

When translating an instance_name in a subcircuit instance 'xfoo'
undconditionally express the exception for 'x' instances, which is:
  x42 --> xsub.x42
but for all others the first char (the devtype) is prepended
  r42 --> r.xsub.r42
This commit is contained in:
rlar 2016-11-19 12:44:35 +01:00
parent 178b6d074a
commit 4dbffc9991
1 changed files with 21 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/frontend/subckt.c
View File

@ -923,7 +923,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, ch, *nametofree, *paren_ptr; char *next_name, dev_type, *name, *s, *t, *nametofree, *paren_ptr;
int nnodes, i, dim; int nnodes, i, dim;
int rtn = 0; int rtn = 0;
@ -1005,7 +1005,10 @@ translate(struct line *deck, char *formal, char *actual, char *scname, const cha
name = MIFgettok(&s); name = MIFgettok(&s);
bxx_rewind(&buffer); bxx_rewind(&buffer);
bxx_printf(&buffer, "%c.%s.%s", name[0], scname, name); if (name[0] != 'x')
bxx_printf(&buffer, "%c.%s.%s", name[0], scname, name);
else
bxx_printf(&buffer, "%s.%s", scname, name);
bxx_putc(&buffer, ' '); bxx_putc(&buffer, ' ');
@ -1101,9 +1104,11 @@ translate(struct line *deck, char *formal, char *actual, char *scname, const cha
/* Here's where we translate the refdes to e.g. F:subcircuitname:57 /* Here's where we translate the refdes to e.g. F:subcircuitname:57
* and stick the translated name into buffer. * and stick the translated name into buffer.
*/ */
ch = *name; /* ch identifies the type of component */
bxx_rewind(&buffer); bxx_rewind(&buffer);
bxx_printf(&buffer, "%c.%s.%s", ch, scname, name); if (name[0] != 'x')
bxx_printf(&buffer, "%c.%s.%s", name[0], scname, name);
else
bxx_printf(&buffer, "%s.%s", scname, name);
tfree(t); tfree(t);
bxx_putc(&buffer, ' '); bxx_putc(&buffer, ' ');
@ -1194,9 +1199,10 @@ translate(struct line *deck, char *formal, char *actual, char *scname, const cha
printf("In translate, found type f or h\n"); printf("In translate, found type f or h\n");
#endif #endif
ch = *name; /* ch is the first char of the token. */ if (name[0] != 'x')
bxx_printf(&buffer, "%c.%s.%s", name[0], scname, name);
bxx_printf(&buffer, "%c.%s.%s", ch, scname, name); else
bxx_printf(&buffer, "%s.%s", scname, name);
/* From Vsense and Urefdes creates V.Urefdes.sense */ /* From Vsense and Urefdes creates V.Urefdes.sense */
} else { /* Handle netname */ } else { /* Handle netname */
@ -1242,12 +1248,11 @@ translate(struct line *deck, char *formal, char *actual, char *scname, const cha
/* Here's where we translate the refdes to e.g. R:subcircuitname:57 /* Here's where we translate the refdes to e.g. R:subcircuitname:57
* and stick the translated name into buffer. * and stick the translated name into buffer.
*/ */
ch = *name;
bxx_rewind(&buffer); bxx_rewind(&buffer);
if (ch != 'x') if (name[0] != 'x')
bxx_printf(&buffer, "%c.%s.%s", ch, scname, name); bxx_printf(&buffer, "%c.%s.%s", name[0], scname, name);
else else
bxx_printf(&buffer, "%s.%s", scname, name); bxx_printf(&buffer, "%s.%s", scname, name);
@ -1289,10 +1294,9 @@ translate(struct line *deck, char *formal, char *actual, char *scname, const cha
fprintf(cp_err, "Error: too few devs: %s\n", c->li_line); fprintf(cp_err, "Error: too few devs: %s\n", c->li_line);
goto quit; goto quit;
} }
ch = *name;
if (ch != 'x') if (name[0] != 'x')
bxx_printf(&buffer, "%c.%s.%s", ch, scname, name); bxx_printf(&buffer, "%c.%s.%s", name[0], scname, name);
else else
bxx_printf(&buffer, "%s.%s", scname, name); bxx_printf(&buffer, "%s.%s", scname, name);
@ -1406,8 +1410,10 @@ finishLine(struct bxx_buffer *t, char *src, char *scname)
/* /*
* i(instance_name) * i(instance_name)
*/ */
bxx_putc(t, buf[0]); if (buf[0] != 'x') {
bxx_putc(t, '.'); bxx_putc(t, buf[0]);
bxx_putc(t, '.');
}
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);