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: hot fix for ternary function for numparam

This commit is contained in:
h_vogt 2013-10-02 22:26:49 +02:00 committed by rlar
parent 9b2aea70f9
commit 6dc46a56b1
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/frontend/inpcom.c
View File

@ -1802,7 +1802,7 @@ inp_fix_ternary_operator_str(char *line, bool all)
if (!strchr(line, '?') && !strchr(line, ':')) if (!strchr(line, '?') && !strchr(line, ':'))
return line; return line;
if (all || ciprefix(".param", line) || if (ciprefix(".param", line) ||
ciprefix(".func", line) || ciprefix(".meas", line)) ciprefix(".func", line) || ciprefix(".meas", line))
{ {
if (ciprefix(".param", line) || ciprefix(".meas", line)) if (ciprefix(".param", line) || ciprefix(".meas", line))
@ -1825,9 +1825,10 @@ inp_fix_ternary_operator_str(char *line, bool all)
str_ptr = skip_ws(str_ptr + 1); str_ptr = skip_ws(str_ptr + 1);
if (*str_ptr == '{') if (*str_ptr == '{')
str_ptr = skip_ws(str_ptr + 1); str_ptr = skip_ws(str_ptr + 1);
} else { } else if (!all){
return line; return line;
} } else
str_ptr = line;
all = TRUE; all = TRUE;
@ -1930,7 +1931,7 @@ inp_fix_ternary_operator_str(char *line, bool all)
if (*str_ptr2 == '\0') if (*str_ptr2 == '\0')
str_ptr2--; 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 != '}') && (*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);
else else
end_str = strdup(str_ptr2); end_str = strdup(str_ptr2);