luke
/
ngspice
mirror of https://git.code.sf.net/p/ngspice/ngspice
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

inpcom.c, inp_chk_for_multi_in_vcvs(), #5/6, drop 'next_card', deploy its value temporarily in the new line's li_next slot

This commit is contained in:
rlar 2017-04-21 20:57:06 +02:00
parent 3b55d2af40
commit d773b73f76
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/frontend/inpcom.c
View File

@ -1242,7 +1242,7 @@ inp_chk_for_multi_in_vcvs(struct line *c, int *line_number)
(fcn_b = strstr(line, "or(")) != NULL) && (fcn_b = strstr(line, "or(")) != NULL) &&
isspace_c(fcn_b[-1])) isspace_c(fcn_b[-1]))
{ {
struct line *model_card, *next_card; struct line *model_card;
char keep, *comma_ptr, *xy_values1[5], *xy_values2[5]; char keep, *comma_ptr, *xy_values1[5], *xy_values2[5];
char *out_str, *ctrl_nodes_str, *xy_values1_b, *ref_str, *fcn_name, *fcn_e, *out_b, *out_e, *ref_e; char *out_str, *ctrl_nodes_str, *xy_values1_b, *ref_str, *fcn_name, *fcn_e, *out_b, *out_e, *ref_e;
char *m_instance, *m_model; char *m_instance, *m_model;
@ -1351,9 +1351,8 @@ inp_chk_for_multi_in_vcvs(struct line *c, int *line_number)
tfree(xy_values2[1]); tfree(xy_values2[1]);
*c->li_line = '*'; *c->li_line = '*';
next_card = c->li_next; c = c->li_next = xx_new_line(c->li_next, m_instance, (*line_number)++, 0);
c = c->li_next = xx_new_line(NULL, m_instance, (*line_number)++, 0); model_card = xx_new_line(c->li_next, m_model, (*line_number)++, 0);
model_card = xx_new_line(next_card, m_model, (*line_number)++, 0);
c->li_next = model_card; c->li_next = model_card;
// skip these two new cards // skip these two new cards
c = model_card; c = model_card;