Bullant lexer added.

9 files changed, 18 insertions, 4 deletions

diff --git a/gtk/makefile b/gtk/makefile
index f70a54d9b..860408596 100644
--- a/gtk/makefile
+++ b/gtk/makefile
@@ -25,8 +25,8 @@ endif
 .cxx.o:
 	$(CC) `gtk-config --cflags` $(CXXFLAGS) -c $<
 
-LEXOBJS=LexAda.o LexAVE.o LexConf.o LexCPP.o LexCrontab.o LexEiffel.o LexHTML.o \
-	LexLisp.o LexLua.o LexOthers.o LexPascal.o LexPerl.o \
+LEXOBJS=LexAda.o LexAVE.o LexBullant.o LexConf.o LexCPP.o LexCrontab.o \

+	LexEiffel.o LexHTML.o LexLisp.o LexLua.o LexOthers.o LexPascal.o LexPerl.o \
 	LexPython.o LexRuby.o LexSQL.o LexVB.o
 
 # 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 970501e98..197bdec1a 100644
--- a/gtk/scintilla.mak
+++ b/gtk/scintilla.mak
@@ -118,6 +118,7 @@ SOBJS=\
 LEXOBJS=\
 	$(DIR_O)\LexAda.obj \
 	$(DIR_O)\LexAVE.obj \
+	$(DIR_O)\LexBullant.obj \
 	$(DIR_O)\LexConf.obj \
 	$(DIR_O)\LexCPP.obj \
 	$(DIR_O)\LexCrontab.obj \
@@ -239,6 +240,8 @@ $(DIR_O)\LexAda.obj: ..\src\LexAda.cxx $(LEX_HEADERS)
 
 $(DIR_O)\LexAVE.obj: ..\src\LexAVE.cxx $(LEX_HEADERS)
 
+$(DIR_O)\LexBullant.obj: ..\src\LexBullant.cxx $(LEX_HEADERS)
+
 $(DIR_O)\LexConf.obj: ..\src\LexConf.cxx $(LEX_HEADERS)
 
 $(DIR_O)\LexCPP.obj: ..\src\LexCPP.cxx $(LEX_HEADERS)
diff --git a/include/SciLexer.h b/include/SciLexer.h
index 680cb1513..a5963014f 100644
--- a/include/SciLexer.h
+++ b/include/SciLexer.h
@@ -41,6 +41,7 @@
 #define SCLEX_EIFFELKW 24
 #define SCLEX_TCL 25
 #define SCLEX_NNCRONTAB 26
+#define SCLEX_BULLANT 27
 #define SCLEX_AUTOMATIC 1000
 #define SCE_P_DEFAULT 0
 #define SCE_P_COMMENTLINE 1
diff --git a/include/Scintilla.iface b/include/Scintilla.iface
index f5aed53ae..6c31eaa70 100644
--- a/include/Scintilla.iface
+++ b/include/Scintilla.iface
@@ -1275,6 +1275,8 @@ val SCLEX_EIFFEL=23
 val SCLEX_EIFFELKW=24
 val SCLEX_TCL=25
 val SCLEX_NNCRONTAB=26
+val SCLEX_BULLANT=27
+
 # When a lexer specifies its language as SCLEX_AUTOMATIC it receives a 
 # value assigned in sequence from SCLEX_AUTOMATIC+1.
 val SCLEX_AUTOMATIC=1000
diff --git a/src/KeyWords.cxx b/src/KeyWords.cxx
index 756037a9a..c759d600f 100644
--- a/src/KeyWords.cxx
+++ b/src/KeyWords.cxx
@@ -128,6 +128,7 @@ int wxForceScintillaLexers(void) {
   extern LexerModule lmSQL;
   extern LexerModule lmVB;
   extern LexerModule lmXML;
+  extern LexerModule lmBullant;
 
   if (
       &lmAda
@@ -153,6 +154,7 @@ int wxForceScintillaLexers(void) {
       && &lmLISP
       && &lmLua
       && &lmNull
+      && &lmBullant
       )
     {
       return 1;
diff --git a/src/LexBullant.cxx b/src/LexBullant.cxx
index e2a04b0c4..0deae1051 100644
--- a/src/LexBullant.cxx
+++ b/src/LexBullant.cxx
@@ -80,7 +80,7 @@ static void ColouriseBullantDoc(unsigned int startPos, int length, int initStyle
 	char chNext = styler[startPos];
 	unsigned int lengthDoc = startPos + length;
 	int visibleChars = 0;
-	int blockChange = 0;
+	//int blockChange = 0;
 	styler.StartSegment(startPos);
 	int endFoundThisLine = 0;
 	for (unsigned int i = startPos; i < lengthDoc; i++) {
diff --git a/win32/deps.mak b/win32/deps.mak
index 0437cf554..7a7f4eaae 100644
--- a/win32/deps.mak
+++ b/win32/deps.mak
@@ -43,6 +43,9 @@ LexAda.o: ../src/LexAda.cxx ../include/Platform.h ../include/PropSet.h \
 LexAVE.o: ../src/LexAVE.cxx ../include/Platform.h ../include/PropSet.h \
  ../include/SString.h ../include/Accessor.h ../include/KeyWords.h \
  ../include/Scintilla.h ../include/SciLexer.h
+LexBullant.o: ../src/LexBullant.cxx ../include/Platform.h \
+ ../include/PropSet.h ../include/SString.h ../include/Accessor.h \
+ ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h
 LexConf.o: ../src/LexConf.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 0d144bcf2..6526c777e 100644
--- a/win32/makefile
+++ b/win32/makefile
@@ -39,7 +39,7 @@ deps:
 
 LEXOBJS=LexAda.o LexAVE.o LexConf.o LexCPP.o LexCrontab.o LexEiffel.o LexHTML.o \
 	LexLisp.o LexLua.o LexOthers.o LexPascal.o LexPerl.o \
-	LexPython.o LexRuby.o LexSQL.o LexVB.o
+	LexPython.o LexRuby.o LexSQL.o LexVB.o LexBullant.o
 
 SOBJS	= ScintillaWin.o ScintillaBase.o Editor.o Document.o \
 	ContractionState.o CellBuffer.o CallTip.o \
diff --git a/win32/scintilla.mak b/win32/scintilla.mak
index 4ac0365fa..cbc05d082 100644
--- a/win32/scintilla.mak
+++ b/win32/scintilla.mak
@@ -107,6 +107,7 @@ SOBJS=\
 LEXOBJS=\
 	$(DIR_O)\LexAda.obj \
 	$(DIR_O)\LexAVE.obj \
+	$(DIR_O)\LexBullant.obj \
 	$(DIR_O)\LexConf.obj \
 	$(DIR_O)\LexCPP.obj \
 	$(DIR_O)\LexCrontab.obj \
@@ -229,6 +230,8 @@ $(DIR_O)\LexAda.obj: ..\src\LexAda.cxx $(LEX_HEADERS)
 
 $(DIR_O)\LexAVE.obj: ..\src\LexAVE.cxx $(LEX_HEADERS)
 
+$(DIR_O)\LexBullant.obj: ..\src\LexBullant.cxx $(LEX_HEADERS)
+
 $(DIR_O)\LexConf.obj: ..\src\LexConf.cxx $(LEX_HEADERS)
 
 $(DIR_O)\LexCPP.obj: ..\src\LexCPP.cxx $(LEX_HEADERS)