Forthe lexer added.

8 files changed, 44 insertions, 6 deletions

diff --git a/gtk/makefile b/gtk/makefile
index 8b1d7ba66..1fcb58656 100644
--- a/gtk/makefile
+++ b/gtk/makefile
@@ -61,9 +61,9 @@ endif
 #**LEXOBJS=\\\n\(\*.o \)
 LEXOBJS=\
 LexAda.o LexAsm.o LexAVE.o LexBaan.o LexBullant.o LexCLW.o LexConf.o LexCPP.o \
-LexCrontab.o LexCSS.o LexEiffel.o LexEScript.o LexFortran.o LexHTML.o \
-LexLisp.o LexLout.o LexLua.o LexMatlab.o LexMetapost.o LexMMIXAL.o LexMPT.o \
-LexNsis.o LexOthers.o LexPascal.o LexPB.o LexPerl.o LexPOV.o LexPS.o \
+LexCrontab.o LexCSS.o LexEiffel.o LexEScript.o LexForth.o LexFortran.o \
+LexHTML.o LexLisp.o LexLout.o LexLua.o LexMatlab.o LexMetapost.o LexMMIXAL.o \
+LexMPT.o LexNsis.o LexOthers.o LexPascal.o LexPB.o LexPerl.o LexPOV.o LexPS.o \
 LexPython.o LexRuby.o LexScriptol.o LexSQL.o LexTeX.o LexVB.o LexYAML.o 
 #--Autogenerated -- end of automatically generated section
 
diff --git a/gtk/scintilla.mak b/gtk/scintilla.mak
index 4a689d92b..f8ba9dd04 100644
--- a/gtk/scintilla.mak
+++ b/gtk/scintilla.mak
@@ -132,6 +132,7 @@ LEXOBJS=\
 	$(DIR_O)\LexCSS.obj \
 	$(DIR_O)\LexEiffel.obj \
 	$(DIR_O)\LexEScript.obj \
+	$(DIR_O)\LexForth.obj \
 	$(DIR_O)\LexFortran.obj \
 	$(DIR_O)\LexHTML.obj \
 	$(DIR_O)\LexLisp.obj \
@@ -291,6 +292,8 @@ $(DIR_O)\LexEiffel.obj: ..\src\LexEiffel.cxx $(LEX_HEADERS)
 
 $(DIR_O)\LexEScript.obj: ..\src\LexEScript.cxx $(LEX_HEADERS)
 
+$(DIR_O)\LexForth.obj: ..\src\LexForth.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 4f6db221a..312a82e99 100644
--- a/include/SciLexer.h
+++ b/include/SciLexer.h
@@ -66,6 +66,7 @@
 #define SCLEX_TEX 49
 #define SCLEX_METAPOST 50
 #define SCLEX_POWERBASIC 51
+#define SCLEX_FORTH 52
 #define SCLEX_AUTOMATIC 1000
 #define SCE_P_DEFAULT 0
 #define SCE_P_COMMENTLINE 1
@@ -395,6 +396,18 @@
 #define SCE_NNCRONTAB_STRING 8
 #define SCE_NNCRONTAB_ENVIRONMENT 9
 #define SCE_NNCRONTAB_IDENTIFIER 10
+#define SCE_FORTH_DEFAULT 0
+#define SCE_FORTH_COMMENT 1
+#define SCE_FORTH_COMMENT_ML 2
+#define SCE_FORTH_IDENTIFIER 3
+#define SCE_FORTH_CONTROL 4
+#define SCE_FORTH_KEYWORD 5
+#define SCE_FORTH_DEFWORD 6
+#define SCE_FORTH_PREWORD1 7
+#define SCE_FORTH_PREWORD2 8
+#define SCE_FORTH_NUMBER 9
+#define SCE_FORTH_STRING 10
+#define SCE_FORTH_LOCALE 11
 #define SCE_MATLAB_DEFAULT 0
 #define SCE_MATLAB_COMMENT 1
 #define SCE_MATLAB_COMMAND 2
diff --git a/include/Scintilla.iface b/include/Scintilla.iface
index 20e38330a..7ea295538 100644
--- a/include/Scintilla.iface
+++ b/include/Scintilla.iface
@@ -1647,6 +1647,7 @@ val SCLEX_YAML=48
 val SCLEX_TEX=49
 val SCLEX_METAPOST=50
 val SCLEX_POWERBASIC=51
+val SCLEX_FORTH=52
 
 # When a lexer specifies its language as SCLEX_AUTOMATIC it receives a
 # value assigned in sequence from SCLEX_AUTOMATIC+1.
@@ -2039,6 +2040,20 @@ val SCE_NNCRONTAB_NUMBER=7
 val SCE_NNCRONTAB_STRING=8
 val SCE_NNCRONTAB_ENVIRONMENT=9
 val SCE_NNCRONTAB_IDENTIFIER=10
+# Lexical states for SCLEX_FORTH (Forth Lexer)
+lex Forth=SCLEX_FORTH SCE_FORTH_
+val SCE_FORTH_DEFAULT=0
+val SCE_FORTH_COMMENT=1
+val SCE_FORTH_COMMENT_ML=2
+val SCE_FORTH_IDENTIFIER=3
+val SCE_FORTH_CONTROL=4
+val SCE_FORTH_KEYWORD=5
+val SCE_FORTH_DEFWORD=6
+val SCE_FORTH_PREWORD1=7
+val SCE_FORTH_PREWORD2=8
+val SCE_FORTH_NUMBER=9
+val SCE_FORTH_STRING=10
+val SCE_FORTH_LOCALE=11
 # Lexical states for SCLEX_MATLAB
 lex MatLab=SCLEX_MATLAB SCE_MATLAB_
 val SCE_MATLAB_DEFAULT=0
diff --git a/src/KeyWords.cxx b/src/KeyWords.cxx
index 45eb83027..d8e6b72a1 100644
--- a/src/KeyWords.cxx
+++ b/src/KeyWords.cxx
@@ -145,6 +145,7 @@ int Scintilla_LinkLexers() {
 	LINK_LEXER(lmEiffel);
 	LINK_LEXER(lmEiffelkw);
 	LINK_LEXER(lmESCRIPT);
+	LINK_LEXER(lmForth);
 	LINK_LEXER(lmFortran);
 	LINK_LEXER(lmF77);
 	LINK_LEXER(lmHTML);
diff --git a/win32/makefile b/win32/makefile
index 010f3be16..a428e594e 100644
--- a/win32/makefile
+++ b/win32/makefile
@@ -51,9 +51,9 @@ deps:
 #**LEXOBJS=\\\n\(\*.o \)
 LEXOBJS=\
 LexAda.o LexAsm.o LexAVE.o LexBaan.o LexBullant.o LexCLW.o LexConf.o LexCPP.o \
-LexCrontab.o LexCSS.o LexEiffel.o LexEScript.o LexFortran.o LexHTML.o \
-LexLisp.o LexLout.o LexLua.o LexMatlab.o LexMetapost.o LexMMIXAL.o LexMPT.o \
-LexNsis.o LexOthers.o LexPascal.o LexPB.o LexPerl.o LexPOV.o LexPS.o \
+LexCrontab.o LexCSS.o LexEiffel.o LexEScript.o LexForth.o LexFortran.o \
+LexHTML.o LexLisp.o LexLout.o LexLua.o LexMatlab.o LexMetapost.o LexMMIXAL.o \
+LexMPT.o LexNsis.o LexOthers.o LexPascal.o LexPB.o LexPerl.o LexPOV.o LexPS.o \
 LexPython.o LexRuby.o LexScriptol.o LexSQL.o LexTeX.o LexVB.o LexYAML.o 
 #--Autogenerated -- end of automatically generated section
 
diff --git a/win32/scintilla.mak b/win32/scintilla.mak
index 1026fdc89..51d9de9a8 100644
--- a/win32/scintilla.mak
+++ b/win32/scintilla.mak
@@ -121,6 +121,7 @@ LEXOBJS=\
 	$(DIR_O)\LexCSS.obj \
 	$(DIR_O)\LexEiffel.obj \
 	$(DIR_O)\LexEScript.obj \
+	$(DIR_O)\LexForth.obj \
 	$(DIR_O)\LexFortran.obj \
 	$(DIR_O)\LexHTML.obj \
 	$(DIR_O)\LexLisp.obj \
@@ -277,6 +278,8 @@ $(DIR_O)\LexEiffel.obj: ..\src\LexEiffel.cxx $(LEX_HEADERS)
 
 $(DIR_O)\LexEScript.obj: ..\src\LexEScript.cxx $(LEX_HEADERS)
 
+$(DIR_O)\LexForth.obj: ..\src\LexForth.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 d8d2d0b59..b46ad430a 100644
--- a/win32/scintilla_vc6.mak
+++ b/win32/scintilla_vc6.mak
@@ -123,6 +123,7 @@ LEXOBJS=\
 	$(DIR_O)\LexCSS.obj \
 	$(DIR_O)\LexEiffel.obj \
 	$(DIR_O)\LexEScript.obj \
+	$(DIR_O)\LexForth.obj \
 	$(DIR_O)\LexFortran.obj \
 	$(DIR_O)\LexHTML.obj \
 	$(DIR_O)\LexLisp.obj \
@@ -279,6 +280,8 @@ $(DIR_O)\LexEiffel.obj: ..\src\LexEiffel.cxx $(LEX_HEADERS)
 
 $(DIR_O)\LexEScript.obj: ..\src\LexEScript.cxx $(LEX_HEADERS)
 
+$(DIR_O)\LexForth.obj: ..\src\LexForth.cxx $(LEX_HEADERS)
+
 $(DIR_O)\LexFortran.obj: ..\src\LexFortran.cxx $(LEX_HEADERS)
 
 $(DIR_O)\LexHTML.obj: ..\src\LexHTML.cxx $(LEX_HEADERS)