luke
/
ngspice
mirror of https://git.code.sf.net/p/ngspice/ngspice
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

drop 'depreciated_skip..()'

This commit is contained in:
rlar 2016-10-30 11:32:55 +01:00
parent 7a42510cc0
commit bd50814677
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/frontend/inpcom.c
View File

@ -6166,14 +6166,15 @@ inp_quote_params(struct line *c, struct line *end_c, struct dependency *deps, in
char *rest = s + strlen(deps[i].param_name);
if ((isspace_c(s[-1]) || s[-1] == '=') &&
if (s > curr_line &&
(isspace_c(s[-1]) || s[-1] == '=') &&
(isspace_c(*rest) || *rest == '\0' || *rest == ')'))
{
int prefix_len;
if (isspace_c(s[-1])) {
s = depreciated_skip_back_ws(s);
if (s[-1] == '{')
s = skip_back_ws(s, curr_line);
if (s > curr_line && s[-1] == '{')
s--;
}

2
src/include/ngspice/stringskip.h
View File

@ -4,8 +4,6 @@
static inline char *skip_non_ws(const char *s) { while (*s && !isspace_c(*s)) s++; return (char *) s; }
static inline char *skip_ws(const char *s) { while ( isspace_c(*s)) s++; return (char *) s; }
static inline char *depreciated_skip_back_non_ws(char *s) { while (s[-1] && !isspace_c(s[-1])) s--; return s; }
static inline char *depreciated_skip_back_ws(char *s) { while (isspace_c(s[-1])) s--; return s; }
static inline char *skip_back_non_ws(const char *s, const char *start) { while (s > start && !isspace_c(s[-1])) s--; return (char *) s; }
static inline char *skip_back_ws(const char *s, const char *start) { while (s > start && isspace_c(s[-1])) s--; return (char *) s; }