diff options
| -rw-r--r-- | doc/ScintillaHistory.html | 1 | ||||
| -rw-r--r-- | gtk/makefile | 10 | ||||
| -rw-r--r-- | gtk/scintilla.mak | 3 | ||||
| -rw-r--r-- | include/SciLexer.h | 18 | ||||
| -rw-r--r-- | include/Scintilla.iface | 20 | ||||
| -rw-r--r-- | src/KeyWords.cxx | 1 |
6 files changed, 48 insertions, 5 deletions
diff --git a/doc/ScintillaHistory.html b/doc/ScintillaHistory.html index f3db817b2..3d5ffce3e 100644 --- a/doc/ScintillaHistory.html +++ b/doc/ScintillaHistory.html @@ -195,6 +195,7 @@ <li>nissl</li> <li>Frank Wunderlich</li> <li>Josepmaria Roca</li> + <li>Tobias Engvall</li> </ul> <p> Images used in GTK+ version diff --git a/gtk/makefile b/gtk/makefile index d9a6a65b6..71a3375bc 100644 --- a/gtk/makefile +++ b/gtk/makefile @@ -66,11 +66,11 @@ LEXOBJS=\ LexAda.o LexAPDL.o LexAsm.o LexAsn1.o LexAU3.o LexAVE.o LexBaan.o LexBash.o \ LexBasic.o LexBullant.o LexCaml.o LexCLW.o LexConf.o LexCPP.o LexCrontab.o \ LexCSS.o LexEiffel.o LexErlang.o LexEScript.o LexForth.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 LexSpecman.o LexSQL.o LexTeX.o LexVB.o LexVerilog.o LexVHDL.o \ -LexYAML.o +LexGui4Cli.o LexHaskell.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 LexSpecman.o LexSQL.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 8274c04bf..269bb73b2 100644 --- a/gtk/scintilla.mak +++ b/gtk/scintilla.mak @@ -161,6 +161,7 @@ LEXOBJS=\ $(DIR_O)\LexForth.obj \ $(DIR_O)\LexFortran.obj \ $(DIR_O)\LexGui4Cli.obj \ + $(DIR_O)\LexHaskell.obj \ $(DIR_O)\LexHTML.obj \ $(DIR_O)\LexKix.obj \ $(DIR_O)\LexLisp.obj \ @@ -348,6 +349,8 @@ $(DIR_O)\LexFortran.obj: ..\src\LexFortran.cxx $(LEX_HEADERS) $(DIR_O)\LexGui4Cli.obj: ..\src\LexGui4Cli.cxx $(LEX_HEADERS) +$(DIR_O)\LexHaskell.obj: ..\src\LexHaskell.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 68f7cbec5..6a1dbc697 100644 --- a/include/SciLexer.h +++ b/include/SciLexer.h @@ -80,6 +80,7 @@ #define SCLEX_CAML 65 #define SCLEX_BLITZBASIC 66 #define SCLEX_PUREBASIC 67 +#define SCLEX_HASKELL 68 #define SCLEX_AUTOMATIC 1000 #define SCE_P_DEFAULT 0 #define SCE_P_COMMENTLINE 1 @@ -811,6 +812,23 @@ #define SCE_CAML_COMMENT1 11 #define SCE_CAML_COMMENT2 12 #define SCE_CAML_COMMENT3 13 +#define SCE_HA_DEFAULT 0 +#define SCE_HA_IDENTIFIER 1 +#define SCE_HA_KEYWORD 2 +#define SCE_HA_NUMBER 3 +#define SCE_HA_STRING 4 +#define SCE_HA_CHARACTER 5 +#define SCE_HA_CLASS 6 +#define SCE_HA_MODULE 7 +#define SCE_HA_CAPITAL 8 +#define SCE_HA_DATA 9 +#define SCE_HA_IMPORT 10 +#define SCE_HA_OPERATOR 11 +#define SCE_HA_INSTANCE 12 +#define SCE_HA_COMMENTLINE 13 +#define SCE_HA_COMMENTBLOCK 14 +#define SCE_HA_COMMENTBLOCK2 15 +#define SCE_HA_COMMENTBLOCK3 16 #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 761ea4d02..417591966 100644 --- a/include/Scintilla.iface +++ b/include/Scintilla.iface @@ -1779,6 +1779,7 @@ val SCLEX_VHDL=64 val SCLEX_CAML=65 val SCLEX_BLITZBASIC=66 val SCLEX_PUREBASIC=67 +val SCLEX_HASKELL=68 # When a lexer specifies its language as SCLEX_AUTOMATIC it receives a # value assigned in sequence from SCLEX_AUTOMATIC+1. @@ -2634,6 +2635,25 @@ val SCE_CAML_COMMENT=10 val SCE_CAML_COMMENT1=11 val SCE_CAML_COMMENT2=12 val SCE_CAML_COMMENT3=13 +# Lexical states for SCLEX_HASKELL +lex Haskell=SCLEX_HASKELL SCE_HA_ +val SCE_HA_DEFAULT=0 +val SCE_HA_IDENTIFIER=1 +val SCE_HA_KEYWORD=2 +val SCE_HA_NUMBER=3 +val SCE_HA_STRING=4 +val SCE_HA_CHARACTER=5 +val SCE_HA_CLASS=6 +val SCE_HA_MODULE=7 +val SCE_HA_CAPITAL=8 +val SCE_HA_DATA=9 +val SCE_HA_IMPORT=10 +val SCE_HA_OPERATOR=11 +val SCE_HA_INSTANCE=12 +val SCE_HA_COMMENTLINE=13 +val SCE_HA_COMMENTBLOCK=14 +val SCE_HA_COMMENTBLOCK2=15 +val SCE_HA_COMMENTBLOCK3=16 # Events diff --git a/src/KeyWords.cxx b/src/KeyWords.cxx index 858eb54a3..d40917fce 100644 --- a/src/KeyWords.cxx +++ b/src/KeyWords.cxx @@ -157,6 +157,7 @@ int Scintilla_LinkLexers() { LINK_LEXER(lmFortran); LINK_LEXER(lmF77); LINK_LEXER(lmGui4Cli); + LINK_LEXER(lmHaskell); LINK_LEXER(lmHTML); LINK_LEXER(lmXML); LINK_LEXER(lmASP); |