Lexer added for SORCUS Installation files.

11 files changed, 49 insertions, 9 deletions

diff --git a/doc/ScintillaHistory.html b/doc/ScintillaHistory.html
index 06b88be28..600ee029a 100644
--- a/doc/ScintillaHistory.html
+++ b/doc/ScintillaHistory.html
@@ -322,6 +322,8 @@
 	<td>ozlooper</td>
       </tr><tr>
 	<td>Marko Njezic</td>
+	<td>Eugen Bitter</td>
+	<td>Christoph Baumann</td>
     </tr>
     </table>
     <p>
diff --git a/gtk/makefile b/gtk/makefile
index 142ae7ce4..a0d0f1bb6 100644
--- a/gtk/makefile
+++ b/gtk/makefile
@@ -71,9 +71,9 @@ LexGAP.o LexGui4Cli.o LexHaskell.o LexHTML.o LexInno.o LexKix.o LexLisp.o \
 LexLout.o LexLua.o LexMagik.o LexMatlab.o LexMetapost.o LexMMIXAL.o LexMPT.o \
 LexMSSQL.o LexMySQL.o LexNsis.o LexOpal.o LexOthers.o LexPascal.o LexPB.o \
 LexPerl.o LexPLM.o LexPOV.o LexPowerShell.o LexProgress.o LexPS.o LexPython.o \
-LexR.o LexRebol.o LexRuby.o LexScriptol.o LexSmalltalk.o LexSpecman.o \
-LexSpice.o LexSQL.o LexTACL.o LexTADS3.o LexTAL.o LexTCL.o LexTeX.o LexVB.o \
-LexVerilog.o LexVHDL.o LexYAML.o
+LexR.o LexRebol.o LexRuby.o LexScriptol.o LexSmalltalk.o LexSorcus.o \
+LexSpecman.o LexSpice.o LexSQL.o LexTACL.o LexTADS3.o LexTAL.o LexTCL.o \
+LexTeX.o LexVB.o LexVerilog.o LexVHDL.o LexYAML.o
 #--Autogenerated -- end of automatically generated section
 
 all: $(COMPLIB)
diff --git a/gtk/scintilla.mak b/gtk/scintilla.mak
index 3a010fd2b..20d82d334 100644
--- a/gtk/scintilla.mak
+++ b/gtk/scintilla.mak
@@ -204,6 +204,7 @@ LEXOBJS=\
 	$(DIR_O)\LexRuby.obj \
 	$(DIR_O)\LexScriptol.obj \
 	$(DIR_O)\LexSmalltalk.obj \
+	$(DIR_O)\LexSorcus.obj \
 	$(DIR_O)\LexSpecman.obj \
 	$(DIR_O)\LexSpice.obj \
 	$(DIR_O)\LexSQL.obj \
@@ -480,6 +481,8 @@ $(DIR_O)\LexScriptol.obj: ..\src\LexScriptol.cxx $(LEX_HEADERS)
 
 $(DIR_O)\LexSmalltalk.obj: ..\src\LexSmalltalk.cxx $(LEX_HEADERS)
 
+$(DIR_O)\LexSorcus.obj: ..\src\LexSorcus.cxx $(LEX_HEADERS)
+
 $(DIR_O)\LexSpecman.obj: ..\src\LexSpecman.cxx $(LEX_HEADERS)
 
 $(DIR_O)\LexSpice.obj: ..\src\LexSpice.cxx $(LEX_HEADERS)
diff --git a/include/SciLexer.h b/include/SciLexer.h
index a53716db9..f842c2aee 100644
--- a/include/SciLexer.h
+++ b/include/SciLexer.h
@@ -106,6 +106,7 @@
 #define SCLEX_TAL 91
 #define SCLEX_COBOL 92
 #define SCLEX_TACL 93
+#define SCLEX_SORCUS 94
 #define SCLEX_AUTOMATIC 1000
 #define SCE_P_DEFAULT 0
 #define SCE_P_COMMENTLINE 1
@@ -1289,6 +1290,16 @@
 #define SCE_PAS_CHARACTER 12
 #define SCE_PAS_OPERATOR 13
 #define SCE_PAS_ASM 14
+#define SCE_SORCUS_DEFAULT 0
+#define SCE_SORCUS_COMMAND 1
+#define SCE_SORCUS_PARAMETER 2
+#define SCE_SORCUS_COMMENTLINE 3
+#define SCE_SORCUS_STRING 4
+#define SCE_SORCUS_STRINGEOL 5
+#define SCE_SORCUS_IDENTIFIER 6
+#define SCE_SORCUS_OPERATOR 7
+#define SCE_SORCUS_NUMBER 8
+#define SCE_SORCUS_CONSTANT 9
 #define SCLEX_ASP 29
 #define SCLEX_PHP 30
 //--Autogenerated -- end of section automatically generated from Scintilla.iface
diff --git a/include/Scintilla.iface b/include/Scintilla.iface
index 21cdcab26..9d0459f48 100644
--- a/include/Scintilla.iface
+++ b/include/Scintilla.iface
@@ -2012,6 +2012,7 @@ val SCLEX_PO=90
 val SCLEX_TAL=91
 val SCLEX_COBOL=92
 val SCLEX_TACL=93
+val SCLEX_SORCUS=94
 
 # When a lexer specifies its language as SCLEX_AUTOMATIC it receives a
 # value assigned in sequence from SCLEX_AUTOMATIC+1.
@@ -3365,6 +3366,18 @@ val SCE_PAS_STRINGEOL=11
 val SCE_PAS_CHARACTER=12
 val SCE_PAS_OPERATOR=13
 val SCE_PAS_ASM=14
+# Lexical state for SCLEX_SORCUS
+lex SORCUS=SCLEX_SORCUS SCE_SORCUS_
+val SCE_SORCUS_DEFAULT=0
+val SCE_SORCUS_COMMAND=1
+val SCE_SORCUS_PARAMETER=2
+val SCE_SORCUS_COMMENTLINE=3
+val SCE_SORCUS_STRING=4
+val SCE_SORCUS_STRINGEOL=5
+val SCE_SORCUS_IDENTIFIER=6
+val SCE_SORCUS_OPERATOR=7
+val SCE_SORCUS_NUMBER=8
+val SCE_SORCUS_CONSTANT=9
 
 # Events
 
diff --git a/macosx/makefile b/macosx/makefile
index bafef84b9..69fd0032d 100644
--- a/macosx/makefile
+++ b/macosx/makefile
@@ -71,9 +71,9 @@ LexGAP.o LexGui4Cli.o LexHaskell.o LexHTML.o LexInno.o LexKix.o LexLisp.o \
 LexLout.o LexLua.o LexMagik.o LexMatlab.o LexMetapost.o LexMMIXAL.o LexMPT.o \
 LexMSSQL.o LexMySQL.o LexNsis.o LexOpal.o LexOthers.o LexPascal.o LexPB.o \
 LexPerl.o LexPLM.o LexPOV.o LexPowerShell.o LexProgress.o LexPS.o LexPython.o \
-LexR.o LexRebol.o LexRuby.o LexScriptol.o LexSmalltalk.o LexSpecman.o \
-LexSpice.o LexSQL.o LexTACL.o LexTADS3.o LexTAL.o LexTCL.o LexTeX.o LexVB.o \
-LexVerilog.o LexVHDL.o LexYAML.o
+LexR.o LexRebol.o LexRuby.o LexScriptol.o LexSmalltalk.o LexSorcus.o \
+LexSpecman.o LexSpice.o LexSQL.o LexTACL.o LexTADS3.o LexTAL.o LexTCL.o \
+LexTeX.o LexVB.o LexVerilog.o LexVHDL.o LexYAML.o
 #--Autogenerated -- end of automatically generated section
 
 # The LEXOBJS have to be treated specially as the functions in them are not called from external code
diff --git a/src/KeyWords.cxx b/src/KeyWords.cxx
index 4907571cf..0b495d1e5 100644
--- a/src/KeyWords.cxx
+++ b/src/KeyWords.cxx
@@ -219,6 +219,7 @@ int Scintilla_LinkLexers() {
 	LINK_LEXER(lmRuby);
 	LINK_LEXER(lmScriptol);
 	LINK_LEXER(lmSmalltalk);
+	LINK_LEXER(lmSorc);
 	LINK_LEXER(lmSpecman);
 	LINK_LEXER(lmSpice);
 	LINK_LEXER(lmSQL);
diff --git a/vcbuild/SciLexer.dsp b/vcbuild/SciLexer.dsp
index a0c109edb..7458486a0 100644
--- a/vcbuild/SciLexer.dsp
+++ b/vcbuild/SciLexer.dsp
@@ -390,6 +390,10 @@ SOURCE=..\src\LexSmalltalk.cxx
 # End Source File
 # Begin Source File
 
+SOURCE=..\src\LexSorcus.cxx
+# End Source File
+# Begin Source File
+
 SOURCE=..\src\LexSpecman.cxx
 # End Source File
 # Begin Source File
diff --git a/win32/makefile b/win32/makefile
index 02e9037b2..adb48fdf4 100644
--- a/win32/makefile
+++ b/win32/makefile
@@ -59,9 +59,9 @@ LexGAP.o LexGui4Cli.o LexHaskell.o LexHTML.o LexInno.o LexKix.o LexLisp.o \
 LexLout.o LexLua.o LexMagik.o LexMatlab.o LexMetapost.o LexMMIXAL.o LexMPT.o \
 LexMSSQL.o LexMySQL.o LexNsis.o LexOpal.o LexOthers.o LexPascal.o LexPB.o \
 LexPerl.o LexPLM.o LexPOV.o LexPowerShell.o LexProgress.o LexPS.o LexPython.o \
-LexR.o LexRebol.o LexRuby.o LexScriptol.o LexSmalltalk.o LexSpecman.o \
-LexSpice.o LexSQL.o LexTACL.o LexTADS3.o LexTAL.o LexTCL.o LexTeX.o LexVB.o \
-LexVerilog.o LexVHDL.o LexYAML.o
+LexR.o LexRebol.o LexRuby.o LexScriptol.o LexSmalltalk.o LexSorcus.o \
+LexSpecman.o LexSpice.o LexSQL.o LexTACL.o LexTADS3.o LexTAL.o LexTCL.o \
+LexTeX.o LexVB.o LexVerilog.o LexVHDL.o LexYAML.o
 #--Autogenerated -- end of automatically generated section
 
 SOBJS	= ScintillaWin.o ScintillaBase.o Editor.o CharClassify.o Decoration.o \
diff --git a/win32/scintilla.mak b/win32/scintilla.mak
index 86371ae9c..6edc26c20 100644
--- a/win32/scintilla.mak
+++ b/win32/scintilla.mak
@@ -174,6 +174,7 @@ LEXOBJS=\
 	$(DIR_O)\LexRuby.obj \
 	$(DIR_O)\LexScriptol.obj \
 	$(DIR_O)\LexSmalltalk.obj \
+	$(DIR_O)\LexSorcus.obj \
 	$(DIR_O)\LexSpecman.obj \
 	$(DIR_O)\LexSpice.obj \
 	$(DIR_O)\LexSQL.obj \
@@ -431,6 +432,8 @@ $(DIR_O)\LexScriptol.obj: ..\src\LexScriptol.cxx $(LEX_HEADERS)
 
 $(DIR_O)\LexSmalltalk.obj: ..\src\LexSmalltalk.cxx $(LEX_HEADERS)
 
+$(DIR_O)\LexSorcus.obj: ..\src\LexSorcus.cxx $(LEX_HEADERS)
+
 $(DIR_O)\LexSpecman.obj: ..\src\LexSpecman.cxx $(LEX_HEADERS)
 
 $(DIR_O)\LexSpice.obj: ..\src\LexSpice.cxx $(LEX_HEADERS)
diff --git a/win32/scintilla_vc6.mak b/win32/scintilla_vc6.mak
index 5cb93d6b7..cbd1f270d 100644
--- a/win32/scintilla_vc6.mak
+++ b/win32/scintilla_vc6.mak
@@ -176,6 +176,7 @@ LEXOBJS=\
 	$(DIR_O)\LexRuby.obj \
 	$(DIR_O)\LexScriptol.obj \
 	$(DIR_O)\LexSmalltalk.obj \
+	$(DIR_O)\LexSorcus.obj \
 	$(DIR_O)\LexSpecman.obj \
 	$(DIR_O)\LexSpice.obj \
 	$(DIR_O)\LexSQL.obj \
@@ -433,6 +434,8 @@ $(DIR_O)\LexScriptol.obj: ..\src\LexScriptol.cxx $(LEX_HEADERS)
 
 $(DIR_O)\LexSmalltalk.obj: ..\src\LexSmalltalk.cxx $(LEX_HEADERS)
 
+$(DIR_O)\LexSorcus.obj: ..\src\LexSorcus.cxx $(LEX_HEADERS)
+
 $(DIR_O)\LexSpecman.obj: ..\src\LexSpecman.cxx $(LEX_HEADERS)
 
 $(DIR_O)\LexSpice.obj: ..\src\LexSpice.cxx $(LEX_HEADERS)