X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tools%2Fmy_str.h;h=60fcc76f5ae902c8ccbe78021b9aaddd2e0cd7e9;hb=HEAD;hp=44caa7cd4b189987255299fc47052cfbe9a35074;hpb=57e4efe91798516df7ebe3ddd9a4aba5cadc497b;p=ia32rtools.git diff --git a/tools/my_str.h b/tools/my_str.h index 44caa7c..60fcc76 100644 --- a/tools/my_str.h +++ b/tools/my_str.h @@ -6,7 +6,8 @@ static int my_isblank(char c) static int my_issep(char c) { return c == '(' || c == ')' || c == '[' || c == ']' - || c == '<' || c == '>' || c == ','; + || c == '<' || c == '>' || c == ',' || c == ';' + || c == '+' || c == '-' || c == '*' || c == '/'; } static char *sskip(char *s) @@ -24,13 +25,13 @@ static char *next_word(char *w, size_t wsize, char *s) s = sskip(s); for (i = 0; i < wsize - 1; i++) { - if (*s == 0 || my_isblank(s[i])) + if (s[i] == 0 || my_isblank(s[i])) break; w[i] = s[i]; } w[i] = 0; - if (*s != 0 && !my_isblank(s[i])) + if (s[i] != 0 && !my_isblank(s[i])) printf("warning: '%s' truncated\n", w); return s + i; @@ -43,13 +44,13 @@ static inline char *next_idt(char *w, size_t wsize, char *s) s = sskip(s); for (i = 0; i < wsize - 1; i++) { - if (*s == 0 || my_isblank(s[i]) || my_issep(s[i])) + if (s[i] == 0 || my_isblank(s[i]) || my_issep(s[i])) break; w[i] = s[i]; } w[i] = 0; - if (*s != 0 && !my_isblank(s[i]) && !my_issep(s[i])) + if (s[i] != 0 && !my_isblank(s[i]) && !my_issep(s[i])) printf("warning: '%s' truncated\n", w); return s + i;