Gui4Cli and Kix lexers.

5 files changed, 31 insertions, 5 deletions

diff --git a/gtk/makefile b/gtk/makefile
index 0f8f29c88..40e9a64d5 100644
--- a/gtk/makefile
+++ b/gtk/makefile
@@ -60,10 +60,10 @@ endif
 LEXOBJS=\
 LexAda.o LexAsm.o LexAVE.o LexBaan.o LexBullant.o LexCLW.o LexConf.o LexCPP.o \
 LexCrontab.o LexCSS.o LexEiffel.o LexErlang.o LexEScript.o LexForth.o \
-LexFortran.o LexHTML.o LexKix.o LexLisp.o LexLout.o LexLua.o LexMatlab.o \
-LexMetapost.o LexMMIXAL.o LexMPT.o LexMSSQL.o LexNsis.o LexOthers.o \
-LexPascal.o LexPB.o LexPerl.o LexPOV.o LexPS.o LexPython.o LexRuby.o \
-LexScriptol.o LexSQL.o LexTeX.o LexVB.o LexVerilog.o LexYAML.o
+LexFortran.o LexGui4Cli.o LexHTML.o LexKix.o LexLisp.o LexLout.o LexLua.o \
+LexMatlab.o LexMetapost.o LexMMIXAL.o LexMPT.o LexMSSQL.o LexNsis.o \
+LexOthers.o LexPascal.o LexPB.o LexPerl.o LexPOV.o LexPS.o LexPython.o \
+LexRuby.o LexScriptol.o LexSQL.o LexTeX.o LexVB.o LexVerilog.o LexYAML.o
 #--Autogenerated -- end of automatically generated section
 
 all: $(COMPLIB)
diff --git a/gtk/scintilla.mak b/gtk/scintilla.mak
index a21f4ff45..c033df375 100644
--- a/gtk/scintilla.mak
+++ b/gtk/scintilla.mak
@@ -135,6 +135,7 @@ LEXOBJS=\
 	$(DIR_O)\LexEScript.obj \
 	$(DIR_O)\LexForth.obj \
 	$(DIR_O)\LexFortran.obj \
+	$(DIR_O)\LexGui4Cli.obj \
 	$(DIR_O)\LexHTML.obj \
 	$(DIR_O)\LexKix.obj \
 	$(DIR_O)\LexLisp.obj \
@@ -302,6 +303,8 @@ $(DIR_O)\LexForth.obj: ..\src\LexForth.cxx $(LEX_HEADERS)
 
 $(DIR_O)\LexFortran.obj: ..\src\LexFortran.cxx $(LEX_HEADERS)
 
+$(DIR_O)\LexGui4Cli.obj: ..\src\LexGui4Cli.cxx $(LEX_HEADERS)
+
 $(DIR_O)\LexHTML.obj: ..\src\LexHTML.cxx $(LEX_HEADERS)
 
 $(DIR_O)\LexKix.obj: ..\src\LexKix.cxx $(LEX_HEADERS)
diff --git a/include/SciLexer.h b/include/SciLexer.h
index 262cff181..06698d8d9 100644
--- a/include/SciLexer.h
+++ b/include/SciLexer.h
@@ -72,6 +72,7 @@
 #define SCLEX_MSSQL 55
 #define SCLEX_VERILOG 56
 #define SCLEX_KIX 57
+#define SCLEX_GUI4CLI 58
 #define SCLEX_AUTOMATIC 1000
 #define SCE_P_DEFAULT 0
 #define SCE_P_COMMENTLINE 1
@@ -678,6 +679,16 @@
 #define SCE_KIX_FUNCTIONS 8
 #define SCE_KIX_OPERATOR 9
 #define SCE_KIX_IDENTIFIER 31
+#define SCE_GC_DEFAULT 0
+#define SCE_GC_COMMENTLINE 1
+#define SCE_GC_COMMENTBLOCK 2
+#define SCE_GC_GLOBAL 3
+#define SCE_GC_EVENT 4
+#define SCE_GC_ATTRIBUTE 5
+#define SCE_GC_CONTROL 6
+#define SCE_GC_COMMAND 7
+#define SCE_GC_STRING 8
+#define SCE_GC_OPERATOR 9
 //--Autogenerated -- end of section automatically generated from Scintilla.iface
 
 #endif
diff --git a/include/Scintilla.iface b/include/Scintilla.iface
index 4bdf9e43d..2cfd2a484 100644
--- a/include/Scintilla.iface
+++ b/include/Scintilla.iface
@@ -1697,7 +1697,7 @@ val SCLEX_OCTAVE=54
 val SCLEX_MSSQL=55
 val SCLEX_VERILOG=56
 val SCLEX_KIX=57
-
+val SCLEX_GUI4CLI=58
 # When a lexer specifies its language as SCLEX_AUTOMATIC it receives a
 # value assigned in sequence from SCLEX_AUTOMATIC+1.
 val SCLEX_AUTOMATIC=1000
@@ -2411,6 +2411,17 @@ val SCE_KIX_KEYWORD=7
 val SCE_KIX_FUNCTIONS=8
 val SCE_KIX_OPERATOR=9
 val SCE_KIX_IDENTIFIER=31
+# Lexical states for SCLEX_GUI4CLI
+val SCE_GC_DEFAULT=0
+val SCE_GC_COMMENTLINE=1
+val SCE_GC_COMMENTBLOCK=2
+val SCE_GC_GLOBAL=3
+val SCE_GC_EVENT=4
+val SCE_GC_ATTRIBUTE=5
+val SCE_GC_CONTROL=6
+val SCE_GC_COMMAND=7
+val SCE_GC_STRING=8
+val SCE_GC_OPERATOR=9
 
 # Events
 
diff --git a/src/KeyWords.cxx b/src/KeyWords.cxx
index 62eda6267..b853fe13e 100644
--- a/src/KeyWords.cxx
+++ b/src/KeyWords.cxx
@@ -149,6 +149,7 @@ int Scintilla_LinkLexers() {
 	LINK_LEXER(lmForth);
 	LINK_LEXER(lmFortran);
 	LINK_LEXER(lmF77);
+	LINK_LEXER(lmGui4Cli);
 	LINK_LEXER(lmHTML);
 	LINK_LEXER(lmXML);
 	LINK_LEXER(lmASP);