Patch from Michael Cartmell improves string parsing and reduces number of

states.

1 files changed, 19 insertions, 31 deletions

diff --git a/include/SciLexer.h b/include/SciLexer.h
index e60b8354c..cd6af1737 100644
--- a/include/SciLexer.h
+++ b/include/SciLexer.h
@@ -841,37 +841,25 @@
 #define SCE_HA_COMMENTBLOCK2 15
 #define SCE_HA_COMMENTBLOCK3 16
 #define SCE_T3_DEFAULT 0
-#define SCE_T3_PREPROCESSOR 1
-#define SCE_T3_BLOCK_COMMENT 2
-#define SCE_T3_LINE_COMMENT 3
-#define SCE_T3_OPERATOR 4
-#define SCE_T3_KEYWORD 5
-#define SCE_T3_NUMBER 6
-#define SCE_T3_BRACKET 7
-#define SCE_T3_HTML_TAG 8
-#define SCE_T3_HTML_STRING 9
-#define SCE_T3_S_STRING 10
-#define SCE_T3_S_LIB_DIRECTIVE 11
-#define SCE_T3_S_MSG_PARAM 12
-#define SCE_T3_S_H_DEFAULT 13
-#define SCE_T3_D_STRING 14
-#define SCE_T3_D_LIB_DIRECTIVE 15
-#define SCE_T3_D_MSG_PARAM 16
-#define SCE_T3_D_H_DEFAULT 17
-#define SCE_T3_X_DEFAULT 18
-#define SCE_T3_X_PREPROCESSOR 19
-#define SCE_T3_X_BLOCK_COMMENT 20
-#define SCE_T3_X_LINE_COMMENT 21
-#define SCE_T3_X_S_STRING 22
-#define SCE_T3_X_S_LIB_DIRECTIVE 23
-#define SCE_T3_X_S_MSG_PARAM 24
-#define SCE_T3_X_S_H_DEFAULT 25
-#define SCE_T3_X_D_STRING 26
-#define SCE_T3_X_D_LIB_DIRECTIVE 27
-#define SCE_T3_X_D_MSG_PARAM 28
-#define SCE_T3_X_D_H_DEFAULT 29
-#define SCE_T3_USER1 30
-#define SCE_T3_USER2 31
+#define SCE_T3_X_DEFAULT 1
+#define SCE_T3_PREPROCESSOR 2
+#define SCE_T3_BLOCK_COMMENT 3
+#define SCE_T3_LINE_COMMENT 4
+#define SCE_T3_OPERATOR 5
+#define SCE_T3_KEYWORD 6
+#define SCE_T3_NUMBER 7
+#define SCE_T3_IDENTIFIER 8
+#define SCE_T3_S_STRING 9
+#define SCE_T3_D_STRING 10
+#define SCE_T3_X_STRING 11
+#define SCE_T3_LIB_DIRECTIVE 12
+#define SCE_T3_MSG_PARAM 13
+#define SCE_T3_HTML_TAG 14
+#define SCE_T3_HTML_DEFAULT 15
+#define SCE_T3_HTML_STRING 16
+#define SCE_T3_USER1 17
+#define SCE_T3_USER2 18
+#define SCE_T3_USER3 19
 #define SCE_REBOL_DEFAULT 0
 #define SCE_REBOL_COMMENTLINE 1
 #define SCE_REBOL_COMMENTBLOCK 2