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 fcn nested ternary hot fix

This commit is contained in:
h_vogt 2013-05-03 23:11:51 +02:00
parent 6021719798
commit a23a913db9
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/frontend/inpcom.c
View File

@ -97,6 +97,8 @@ static char *skip_non_ws(char *d) { while (*d && !isspace(*d)) d++; return
static char *skip_back_ws(char *d) { while (isspace(*d)) d--; return d; } static char *skip_back_ws(char *d) { while (isspace(*d)) d--; return d; }
static char *skip_ws(char *d) { while (isspace(*d)) d++; return d; } static char *skip_ws(char *d) { while (isspace(*d)) d++; return d; }
static void tprint(struct line *deck);
#ifndef XSPICE #ifndef XSPICE
static void inp_poly_err(struct line *deck); static void inp_poly_err(struct line *deck);
#endif #endif
@ -822,8 +824,8 @@ inp_readall(FILE *fp, int call_depth, char *dir_name, bool comfile, bool intfile
inp_fix_macro_param_func_paren_io(working); inp_fix_macro_param_func_paren_io(working);
inp_fix_ternary_operator(working); inp_fix_ternary_operator(working);
//tprint(working);
inp_grab_func(working); inp_grab_func(working);
inp_expand_macros_in_func(); inp_expand_macros_in_func();
inp_expand_macros_in_deck(working); inp_expand_macros_in_deck(working);
inp_fix_param_values(working); inp_fix_param_values(working);
@ -1784,7 +1786,7 @@ inp_fix_ternary_operator_str(char *line, bool all)
} else { } else {
return line; return line;
} }
all = TRUE;
// get conditional // get conditional
question = strchr(str_ptr, '?'); question = strchr(str_ptr, '?');
str_ptr2 = skip_back_ws(question - 1); str_ptr2 = skip_back_ws(question - 1);
@ -1871,6 +1873,8 @@ inp_fix_ternary_operator_str(char *line, bool all)
fprintf(stderr, "ERROR: problem parsing ternary line %s!\n", line); fprintf(stderr, "ERROR: problem parsing ternary line %s!\n", line);
controlled_exit(EXIT_FAILURE); controlled_exit(EXIT_FAILURE);
} }
if (*str_ptr2 == '\0')
str_ptr2--;
else_str = inp_fix_ternary_operator_str(copy_substring(str_ptr, str_ptr2), all); else_str = inp_fix_ternary_operator_str(copy_substring(str_ptr, str_ptr2), all);
if (*str_ptr2 != '}') if (*str_ptr2 != '}')
end_str = inp_fix_ternary_operator_str(strdup(str_ptr2+1), all); end_str = inp_fix_ternary_operator_str(strdup(str_ptr2+1), all);
@ -5736,3 +5740,13 @@ inp_poly_err(struct line *deck)
} }
} }
#endif #endif
static void
tprint(struct line *deck)
{
/*debug: print into file*/
FILE *fd = fopen("tprint-out.txt", "w");
struct line *t;
for (t = deck; t; t = t->li_next)
fprintf(fd, "%d %d %s\n", t->li_linenum_orig, t->li_linenum, t->li_line);
fclose(fd);
}