EScript lexer added.

8 files changed, 46 insertions, 8 deletions

diff --git a/gtk/makefile b/gtk/makefile
index d6f05c470..041e9d8c4 100644
--- a/gtk/makefile
+++ b/gtk/makefile
@@ -49,9 +49,9 @@ endif
 #**LEXOBJS=\\\n\(\*.o \)
 LEXOBJS=\
 LexAda.o LexAsm.o LexAVE.o LexBaan.o LexBullant.o LexConf.o LexCPP.o \
-LexCrontab.o LexCSS.o LexEiffel.o LexFortran.o LexHTML.o LexLisp.o LexLout.o \
-LexLua.o LexMatlab.o LexOthers.o LexPascal.o LexPerl.o LexPOV.o LexPython.o \
-LexRuby.o LexSQL.o LexVB.o 
+LexCrontab.o LexCSS.o LexEiffel.o LexEScript.o LexFortran.o LexHTML.o \
+LexLisp.o LexLout.o LexLua.o LexMatlab.o LexOthers.o LexPascal.o LexPerl.o \
+LexPOV.o LexPython.o LexRuby.o LexSQL.o LexVB.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/gtk/scintilla.mak b/gtk/scintilla.mak
index 8f46fcbaa..42a282246 100644
--- a/gtk/scintilla.mak
+++ b/gtk/scintilla.mak
@@ -130,6 +130,7 @@ LEXOBJS=\
 	$(DIR_O)\LexCrontab.obj \
 	$(DIR_O)\LexCSS.obj \
 	$(DIR_O)\LexEiffel.obj \
+	$(DIR_O)\LexEScript.obj \
 	$(DIR_O)\LexFortran.obj \
 	$(DIR_O)\LexHTML.obj \
 	$(DIR_O)\LexLisp.obj \
@@ -276,6 +277,8 @@ $(DIR_O)\LexCSS.obj: ..\src\LexCSS.cxx $(LEX_HEADERS)
 
 $(DIR_O)\LexEiffel.obj: ..\src\LexEiffel.cxx $(LEX_HEADERS)
 
+$(DIR_O)\LexEScript.obj: ..\src\LexEScript.cxx $(LEX_HEADERS)
+
 $(DIR_O)\LexFortran.obj: ..\src\LexFortran.cxx $(LEX_HEADERS)
 
 $(DIR_O)\LexHTML.obj: ..\src\LexHTML.cxx $(LEX_HEADERS)
diff --git a/include/SciLexer.h b/include/SciLexer.h
index b97bf2187..edf4bd0d2 100644
--- a/include/SciLexer.h
+++ b/include/SciLexer.h
@@ -55,6 +55,7 @@
 #define SCLEX_CSS 38
 #define SCLEX_POV 39
 #define SCLEX_LOUT 40
+#define SCLEX_ESCRIPT 41
 #define SCLEX_AUTOMATIC 1000
 #define SCE_P_DEFAULT 0
 #define SCE_P_COMMENTLINE 1
@@ -473,6 +474,18 @@
 #define SCE_LOUT_OPERATOR 8
 #define SCE_LOUT_IDENTIFIER 9
 #define SCE_LOUT_STRINGEOL 10
+#define SCE_ESCRIPT_DEFAULT 0
+#define SCE_ESCRIPT_COMMENT 1
+#define SCE_ESCRIPT_COMMENTLINE 2
+#define SCE_ESCRIPT_COMMENTDOC 3
+#define SCE_ESCRIPT_NUMBER 4
+#define SCE_ESCRIPT_WORD 5
+#define SCE_ESCRIPT_STRING 6
+#define SCE_ESCRIPT_OPERATOR 7
+#define SCE_ESCRIPT_IDENTIFIER 8
+#define SCE_ESCRIPT_BRACE 9
+#define SCE_ESCRIPT_WORD2 10
+#define SCE_ESCRIPT_WORD3 11
 //--Autogenerated -- end of section automatically generated from Scintilla.iface
 
 #endif
diff --git a/include/Scintilla.iface b/include/Scintilla.iface
index 2c2c092e7..72cdc2485 100644
--- a/include/Scintilla.iface
+++ b/include/Scintilla.iface
@@ -1584,6 +1584,7 @@ val SCLEX_F77=37
 val SCLEX_CSS=38
 val SCLEX_POV=39
 val SCLEX_LOUT=40
+val SCLEX_ESCRIPT=41
 
 # When a lexer specifies its language as SCLEX_AUTOMATIC it receives a
 # value assigned in sequence from SCLEX_AUTOMATIC+1.
@@ -2079,6 +2080,20 @@ val SCE_LOUT_STRING=7
 val SCE_LOUT_OPERATOR=8
 val SCE_LOUT_IDENTIFIER=9
 val SCE_LOUT_STRINGEOL=10
+# Lexical states for SCLEX_ESCRIPT
+lex ESCRIPT=SCLEX_ESCRIPT SCE_ESCRIPT_
+val SCE_ESCRIPT_DEFAULT=0
+val SCE_ESCRIPT_COMMENT=1
+val SCE_ESCRIPT_COMMENTLINE=2
+val SCE_ESCRIPT_COMMENTDOC=3
+val SCE_ESCRIPT_NUMBER=4
+val SCE_ESCRIPT_WORD=5
+val SCE_ESCRIPT_STRING=6
+val SCE_ESCRIPT_OPERATOR=7
+val SCE_ESCRIPT_IDENTIFIER=8
+val SCE_ESCRIPT_BRACE=9
+val SCE_ESCRIPT_WORD2=10
+val SCE_ESCRIPT_WORD3=11
 
 # Events
 
diff --git a/src/KeyWords.cxx b/src/KeyWords.cxx
index 3002c7d45..8fb51bdb7 100644
--- a/src/KeyWords.cxx
+++ b/src/KeyWords.cxx
@@ -142,6 +142,7 @@ int Scintilla_LinkLexers() {
 	LINK_LEXER(lmCss);
 	LINK_LEXER(lmEiffel);
 	LINK_LEXER(lmEiffelkw);
+	LINK_LEXER(lmESCRIPT);
 	LINK_LEXER(lmFortran);
 	LINK_LEXER(lmF77);
 	LINK_LEXER(lmHTML);
diff --git a/win32/makefile b/win32/makefile
index 25d9c575c..44852d116 100644
--- a/win32/makefile
+++ b/win32/makefile
@@ -47,9 +47,9 @@ deps:
 #**LEXOBJS=\\\n\(\*.o \)
 LEXOBJS=\
 LexAda.o LexAsm.o LexAVE.o LexBaan.o LexBullant.o LexConf.o LexCPP.o \
-LexCrontab.o LexCSS.o LexEiffel.o LexFortran.o LexHTML.o LexLisp.o LexLout.o \
-LexLua.o LexMatlab.o LexOthers.o LexPascal.o LexPerl.o LexPOV.o LexPython.o \
-LexRuby.o LexSQL.o LexVB.o 
+LexCrontab.o LexCSS.o LexEiffel.o LexEScript.o LexFortran.o LexHTML.o \
+LexLisp.o LexLout.o LexLua.o LexMatlab.o LexOthers.o LexPascal.o LexPerl.o \
+LexPOV.o LexPython.o LexRuby.o LexSQL.o LexVB.o 
 #--Autogenerated -- end of automatically generated section
 
 SOBJS	= ScintillaWin.o ScintillaBase.o Editor.o Document.o \
diff --git a/win32/scintilla.mak b/win32/scintilla.mak
index 9c741ea1b..20d6ff71f 100644
--- a/win32/scintilla.mak
+++ b/win32/scintilla.mak
@@ -119,6 +119,7 @@ LEXOBJS=\
 	$(DIR_O)\LexCrontab.obj \
 	$(DIR_O)\LexCSS.obj \
 	$(DIR_O)\LexEiffel.obj \
+	$(DIR_O)\LexEScript.obj \
 	$(DIR_O)\LexFortran.obj \
 	$(DIR_O)\LexHTML.obj \
 	$(DIR_O)\LexLisp.obj \
@@ -262,6 +263,8 @@ $(DIR_O)\LexCSS.obj: ..\src\LexCSS.cxx $(LEX_HEADERS)
 
 $(DIR_O)\LexEiffel.obj: ..\src\LexEiffel.cxx $(LEX_HEADERS)
 
+$(DIR_O)\LexEScript.obj: ..\src\LexEScript.cxx $(LEX_HEADERS)
+
 $(DIR_O)\LexFortran.obj: ..\src\LexFortran.cxx $(LEX_HEADERS)
 
 $(DIR_O)\LexHTML.obj: ..\src\LexHTML.cxx $(LEX_HEADERS)
diff --git a/win32/scintilla_vc6.mak b/win32/scintilla_vc6.mak
index 73ff497bd..ef707e44d 100644
--- a/win32/scintilla_vc6.mak
+++ b/win32/scintilla_vc6.mak
@@ -121,6 +121,7 @@ LEXOBJS=\
 	$(DIR_O)\LexCrontab.obj \
 	$(DIR_O)\LexCSS.obj \
 	$(DIR_O)\LexEiffel.obj \
+	$(DIR_O)\LexEScript.obj \
 	$(DIR_O)\LexFortran.obj \
 	$(DIR_O)\LexHTML.obj \
 	$(DIR_O)\LexLisp.obj \
@@ -229,10 +230,10 @@ $(DIR_O)\Editor.obj: ../src/Editor.cxx ../include/Platform.h \
  ../src/CellBuffer.h ../src/KeyMap.h ../src/Indicator.h \
  ../src/LineMarker.h ../src/Style.h ../src/ViewStyle.h \
  ../src/Document.h ../src/Editor.h ../src/XPM.h
-$(DIR_O)\ExternalLexer.obj: ExternalLexer.cxx ../include/Platform.h \
+$(DIR_O)\ExternalLexer.obj: ../src/ExternalLexer.cxx ../include/Platform.h \
  ../include/SciLexer.h ../include/PropSet.h ../include/SString.h \
  ../include/Accessor.h ../src/DocumentAccessor.h ../include/KeyWords.h \
- ExternalLexer.h
+ ../src/ExternalLexer.h
 $(DIR_O)\Indicator.obj: ../src/Indicator.cxx ../include/Platform.h \
  ../include/Scintilla.h ../src/Indicator.h
 $(DIR_O)\KeyMap.obj: ../src/KeyMap.cxx ../include/Platform.h \
@@ -264,6 +265,8 @@ $(DIR_O)\LexCSS.obj: ..\src\LexCSS.cxx $(LEX_HEADERS)
 
 $(DIR_O)\LexEiffel.obj: ..\src\LexEiffel.cxx $(LEX_HEADERS)
 
+$(DIR_O)\LexEScript.obj: ..\src\LexEScript.cxx $(LEX_HEADERS)
+
 $(DIR_O)\LexFortran.obj: ..\src\LexFortran.cxx $(LEX_HEADERS)
 
 $(DIR_O)\LexHTML.obj: ..\src\LexHTML.cxx $(LEX_HEADERS)