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, abstraction, new_subckt_w_params()

This commit is contained in:
rlar 2013-05-19 23:09:15 +02:00
parent f9dca702c9
commit ee626636c3
1 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/frontend/inpcom.c
View File

@ -1998,6 +1998,18 @@ inp_change_quotes(char *s)
} }
static void
new_subckt_w_params(char *str)
{
if (num_subckt_w_params >= N_SUBCKT_W_PARAMS) {
fprintf(stderr, "ERROR, N_SUBCKT_W_PARMS overflow\n");
controlled_exit(EXIT_FAILURE);
}
subckt_w_params[num_subckt_w_params++] = str;
}
static char* static char*
inp_fix_subckt(char *s) inp_fix_subckt(char *s)
{ {
@ -2014,12 +2026,7 @@ inp_fix_subckt(char *s)
for (ptr2 = ptr1; *ptr2 && !isspace(*ptr2) && !isquote(*ptr2); ptr2++) for (ptr2 = ptr1; *ptr2 && !isspace(*ptr2) && !isquote(*ptr2); ptr2++)
; ;
if (num_subckt_w_params >= N_SUBCKT_W_PARAMS) { new_subckt_w_params(copy_substring(ptr1, ptr2));
fprintf(stderr, "ERROR, N_SUBCKT_W_PARMS overflow\n");
controlled_exit(EXIT_FAILURE);
}
subckt_w_params[num_subckt_w_params++] = copy_substring(ptr1, ptr2);
/* go to beginning of first parameter word */ /* go to beginning of first parameter word */
/* s will contain only subckt definition */ /* s will contain only subckt definition */
@ -2562,11 +2569,7 @@ inp_fix_subckt_multiplier(struct line *subckt_card,
if (!strstr(subckt_card->li_line, "params:")) { if (!strstr(subckt_card->li_line, "params:")) {
new_str = TMALLOC(char, strlen(subckt_card->li_line) + 13); new_str = TMALLOC(char, strlen(subckt_card->li_line) + 13);
sprintf(new_str, "%s params: m=1", subckt_card->li_line); sprintf(new_str, "%s params: m=1", subckt_card->li_line);
if (num_subckt_w_params >= N_SUBCKT_W_PARAMS) { new_subckt_w_params(get_subckt_model_name(subckt_card->li_line));
fprintf(stderr, "ERROR, N_SUBCKT_W_PARMS overflow\n");
controlled_exit(EXIT_FAILURE);
}
subckt_w_params[num_subckt_w_params++] = get_subckt_model_name(subckt_card->li_line);
} else { } else {
new_str = TMALLOC(char, strlen(subckt_card->li_line) + 5); new_str = TMALLOC(char, strlen(subckt_card->li_line) + 5);
sprintf(new_str, "%s m=1", subckt_card->li_line); sprintf(new_str, "%s m=1", subckt_card->li_line);
@ -3821,11 +3824,7 @@ inp_add_params_to_subckt(struct line *subckt_card)
subckt_name = skip_non_ws(subckt_card->li_line); subckt_name = skip_non_ws(subckt_card->li_line);
subckt_name = skip_ws(subckt_name); subckt_name = skip_ws(subckt_name);
end_ptr = skip_non_ws(subckt_name); end_ptr = skip_non_ws(subckt_name);
if (num_subckt_w_params >= N_SUBCKT_W_PARAMS) { new_subckt_w_params(copy_substring(subckt_name, end_ptr));
fprintf(stderr, "ERROR, N_SUBCKT_W_PARMS overflow\n");
controlled_exit(EXIT_FAILURE);
}
subckt_w_params[num_subckt_w_params++] = copy_substring(subckt_name, end_ptr);
} else { } else {
new_line = TMALLOC(char, strlen(subckt_line) + strlen(param_ptr) + 2); new_line = TMALLOC(char, strlen(subckt_line) + strlen(param_ptr) + 2);
sprintf(new_line, "%s %s", subckt_line, param_ptr); sprintf(new_line, "%s %s", subckt_line, param_ptr);