diff options
| -rw-r--r-- | gtk/makefile | 44 | ||||
| -rw-r--r-- | include/SciLexer.h | 10 | ||||
| -rw-r--r-- | include/Scintilla.iface | 11 | ||||
| -rw-r--r-- | vcbuild/SciLexer.dsp | 4 | ||||
| -rw-r--r-- | win32/makefile | 42 | ||||
| -rw-r--r-- | win32/scintilla.mak | 53 |
6 files changed, 82 insertions, 82 deletions
diff --git a/gtk/makefile b/gtk/makefile index 7e5967f8d..06a8bf2b8 100644 --- a/gtk/makefile +++ b/gtk/makefile @@ -25,8 +25,8 @@ endif .cxx.o: $(CC) `gtk-config --cflags` $(INCLUDEDIRS) $(CXXFLAGS) -c $< -o $@ -LEXOBJS = LexAVE.o LexConf.o LexCPP.o LexHTML.o LexLua.o LexOthers.o \ - LexPascal.o LexPerl.o LexPython.o LexSQL.o LexVB.o +LEXOBJS = LexAda.o LexAVE.o LexConf.o LexCPP.o LexHTML.o LexLua.o \
+ LexOthers.o LexPascal.o LexPerl.o LexPython.o LexSQL.o LexVB.o # The LEXOBJS have to be treated specially as the functions in them are not called from external code @@ -38,6 +38,10 @@ $(COMPLIB): DocumentAccessor.o WindowAccessor.o KeyWords.o Document.o CallTip.o RESearch.o Style.o Indicator.o AutoComplete.o $(AR) rc $@ $^ +# All lexers depend on this set of headers
+LEX_HEADERS=Platform.h PropSet.h SString.h Accessor.h \ + KeyWords.h Scintilla.h WinDefs.h SciLexer.h
+ AutoComplete.o: AutoComplete.cxx Platform.h AutoComplete.h CallTip.o: CallTip.cxx Platform.h CallTip.h CellBuffer.o: CellBuffer.cxx Platform.h Scintilla.h WinDefs.h \ @@ -54,29 +58,19 @@ Indicator.o: Indicator.cxx Platform.h Scintilla.h WinDefs.h \ Indicator.h KeyMap.o: KeyMap.cxx Platform.h Scintilla.h WinDefs.h KeyMap.h KeyWords.o: KeyWords.cxx Platform.h PropSet.h SString.h Accessor.h \ - KeyWords.h Scintilla.h WinDefs.h SciLexer.h -LexAVE.o: LexAVE.cxx Platform.h PropSet.h SString.h Accessor.h \ - KeyWords.h Scintilla.h WinDefs.h SciLexer.h -LexConf.o: LexConf.cxx Platform.h PropSet.h SString.h Accessor.h \ - KeyWords.h Scintilla.h WinDefs.h SciLexer.h -LexCPP.o: LexCPP.cxx Platform.h PropSet.h SString.h Accessor.h \ - KeyWords.h Scintilla.h WinDefs.h SciLexer.h -LexHTML.o: LexHTML.cxx Platform.h PropSet.h SString.h Accessor.h \ - KeyWords.h Scintilla.h WinDefs.h SciLexer.h -LexLua.o: LexLua.cxx Platform.h PropSet.h SString.h Accessor.h \ - KeyWords.h Scintilla.h WinDefs.h SciLexer.h -LexOthers.o: LexOthers.cxx Platform.h PropSet.h SString.h Accessor.h \ - KeyWords.h Scintilla.h WinDefs.h SciLexer.h -LexPascal.o: LexPascal.cxx Platform.h PropSet.h SString.h Accessor.h \ - KeyWords.h Scintilla.h WinDefs.h SciLexer.h -LexPerl.o: LexPerl.cxx Platform.h PropSet.h SString.h Accessor.h KeyWords.h \ - Scintilla.h WinDefs.h SciLexer.h -LexPython.o: LexPython.cxx Platform.h PropSet.h SString.h \ - Accessor.h KeyWords.h Scintilla.h WinDefs.h SciLexer.h -LexSQL.o: LexSQL.cxx Platform.h PropSet.h SString.h \ - Accessor.h KeyWords.h Scintilla.h WinDefs.h SciLexer.h -LexVB.o: LexVB.cxx Platform.h PropSet.h SString.h \ - Accessor.h KeyWords.h Scintilla.h WinDefs.h SciLexer.h + KeyWords.h Scintilla.h WinDefs.h SciLexer.h
+LexAda.o: LexAda.cxx $(LEX_HEADERS) +LexAVE.o: LexAVE.cxx $(LEX_HEADERS) +LexConf.o: LexConf.cxx $(LEX_HEADERS) +LexCPP.o: LexCPP.cxx $(LEX_HEADERS) +LexHTML.o: LexHTML.cxx $(LEX_HEADERS) +LexLua.o: LexLua.cxx $(LEX_HEADERS) +LexOthers.o: LexOthers.cxx $(LEX_HEADERS) +LexPascal.o: LexPascal.cxx $(LEX_HEADERS) +LexPerl.o: LexPerl.cxx $(LEX_HEADERS) +LexPython.o: LexPython.cxx $(LEX_HEADERS) +LexSQL.o: LexSQL.cxx $(LEX_HEADERS) +LexVB.o: LexVB.cxx $(LEX_HEADERS) LineMarker.o: LineMarker.cxx Platform.h Scintilla.h WinDefs.h \ LineMarker.h PlatGTK.o: PlatGTK.cxx Platform.h Scintilla.h ScintillaWidget.h WinDefs.h diff --git a/include/SciLexer.h b/include/SciLexer.h index 076a96fb1..75af63f58 100644 --- a/include/SciLexer.h +++ b/include/SciLexer.h @@ -34,6 +34,7 @@ #define SCLEX_CONF 17 #define SCLEX_PASCAL 18 #define SCLEX_AVE 19 +#define SCLEX_ADA 20 #define SCE_P_DEFAULT 0 #define SCE_P_COMMENTLINE 1 #define SCE_P_NUMBER 2 @@ -237,6 +238,15 @@ #define SCE_AVE_STRINGEOL 8 #define SCE_AVE_IDENTIFIER 9 #define SCE_AVE_OPERATOR 10 +#define SCE_ADA_DEFAULT 0 +#define SCE_ADA_COMMENT 1 +#define SCE_ADA_NUMBER 2 +#define SCE_ADA_WORD 3 +#define SCE_ADA_STRING 4 +#define SCE_ADA_CHARACTER 5 +#define SCE_ADA_OPERATOR 6 +#define SCE_ADA_IDENTIFIER 7 +#define SCE_ADA_STRINGEOL 8 //--Autogenerated -- end of section automatically generated from Scintilla.iface #endif diff --git a/include/Scintilla.iface b/include/Scintilla.iface index dd4a167f1..3a595156d 100644 --- a/include/Scintilla.iface +++ b/include/Scintilla.iface @@ -1173,6 +1173,7 @@ val SCLEX_DIFF=16 val SCLEX_CONF=17 val SCLEX_PASCAL=18 val SCLEX_AVE=19 +val SCLEX_ADA=20 # Lexical states for SCLEX_PYTHON val SCE_P_DEFAULT=0 val SCE_P_COMMENTLINE=1 @@ -1393,6 +1394,16 @@ val SCE_AVE_ENUM=7 val SCE_AVE_STRINGEOL=8 val SCE_AVE_IDENTIFIER=9 val SCE_AVE_OPERATOR=10 +# Lexical states for SCLEX_ADA +val SCE_ADA_DEFAULT=0 +val SCE_ADA_COMMENT=1 +val SCE_ADA_NUMBER=2 +val SCE_ADA_WORD=3 +val SCE_ADA_STRING=4 +val SCE_ADA_CHARACTER=5 +val SCE_ADA_OPERATOR=6 +val SCE_ADA_IDENTIFIER=7 +val SCE_ADA_STRINGEOL=8 # Events diff --git a/vcbuild/SciLexer.dsp b/vcbuild/SciLexer.dsp index 970c0a23e..28c9959b6 100644 --- a/vcbuild/SciLexer.dsp +++ b/vcbuild/SciLexer.dsp @@ -134,6 +134,10 @@ SOURCE=..\src\KeyWords.cxx # End Source File # Begin Source File +SOURCE=..\src\LexAda.cxx +# End Source File +# Begin Source File + SOURCE=..\src\LexAVE.cxx # End Source File # Begin Source File diff --git a/win32/makefile b/win32/makefile index 3c04dadd1..a7ab56835 100644 --- a/win32/makefile +++ b/win32/makefile @@ -34,8 +34,8 @@ ALL: $(COMPONENT) $(LEXCOMPONENT) ScintillaWinS.o WindowAccessor.o clean: del /q *.exe *.o *.obj *.dll *.res *.map -LEXOBJS = LexAVE.o LexConf.o LexCPP.o LexHTML.o LexLua.o LexOthers.o \ - LexPascal.o LexPerl.o LexPython.o LexSQL.o LexVB.o +LEXOBJS = LexAda.o LexAVE.o LexConf.o LexCPP.o LexHTML.o LexLua.o \ + LexOthers.o LexPascal.o LexPerl.o LexPython.o LexSQL.o LexVB.o SOBJS = ScintillaWin.o ScintillaBase.o Editor.o Document.o \ ContractionState.o CellBuffer.o CallTip.o \ @@ -52,6 +52,10 @@ LOBJS = ScintillaWinL.o ScintillaBaseL.o Editor.o Document.o \ $(LEXCOMPONENT): $(LOBJS) $(DLLWRAP) --target i386-mingw32 -o $@ $(LOBJS) $(LDFLAGS) -s --relocatable +# All lexers depend on this set of headers +LEX_HEADERS=Platform.h PropSet.h SString.h Accessor.h \ + KeyWords.h Scintilla.h WinDefs.h SciLexer.h + AutoComplete.o: AutoComplete.cxx Platform.h AutoComplete.h CallTip.o: CallTip.cxx Platform.h CallTip.h CellBuffer.o: CellBuffer.cxx Platform.h Scintilla.h CellBuffer.h @@ -65,28 +69,18 @@ Editor.o: Editor.cxx Platform.h Scintilla.h ContractionState.h \ Document.h Editor.h Indicator.o: Indicator.cxx Platform.h Scintilla.h Indicator.h KeyMap.o: KeyMap.cxx Platform.h Scintilla.h KeyMap.h -LexAVE.o: LexAVE.cxx Platform.h PropSet.h \ - SString.h Accessor.h KeyWords.h Scintilla.h SciLexer.h -LexConf.o: LexConf.cxx Platform.h PropSet.h \ - SString.h Accessor.h KeyWords.h Scintilla.h SciLexer.h -LexCPP.o: LexCPP.cxx Platform.h PropSet.h SString.h Accessor.h KeyWords.h \ - Scintilla.h SciLexer.h -LexHTML.o: LexHTML.cxx Platform.h PropSet.h SString.h Accessor.h KeyWords.h \ - Scintilla.h SciLexer.h -LexLua.o: LexLua.cxx Platform.h PropSet.h SString.h Accessor.h KeyWords.h \ - Scintilla.h SciLexer.h -LexOthers.o: LexOthers.cxx Platform.h PropSet.h SString.h Accessor.h KeyWords.h \ - Scintilla.h SciLexer.h -LexPascal.o: LexPascal.cxx Platform.h PropSet.h SString.h Accessor.h KeyWords.h \ - Scintilla.h SciLexer.h -LexPerl.o: LexPerl.cxx Platform.h PropSet.h SString.h Accessor.h KeyWords.h \ - Scintilla.h SciLexer.h -LexPython.o: LexPython.cxx Platform.h PropSet.h SString.h Accessor.h KeyWords.h \ - Scintilla.h SciLexer.h -LexSQL.o: LexSQL.cxx Platform.h PropSet.h SString.h Accessor.h KeyWords.h \ - Scintilla.h SciLexer.h -LexVB.o: LexVB.cxx Platform.h PropSet.h SString.h Accessor.h KeyWords.h \ - Scintilla.h SciLexer.h +LexAda.o: LexAVE.cxx $(LEX_HEADERS) +LexAVE.o: LexAVE.cxx $(LEX_HEADERS) +LexConf.o: LexConf.cxx $(LEX_HEADERS) +LexCPP.o: LexCPP.cxx $(LEX_HEADERS) +LexHTML.o: LexHTML.cxx $(LEX_HEADERS) +LexLua.o: LexLua.cxx $(LEX_HEADERS) +LexOthers.o: LexOthers.cxx $(LEX_HEADERS) +LexPascal.o: LexPascal.cxx $(LEX_HEADERS) +LexPerl.o: LexPerl.cxx $(LEX_HEADERS) +LexPython.o: LexPython.cxx $(LEX_HEADERS) +LexSQL.o: LexSQL.cxx $(LEX_HEADERS) +LexVB.o: LexVB.cxx $(LEX_HEADERS) KeyWords.o: KeyWords.cxx Platform.h PropSet.h SString.h Accessor.h KeyWords.h \ Scintilla.h SciLexer.h LineMarker.o: LineMarker.cxx Platform.h Scintilla.h LineMarker.h diff --git a/win32/scintilla.mak b/win32/scintilla.mak index eb7b64a01..ad51df98a 100644 --- a/win32/scintilla.mak +++ b/win32/scintilla.mak @@ -103,6 +103,7 @@ SOBJS=\ $(DIR_O)\ViewStyle.obj LEXOBJS=\ + $(DIR_O)\LexAda.obj \ $(DIR_O)\LexAVE.obj \ $(DIR_O)\LexConf.obj \ $(DIR_O)\LexCPP.obj \ @@ -180,6 +181,12 @@ $(DIR_O)\ScintillaWinS.obj: ScintillaWin.cxx $(CC) $(INCLUDEDIRS) $(CXXFLAGS) -DSTATIC_BUILD -c $(NAMEFLAG)$@ ScintillaWin.cxx # Dependencies + +# All lexers depend on this set of headers +LEX_HEADERS=..\include\Platform.h ..\include\PropSet.h \ + ..\include\SString.h ..\include\Accessor.h ..\include\KeyWords.h \ + ..\include\Scintilla.h ..\include\SciLexer.h + $(DIR_O)\AutoComplete.obj: ..\src\AutoComplete.cxx ..\include\Platform.h ..\src\AutoComplete.h $(DIR_O)\CallTip.obj: ..\src\CallTip.cxx ..\include\Platform.h ..\src\CallTip.h @@ -206,49 +213,29 @@ $(DIR_O)\KeyWords.obj: ..\src\KeyWords.cxx ..\include\Platform.h ..\include\Prop ..\include\SString.h ..\include\Accessor.h ..\include\KeyWords.h \ ..\include\Scintilla.h ..\include\SciLexer.h -$(DIR_O)\LexAVE.obj: ..\src\LexAVE.cxx ..\include\Platform.h ..\include\PropSet.h \ - ..\include\SString.h ..\include\Accessor.h ..\include\KeyWords.h \ - ..\include\Scintilla.h ..\include\SciLexer.h +$(DIR_O)\LexAda.obj: ..\src\LexAda.cxx $(LEX_HEADERS) -$(DIR_O)\LexConf.obj: ..\src\LexConf.cxx ..\include\Platform.h ..\include\PropSet.h \ - ..\include\SString.h ..\include\Accessor.h ..\include\KeyWords.h \ - ..\include\Scintilla.h ..\include\SciLexer.h +$(DIR_O)\LexAVE.obj: ..\src\LexAVE.cxx $(LEX_HEADERS) -$(DIR_O)\LexCPP.obj: ..\src\LexCPP.cxx ..\include\Platform.h ..\include\PropSet.h \ - ..\include\SString.h ..\include\Accessor.h ..\include\KeyWords.h \ - ..\include\Scintilla.h ..\include\SciLexer.h +$(DIR_O)\LexConf.obj: ..\src\LexConf.cxx $(LEX_HEADERS) -$(DIR_O)\LexHTML.obj: ..\src\LexHTML.cxx ..\include\Platform.h ..\include\PropSet.h \ - ..\include\SString.h ..\include\Accessor.h ..\include\KeyWords.h \ - ..\include\Scintilla.h ..\include\SciLexer.h +$(DIR_O)\LexCPP.obj: ..\src\LexCPP.cxx $(LEX_HEADERS) -$(DIR_O)\LexLua.obj: ..\src\LexLua.cxx ..\include\Platform.h ..\include\PropSet.h \ - ..\include\SString.h ..\include\Accessor.h ..\include\KeyWords.h \ - ..\include\Scintilla.h ..\include\SciLexer.h +$(DIR_O)\LexHTML.obj: ..\src\LexHTML.cxx $(LEX_HEADERS) -$(DIR_O)\LexOthers.obj: ..\src\LexOthers.cxx ..\include\Platform.h ..\include\PropSet.h \ - ..\include\SString.h ..\include\Accessor.h ..\include\KeyWords.h \ - ..\include\Scintilla.h ..\include\SciLexer.h +$(DIR_O)\LexLua.obj: ..\src\LexLua.cxx $(LEX_HEADERS) -$(DIR_O)\LexPerl.obj: ..\src\LexPerl.cxx ..\include\Platform.h ..\include\PropSet.h \ - ..\include\SString.h ..\include\Accessor.h ..\include\KeyWords.h \ - ..\include\Scintilla.h ..\include\SciLexer.h +$(DIR_O)\LexOthers.obj: ..\src\LexOthers.cxx $(LEX_HEADERS) -$(DIR_O)\LexPascal.obj: ..\src\LexPascal.cxx ..\include\Platform.h ..\include\PropSet.h \ - ..\include\SString.h ..\include\Accessor.h ..\include\KeyWords.h \ - ..\include\Scintilla.h ..\include\SciLexer.h +$(DIR_O)\LexPerl.obj: ..\src\LexPerl.cxx $(LEX_HEADERS) -$(DIR_O)\LexPython.obj: ..\src\LexPython.cxx ..\include\Platform.h ..\include\PropSet.h \ - ..\include\SString.h ..\include\Accessor.h ..\include\KeyWords.h \ - ..\include\Scintilla.h ..\include\SciLexer.h +$(DIR_O)\LexPascal.obj: ..\src\LexPascal.cxx $(LEX_HEADERS) -$(DIR_O)\LexSQL.obj: ..\src\LexSQL.cxx ..\include\Platform.h ..\include\PropSet.h \ - ..\include\SString.h ..\include\Accessor.h ..\include\KeyWords.h \ - ..\include\Scintilla.h ..\include\SciLexer.h +$(DIR_O)\LexPython.obj: ..\src\LexPython.cxx $(LEX_HEADERS) -$(DIR_O)\LexVB.obj: ..\src\LexVB.cxx ..\include\Platform.h ..\include\PropSet.h \ - ..\include\SString.h ..\include\Accessor.h ..\include\KeyWords.h \ - ..\include\Scintilla.h ..\include\SciLexer.h +$(DIR_O)\LexSQL.obj: ..\src\LexSQL.cxx $(LEX_HEADERS) + +$(DIR_O)\LexVB.obj: ..\src\LexVB.cxx $(LEX_HEADERS) $(DIR_O)\LineMarker.obj: ..\src\LineMarker.cxx ..\include\Platform.h ..\include\Scintilla.h ..\src\LineMarker.h |