[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemacs-commit] qemacs arm.c clang.c cobol.c extra-modes.c fort...
|
From: |
Charlie Gordon |
|
Subject: |
[Qemacs-commit] qemacs arm.c clang.c cobol.c extra-modes.c fort... |
|
Date: |
Fri, 07 Aug 2015 20:55:41 +0000 |
CVSROOT: /sources/qemacs
Module name: qemacs
Changes by: Charlie Gordon <chqrlie> 15/08/07 20:55:41
Modified files:
. : arm.c clang.c cobol.c extra-modes.c forth.c
groovy.c icon.c lisp.c markdown.c perl.c
rlang.c rust.c
Log message:
use qe_isblank instead of qe_isspace in syntax colorizers
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/qemacs/arm.c?cvsroot=qemacs&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/qemacs/clang.c?cvsroot=qemacs&r1=1.91&r2=1.92
http://cvs.savannah.gnu.org/viewcvs/qemacs/cobol.c?cvsroot=qemacs&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/qemacs/extra-modes.c?cvsroot=qemacs&r1=1.45&r2=1.46
http://cvs.savannah.gnu.org/viewcvs/qemacs/forth.c?cvsroot=qemacs&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/qemacs/groovy.c?cvsroot=qemacs&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/qemacs/icon.c?cvsroot=qemacs&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/qemacs/lisp.c?cvsroot=qemacs&r1=1.24&r2=1.25
http://cvs.savannah.gnu.org/viewcvs/qemacs/markdown.c?cvsroot=qemacs&r1=1.20&r2=1.21
http://cvs.savannah.gnu.org/viewcvs/qemacs/perl.c?cvsroot=qemacs&r1=1.22&r2=1.23
http://cvs.savannah.gnu.org/viewcvs/qemacs/rlang.c?cvsroot=qemacs&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/qemacs/rust.c?cvsroot=qemacs&r1=1.2&r2=1.3
Patches:
Index: arm.c
===================================================================
RCS file: /sources/qemacs/qemacs/arm.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- arm.c 7 Aug 2015 17:26:13 -0000 1.4
+++ arm.c 7 Aug 2015 20:55:40 -0000 1.5
@@ -62,7 +62,7 @@
if (colstate & IN_ASM_TRAIL)
goto comment;
- for (; qe_isspace(str[i]); i++)
+ for (; qe_isblank(str[i]); i++)
continue;
style = 0;
@@ -201,7 +201,7 @@
char keyword[16];
int i, w, start, c, len, colstate = cp->colorize_state;
- for (w = 0; qe_isspace(str[w]); w++)
+ for (w = 0; qe_isblank(str[w]); w++)
continue;
if (str[0] && str[1] == ':' && str[2] == '\\') {
@@ -228,7 +228,7 @@
i += 1;
SET_COLOR(str, start, i, LST_STYLE_OFFSET);
- for (; qe_isspace(str[i]); i++)
+ for (; qe_isblank(str[i]); i++)
continue;
for (start = i; qe_isxdigit(str[i]); i++)
continue;
@@ -237,12 +237,12 @@
continue;
}
SET_COLOR(str, start, i, LST_STYLE_DUMP);
- for (; qe_isspace(str[i]); i++)
+ for (; qe_isblank(str[i]); i++)
continue;
- for (start = i; i < n && !qe_isspace(str[i]); i++)
+ for (start = i; i < n && !qe_isblank(str[i]); i++)
continue;
SET_COLOR(str, start, i, LST_STYLE_OPCODE);
- for (; qe_isspace(str[i]); i++)
+ for (; qe_isblank(str[i]); i++)
continue;
while (i < n) {
start = i;
Index: clang.c
===================================================================
RCS file: /sources/qemacs/qemacs/clang.c,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -b -r1.91 -r1.92
--- clang.c 7 Aug 2015 08:28:59 -0000 1.91
+++ clang.c 7 Aug 2015 20:55:40 -0000 1.92
@@ -607,7 +607,7 @@
mode_flags = syn->colorize_flags;
flavor = (mode_flags & CLANG_FLAVOR);
- for (indent = 0; qe_isspace(str[indent]); indent++)
+ for (indent = 0; qe_isblank(str[indent]); indent++)
continue;
state = cp->colorize_state;
Index: cobol.c
===================================================================
RCS file: /sources/qemacs/qemacs/cobol.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- cobol.c 28 Jul 2015 19:01:36 -0000 1.3
+++ cobol.c 7 Aug 2015 20:55:40 -0000 1.4
@@ -88,7 +88,7 @@
int i = 0, start = i, j, c, style, len, indent, heading = 0, preproc = 0,
comment = -1;
int state = cp->colorize_state;
- for (; i < n && qe_isspace(str[i]); i++)
+ for (; i < n && qe_isblank(str[i]); i++)
continue;
indent = i;
Index: extra-modes.c
===================================================================
RCS file: /sources/qemacs/qemacs/extra-modes.c,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -b -r1.45 -r1.46
--- extra-modes.c 7 Aug 2015 16:45:10 -0000 1.45
+++ extra-modes.c 7 Aug 2015 20:55:40 -0000 1.46
@@ -77,7 +77,7 @@
}
SET_COLOR(str, start, i, ASM_STYLE_COMMENT);
}
- for (; i < n && qe_isspace(str[i]); i++)
+ for (; i < n && qe_isblank(str[i]); i++)
continue;
for (w = i; i < n;) {
@@ -133,7 +133,7 @@
keyword[len] = '\0';
if (++wn == 1) {
if (!strcmp(keyword, "comment") && n - i >= 2) {
- for (w = i; qe_isspace(str[w]); w++)
+ for (w = i; qe_isblank(str[w]); w++)
continue;
colstate = str[w]; /* end of comment character */
SET_COLOR(str, start, w, ASM_STYLE_PREPROCESS);
@@ -933,7 +933,7 @@
int i = 0, start = i, c, style, len, w;
int colstate = cp->colorize_state;
- for (w = 0; qe_isspace(str[w]); w++)
+ for (w = 0; qe_isblank(str[w]); w++)
continue;
while (i < n) {
@@ -2027,7 +2027,7 @@
if (state & IN_HASKELL_STRING) {
sep = '\"';
state = 0;
- while (qe_isspace(str[i]))
+ while (qe_isblank(str[i]))
i++;
if (str[i] == '\\')
i++;
@@ -2485,12 +2485,12 @@
int state = cp->colorize_state;
char kbuf[32];
- for (indent = 0; qe_isspace(str[indent]); indent++)
+ for (indent = 0; qe_isblank(str[indent]); indent++)
continue;
if (state & IN_RUBY_HEREDOC) {
if (state & IN_RUBY_HD_INDENT) {
- while (qe_isspace(str[i]))
+ while (qe_isblank(str[i]))
i++;
}
sig = 0;
@@ -2500,7 +2500,7 @@
sig = ((sig << 6) + str[i]) % 61;
}
}
- for (; qe_isspace(str[i]); i++)
+ for (; qe_isblank(str[i]); i++)
continue;
i = n;
SET_COLOR(str, start, i, RUBY_STYLE_HEREDOC);
@@ -2540,7 +2540,7 @@
}
}
- while (i < n && qe_isspace(str[i]))
+ while (i < n && qe_isblank(str[i]))
i++;
indent = i;
@@ -2606,7 +2606,7 @@
case '%':
/* parse alternate string/array syntaxes */
- if (str[i] != '\0' && !qe_isspace(str[i]) && !qe_isalnum(str[i]))
+ if (str[i] != '\0' && !qe_isblank(str[i]) && !qe_isalnum(str[i]))
goto has_string4;
if (str[i] == 'q' || str[i] == 'Q'
Index: forth.c
===================================================================
RCS file: /sources/qemacs/qemacs/forth.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- forth.c 8 Jun 2014 10:56:58 -0000 1.3
+++ forth.c 7 Aug 2015 20:55:40 -0000 1.4
@@ -218,7 +218,7 @@
SET_COLOR1(str, start, FF_STYLE_COMMENT);
continue;
}
- if (qe_isspace(c))
+ if (qe_isblank(c))
continue;
if (c == '\\' && str[i] == ' ') {
comment:
@@ -256,7 +256,7 @@
/* scan for space and determine word type */
len = 0;
word[len++] = c;
- for (; i < n && !qe_isspace(str[i]); i++) {
+ for (; i < n && !qe_isblank(str[i]); i++) {
if (len < countof(word) - 1)
word[len++] = str[i];
}
Index: groovy.c
===================================================================
RCS file: /sources/qemacs/qemacs/groovy.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- groovy.c 7 Aug 2015 16:45:11 -0000 1.2
+++ groovy.c 7 Aug 2015 20:55:40 -0000 1.3
@@ -256,7 +256,7 @@
continue;
case '~':
- while (str[i] == ' ')
+ while (qe_isblank(str[i]))
i++;
if (str[i] == '/') {
/* parse slashy string as regex */
Index: icon.c
===================================================================
RCS file: /sources/qemacs/qemacs/icon.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- icon.c 7 Aug 2015 16:45:11 -0000 1.2
+++ icon.c 7 Aug 2015 20:55:41 -0000 1.3
@@ -57,7 +57,7 @@
int i, start, indent, c, state, style, klen, delim;
char kbuf[32];
- for (i = 0; qe_isspace(str[i]); i++)
+ for (i = 0; qe_isblank(str[i]); i++)
continue;
state = cp->colorize_state;
Index: lisp.c
===================================================================
RCS file: /sources/qemacs/qemacs/lisp.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- lisp.c 3 May 2015 10:31:13 -0000 1.24
+++ lisp.c 7 Aug 2015 20:55:41 -0000 1.25
@@ -167,7 +167,7 @@
out = buf_init(&outbuf, buf, buf_size);
for (i = 0; (c = p[i]) != '\0'; i++) {
- if (qe_isspace(c) || qe_findchar(";(){}[]#'`,\"", c))
+ if (qe_isblank(c) || qe_findchar(";(){}[]#'`,\"", c))
break;
buf_putc_utf8(out, c);
}
Index: markdown.c
===================================================================
RCS file: /sources/qemacs/qemacs/markdown.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- markdown.c 19 Jun 2015 14:34:30 -0000 1.20
+++ markdown.c 7 Aug 2015 20:55:41 -0000 1.21
@@ -209,7 +209,7 @@
ModeDef *m;
colstate &= ~(IN_MKD_BLOCK | IN_MKD_LANG_STATE);
- for (i += 3; qe_isspace(str[i]); i++)
+ for (i += 3; qe_isblank(str[i]); i++)
continue;
for (len = 0; i < n && qe_isalnum_(str[i]); i++) {
if (len < countof(lang_name) - 1)
Index: perl.c
===================================================================
RCS file: /sources/qemacs/qemacs/perl.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- perl.c 8 Jun 2014 10:56:58 -0000 1.22
+++ perl.c 7 Aug 2015 20:55:41 -0000 1.23
@@ -199,7 +199,7 @@
if (c1 == '<') {
/* Should check for unary context */
s1 = i + 2;
- while (qe_isspace(str[s1]))
+ while (qe_isblank(str[s1]))
s1++;
c2 = str[s1];
if (c2 == '"' || c2 == '\'' || c2 == '`') {
@@ -320,7 +320,7 @@
keyword:
if (j - i == 6 && ustristart(str + i, "format", NULL)) {
for (s1 = 0; s1 < i; s1++) {
- if (!qe_isspace(str[s1]))
+ if (!qe_isblank(str[s1]))
break;
}
if (s1 == i) {
Index: rlang.c
===================================================================
RCS file: /sources/qemacs/qemacs/rlang.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- rlang.c 28 Jul 2015 19:00:28 -0000 1.2
+++ rlang.c 7 Aug 2015 20:55:41 -0000 1.3
@@ -145,7 +145,7 @@
}
}
keyword[len] = '\0';
- for (j = i; qe_isspace(str[j]); j++)
+ for (j = i; qe_isblank(str[j]); j++)
continue;
if (strfind(syn->keywords, keyword)) {
if (strequal(keyword, "function"))
Index: rust.c
===================================================================
RCS file: /sources/qemacs/qemacs/rust.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- rust.c 4 Aug 2015 11:21:07 -0000 1.2
+++ rust.c 7 Aug 2015 20:55:41 -0000 1.3
@@ -62,7 +62,7 @@
int i = 0, start, i1, i2, indent, c, state, style, klen, delim;
char kbuf[32];
- for (indent = 0; qe_isspace(str[indent]); indent++)
+ for (indent = 0; qe_isblank(str[indent]); indent++)
continue;
state = cp->colorize_state;
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Qemacs-commit] qemacs arm.c clang.c cobol.c extra-modes.c fort...,
Charlie Gordon <=