diff options
| -rw-r--r-- | doc/ScintillaHistory.html | 1 | ||||
| -rw-r--r-- | gtk/makefile | 6 | ||||
| -rw-r--r-- | gtk/scintilla.mak | 3 | ||||
| -rw-r--r-- | include/SciLexer.h | 25 | ||||
| -rw-r--r-- | include/Scintilla.iface | 27 | ||||
| -rw-r--r-- | src/KeyWords.cxx | 1 |
6 files changed, 60 insertions, 3 deletions
diff --git a/doc/ScintillaHistory.html b/doc/ScintillaHistory.html index 394069969..dd812cba8 100644 --- a/doc/ScintillaHistory.html +++ b/doc/ScintillaHistory.html @@ -200,6 +200,7 @@ <li>Michael Cartmell</li> <li>Pascal Hurni</li> <li>Andre</li> + <li>Randy Butler</li> </ul> <p> Images used in GTK+ version diff --git a/gtk/makefile b/gtk/makefile index 1b1ea98d6..9cf772d77 100644 --- a/gtk/makefile +++ b/gtk/makefile @@ -65,9 +65,9 @@ endif 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 LexHaskell.o LexHTML.o LexKix.o LexLisp.o LexLout.o LexLua.o \ -LexMatlab.o LexMetapost.o LexMMIXAL.o LexMPT.o LexMSSQL.o LexNsis.o \ +LexCSS.o LexEiffel.o LexErlang.o LexEScript.o LexFlagShip.o LexForth.o \ +LexFortran.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 \ LexRebol.o LexRuby.o LexScriptol.o LexSmalltalk.o LexSpecman.o LexSQL.o \ LexTADS3.o LexTeX.o LexVB.o LexVerilog.o LexVHDL.o LexYAML.o diff --git a/gtk/scintilla.mak b/gtk/scintilla.mak index 682db1934..1590d0040 100644 --- a/gtk/scintilla.mak +++ b/gtk/scintilla.mak @@ -158,6 +158,7 @@ LEXOBJS=\ $(DIR_O)\LexEiffel.obj \ $(DIR_O)\LexErlang.obj \ $(DIR_O)\LexEScript.obj \ + $(DIR_O)\LexFlagShip.obj \ $(DIR_O)\LexForth.obj \ $(DIR_O)\LexFortran.obj \ $(DIR_O)\LexGui4Cli.obj \ @@ -346,6 +347,8 @@ $(DIR_O)\LexErlang.obj: ..\src\LexErlang.cxx $(LEX_HEADERS) $(DIR_O)\LexEScript.obj: ..\src\LexEScript.cxx $(LEX_HEADERS) +$(DIR_O)\LexFlagShip.obj: ..\src\LexFlagShip.cxx $(LEX_HEADERS) + $(DIR_O)\LexForth.obj: ..\src\LexForth.cxx $(LEX_HEADERS) $(DIR_O)\LexFortran.obj: ..\src\LexFortran.cxx $(LEX_HEADERS) diff --git a/include/SciLexer.h b/include/SciLexer.h index af0f05910..fb5d6b40c 100644 --- a/include/SciLexer.h +++ b/include/SciLexer.h @@ -85,6 +85,7 @@ #define SCLEX_TADS3 70 #define SCLEX_REBOL 71 #define SCLEX_SMALLTALK 72 +#define SCLEX_FLAGSHIP 73 #define SCLEX_AUTOMATIC 1000 #define SCE_P_DEFAULT 0 #define SCE_P_COMMENTLINE 1 @@ -932,6 +933,30 @@ #define SCE_ST_ASSIGN 14 #define SCE_ST_CHARACTER 15 #define SCE_ST_SPEC_SEL 16 +#define SCE_FS_DEFAULT 0 +#define SCE_FS_COMMENT 1 +#define SCE_FS_COMMENTLINE 2 +#define SCE_FS_COMMENTDOC 3 +#define SCE_FS_COMMENTLINEDOC 4 +#define SCE_FS_COMMENTDOCKEYWORD 5 +#define SCE_FS_COMMENTDOCKEYWORDERROR 6 +#define SCE_FS_KEYWORD 7 +#define SCE_FS_KEYWORD2 8 +#define SCE_FS_KEYWORD3 9 +#define SCE_FS_KEYWORD4 10 +#define SCE_FS_NUMBER 11 +#define SCE_FS_STRING 12 +#define SCE_FS_PREPROCESSOR 13 +#define SCE_FS_OPERATOR 14 +#define SCE_FS_IDENTIFIER 15 +#define SCE_FS_DATE 16 +#define SCE_FS_STRINGEOL 17 +#define SCE_FS_CONSTANT 18 +#define SCE_FS_ASM 19 +#define SCE_FS_LABEL 20 +#define SCE_FS_ERROR 21 +#define SCE_FS_HEXNUMBER 22 +#define SCE_FS_BINNUMBER 23 #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 6527aec38..824ff4fd0 100644 --- a/include/Scintilla.iface +++ b/include/Scintilla.iface @@ -1788,6 +1788,7 @@ val SCLEX_PHPSCRIPT=69 val SCLEX_TADS3=70 val SCLEX_REBOL=71 val SCLEX_SMALLTALK=72 +val SCLEX_FLAGSHIP=73 # When a lexer specifies its language as SCLEX_AUTOMATIC it receives a # value assigned in sequence from SCLEX_AUTOMATIC+1. @@ -2768,6 +2769,32 @@ val SCE_ST_KWSEND=13 val SCE_ST_ASSIGN=14 val SCE_ST_CHARACTER=15 val SCE_ST_SPEC_SEL=16 +# Lexical states for SCLEX_FLAGSHIP (clipper) +lex FlagShip=SCLEX_FLAGSHIP SCE_B_ +val SCE_FS_DEFAULT=0 +val SCE_FS_COMMENT=1 +val SCE_FS_COMMENTLINE=2 +val SCE_FS_COMMENTDOC=3 +val SCE_FS_COMMENTLINEDOC=4 +val SCE_FS_COMMENTDOCKEYWORD=5 +val SCE_FS_COMMENTDOCKEYWORDERROR=6 +val SCE_FS_KEYWORD=7 +val SCE_FS_KEYWORD2=8 +val SCE_FS_KEYWORD3=9 +val SCE_FS_KEYWORD4=10 +val SCE_FS_NUMBER=11 +val SCE_FS_STRING=12 +val SCE_FS_PREPROCESSOR=13 +val SCE_FS_OPERATOR=14 +val SCE_FS_IDENTIFIER=15 +val SCE_FS_DATE=16 +val SCE_FS_STRINGEOL=17 +val SCE_FS_CONSTANT=18 +val SCE_FS_ASM=19 +val SCE_FS_LABEL=20 +val SCE_FS_ERROR=21 +val SCE_FS_HEXNUMBER=22 +val SCE_FS_BINNUMBER=23 # Events diff --git a/src/KeyWords.cxx b/src/KeyWords.cxx index cee412b1e..3044f259e 100644 --- a/src/KeyWords.cxx +++ b/src/KeyWords.cxx @@ -153,6 +153,7 @@ int Scintilla_LinkLexers() { LINK_LEXER(lmEiffelkw); LINK_LEXER(lmErlang); LINK_LEXER(lmESCRIPT); + LINK_LEXER(lmFlagShip); LINK_LEXER(lmForth); LINK_LEXER(lmFortran); LINK_LEXER(lmF77); |