diff options
| -rw-r--r-- | gtk/makefile | 8 | ||||
| -rw-r--r-- | gtk/scintilla.mak | 3 | ||||
| -rw-r--r-- | include/SciLexer.h | 12 | ||||
| -rw-r--r-- | include/Scintilla.iface | 18 | ||||
| -rw-r--r-- | src/KeyWords.cxx | 1 | ||||
| -rw-r--r-- | win32/makefile | 6 | ||||
| -rw-r--r-- | win32/scintilla.mak | 3 | ||||
| -rw-r--r-- | win32/scintilla_vc6.mak | 3 |
8 files changed, 45 insertions, 9 deletions
diff --git a/gtk/makefile b/gtk/makefile index a91c09101..14b3819ad 100644 --- a/gtk/makefile +++ b/gtk/makefile @@ -2,7 +2,7 @@ # Copyright 1998-2001 by Neil Hodgson <neilh@scintilla.org> # The License.txt file describes the conditions under which this software may be distributed. # This makefile assumes GCC 2.95.2 is used and changes will be needed to use other compilers. -# GNU make does not like \r\n line endings so should be saved to CVS in binary form.
+# GNU make does not like \r\n line endings so should be saved to CVS in binary form. # To build for GTK+ 2, define GTK2 on the make command line. .SUFFIXES: .cxx .o .h .a @@ -42,9 +42,9 @@ endif #++Autogenerated -- run src/LexGen.py to regenerate #**LEXOBJS=\\\n\(\*.o \) LEXOBJS=\ -LexAda.o LexAVE.o LexBaan.o LexBullant.o LexConf.o LexCPP.o LexCrontab.o \ -LexEiffel.o LexHTML.o LexLisp.o LexLua.o LexMatlab.o LexOthers.o LexPascal.o \ -LexPerl.o LexPython.o LexRuby.o LexSQL.o LexVB.o +LexAda.o LexAsm.o LexAVE.o LexBaan.o LexBullant.o LexConf.o LexCPP.o \ +LexCrontab.o LexEiffel.o LexHTML.o LexLisp.o LexLua.o LexMatlab.o LexOthers.o \ +LexPascal.o LexPerl.o LexPython.o LexRuby.o LexSQL.o LexVB.o #--Autogenerated -- end of automatically generated section # 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 1fb270894..96447587f 100644 --- a/gtk/scintilla.mak +++ b/gtk/scintilla.mak @@ -119,6 +119,7 @@ SOBJS=\ #**LEXOBJS=\\\n\(\t$(DIR_O)\\\*.obj \\\n\) LEXOBJS=\ $(DIR_O)\LexAda.obj \ + $(DIR_O)\LexAsm.obj \ $(DIR_O)\LexAVE.obj \ $(DIR_O)\LexBaan.obj \ $(DIR_O)\LexBullant.obj \ @@ -247,6 +248,8 @@ $(DIR_O)\KeyWords.obj: ..\src\KeyWords.cxx ..\include\Platform.h ..\include\Prop $(DIR_O)\LexAda.obj: ..\src\LexAda.cxx $(LEX_HEADERS) +$(DIR_O)\LexAsm.obj: ..\src\LexAsm.cxx $(LEX_HEADERS) + $(DIR_O)\LexAVE.obj: ..\src\LexAVE.cxx $(LEX_HEADERS) $(DIR_O)\LexBaan.obj: ..\src\LexBaan.cxx $(LEX_HEADERS) diff --git a/include/SciLexer.h b/include/SciLexer.h index a6066cd58..1fca795ae 100644 --- a/include/SciLexer.h +++ b/include/SciLexer.h @@ -48,6 +48,7 @@ #define SCLEX_BAAN 31 #define SCLEX_MATLAB 32 #define SCLEX_SCRIPTOL 33 +#define SCLEX_ASM 34 #define SCLEX_AUTOMATIC 1000 #define SCE_P_DEFAULT 0 #define SCE_P_COMMENTLINE 1 @@ -392,6 +393,17 @@ #define SCE_SCRIPTOL_COMMENTDOCKEYWORD 17 #define SCE_SCRIPTOL_COMMENTDOCKEYWORDERROR 18 #define SCE_SCRIPTOL_COMMENTBASIC 19 +#define SCE_ASM_DEFAULT 0 +#define SCE_ASM_COMMENT 1 +#define SCE_ASM_NUMBER 2 +#define SCE_ASM_STRING 3 +#define SCE_ASM_OPERATOR 4 +#define SCE_ASM_IDENTIFIER 5 +#define SCE_ASM_CPUINSTRUCTION 6 +#define SCE_ASM_MATHINSTRUCTION 7 +#define SCE_ASM_REGISTER 8 +#define SCE_ASM_DIRECTIVE 9 +#define SCE_ASM_DIRECTIVEOPERAND 10 //--Autogenerated -- end of section automatically generated from Scintilla.iface #endif diff --git a/include/Scintilla.iface b/include/Scintilla.iface index 776fe8f2b..ff7251667 100644 --- a/include/Scintilla.iface +++ b/include/Scintilla.iface @@ -1130,14 +1130,14 @@ fun void DeleteBackNotLine=2344(,) # Move caret to first position on display line. fun void HomeDisplay=2345(,) -# Move caret to first position on display line extending selection to +# Move caret to first position on display line extending selection to # new caret position. fun void HomeDisplayExtend=2346(,) # Move caret to last position on display line. fun void LineEndDisplay=2347(,) -# Move caret to last position on display line extending selection to new +# Move caret to last position on display line extending selection to new # caret position. fun void LineEndDisplayExtend=2348(,) @@ -1442,6 +1442,7 @@ val SCLEX_PHP=30 val SCLEX_BAAN=31 val SCLEX_MATLAB=32 val SCLEX_SCRIPTOL=33 +val SCLEX_ASM=34 # When a lexer specifies its language as SCLEX_AUTOMATIC it receives a # value assigned in sequence from SCLEX_AUTOMATIC+1. @@ -1852,6 +1853,19 @@ val SCE_SCRIPTOL_WORD2=16 val SCE_SCRIPTOL_COMMENTDOCKEYWORD=17 val SCE_SCRIPTOL_COMMENTDOCKEYWORDERROR=18 val SCE_SCRIPTOL_COMMENTBASIC=19 +# Lexical states for SCLEX_ASM +lex Asm=SCLEX_ASM SCE_ASM_ +val SCE_ASM_DEFAULT=0 +val SCE_ASM_COMMENT=1 +val SCE_ASM_NUMBER=2 +val SCE_ASM_STRING=3 +val SCE_ASM_OPERATOR=4 +val SCE_ASM_IDENTIFIER=5 +val SCE_ASM_CPUINSTRUCTION=6 +val SCE_ASM_MATHINSTRUCTION=7 +val SCE_ASM_REGISTER=8 +val SCE_ASM_DIRECTIVE=9 +val SCE_ASM_DIRECTIVEOPERAND=10 # Events diff --git a/src/KeyWords.cxx b/src/KeyWords.cxx index 8a03aa8ac..2cb2df25f 100644 --- a/src/KeyWords.cxx +++ b/src/KeyWords.cxx @@ -142,6 +142,7 @@ int Scintilla_LinkLexers() { //++Autogenerated -- run src/LexGen.py to regenerate //**\(\tLINK_LEXER(\*);\n\) LINK_LEXER(lmAda); + LINK_LEXER(lmAsm); LINK_LEXER(lmAVE); LINK_LEXER(lmBaan); LINK_LEXER(lmBullant); diff --git a/win32/makefile b/win32/makefile index 0a7b5203b..e0334284d 100644 --- a/win32/makefile +++ b/win32/makefile @@ -40,9 +40,9 @@ deps: #++Autogenerated -- run src/LexGen.py to regenerate #**LEXOBJS=\\\n\(\*.o \) LEXOBJS=\ -LexAda.o LexAVE.o LexBaan.o LexBullant.o LexConf.o LexCPP.o LexCrontab.o \ -LexEiffel.o LexHTML.o LexLisp.o LexLua.o LexMatlab.o LexOthers.o LexPascal.o \ -LexPerl.o LexPython.o LexRuby.o LexSQL.o LexVB.o +LexAda.o LexAsm.o LexAVE.o LexBaan.o LexBullant.o LexConf.o LexCPP.o \ +LexCrontab.o LexEiffel.o LexHTML.o LexLisp.o LexLua.o LexMatlab.o LexOthers.o \ +LexPascal.o LexPerl.o LexPython.o LexRuby.o LexSQL.o LexVB.o #--Autogenerated -- end of automatically generated section SOBJS = ScintillaWin.o ScintillaBase.o Editor.o Document.o \ diff --git a/win32/scintilla.mak b/win32/scintilla.mak index 5b9b5b8a5..b149de7d8 100644 --- a/win32/scintilla.mak +++ b/win32/scintilla.mak @@ -108,6 +108,7 @@ SOBJS=\ #**LEXOBJS=\\\n\(\t$(DIR_O)\\\*.obj \\\n\) LEXOBJS=\ $(DIR_O)\LexAda.obj \ + $(DIR_O)\LexAsm.obj \ $(DIR_O)\LexAVE.obj \ $(DIR_O)\LexBaan.obj \ $(DIR_O)\LexBullant.obj \ @@ -236,6 +237,8 @@ $(DIR_O)\KeyWords.obj: ../src/KeyWords.cxx ../include/Platform.h \ $(DIR_O)\LexAda.obj: ..\src\LexAda.cxx $(LEX_HEADERS) +$(DIR_O)\LexAsm.obj: ..\src\LexAsm.cxx $(LEX_HEADERS) + $(DIR_O)\LexAVE.obj: ..\src\LexAVE.cxx $(LEX_HEADERS) $(DIR_O)\LexBaan.obj: ..\src\LexBaan.cxx $(LEX_HEADERS) diff --git a/win32/scintilla_vc6.mak b/win32/scintilla_vc6.mak index c03278e02..bdc1365a5 100644 --- a/win32/scintilla_vc6.mak +++ b/win32/scintilla_vc6.mak @@ -110,6 +110,7 @@ SOBJS=\ #**LEXOBJS=\\\n\(\t$(DIR_O)\\\*.obj \\\n\) LEXOBJS=\ $(DIR_O)\LexAda.obj \ + $(DIR_O)\LexAsm.obj \ $(DIR_O)\LexAVE.obj \ $(DIR_O)\LexBaan.obj \ $(DIR_O)\LexBullant.obj \ @@ -238,6 +239,8 @@ $(DIR_O)\KeyWords.obj: ../src/KeyWords.cxx ../include/Platform.h \ $(DIR_O)\LexAda.obj: ..\src\LexAda.cxx $(LEX_HEADERS) +$(DIR_O)\LexAsm.obj: ..\src\LexAsm.cxx $(LEX_HEADERS) + $(DIR_O)\LexAVE.obj: ..\src\LexAVE.cxx $(LEX_HEADERS) $(DIR_O)\LexBaan.obj: ..\src\LexBaan.cxx $(LEX_HEADERS) |