Eiffel support.

8 files changed, 36 insertions, 5 deletions

diff --git a/gtk/makefile b/gtk/makefile
index c5464fcee..05778f3b6 100644
--- a/gtk/makefile
+++ b/gtk/makefile
@@ -25,7 +25,7 @@ endif
 .cxx.o:
 	$(CC) `gtk-config --cflags` $(CXXFLAGS) -c $<
 
-LEXOBJS=LexAda.o LexAVE.o LexConf.o LexCPP.o LexHTML.o \
+LEXOBJS=LexAda.o LexAVE.o LexConf.o LexCPP.o LexEiffel.o LexHTML.o \
 	LexLisp.o LexLua.o LexOthers.o LexPascal.o LexPerl.o \
 	LexPython.o LexRuby.o LexSQL.o LexVB.o
 
diff --git a/gtk/scintilla.mak b/gtk/scintilla.mak
index 28bb28e84..3a21306ea 100644
--- a/gtk/scintilla.mak
+++ b/gtk/scintilla.mak
@@ -116,8 +116,10 @@ SOBJS=\
 
 LEXOBJS=\
 	$(DIR_O)\LexAda.obj \
+	$(DIR_O)\LexAVE.obj \
 	$(DIR_O)\LexConf.obj \
 	$(DIR_O)\LexCPP.obj \
+	$(DIR_O)\LexEiffel.obj \
 	$(DIR_O)\LexHTML.obj \
 	$(DIR_O)\LexLisp.obj \
 	$(DIR_O)\LexLua.obj \
diff --git a/include/SciLexer.h b/include/SciLexer.h
index 72f9cd5ea..b55c5a375 100644
--- a/include/SciLexer.h
+++ b/include/SciLexer.h
@@ -37,6 +37,8 @@
 #define SCLEX_ADA 20
 #define SCLEX_LISP 21
 #define SCLEX_RUBY 22
+#define SCLEX_EIFFEL 23
+#define SCLEX_EIFFELKW 24
 #define SCLEX_AUTOMATIC 1000
 #define SCE_P_DEFAULT 0
 #define SCE_P_COMMENTLINE 1
@@ -276,6 +278,15 @@
 #define SCE_LISP_STRINGEOL 8
 #define SCE_LISP_IDENTIFIER 9
 #define SCE_LISP_OPERATOR 10
+#define SCE_EIFFEL_DEFAULT 0
+#define SCE_EIFFEL_COMMENTLINE 1
+#define SCE_EIFFEL_NUMBER 2
+#define SCE_EIFFEL_WORD 3
+#define SCE_EIFFEL_STRING 4
+#define SCE_EIFFEL_CHARACTER 5
+#define SCE_EIFFEL_OPERATOR 6
+#define SCE_EIFFEL_IDENTIFIER 7
+#define SCE_EIFFEL_STRINGEOL 8
 //--Autogenerated -- end of section automatically generated from Scintilla.iface
 
 #endif
diff --git a/include/Scintilla.h b/include/Scintilla.h
index daca5102a..27df91183 100644
--- a/include/Scintilla.h
+++ b/include/Scintilla.h
@@ -63,10 +63,10 @@ typedef sptr_t (*SciFnDirect)(sptr_t ptr, unsigned int iMessage, uptr_t wParam,
 #define SCI_SETANCHOR 2026
 #define SCI_GETCURLINE 2027
 #define SCI_GETENDSTYLED 2028
-#define SCI_CONVERTEOLS 2029
 #define SC_EOL_CRLF 0
 #define SC_EOL_CR 1
 #define SC_EOL_LF 2
+#define SCI_CONVERTEOLS 2029
 #define SCI_GETEOLMODE 2030
 #define SCI_SETEOLMODE 2031
 #define SCI_STARTSTYLING 2032
diff --git a/include/Scintilla.iface b/include/Scintilla.iface
index 533e82a73..a854203f4 100644
--- a/include/Scintilla.iface
+++ b/include/Scintilla.iface
@@ -1222,6 +1222,8 @@ val SCLEX_AVE=19
 val SCLEX_ADA=20
 val SCLEX_LISP=21
 val SCLEX_RUBY=22
+val SCLEX_EIFFEL=23
+val SCLEX_EIFFELKW=24
 # When a lexer specifies its language as SCLEX_AUTOMATIC it receives a 
 # value assigned in sequence from SCLEX_AUTOMATIC+1.
 val SCLEX_AUTOMATIC=1000
@@ -1485,6 +1487,16 @@ val SCE_LISP_STRING=6
 val SCE_LISP_STRINGEOL=8
 val SCE_LISP_IDENTIFIER=9
 val SCE_LISP_OPERATOR=10
+# Lexical states for SCLEX_EIFFEL and SCLEX_EIFFELKW
+val SCE_EIFFEL_DEFAULT=0
+val SCE_EIFFEL_COMMENTLINE=1
+val SCE_EIFFEL_NUMBER=2
+val SCE_EIFFEL_WORD=3
+val SCE_EIFFEL_STRING=4
+val SCE_EIFFEL_CHARACTER=5
+val SCE_EIFFEL_OPERATOR=6
+val SCE_EIFFEL_IDENTIFIER=7
+val SCE_EIFFEL_STRINGEOL=8
 
 # Events
 
diff --git a/win32/deps.mak b/win32/deps.mak
index f2b1908d7..74e4a4421 100644
--- a/win32/deps.mak
+++ b/win32/deps.mak
@@ -1,6 +1,6 @@
 ExternalLexer.o: ExternalLexer.cxx ..\include\SciLexer.h \
- ..\include\platform.h ..\include\propset.h ..\include\SString.h \
- ..\include\accessor.h ..\src\DocumentAccessor.h ..\include\KeyWords.h \
+ ..\include\Platform.h ..\include\PropSet.h ..\include\SString.h \
+ ..\include\Accessor.h ..\src\DocumentAccessor.h ..\include\KeyWords.h \
  ExternalLexer.h
 PlatWin.o: PlatWin.cxx ..\include\Platform.h PlatformRes.h \
  ..\src\UniConversion.h
@@ -49,6 +49,9 @@ LexConf.o: ../src/LexConf.cxx ..\include\Platform.h \
 LexCPP.o: ../src/LexCPP.cxx ..\include\Platform.h ..\include\PropSet.h \
  ..\include\SString.h ..\include\Accessor.h ..\include\KeyWords.h \
  ..\include\Scintilla.h ..\include\SciLexer.h
+LexEiffel.o: ../src/LexEiffel.cxx ..\include\Platform.h \
+ ..\include\PropSet.h ..\include\SString.h ..\include\Accessor.h \
+ ..\include\KeyWords.h ..\include\Scintilla.h ..\include\SciLexer.h
 LexHTML.o: ../src/LexHTML.cxx ..\include\Platform.h \
  ..\include\PropSet.h ..\include\SString.h ..\include\Accessor.h \
  ..\include\KeyWords.h ..\include\Scintilla.h ..\include\SciLexer.h
diff --git a/win32/makefile b/win32/makefile
index 91407950a..67d24b035 100644
--- a/win32/makefile
+++ b/win32/makefile
@@ -37,7 +37,7 @@ clean:
 deps:
 	$(CC) -MM $(CXXFLAGS) *.cxx ../src/*.cxx >deps.mak
 
-LEXOBJS=LexAda.o LexAVE.o LexConf.o LexCPP.o LexHTML.o \
+LEXOBJS=LexAda.o LexAVE.o LexConf.o LexCPP.o LexEiffel.o LexHTML.o \
 	LexLisp.o LexLua.o LexOthers.o LexPascal.o LexPerl.o \
 	LexPython.o LexRuby.o LexSQL.o LexVB.o
 
diff --git a/win32/scintilla.mak b/win32/scintilla.mak
index bd89c0736..d93398f2b 100644
--- a/win32/scintilla.mak
+++ b/win32/scintilla.mak
@@ -108,6 +108,7 @@ LEXOBJS=\
 	$(DIR_O)\LexAVE.obj \
 	$(DIR_O)\LexConf.obj \
 	$(DIR_O)\LexCPP.obj \
+	$(DIR_O)\LexEiffel.obj \
 	$(DIR_O)\LexHTML.obj \
 	$(DIR_O)\LexLisp.obj \
 	$(DIR_O)\LexLua.obj \
@@ -229,6 +230,8 @@ $(DIR_O)\LexConf.obj: ..\src\LexConf.cxx $(LEX_HEADERS)
 
 $(DIR_O)\LexCPP.obj: ..\src\LexCPP.cxx $(LEX_HEADERS)
 
+$(DIR_O)\LexEiffel.obj: ..\src\LexEiffel.cxx $(LEX_HEADERS)
+
 $(DIR_O)\LexHTML.obj: ..\src\LexHTML.cxx $(LEX_HEADERS)
 
 $(DIR_O)\LexLisp.obj: ..\src\LexLisp.cxx $(LEX_HEADERS)