aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--include/SciLexer.h32
-rw-r--r--include/Scintilla.iface32
2 files changed, 28 insertions, 36 deletions
diff --git a/include/SciLexer.h b/include/SciLexer.h
index 6c60a909f..4f25f6283 100644
--- a/include/SciLexer.h
+++ b/include/SciLexer.h
@@ -401,25 +401,21 @@
#define SCE_MATLAB_OPERATOR 6
#define SCE_MATLAB_IDENTIFIER 7
#define SCE_SCRIPTOL_DEFAULT 0
-#define SCE_SCRIPTOL_COMMENT 1
+#define SCE_SCRIPTOL_WHITE 1
#define SCE_SCRIPTOL_COMMENTLINE 2
-#define SCE_SCRIPTOL_COMMENTDOC 3
-#define SCE_SCRIPTOL_NUMBER 4
-#define SCE_SCRIPTOL_WORD 5
-#define SCE_SCRIPTOL_STRING 6
-#define SCE_SCRIPTOL_CHARACTER 7
-#define SCE_SCRIPTOL_UUID 8
-#define SCE_SCRIPTOL_PREPROCESSOR 9
-#define SCE_SCRIPTOL_OPERATOR 10
-#define SCE_SCRIPTOL_IDENTIFIER 11
-#define SCE_SCRIPTOL_STRINGEOL 12
-#define SCE_SCRIPTOL_VERBATIM 13
-#define SCE_SCRIPTOL_REGEX 14
-#define SCE_SCRIPTOL_COMMENTLINEDOC 15
-#define SCE_SCRIPTOL_WORD2 16
-#define SCE_SCRIPTOL_COMMENTDOCKEYWORD 17
-#define SCE_SCRIPTOL_COMMENTDOCKEYWORDERROR 18
-#define SCE_SCRIPTOL_COMMENTBASIC 19
+#define SCE_SCRIPTOL_PERSISTENT 3
+#define SCE_SCRIPTOL_CSTYLE 4
+#define SCE_SCRIPTOL_COMMENTBLOCK 5
+#define SCE_SCRIPTOL_NUMBER 6
+#define SCE_SCRIPTOL_STRING 7
+#define SCE_SCRIPTOL_CHARACTER 8
+#define SCE_SCRIPTOL_STRINGEOL 9
+#define SCE_SCRIPTOL_KEYWORD 10
+#define SCE_SCRIPTOL_OPERATOR 11
+#define SCE_SCRIPTOL_IDENTIFIER 12
+#define SCE_SCRIPTOL_TRIPLE 13
+#define SCE_SCRIPTOL_CLASSNAME 14
+#define SCE_SCRIPTOL_PREPROCESSOR 15
#define SCE_ASM_DEFAULT 0
#define SCE_ASM_COMMENT 1
#define SCE_ASM_NUMBER 2
diff --git a/include/Scintilla.iface b/include/Scintilla.iface
index 064aff067..b0e236d2c 100644
--- a/include/Scintilla.iface
+++ b/include/Scintilla.iface
@@ -2000,25 +2000,21 @@ val SCE_MATLAB_IDENTIFIER=7
# Lexical states for SCLEX_SCRIPTOL
lex Sol=SCLEX_SCRIPTOL SCE_SCRIPTOL_
val SCE_SCRIPTOL_DEFAULT=0
-val SCE_SCRIPTOL_COMMENT=1
+val SCE_SCRIPTOL_WHITE=1
val SCE_SCRIPTOL_COMMENTLINE=2
-val SCE_SCRIPTOL_COMMENTDOC=3
-val SCE_SCRIPTOL_NUMBER=4
-val SCE_SCRIPTOL_WORD=5
-val SCE_SCRIPTOL_STRING=6
-val SCE_SCRIPTOL_CHARACTER=7
-val SCE_SCRIPTOL_UUID=8
-val SCE_SCRIPTOL_PREPROCESSOR=9
-val SCE_SCRIPTOL_OPERATOR=10
-val SCE_SCRIPTOL_IDENTIFIER=11
-val SCE_SCRIPTOL_STRINGEOL=12
-val SCE_SCRIPTOL_VERBATIM=13
-val SCE_SCRIPTOL_REGEX=14
-val SCE_SCRIPTOL_COMMENTLINEDOC=15
-val SCE_SCRIPTOL_WORD2=16
-val SCE_SCRIPTOL_COMMENTDOCKEYWORD=17
-val SCE_SCRIPTOL_COMMENTDOCKEYWORDERROR=18
-val SCE_SCRIPTOL_COMMENTBASIC=19
+val SCE_SCRIPTOL_PERSISTENT=3
+val SCE_SCRIPTOL_CSTYLE=4
+val SCE_SCRIPTOL_COMMENTBLOCK=5
+val SCE_SCRIPTOL_NUMBER=6
+val SCE_SCRIPTOL_STRING=7
+val SCE_SCRIPTOL_CHARACTER=8
+val SCE_SCRIPTOL_STRINGEOL=9
+val SCE_SCRIPTOL_KEYWORD=10
+val SCE_SCRIPTOL_OPERATOR=11
+val SCE_SCRIPTOL_IDENTIFIER=12
+val SCE_SCRIPTOL_TRIPLE=13
+val SCE_SCRIPTOL_CLASSNAME=14
+val SCE_SCRIPTOL_PREPROCESSOR=15
# Lexical states for SCLEX_ASM
lex Asm=SCLEX_ASM SCE_ASM_
val SCE_ASM_DEFAULT=0