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, simple cleanups

This commit is contained in:
rlar 2013-05-26 00:07:43 +02:00
parent 30a88925da
commit 129b1f36ed
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/frontend/inpcom.c
View File

@ -1024,11 +1024,10 @@ inp_chk_for_multi_in_vcvs(struct line *deck, int *line_number)
while (*str_ptr2 != '{') while (*str_ptr2 != '{')
str_ptr2--; str_ptr2--;
xy_str1 = str_ptr2; xy_str1 = str_ptr2;
str_ptr2 = skip_back_ws(xy_str1);
} else { } else {
xy_str1 = skip_back_non_ws(str_ptr2); xy_str1 = skip_back_non_ws(str_ptr2);
str_ptr2 = skip_back_ws(xy_str1);
} }
str_ptr2 = skip_back_ws(xy_str1);
keep = *str_ptr2; keep = *str_ptr2;
*str_ptr2 = '\0'; *str_ptr2 = '\0';
ctrl_node_str = strdup(str_ptr1); ctrl_node_str = strdup(str_ptr1);
@ -1948,7 +1947,7 @@ inp_stripcomments_line(char *s)
return; return;
} }
if (d>s) { if (d > s) {
d--; d--;
/* d now points to character just before comment */ /* d now points to character just before comment */
@ -2083,7 +2082,7 @@ inp_fix_subckt(char *s)
beg = ptr2; beg = ptr2;
} else { } else {
*ptr2 = '\0'; *ptr2 = '\0';
beg = ptr2+1; beg = ptr2 + 1;
} }
newcard = alloc(struct line); newcard = alloc(struct line);
@ -2442,12 +2441,12 @@ inp_get_params(char *line, char *param_names[], char *param_values[])
// check for equality '==' // check for equality '=='
if (equal_ptr[1] == '=') { if (equal_ptr[1] == '=') {
line = equal_ptr+2; line = equal_ptr + 2;
continue; continue;
} }
// check for '!=', '<=', '>=' // check for '!=', '<=', '>='
if (*(equal_ptr-1) == '!' || *(equal_ptr-1) == '<' || *(equal_ptr-1) == '>') { if (*(equal_ptr-1) == '!' || *(equal_ptr-1) == '<' || *(equal_ptr-1) == '>') {
line = equal_ptr+1; line = equal_ptr + 1;
continue; continue;
} }
@ -4023,12 +4022,12 @@ inp_split_multi_param_lines(struct line *deck, int line_num)
while ((equal_ptr = strchr(curr_line, '=')) != NULL) { while ((equal_ptr = strchr(curr_line, '=')) != NULL) {
// check for equality '==' // check for equality '=='
if (equal_ptr[1] == '=') { if (equal_ptr[1] == '=') {
curr_line = equal_ptr+2; curr_line = equal_ptr + 2;
continue; continue;
} }
// check for '!=', '<=', '>=' // check for '!=', '<=', '>='
if (*(equal_ptr-1) == '!' || *(equal_ptr-1) == '<' || *(equal_ptr-1) == '>') { if (*(equal_ptr-1) == '!' || *(equal_ptr-1) == '<' || *(equal_ptr-1) == '>') {
curr_line = equal_ptr+1; curr_line = equal_ptr + 1;
continue; continue;
} }
counter++; counter++;
@ -4045,12 +4044,12 @@ inp_split_multi_param_lines(struct line *deck, int line_num)
while (curr_line < card->li_line+strlen(card->li_line) && (equal_ptr = strchr(curr_line, '=')) != NULL) { while (curr_line < card->li_line+strlen(card->li_line) && (equal_ptr = strchr(curr_line, '=')) != NULL) {
// check for equality '==' // check for equality '=='
if (equal_ptr[1] == '=') { if (equal_ptr[1] == '=') {
curr_line = equal_ptr+2; curr_line = equal_ptr + 2;
continue; continue;
} }
// check for '!=', '<=', '>=' // check for '!=', '<=', '>='
if (*(equal_ptr-1) == '!' || *(equal_ptr-1) == '<' || *(equal_ptr-1) == '>') { if (*(equal_ptr-1) == '!' || *(equal_ptr-1) == '<' || *(equal_ptr-1) == '>') {
curr_line = equal_ptr+1; curr_line = equal_ptr + 1;
continue; continue;
} }