epilectrik
/
pyNgSpice
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Bail out if {...} or '...' are missing around RHS of the equation. 

(...) may be possible, elsewhere additional {} are put around,
so we have {(...)}.
pre-master-46
Holger Vogt 3 years ago
parent
0ee5e3f32a
commit
29c51c0d30
1 changed files with 9 additions and 24 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 33
      src/frontend/inpcom.c

33
src/frontend/inpcom.c
View File

@ -6240,14 +6240,9 @@ static void inp_compat(struct card *card)
/* Find equation, starts with '{', till end of line */
str_ptr = strchr(cut_line, '{');
if (str_ptr == NULL) {
/* if not, equation may start with a '(' */
str_ptr = strchr(cut_line, '(');
if (str_ptr == NULL) {
fprintf(stderr, "ERROR: mal formed R line: %s\n",
curr_line);
controlled_exit(EXIT_FAILURE);
}
equation = gettok_char(&str_ptr, ')', TRUE, TRUE);
fprintf(stderr, "ERROR: mal formed R line: %s\n", curr_line);
fprintf(stderr, " {...} or '...' around equation's right hand side are missing!\n");
controlled_exit(EXIT_FAILURE);
}
else
equation = gettok_char(&str_ptr, '}', TRUE, TRUE);
@ -6324,14 +6319,9 @@ static void inp_compat(struct card *card)
/* Find equation, starts with '{', till end of line */
str_ptr = strchr(cut_line, '{');
if (str_ptr == NULL) {
/* if not, equation may start with a '(' */
str_ptr = strchr(cut_line, '(');
if (str_ptr == NULL) {
fprintf(stderr, "ERROR: mal formed C line: %s\n",
curr_line);
controlled_exit(EXIT_FAILURE);
}
equation = gettok_char(&str_ptr, ')', TRUE, TRUE);
fprintf(stderr, "ERROR: mal formed C line: %s\n", curr_line);
fprintf(stderr, " {...} or '...' around equation's right hand side are missing!\n");
controlled_exit(EXIT_FAILURE);
}
else
equation = gettok_char(&str_ptr, '}', TRUE, TRUE);
@ -6399,14 +6389,9 @@ static void inp_compat(struct card *card)
/* Find equation, starts with '{', till end of line */
str_ptr = strchr(cut_line, '{');
if (str_ptr == NULL) {
/* if not, equation may start with a '(' */
str_ptr = strchr(cut_line, '(');
if (str_ptr == NULL) {
fprintf(stderr, "ERROR: mal formed L line: %s\n",
curr_line);
controlled_exit(EXIT_FAILURE);
}
equation = gettok_char(&str_ptr, ')', TRUE, TRUE);
fprintf(stderr, "ERROR: mal formed L line: %s\n", curr_line);
fprintf(stderr, " {...} or '...' around equation's right hand side are missing!\n");
controlled_exit(EXIT_FAILURE);
}
else
equation = gettok_char(&str_ptr, '}', TRUE, TRUE);

Write Preview
Loading…
Cancel
Save