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 inp_remove_ws(), #3/5, drop `curr', use `s' instead

This commit is contained in:
rlar 2014-12-31 15:04:04 +01:00
parent 0081ec9b51
commit e290e55f31
1 changed files with 18 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/frontend/inpcom.c
View File

@ -2196,39 +2196,38 @@ inp_fix_subckt(struct names *subckt_w_params, char *s)
static char* static char*
inp_remove_ws(char * const s_) inp_remove_ws(char *s)
{ {
char *x = s_; char *x = s;
char *big_buff; char *big_buff;
int big_buff_index = 0; int big_buff_index = 0;
char *buffer, *curr; char *buffer;
bool is_expression = FALSE; bool is_expression = FALSE;
big_buff = TMALLOC(char, strlen(s_) + 2); big_buff = TMALLOC(char, strlen(s) + 2);
curr = s_;
while (*curr != '\0') { while (*s != '\0') {
if (*curr == '{') if (*s == '{')
is_expression = TRUE; is_expression = TRUE;
if (*curr == '}') if (*s == '}')
is_expression = FALSE; is_expression = FALSE;
big_buff[big_buff_index++] = *curr; big_buff[big_buff_index++] = *s;
if (*curr == '=' || (is_expression && (is_arith_char(*curr) || *curr == ','))) { if (*s == '=' || (is_expression && (is_arith_char(*s) || *s == ','))) {
curr = skip_ws(curr + 1); s = skip_ws(s + 1);
if (*curr == '{') if (*s == '{')
is_expression = TRUE; is_expression = TRUE;
if (*curr == '}') if (*s == '}')
is_expression = FALSE; is_expression = FALSE;
big_buff[big_buff_index++] = *curr; big_buff[big_buff_index++] = *s;
} }
if (*curr != '\0') if (*s != '\0')
curr++; s++;
if (isspace(*curr)) { if (isspace(*s)) {
curr = skip_ws(curr); s = skip_ws(s);
if (!(*curr == '\0' || *curr == '=' || (is_expression && (is_arith_char(*curr) || *curr == ',')))) if (!(*s == '\0' || *s == '=' || (is_expression && (is_arith_char(*s) || *s == ','))))
big_buff[big_buff_index++] = ' '; big_buff[big_buff_index++] = ' ';
} }
} }