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, think in terms of struct functions instead of an integer

This commit is contained in:
rlar 2013-05-18 23:12:36 +02:00
parent 774c7f9781
commit 5892a65b23
1 changed files with 43 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
src/frontend/inpcom.c
View File

@ -2727,6 +2727,29 @@ inp_fix_inst_calls_for_numparam(struct line *deck)
} }
static struct function *
new_function(void)
{
if (num_functions >= N_FUNCTIONS) {
fprintf(stderr, "ERROR, N_FUNCTIONS overflow\n");
controlled_exit(EXIT_FAILURE);
}
return & functions[num_functions++];
}
static struct function *
find_function(char *name)
{
int i;
for (i = 0; i < num_functions; i++)
if (strcmp(functions[i].name, name) == 0)
return & functions[i];
return NULL;
}
static void static void
inp_get_func_from_line(char *line) inp_get_func_from_line(char *line)
{ {
@ -2735,7 +2758,7 @@ inp_get_func_from_line(char *line)
char temp_buf[5000]; char temp_buf[5000];
int num_params = 0; int num_params = 0;
int str_len = 0; int str_len = 0;
int i = 0; struct function *function;
/* get function name */ /* get function name */
line = skip_non_ws(line); line = skip_non_ws(line);
@ -2748,16 +2771,11 @@ inp_get_func_from_line(char *line)
/* see if already encountered this function */ /* see if already encountered this function */
/* FIXME, this code is unused, which is probably a bug */ /* FIXME, this code is unused, which is probably a bug */
for (i = 0; i < num_functions; i++) function = find_function(line);
if (strcmp(functions[i].name, line) == 0)
break;
if (num_functions >= N_FUNCTIONS) { function = new_function();
fprintf(stderr, "ERROR, N_FUNCTIONS overflow\n");
controlled_exit(EXIT_FAILURE);
}
functions[num_functions++].name = strdup(line); function->name = strdup(line);
*end = keep; *end = keep;
num_params = 0; num_params = 0;
@ -2775,10 +2793,10 @@ inp_get_func_from_line(char *line)
fprintf(stderr, "ERROR, N_PARAMS overflow\n"); fprintf(stderr, "ERROR, N_PARAMS overflow\n");
controlled_exit(EXIT_FAILURE); controlled_exit(EXIT_FAILURE);
} }
functions[num_functions-1].params[num_params++] = copy_substring(ptr, end); function->params[num_params++] = copy_substring(ptr, end);
} }
} }
functions[num_functions-1].num_parameters = num_params; function->num_parameters = num_params;
/* get function macro */ /* get function macro */
str_len = 0; str_len = 0;
@ -2792,7 +2810,7 @@ inp_get_func_from_line(char *line)
} }
temp_buf[str_len++] = '\0'; temp_buf[str_len++] = '\0';
functions[num_functions-1].macro = strdup(temp_buf); function->macro = strdup(temp_buf);
} }
@ -2840,30 +2858,30 @@ inp_grab_subckt_func(struct line *subckt)
static char* static char*
inp_do_macro_param_replace(int fcn_number, char *params[]) inp_do_macro_param_replace(struct function *fcn, char *params[])
{ {
char *param_ptr, *curr_ptr, *new_str, *curr_str = NULL, *search_ptr; char *param_ptr, *curr_ptr, *new_str, *curr_str = NULL, *search_ptr;
char keep, before, after; char keep, before, after;
int i; int i;
if (functions[fcn_number].num_parameters == 0) if (fcn->num_parameters == 0)
return strdup(functions[fcn_number].macro); return strdup(fcn->macro);
for (i = 0; i < functions[fcn_number].num_parameters; i++) { for (i = 0; i < fcn->num_parameters; i++) {
if (curr_str == NULL) { if (curr_str == NULL) {
search_ptr = curr_ptr = functions[fcn_number].macro; search_ptr = curr_ptr = fcn->macro;
} else { } else {
search_ptr = curr_ptr = curr_str; search_ptr = curr_ptr = curr_str;
curr_str = NULL; curr_str = NULL;
} }
while ((param_ptr = strstr(search_ptr, functions[fcn_number].params[i])) != NULL) { while ((param_ptr = strstr(search_ptr, fcn->params[i])) != NULL) {
/* make sure actually have the parameter name */ /* make sure actually have the parameter name */
if (param_ptr == search_ptr) /* no valid 'before' */ if (param_ptr == search_ptr) /* no valid 'before' */
before = '\0'; before = '\0';
else else
before = *(param_ptr-1); before = *(param_ptr-1);
after = param_ptr [ strlen(functions[fcn_number].params[i]) ]; after = param_ptr [ strlen(fcn->params[i]) ];
if (!(is_arith_char(before) || isspace(before) || if (!(is_arith_char(before) || isspace(before) ||
before == ',' || before == '=' || (param_ptr-1) < curr_ptr) || before == ',' || before == '=' || (param_ptr-1) < curr_ptr) ||
!(is_arith_char(after) || isspace(after) || !(is_arith_char(after) || isspace(after) ||
@ -2889,7 +2907,7 @@ inp_do_macro_param_replace(int fcn_number, char *params[])
} }
*param_ptr = keep; *param_ptr = keep;
search_ptr = curr_ptr = param_ptr + strlen(functions[fcn_number].params[i]); search_ptr = curr_ptr = param_ptr + strlen(fcn->params[i]);
} }
if (param_ptr == NULL) { if (param_ptr == NULL) {
if (curr_str == NULL) { if (curr_str == NULL) {
@ -2909,7 +2927,7 @@ inp_do_macro_param_replace(int fcn_number, char *params[])
static char* static char*
inp_expand_macro_in_str(char *str) inp_expand_macro_in_str(char *str)
{ {
int i; struct function *function;
char *c; char *c;
char *open_paren_ptr, *close_paren_ptr, *fcn_name, *params[1000]; char *open_paren_ptr, *close_paren_ptr, *fcn_name, *params[1000];
char *curr_ptr, *macro_str, *curr_str = NULL; char *curr_ptr, *macro_str, *curr_str = NULL;
@ -2932,13 +2950,11 @@ inp_expand_macro_in_str(char *str)
*open_paren_ptr = '\0'; *open_paren_ptr = '\0';
for (i = 0; i < num_functions; i++) function = find_function(fcn_name);
if (strcmp(functions[i].name, fcn_name) == 0)
break;
*open_paren_ptr = '('; *open_paren_ptr = '(';
if (i >= num_functions) if (!function)
continue; continue;
/* find the closing paren */ /* find the closing paren */
@ -2991,12 +3007,12 @@ inp_expand_macro_in_str(char *str)
inp_expand_macro_in_str(copy_substring(beg_parameter, curr_ptr)); inp_expand_macro_in_str(copy_substring(beg_parameter, curr_ptr));
} }
if (functions[i].num_parameters != num_params) { if (function->num_parameters != num_params) {
fprintf(stderr, "ERROR: parameter mismatch for function call in str: %s\n", orig_str); fprintf(stderr, "ERROR: parameter mismatch for function call in str: %s\n", orig_str);
controlled_exit(EXIT_FAILURE); controlled_exit(EXIT_FAILURE);
} }
macro_str = inp_do_macro_param_replace(i, params); macro_str = inp_do_macro_param_replace(function, params);
keep = *fcn_name; keep = *fcn_name;
*fcn_name = '\0'; *fcn_name = '\0';
{ {