diff options
| -rw-r--r-- | gtk/makefile | 20 | ||||
| -rw-r--r-- | gtk/scintilla.mak | 3 | ||||
| -rw-r--r-- | include/SciLexer.h | 13 | ||||
| -rw-r--r-- | include/Scintilla.iface | 16 | ||||
| -rw-r--r-- | macosx/makefile | 20 | ||||
| -rw-r--r-- | src/KeyWords.cxx | 1 | ||||
| -rw-r--r-- | src/LexASY.cxx | 270 | ||||
| -rw-r--r-- | vcbuild/SciLexer.dsp | 4 | ||||
| -rw-r--r-- | win32/makefile | 20 | ||||
| -rw-r--r-- | win32/scintilla.mak | 3 | ||||
| -rw-r--r-- | win32/scintilla_vc6.mak | 3 | 
11 files changed, 343 insertions, 30 deletions
| diff --git a/gtk/makefile b/gtk/makefile index 82a4faf71..b9a49ae3a 100644 --- a/gtk/makefile +++ b/gtk/makefile @@ -63,16 +63,16 @@ endif  #++Autogenerated -- run src/LexGen.py to regenerate  #**LEXOBJS=\\\n\(\*.o \)  LEXOBJS=\ -LexAbaqus.o LexAda.o LexAPDL.o LexAsm.o LexAsn1.o LexAU3.o LexAVE.o LexBaan.o \ -LexBash.o LexBasic.o LexBullant.o LexCaml.o LexCLW.o LexCmake.o LexConf.o \ -LexCPP.o LexCrontab.o LexCsound.o LexCSS.o LexD.o LexEiffel.o LexErlang.o \ -LexEScript.o LexFlagship.o LexForth.o LexFortran.o LexGAP.o LexGui4Cli.o \ -LexHaskell.o LexHTML.o LexInno.o LexKix.o LexLisp.o LexLout.o LexLua.o \ -LexMatlab.o LexMetapost.o LexMMIXAL.o LexMPT.o LexMSSQL.o LexNsis.o LexOpal.o \ -LexOthers.o LexPascal.o LexPB.o LexPerl.o LexPLM.o LexPOV.o LexProgress.o \ -LexPS.o LexPython.o LexRebol.o LexRuby.o LexScriptol.o LexSmalltalk.o \ -LexSpecman.o LexSpice.o LexSQL.o LexTADS3.o LexTCL.o LexTeX.o LexVB.o \ -LexVerilog.o LexVHDL.o LexYAML.o +LexAbaqus.o LexAda.o LexAPDL.o LexAsm.o LexAsn1.o LexASY.o LexAU3.o LexAVE.o \ +LexBaan.o LexBash.o LexBasic.o LexBullant.o LexCaml.o LexCLW.o LexCmake.o \ +LexConf.o LexCPP.o LexCrontab.o LexCsound.o LexCSS.o LexD.o LexEiffel.o \ +LexErlang.o LexEScript.o LexFlagship.o LexForth.o LexFortran.o LexGAP.o \ +LexGui4Cli.o LexHaskell.o LexHTML.o LexInno.o LexKix.o LexLisp.o LexLout.o \ +LexLua.o LexMatlab.o LexMetapost.o LexMMIXAL.o LexMPT.o LexMSSQL.o LexNsis.o \ +LexOpal.o LexOthers.o LexPascal.o LexPB.o LexPerl.o LexPLM.o LexPOV.o \ +LexProgress.o LexPS.o LexPython.o LexRebol.o LexRuby.o LexScriptol.o \ +LexSmalltalk.o LexSpecman.o LexSpice.o LexSQL.o LexTADS3.o LexTCL.o LexTeX.o \ +LexVB.o LexVerilog.o LexVHDL.o LexYAML.o  #--Autogenerated -- end of automatically generated section  all: $(COMPLIB) diff --git a/gtk/scintilla.mak b/gtk/scintilla.mak index fdb44ad94..e44143ec9 100644 --- a/gtk/scintilla.mak +++ b/gtk/scintilla.mak @@ -148,6 +148,7 @@ LEXOBJS=\  	$(DIR_O)\LexAPDL.obj \  	$(DIR_O)\LexAsm.obj \  	$(DIR_O)\LexAsn1.obj \ +	$(DIR_O)\LexASY.obj \  	$(DIR_O)\LexAU3.obj \  	$(DIR_O)\LexAVE.obj \  	$(DIR_O)\LexBaan.obj \ @@ -360,6 +361,8 @@ $(DIR_O)\LexAsm.obj: ..\src\LexAsm.cxx $(LEX_HEADERS)  $(DIR_O)\LexAsn1.obj: ..\src\LexAsn1.cxx $(LEX_HEADERS) +$(DIR_O)\LexASY.obj: ..\src\LexASY.cxx $(LEX_HEADERS) +  $(DIR_O)\LexAU3.obj: ..\src\LexAU3.cxx $(LEX_HEADERS)  $(DIR_O)\LexAVE.obj: ..\src\LexAVE.cxx $(LEX_HEADERS) diff --git a/include/SciLexer.h b/include/SciLexer.h index fcffb6d3a..d5dc072b0 100644 --- a/include/SciLexer.h +++ b/include/SciLexer.h @@ -97,6 +97,7 @@  #define SCLEX_PLM 82  #define SCLEX_PROGRESS 83  #define SCLEX_ABAQUS 84 +#define SCLEX_ASYMPTOTE 85  #define SCLEX_AUTOMATIC 1000  #define SCE_P_DEFAULT 0  #define SCE_P_COMMENTLINE 1 @@ -1177,6 +1178,18 @@  #define SCE_ABAQUS_STARCOMMAND 10  #define SCE_ABAQUS_ARGUMENT 11  #define SCE_ABAQUS_FUNCTION 12 +#define SCE_ASY_DEFAULT 0 +#define SCE_ASY_COMMENT 1 +#define SCE_ASY_COMMENTLINE 2 +#define SCE_ASY_NUMBER 3 +#define SCE_ASY_WORD 4 +#define SCE_ASY_STRING 5 +#define SCE_ASY_CHARACTER 6 +#define SCE_ASY_OPERATOR 7 +#define SCE_ASY_IDENTIFIER 8 +#define SCE_ASY_STRINGEOL 9 +#define SCE_ASY_COMMENTLINEDOC 10 +#define SCE_ASY_WORD2 11  #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 dfc65f4da..da124e3d0 100644 --- a/include/Scintilla.iface +++ b/include/Scintilla.iface @@ -1989,6 +1989,7 @@ val SCLEX_GAP=81  val SCLEX_PLM=82  val SCLEX_PROGRESS=83  val SCLEX_ABAQUS=84 +val SCLEX_ASYMPTOTE=85  # When a lexer specifies its language as SCLEX_AUTOMATIC it receives a  # value assigned in sequence from SCLEX_AUTOMATIC+1. @@ -3177,6 +3178,7 @@ val SCE_PLM_IDENTIFIER=4  val SCE_PLM_OPERATOR=5  val SCE_PLM_CONTROL=6  val SCE_PLM_KEYWORD=7 +# Lexical state for SCLEX_PROGRESS  lex Progress=SCLEX_PROGRESS SCE_4GL_  val SCE_4GL_DEFAULT=0  val SCE_4GL_NUMBER=1 @@ -3225,6 +3227,20 @@ val SCE_ABAQUS_SLASHCOMMAND=9  val SCE_ABAQUS_STARCOMMAND=10  val SCE_ABAQUS_ARGUMENT=11  val SCE_ABAQUS_FUNCTION=12 +# Lexical states for SCLEX_ASYMPTOTE +lex Asymptote=SCLEX_ASYMPTOTE SCE_ASY_ +val SCE_ASY_DEFAULT=0 +val SCE_ASY_COMMENT=1 +val SCE_ASY_COMMENTLINE=2 +val SCE_ASY_NUMBER=3 +val SCE_ASY_WORD=4 +val SCE_ASY_STRING=5 +val SCE_ASY_CHARACTER=6 +val SCE_ASY_OPERATOR=7 +val SCE_ASY_IDENTIFIER=8 +val SCE_ASY_STRINGEOL=9 +val SCE_ASY_COMMENTLINEDOC=10 +val SCE_ASY_WORD2=11  # Events diff --git a/macosx/makefile b/macosx/makefile index 6839fe9a8..eda3e3c25 100644 --- a/macosx/makefile +++ b/macosx/makefile @@ -53,16 +53,16 @@ endif  #++Autogenerated -- run src/LexGen.py to regenerate  #**LEXOBJS=\\\n\(\*.o \)  LEXOBJS=\ -LexAbaqus.o LexAda.o LexAPDL.o LexAsm.o LexAsn1.o LexAU3.o LexAVE.o LexBaan.o \ -LexBash.o LexBasic.o LexBullant.o LexCaml.o LexCLW.o LexCmake.o LexConf.o \ -LexCPP.o LexCrontab.o LexCsound.o LexCSS.o LexD.o LexEiffel.o LexErlang.o \ -LexEScript.o LexFlagship.o LexForth.o LexFortran.o LexGAP.o LexGui4Cli.o \ -LexHaskell.o LexHTML.o LexInno.o LexKix.o LexLisp.o LexLout.o LexLua.o \ -LexMatlab.o LexMetapost.o LexMMIXAL.o LexMPT.o LexMSSQL.o LexNsis.o LexOpal.o \ -LexOthers.o LexPascal.o LexPB.o LexPerl.o LexPLM.o LexPOV.o LexProgress.o \ -LexPS.o LexPython.o LexRebol.o LexRuby.o LexScriptol.o LexSmalltalk.o \ -LexSpecman.o LexSpice.o LexSQL.o LexTADS3.o LexTCL.o LexTeX.o LexVB.o \ -LexVerilog.o LexVHDL.o LexYAML.o +LexAbaqus.o LexAda.o LexAPDL.o LexAsm.o LexAsn1.o LexASY.o LexAU3.o LexAVE.o \ +LexBaan.o LexBash.o LexBasic.o LexBullant.o LexCaml.o LexCLW.o LexCmake.o \ +LexConf.o LexCPP.o LexCrontab.o LexCsound.o LexCSS.o LexD.o LexEiffel.o \ +LexErlang.o LexEScript.o LexFlagship.o LexForth.o LexFortran.o LexGAP.o \ +LexGui4Cli.o LexHaskell.o LexHTML.o LexInno.o LexKix.o LexLisp.o LexLout.o \ +LexLua.o LexMatlab.o LexMetapost.o LexMMIXAL.o LexMPT.o LexMSSQL.o LexNsis.o \ +LexOpal.o LexOthers.o LexPascal.o LexPB.o LexPerl.o LexPLM.o LexPOV.o \ +LexProgress.o LexPS.o LexPython.o LexRebol.o LexRuby.o LexScriptol.o \ +LexSmalltalk.o LexSpecman.o LexSpice.o LexSQL.o LexTADS3.o LexTCL.o LexTeX.o \ +LexVB.o LexVerilog.o LexVHDL.o LexYAML.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/src/KeyWords.cxx b/src/KeyWords.cxx index 6eb217104..df85e0456 100644 --- a/src/KeyWords.cxx +++ b/src/KeyWords.cxx @@ -147,6 +147,7 @@ int Scintilla_LinkLexers() {  	LINK_LEXER(lmAPDL);  	LINK_LEXER(lmAsm);  	LINK_LEXER(lmASP); +	LINK_LEXER(lmASY);  	LINK_LEXER(lmAU3);  	LINK_LEXER(lmAVE);  	LINK_LEXER(lmBaan); diff --git a/src/LexASY.cxx b/src/LexASY.cxx new file mode 100644 index 000000000..5bf979fd3 --- /dev/null +++ b/src/LexASY.cxx @@ -0,0 +1,270 @@ +// Scintilla source code edit control +//Author: instanton (email: soft_share<at>126<dot>com) +// The License.txt file describes the conditions under which this software may be distributed. + +#include <stdlib.h> +#include <string.h> +#include <ctype.h> +#include <stdio.h> +#include <stdarg.h> + +#include "Platform.h" + +#include "PropSet.h" +#include "Accessor.h" +#include "StyleContext.h" +#include "KeyWords.h" +#include "Scintilla.h" +#include "SciLexer.h" +#include "CharacterSet.h" + +#ifdef SCI_NAMESPACE +using namespace Scintilla; +#endif + +static void ColouriseAsyDoc(unsigned int startPos, int length, int initStyle,  +		WordList *keywordlists[], Accessor &styler) { + +	WordList &keywords = *keywordlists[0]; +	WordList &keywords2 = *keywordlists[1]; + +	CharacterSet setWordStart(CharacterSet::setAlpha, "_", 0x80, true); +	CharacterSet setWord(CharacterSet::setAlphaNum, "._", 0x80, true); + +	int visibleChars = 0; + +	StyleContext sc(startPos, length, initStyle, styler); + +	for (; sc.More(); sc.Forward()) { + +		if (sc.atLineStart) { +			if (sc.state == SCE_ASY_STRING) { +				sc.SetState(SCE_ASY_STRING); +			} +			visibleChars = 0; +		} + +		if (sc.ch == '\\') { +			if (sc.chNext == '\n' || sc.chNext == '\r') { +				sc.Forward(); +				if (sc.ch == '\r' && sc.chNext == '\n') { +					sc.Forward(); +				} +//				continuationLine = true; +				continue; +			} +		} + +		// Determine if the current state should terminate. +		switch (sc.state) { +			case SCE_ASY_OPERATOR: +				sc.SetState(SCE_ASY_DEFAULT); +				break; +			case SCE_ASY_NUMBER: +				if (!setWord.Contains(sc.ch)) { +					sc.SetState(SCE_ASY_DEFAULT); +				} +				break; +			case SCE_ASY_IDENTIFIER: +				if (!setWord.Contains(sc.ch) || (sc.ch == '.')) { +					char s[1000]; +					sc.GetCurrentLowered(s, sizeof(s)); +					if (keywords.InList(s)) { +						sc.ChangeState(SCE_ASY_WORD); +					} else if (keywords2.InList(s)) { +						sc.ChangeState(SCE_ASY_WORD2); +					} +					sc.SetState(SCE_ASY_DEFAULT); +				} +				break; +			case SCE_ASY_COMMENT: +				if (sc.Match('*', '/')) { +					sc.Forward(); +					sc.ForwardSetState(SCE_ASY_DEFAULT); +				} +				break; +			case SCE_ASY_COMMENTLINE: +				if (sc.atLineStart) { +					sc.SetState(SCE_ASY_DEFAULT); +				} +				break; +			case SCE_ASY_STRING: +				if (sc.atLineEnd) { +					sc.ChangeState(SCE_ASY_STRINGEOL); +				} else if (sc.ch == '\\') { +					if (sc.chNext == '\"' || sc.chNext == '\'' || sc.chNext == '\\') { +						sc.Forward(); +					} +				} else if (sc.ch == '\"') { +					sc.ForwardSetState(SCE_ASY_DEFAULT); +				} +				break; +			case SCE_ASY_CHARACTER: +				if (sc.atLineEnd) { +					sc.ChangeState(SCE_ASY_STRINGEOL); +				} else 	if (sc.ch == '\\') { +					if (sc.chNext == '\"' || sc.chNext == '\'' || sc.chNext == '\\') { +						sc.Forward(); +					} +				} else if (sc.ch == '\'') { +					sc.ForwardSetState(SCE_ASY_DEFAULT); +				} +				break; +		} + +		// Determine if a new state should be entered. +		if (sc.state == SCE_ASY_DEFAULT) { +			if (setWordStart.Contains(sc.ch) || (sc.ch == '@')) { +				sc.SetState(SCE_ASY_IDENTIFIER); +			} else if (sc.Match('/', '*')) { +				sc.SetState(SCE_ASY_COMMENT); +				sc.Forward();	//  +			} else if (sc.Match('/', '/')) { +				sc.SetState(SCE_ASY_COMMENTLINE); +			} else if (sc.ch == '\"') { +				sc.SetState(SCE_ASY_STRING); +			} else if (sc.ch == '\'') { +				sc.SetState(SCE_ASY_CHARACTER); +			} else if (sc.ch == '#' && visibleChars == 0) { +				do { +					sc.Forward(); +				} while ((sc.ch == ' ' || sc.ch == '\t') && sc.More()); +				if (sc.atLineEnd) { +					sc.SetState(SCE_ASY_DEFAULT); +				} +			} else if (isoperator(static_cast<char>(sc.ch))) { +				sc.SetState(SCE_ASY_OPERATOR); +			} +		} + +	} +	sc.Complete(); +} + +static bool IsAsyCommentStyle(int style) { +	return style == SCE_ASY_COMMENT; +} + + +static inline bool isASYidentifier(int ch) { +	return +      ((ch >= 'a') && (ch <= 'z')) || ((ch >= 'A') && (ch <= 'Z')) ; +} + +static int ParseASYWord(unsigned int pos, Accessor &styler, char *word) +{ +  int length=0; +  char ch=styler.SafeGetCharAt(pos); +  *word=0; + +  while(isASYidentifier(ch) && length<100){ +          word[length]=ch; +          length++; +          ch=styler.SafeGetCharAt(pos+length); +  } +  word[length]=0;    +  return length; +} + +static bool IsASYDrawingLine(int line, Accessor &styler) { +	int pos = styler.LineStart(line); +	int eol_pos = styler.LineStart(line + 1) - 1; +	 +	int startpos = pos; +	char buffer[100]=""; + +	while (startpos<eol_pos){ +		char ch = styler[startpos]; +		ParseASYWord(startpos,styler,buffer); +		bool drawcommands = strncmp(buffer,"draw",4)==0|| +			strncmp(buffer,"pair",4)==0||strncmp(buffer,"label",5)==0; +		if (!drawcommands && ch!=' ') return false; +		else if (drawcommands) return true; +		startpos++; +	}		 +	return false; +} + +static void FoldAsyDoc(unsigned int startPos, int length, int initStyle,  +					   WordList *[], Accessor &styler) { +	bool foldComment = styler.GetPropertyInt("fold.comment") != 0; +	bool foldCompact = styler.GetPropertyInt("fold.compact", 1) != 0; +	bool foldAtElse = styler.GetPropertyInt("fold.at.else", 0) != 0; +	unsigned int endPos = startPos + length; +	int visibleChars = 0; +	int lineCurrent = styler.GetLine(startPos); +	int levelCurrent = SC_FOLDLEVELBASE; +	if (lineCurrent > 0) +		levelCurrent = styler.LevelAt(lineCurrent-1) >> 16; +	int levelMinCurrent = levelCurrent; +	int levelNext = levelCurrent; +	char chNext = styler[startPos]; +	int styleNext = styler.StyleAt(startPos); +	int style = initStyle; +	for (unsigned int i = startPos; i < endPos; i++) { +		char ch = chNext; +		chNext = styler.SafeGetCharAt(i + 1); +		int stylePrev = style; +		style = styleNext; +		styleNext = styler.StyleAt(i + 1); +		bool atEOL = (ch == '\r' && chNext != '\n') || (ch == '\n'); +		if (foldComment && IsAsyCommentStyle(style)) { +			if (!IsAsyCommentStyle(stylePrev) && (stylePrev != SCE_ASY_COMMENTLINEDOC)) { +				levelNext++; +			} else if (!IsAsyCommentStyle(styleNext) && (styleNext != SCE_ASY_COMMENTLINEDOC) && !atEOL) { +				levelNext--; +			} +		} +		if (style == SCE_ASY_OPERATOR) { +			if (ch == '{') { +				if (levelMinCurrent > levelNext) { +					levelMinCurrent = levelNext; +				} +				levelNext++; +			} else if (ch == '}') { +				levelNext--; +			} +		} + +		if (atEOL && IsASYDrawingLine(lineCurrent, styler)){ +			if (lineCurrent==0 && IsASYDrawingLine(lineCurrent + 1, styler)) +				levelNext++; +			else if (lineCurrent!=0 && !IsASYDrawingLine(lineCurrent - 1, styler) +				&& IsASYDrawingLine(lineCurrent + 1, styler) +				) +				levelNext++; +			else if (lineCurrent!=0 && IsASYDrawingLine(lineCurrent - 1, styler) && +				!IsASYDrawingLine(lineCurrent+1, styler)) +				levelNext--; +		}	 + +		if (atEOL) { +			int levelUse = levelCurrent; +			if (foldAtElse) { +				levelUse = levelMinCurrent; +			} +			int lev = levelUse | levelNext << 16; +			if (visibleChars == 0 && foldCompact) +				lev |= SC_FOLDLEVELWHITEFLAG; +			if (levelUse < levelNext) +				lev |= SC_FOLDLEVELHEADERFLAG; +			if (lev != styler.LevelAt(lineCurrent)) { +				styler.SetLevel(lineCurrent, lev); +			} +			lineCurrent++; +			levelCurrent = levelNext; +			levelMinCurrent = levelCurrent; +			visibleChars = 0; +		} +		if (!IsASpace(ch)) +			visibleChars++; +	} +} + +static const char * const asyWordLists[] = { +            "Primary keywords and identifiers", +            "Secondary keywords and identifiers", +            0, +        }; + +LexerModule lmASY(SCLEX_ASYMPTOTE, ColouriseAsyDoc, "asy", FoldAsyDoc, asyWordLists); diff --git a/vcbuild/SciLexer.dsp b/vcbuild/SciLexer.dsp index 9e18606ee..70267a2c8 100644 --- a/vcbuild/SciLexer.dsp +++ b/vcbuild/SciLexer.dsp @@ -166,6 +166,10 @@ SOURCE=..\src\LexAsn1.cxx  # End Source File  # Begin Source File +SOURCE=..\src\LexASY.cxx +# End Source File +# Begin Source File +  SOURCE=..\src\LexAU3.cxx  # End Source File  # Begin Source File diff --git a/win32/makefile b/win32/makefile index 70127fc5e..869419d66 100644 --- a/win32/makefile +++ b/win32/makefile @@ -51,16 +51,16 @@ deps:  #++Autogenerated -- run src/LexGen.py to regenerate  #**LEXOBJS=\\\n\(\*.o \)  LEXOBJS=\ -LexAbaqus.o LexAda.o LexAPDL.o LexAsm.o LexAsn1.o LexAU3.o LexAVE.o LexBaan.o \ -LexBash.o LexBasic.o LexBullant.o LexCaml.o LexCLW.o LexCmake.o LexConf.o \ -LexCPP.o LexCrontab.o LexCsound.o LexCSS.o LexD.o LexEiffel.o LexErlang.o \ -LexEScript.o LexFlagship.o LexForth.o LexFortran.o LexGAP.o LexGui4Cli.o \ -LexHaskell.o LexHTML.o LexInno.o LexKix.o LexLisp.o LexLout.o LexLua.o \ -LexMatlab.o LexMetapost.o LexMMIXAL.o LexMPT.o LexMSSQL.o LexNsis.o LexOpal.o \ -LexOthers.o LexPascal.o LexPB.o LexPerl.o LexPLM.o LexPOV.o LexProgress.o \ -LexPS.o LexPython.o LexRebol.o LexRuby.o LexScriptol.o LexSmalltalk.o \ -LexSpecman.o LexSpice.o LexSQL.o LexTADS3.o LexTCL.o LexTeX.o LexVB.o \ -LexVerilog.o LexVHDL.o LexYAML.o +LexAbaqus.o LexAda.o LexAPDL.o LexAsm.o LexAsn1.o LexASY.o LexAU3.o LexAVE.o \ +LexBaan.o LexBash.o LexBasic.o LexBullant.o LexCaml.o LexCLW.o LexCmake.o \ +LexConf.o LexCPP.o LexCrontab.o LexCsound.o LexCSS.o LexD.o LexEiffel.o \ +LexErlang.o LexEScript.o LexFlagship.o LexForth.o LexFortran.o LexGAP.o \ +LexGui4Cli.o LexHaskell.o LexHTML.o LexInno.o LexKix.o LexLisp.o LexLout.o \ +LexLua.o LexMatlab.o LexMetapost.o LexMMIXAL.o LexMPT.o LexMSSQL.o LexNsis.o \ +LexOpal.o LexOthers.o LexPascal.o LexPB.o LexPerl.o LexPLM.o LexPOV.o \ +LexProgress.o LexPS.o LexPython.o LexRebol.o LexRuby.o LexScriptol.o \ +LexSmalltalk.o LexSpecman.o LexSpice.o LexSQL.o LexTADS3.o LexTCL.o LexTeX.o \ +LexVB.o LexVerilog.o LexVHDL.o LexYAML.o  #--Autogenerated -- end of automatically generated section  SOBJS	= ScintillaWin.o ScintillaBase.o Editor.o CharClassify.o Decoration.o \ diff --git a/win32/scintilla.mak b/win32/scintilla.mak index 3d78effa0..8501e5505 100644 --- a/win32/scintilla.mak +++ b/win32/scintilla.mak @@ -118,6 +118,7 @@ LEXOBJS=\  	$(DIR_O)\LexAPDL.obj \  	$(DIR_O)\LexAsm.obj \  	$(DIR_O)\LexAsn1.obj \ +	$(DIR_O)\LexASY.obj \  	$(DIR_O)\LexAU3.obj \  	$(DIR_O)\LexAVE.obj \  	$(DIR_O)\LexBaan.obj \ @@ -311,6 +312,8 @@ $(DIR_O)\LexAsm.obj: ..\src\LexAsm.cxx $(LEX_HEADERS)  $(DIR_O)\LexAsn1.obj: ..\src\LexAsn1.cxx $(LEX_HEADERS) +$(DIR_O)\LexASY.obj: ..\src\LexASY.cxx $(LEX_HEADERS) +  $(DIR_O)\LexAU3.obj: ..\src\LexAU3.cxx $(LEX_HEADERS)  $(DIR_O)\LexAVE.obj: ..\src\LexAVE.cxx $(LEX_HEADERS) diff --git a/win32/scintilla_vc6.mak b/win32/scintilla_vc6.mak index e9ecdf5be..c4b120250 100644 --- a/win32/scintilla_vc6.mak +++ b/win32/scintilla_vc6.mak @@ -120,6 +120,7 @@ LEXOBJS=\  	$(DIR_O)\LexAPDL.obj \  	$(DIR_O)\LexAsm.obj \  	$(DIR_O)\LexAsn1.obj \ +	$(DIR_O)\LexASY.obj \  	$(DIR_O)\LexAU3.obj \  	$(DIR_O)\LexAVE.obj \  	$(DIR_O)\LexBaan.obj \ @@ -313,6 +314,8 @@ $(DIR_O)\LexAsm.obj: ..\src\LexAsm.cxx $(LEX_HEADERS)  $(DIR_O)\LexAsn1.obj: ..\src\LexAsn1.cxx $(LEX_HEADERS) +$(DIR_O)\LexASY.obj: ..\src\LexASY.cxx $(LEX_HEADERS) +  $(DIR_O)\LexAU3.obj: ..\src\LexAU3.cxx $(LEX_HEADERS)  $(DIR_O)\LexAVE.obj: ..\src\LexAVE.cxx $(LEX_HEADERS) | 
