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, cleanup

This commit is contained in:
rlar 2013-06-07 22:29:59 +02:00
parent 41944a6243
commit 3b3a808213
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/frontend/inpcom.c
View File

@ -664,7 +664,7 @@ inp_readall(FILE *fp, int call_depth, char *dir_name, bool comfile, bool intfile
/* find the true .end command out of .endc, .ends, .endl, .end (comments may follow) */ /* find the true .end command out of .endc, .ends, .endl, .end (comments may follow) */
if (ciprefix(".end", buffer)) if (ciprefix(".end", buffer))
if ((buffer[4] == '\0') || (isspace(buffer[4]))) { if ((buffer[4] == '\0') || isspace(buffer[4])) {
found_end = TRUE; found_end = TRUE;
*buffer = '*'; *buffer = '*';
} }
@ -968,7 +968,7 @@ inp_fix_gnd_name(struct line *c)
for (; c; c = c->li_next) { for (; c; c = c->li_next) {
char *gnd = c->li_line; char *gnd = c->li_line;
// if there is a comment or no gnd, go to next line // if there is a comment or no gnd, go to next line
if ((*gnd == '*') || (strstr(gnd, "gnd") == NULL)) if ((*gnd == '*') || !strstr(gnd, "gnd"))
continue; continue;
// replace "?gnd?" by "? 0 ?", ? being a ' ' ',' '(' ')'. // replace "?gnd?" by "? 0 ?", ? being a ' ' ',' '(' ')'.
@ -1325,7 +1325,7 @@ static char*
get_model_type(char *line) get_model_type(char *line)
{ {
char *beg_ptr; char *beg_ptr;
if (!(ciprefix(".model", line))) if (!ciprefix(".model", line))
return NULL; return NULL;
beg_ptr = skip_non_ws(line); /* eat .model */ beg_ptr = skip_non_ws(line); /* eat .model */
beg_ptr = skip_ws(beg_ptr); beg_ptr = skip_ws(beg_ptr);
@ -1667,12 +1667,12 @@ inp_fix_ternary_operator_str(char *line, bool all)
else else
str_ptr = strchr(line, ')'); str_ptr = strchr(line, ')');
if ((str_ptr == NULL) && all == FALSE) { if (!str_ptr && all == FALSE) {
fprintf(stderr, "ERROR: mal formed .param, .func or .meas line:\n %s\n", line); fprintf(stderr, "ERROR: mal formed .param, .func or .meas line:\n %s\n", line);
controlled_exit(EXIT_FAILURE); controlled_exit(EXIT_FAILURE);
} }
if ((str_ptr == NULL) && all == TRUE) { if (!str_ptr && all == TRUE) {
fprintf(stderr, "ERROR: mal formed expression in line:\n %s\n", line); fprintf(stderr, "ERROR: mal formed expression in line:\n %s\n", line);
fprintf(stderr, " We need parentheses around 'if' clause and nested ternary functions\n"); fprintf(stderr, " We need parentheses around 'if' clause and nested ternary functions\n");
fprintf(stderr, " like: Rtern4 1 0 '(ut > 0.7) ? 2k : ((ut < 0.3) ? 500 : 1k)'\n"); fprintf(stderr, " like: Rtern4 1 0 '(ut > 0.7) ? 2k : ((ut < 0.3) ? 500 : 1k)'\n");
@ -2261,7 +2261,7 @@ inp_remove_excess_ws(struct line *c)
found_control = TRUE; found_control = TRUE;
if (ciprefix(".endc", c->li_line)) if (ciprefix(".endc", c->li_line))
found_control = FALSE; found_control = FALSE;
if ((found_control) && (ciprefix("echo", c->li_line))) if (found_control && ciprefix("echo", c->li_line))
continue; continue;
c->li_line = inp_remove_ws(c->li_line); /* freed in fcn */ c->li_line = inp_remove_ws(c->li_line); /* freed in fcn */
@ -4129,7 +4129,7 @@ inp_compat(struct line *card)
tfree(str_ptr); tfree(str_ptr);
str_ptr = gettok_char(&cut_line, '{', FALSE, FALSE); str_ptr = gettok_char(&cut_line, '{', FALSE, FALSE);
expression = gettok_char(&cut_line, '}', TRUE, TRUE); /* expression */ expression = gettok_char(&cut_line, '}', TRUE, TRUE); /* expression */
if ((!expression) || (!str_ptr)) { if (!expression || !str_ptr) {
fprintf(stderr, "Error: bad sytax in line %d\n %s\n", fprintf(stderr, "Error: bad sytax in line %d\n %s\n",
card->li_linenum_orig, card->li_line); card->li_linenum_orig, card->li_line);
controlled_exit(EXIT_BAD); controlled_exit(EXIT_BAD);
@ -4321,7 +4321,7 @@ inp_compat(struct line *card)
tfree(str_ptr); tfree(str_ptr);
str_ptr = gettok_char(&cut_line, '{', FALSE, FALSE); str_ptr = gettok_char(&cut_line, '{', FALSE, FALSE);
expression = gettok_char(&cut_line, '}', TRUE, TRUE); /* expression */ expression = gettok_char(&cut_line, '}', TRUE, TRUE); /* expression */
if ((!expression) || (!str_ptr)) { if (!expression || !str_ptr) {
fprintf(stderr, "Error: bad sytax in line %d\n %s\n", fprintf(stderr, "Error: bad sytax in line %d\n %s\n",
card->li_linenum_orig, card->li_line); card->li_linenum_orig, card->li_line);
controlled_exit(EXIT_BAD); controlled_exit(EXIT_BAD);