luke/ngspice
1
0
Fork 0
mirror of https://git.code.sf.net/p/ngspice/ngspice synced 2026-08-22 05:47:42 +02:00
Code Issues Packages Projects Releases Wiki Activity

inp_fix_ternary_operator_str(), prepare for abstraction

Browse Source
This commit is contained in:
rlar
2013-12-31 16:24:04 +01:00
parent 3c71863c05
commit 2c74e02d42
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/frontend/inpcom.c
+8 -2
View File
@@ -1874,6 +1874,7 @@ inp_fix_ternary_operator_str(char *line, bool all)
// find closing paren // find closing paren
int count = 1; int count = 1;
str_ptr2 = str_ptr/* + 1*/; str_ptr2 = str_ptr/* + 1*/;
// assert(*str_ptr2 == '(')
while (count != 0 && *str_ptr2 != '\0') { while (count != 0 && *str_ptr2 != '\0') {
str_ptr2++; str_ptr2++;
if (*str_ptr2 == '(') if (*str_ptr2 == '(')
@@ -1881,7 +1882,9 @@ inp_fix_ternary_operator_str(char *line, bool all)
if (*str_ptr2 == ')') if (*str_ptr2 == ')')
count--; count--;
} }
if (count != 0) { if (count != 0)
str_ptr2 = NULL;
if (!str_ptr2) {
fprintf(stderr, "ERROR: problem parsing 'if' of ternary string %s!\n", line); fprintf(stderr, "ERROR: problem parsing 'if' of ternary string %s!\n", line);
controlled_exit(EXIT_FAILURE); controlled_exit(EXIT_FAILURE);
} }
@@ -1912,6 +1915,7 @@ inp_fix_ternary_operator_str(char *line, bool all)
bool found_paren = FALSE; bool found_paren = FALSE;
int count = 0; int count = 0;
str_ptr2 = str_ptr; str_ptr2 = str_ptr;
// assert(*str_ptr2 == '(')
while (*str_ptr2 != '\0') { while (*str_ptr2 != '\0') {
if (*str_ptr2 == '(') { if (*str_ptr2 == '(') {
count++; count++;
@@ -1923,7 +1927,9 @@ inp_fix_ternary_operator_str(char *line, bool all)
if (found_paren && count == 0) if (found_paren && count == 0)
break; break;
} }
if (found_paren && count != 0) { if (found_paren && count != 0)
str_ptr2 = NULL;
if (!str_ptr2) {
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);
} }