1
1

* syntax.c (compare_word_to_right): More checks for braces and

brackets.
Этот коммит содержится в:
Pavel Roskin 2003-10-16 20:31:06 +00:00
родитель 7f8dfa977d
Коммит f426c570a6
2 изменённых файлов: 11 добавлений и 5 удалений

Просмотреть файл

@ -1,3 +1,8 @@
2003-10-16 Andrew V. Samoilov <sav@bcs.zp.ua>
* syntax.c (compare_word_to_right): More checks for braces and
brackets.
2003-10-16 Pavel Roskin <proski@gnu.org> 2003-10-16 Pavel Roskin <proski@gnu.org>
* syntax.c (compare_word_to_right): Fix recent breakage - rules * syntax.c (compare_word_to_right): Fix recent breakage - rules

Просмотреть файл

@ -147,7 +147,7 @@ compare_word_to_right (WEdit *edit, long i, const char *text,
const char *whole_left, const char *whole_right, const char *whole_left, const char *whole_right,
int line_start) int line_start)
{ {
unsigned char *p, *q; const unsigned char *p, *q;
int c, d, j; int c, d, j;
if (!*text) if (!*text)
return -1; return -1;
@ -220,12 +220,12 @@ compare_word_to_right (WEdit *edit, long i, const char *text,
for (;; i++) { for (;; i++) {
d = c; d = c;
c = edit_get_byte (edit, i); c = edit_get_byte (edit, i);
for (j = 0; p[j] != SYNTAX_TOKEN_BRACKET; j++) for (j = 0; p[j] != SYNTAX_TOKEN_BRACKET && p[j]; j++)
if (c == p[j]) if (c == p[j])
goto found_char2; goto found_char2;
break; break;
found_char2: found_char2:
j = c; /* dummy command */ ; /* dummy command */
} }
i--; i--;
while (*p != SYNTAX_TOKEN_BRACKET && p <= q) while (*p != SYNTAX_TOKEN_BRACKET && p <= q)
@ -239,12 +239,13 @@ compare_word_to_right (WEdit *edit, long i, const char *text,
if (++p > q) if (++p > q)
return -1; return -1;
c = edit_get_byte (edit, i); c = edit_get_byte (edit, i);
for (; *p != SYNTAX_TOKEN_BRACE; p++) for (; *p != SYNTAX_TOKEN_BRACE && *p; p++)
if (c == *p) if (c == *p)
goto found_char3; goto found_char3;
return -1; return -1;
found_char3: found_char3:
for (; *p != SYNTAX_TOKEN_BRACE && p <= q; p++); while (*p != SYNTAX_TOKEN_BRACE && p < q)
p++;
break; break;
default: default:
if (*p != edit_get_byte (edit, i)) if (*p != edit_get_byte (edit, i))