diff options
| -rw-r--r-- | doc/ScintillaHistory.html | 2 | ||||
| -rw-r--r-- | doc/index.html | 2 | ||||
| -rw-r--r-- | gtk/deps.mak | 4 | ||||
| -rw-r--r-- | gtk/makefile | 12 | ||||
| -rw-r--r-- | gtk/scintilla.mak | 3 | ||||
| -rw-r--r-- | macosx/deps.mak | 4 | ||||
| -rw-r--r-- | macosx/makefile | 12 | ||||
| -rw-r--r-- | src/KeyWords.cxx | 1 | ||||
| -rw-r--r-- | src/LexEScript.cxx | 273 | ||||
| -rw-r--r-- | vcbuild/SciLexer.dsp | 4 | ||||
| -rw-r--r-- | win32/deps.mak | 4 | ||||
| -rw-r--r-- | win32/makefile | 12 | ||||
| -rw-r--r-- | win32/scintilla.mak | 3 | ||||
| -rw-r--r-- | win32/scintilla_vc6.mak | 3 | 
14 files changed, 319 insertions, 20 deletions
| diff --git a/doc/ScintillaHistory.html b/doc/ScintillaHistory.html index bc6d02a46..f0b53e274 100644 --- a/doc/ScintillaHistory.html +++ b/doc/ScintillaHistory.html @@ -346,7 +346,7 @@  	Released on 25 January 2009.  	</li>  	<li> -	Removed support for EScript language due to a licensing issue. +	PowerPro.  	</li>      </ul>      <h3> diff --git a/doc/index.html b/doc/index.html index f8f27474f..3c3852120 100644 --- a/doc/index.html +++ b/doc/index.html @@ -54,7 +54,7 @@      <table bgcolor="#000000" width="100%" cellspacing="0" cellpadding="6" border="0">        <tr>          <td width="100%"> -          <span class="versionlist">Version 1.78 removes support for the EScript language.</span> +          <span class="versionlist">Version 1.78 is an update.</span>          </td>        </tr>        <tr> diff --git a/gtk/deps.mak b/gtk/deps.mak index 58dece874..13569be79 100644 --- a/gtk/deps.mak +++ b/gtk/deps.mak @@ -123,6 +123,10 @@ LexErlang.o: ../src/LexErlang.cxx ../include/Platform.h \    ../include/PropSet.h ../include/SString.h ../include/Accessor.h \    ../src/StyleContext.h ../include/KeyWords.h ../include/Scintilla.h \    ../include/SciLexer.h +LexEScript.o: ../src/LexEScript.cxx ../include/Platform.h \ +  ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ +  ../src/StyleContext.h ../include/KeyWords.h ../include/Scintilla.h \ +  ../include/SciLexer.h  LexFlagship.o: ../src/LexFlagship.cxx ../include/Platform.h \    ../include/PropSet.h ../include/SString.h ../include/Accessor.h \    ../src/StyleContext.h ../include/KeyWords.h ../include/Scintilla.h \ diff --git a/gtk/makefile b/gtk/makefile index e42e0ba38..f6fde6c66 100644 --- a/gtk/makefile +++ b/gtk/makefile @@ -66,12 +66,12 @@ LEXOBJS=\  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 \  LexCOBOL.o LexConf.o LexCPP.o LexCrontab.o LexCsound.o LexCSS.o LexD.o \ -LexEiffel.o LexErlang.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 LexMagik.o LexMatlab.o LexMetapost.o LexMMIXAL.o LexMPT.o LexMSSQL.o \ -LexMySQL.o LexNsis.o LexOpal.o LexOthers.o LexPascal.o LexPB.o LexPerl.o \ -LexPLM.o LexPOV.o LexPowerPro.o LexPowerShell.o LexProgress.o LexPS.o \ -LexPython.o LexR.o LexRebol.o LexRuby.o LexScriptol.o LexSmalltalk.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 LexMagik.o LexMatlab.o LexMetapost.o LexMMIXAL.o LexMPT.o \ +LexMSSQL.o LexMySQL.o LexNsis.o LexOpal.o LexOthers.o LexPascal.o LexPB.o \ +LexPerl.o LexPLM.o LexPOV.o LexPowerPro.o LexPowerShell.o LexProgress.o \ +LexPS.o LexPython.o LexR.o LexRebol.o LexRuby.o LexScriptol.o LexSmalltalk.o \  LexSorcus.o LexSpecman.o LexSpice.o LexSQL.o LexTACL.o LexTADS3.o LexTAL.o \  LexTCL.o LexTeX.o LexVB.o LexVerilog.o LexVHDL.o LexYAML.o  #--Autogenerated -- end of automatically generated section diff --git a/gtk/scintilla.mak b/gtk/scintilla.mak index 2d971e644..537a2a503 100644 --- a/gtk/scintilla.mak +++ b/gtk/scintilla.mak @@ -167,6 +167,7 @@ LEXOBJS=\  	$(DIR_O)\LexD.obj \  	$(DIR_O)\LexEiffel.obj \  	$(DIR_O)\LexErlang.obj \ +	$(DIR_O)\LexEScript.obj \  	$(DIR_O)\LexFlagship.obj \  	$(DIR_O)\LexForth.obj \  	$(DIR_O)\LexFortran.obj \ @@ -407,6 +408,8 @@ $(DIR_O)\LexEiffel.obj: ..\src\LexEiffel.cxx $(LEX_HEADERS)  $(DIR_O)\LexErlang.obj: ..\src\LexErlang.cxx $(LEX_HEADERS) +$(DIR_O)\LexEScript.obj: ..\src\LexEScript.cxx $(LEX_HEADERS) +  $(DIR_O)\LexFlagship.obj: ..\src\LexFlagship.cxx $(LEX_HEADERS)  $(DIR_O)\LexForth.obj: ..\src\LexForth.cxx $(LEX_HEADERS) diff --git a/macosx/deps.mak b/macosx/deps.mak index 251fcb8f5..5c65dcc1f 100644 --- a/macosx/deps.mak +++ b/macosx/deps.mak @@ -136,6 +136,10 @@ LexCsound.o: ../src/LexCsound.cxx ../include/Platform.h \  LexD.o: ../src/LexD.cxx ../include/Platform.h ../include/PropSet.h \    ../include/SString.h ../include/Accessor.h ../src/StyleContext.h \    ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h +LexEScript.o: ../src/LexEScript.cxx ../include/Platform.h \ +  ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ +  ../src/StyleContext.h ../include/KeyWords.h ../include/Scintilla.h \ +  ../include/SciLexer.h  LexEiffel.o: ../src/LexEiffel.cxx ../include/Platform.h \    ../include/PropSet.h ../include/SString.h ../include/Accessor.h \    ../src/StyleContext.h ../include/KeyWords.h ../include/Scintilla.h \ diff --git a/macosx/makefile b/macosx/makefile index bbf602bda..342021ba8 100644 --- a/macosx/makefile +++ b/macosx/makefile @@ -66,12 +66,12 @@ LEXOBJS=\  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 \  LexCOBOL.o LexConf.o LexCPP.o LexCrontab.o LexCsound.o LexCSS.o LexD.o \ -LexEiffel.o LexErlang.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 LexMagik.o LexMatlab.o LexMetapost.o LexMMIXAL.o LexMPT.o LexMSSQL.o \ -LexMySQL.o LexNsis.o LexOpal.o LexOthers.o LexPascal.o LexPB.o LexPerl.o \ -LexPLM.o LexPOV.o LexPowerPro.o LexPowerShell.o LexProgress.o LexPS.o \ -LexPython.o LexR.o LexRebol.o LexRuby.o LexScriptol.o LexSmalltalk.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 LexMagik.o LexMatlab.o LexMetapost.o LexMMIXAL.o LexMPT.o \ +LexMSSQL.o LexMySQL.o LexNsis.o LexOpal.o LexOthers.o LexPascal.o LexPB.o \ +LexPerl.o LexPLM.o LexPOV.o LexPowerPro.o LexPowerShell.o LexProgress.o \ +LexPS.o LexPython.o LexR.o LexRebol.o LexRuby.o LexScriptol.o LexSmalltalk.o \  LexSorcus.o LexSpecman.o LexSpice.o LexSQL.o LexTACL.o LexTADS3.o LexTAL.o \  LexTCL.o LexTeX.o LexVB.o LexVerilog.o LexVHDL.o LexYAML.o  #--Autogenerated -- end of automatically generated section diff --git a/src/KeyWords.cxx b/src/KeyWords.cxx index 549c32a7a..d5d7499df 100644 --- a/src/KeyWords.cxx +++ b/src/KeyWords.cxx @@ -171,6 +171,7 @@ int Scintilla_LinkLexers() {  	LINK_LEXER(lmEiffelkw);  	LINK_LEXER(lmErlang);  	LINK_LEXER(lmErrorList); +	LINK_LEXER(lmESCRIPT);  	LINK_LEXER(lmF77);  	LINK_LEXER(lmFlagShip);  	LINK_LEXER(lmForth); diff --git a/src/LexEScript.cxx b/src/LexEScript.cxx new file mode 100644 index 000000000..295aaec53 --- /dev/null +++ b/src/LexEScript.cxx @@ -0,0 +1,273 @@ +// Scintilla source code edit control +/** @file LexESCRIPT.cxx + ** Lexer for ESCRIPT + **/ +// Copyright 2003 by Patrizio Bekerle (patrizio@bekerle.com) + +#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" + +#ifdef SCI_NAMESPACE +using namespace Scintilla; +#endif + + +static inline bool IsAWordChar(const int ch) { +	return (ch < 0x80) && (isalnum(ch) || ch == '.' || ch == '_'); +} + +static inline bool IsAWordStart(const int ch) { +	return (ch < 0x80) && (isalnum(ch) || ch == '_'); +} + + + +static void ColouriseESCRIPTDoc(unsigned int startPos, int length, int initStyle, WordList *keywordlists[], +                            Accessor &styler) { + +	WordList &keywords = *keywordlists[0]; +	WordList &keywords2 = *keywordlists[1]; +	WordList &keywords3 = *keywordlists[2]; + +	// Do not leak onto next line +	/*if (initStyle == SCE_ESCRIPT_STRINGEOL) +		initStyle = SCE_ESCRIPT_DEFAULT;*/ + +	StyleContext sc(startPos, length, initStyle, styler); + +	bool caseSensitive = styler.GetPropertyInt("escript.case.sensitive", 0) != 0; + +	for (; sc.More(); sc.Forward()) { + +		/*if (sc.atLineStart && (sc.state == SCE_ESCRIPT_STRING)) { +			// Prevent SCE_ESCRIPT_STRINGEOL from leaking back to previous line +			sc.SetState(SCE_ESCRIPT_STRING); +		}*/ + +		// Handle line continuation generically. +		if (sc.ch == '\\') { +			if (sc.chNext == '\n' || sc.chNext == '\r') { +				sc.Forward(); +				if (sc.ch == '\r' && sc.chNext == '\n') { +					sc.Forward(); +				} +				continue; +			} +		} + +		// Determine if the current state should terminate. +		if (sc.state == SCE_ESCRIPT_OPERATOR || sc.state == SCE_ESCRIPT_BRACE) { +			sc.SetState(SCE_ESCRIPT_DEFAULT); +		} else if (sc.state == SCE_ESCRIPT_NUMBER) { +			if (!IsADigit(sc.ch) || sc.ch != '.') { +				sc.SetState(SCE_ESCRIPT_DEFAULT); +			} +		} else if (sc.state == SCE_ESCRIPT_IDENTIFIER) { +			if (!IsAWordChar(sc.ch) || (sc.ch == '.')) { +				char s[100]; +				if (caseSensitive) { +					sc.GetCurrent(s, sizeof(s)); +				} else { +					sc.GetCurrentLowered(s, sizeof(s)); +				} + +//				sc.GetCurrentLowered(s, sizeof(s)); + +                                if (keywords.InList(s)) { +					sc.ChangeState(SCE_ESCRIPT_WORD); +				} else if (keywords2.InList(s)) { +					sc.ChangeState(SCE_ESCRIPT_WORD2); +				} else if (keywords3.InList(s)) { +					sc.ChangeState(SCE_ESCRIPT_WORD3); +                                        // sc.state = SCE_ESCRIPT_IDENTIFIER; +				} +				sc.SetState(SCE_ESCRIPT_DEFAULT); +			} +		} else if (sc.state == SCE_ESCRIPT_COMMENT) { +			if (sc.Match('*', '/')) { +				sc.Forward(); +				sc.ForwardSetState(SCE_ESCRIPT_DEFAULT); +			} +		} else if (sc.state == SCE_ESCRIPT_COMMENTDOC) { +			if (sc.Match('*', '/')) { +				sc.Forward(); +				sc.ForwardSetState(SCE_ESCRIPT_DEFAULT); +			} +		} else if (sc.state == SCE_ESCRIPT_COMMENTLINE) { +			if (sc.atLineEnd) { +				sc.SetState(SCE_ESCRIPT_DEFAULT); +			} +		} else if (sc.state == SCE_ESCRIPT_STRING) { +			if (sc.ch == '\\') { +				if (sc.chNext == '\"' || sc.chNext == '\\') { +					sc.Forward(); +				} +			} else if (sc.ch == '\"') { +				sc.ForwardSetState(SCE_ESCRIPT_DEFAULT); +			} +		} + +		// Determine if a new state should be entered. +		if (sc.state == SCE_ESCRIPT_DEFAULT) { +			if (IsADigit(sc.ch) || (sc.ch == '.' && IsADigit(sc.chNext))) { +				sc.SetState(SCE_ESCRIPT_NUMBER); +			} else if (IsAWordStart(sc.ch) || (sc.ch == '#')) { +				sc.SetState(SCE_ESCRIPT_IDENTIFIER); +			} else if (sc.Match('/', '*')) { +				sc.SetState(SCE_ESCRIPT_COMMENT); +				sc.Forward();	// Eat the * so it isn't used for the end of the comment +			} else if (sc.Match('/', '/')) { +				sc.SetState(SCE_ESCRIPT_COMMENTLINE); +			} else if (sc.ch == '\"') { +				sc.SetState(SCE_ESCRIPT_STRING); +				//} else if (isoperator(static_cast<char>(sc.ch))) { +			} else if (sc.ch == '+' || sc.ch == '-' || sc.ch == '*' || sc.ch == '/' || sc.ch == '=' || sc.ch == '<' || sc.ch == '>' || sc.ch == '&' || sc.ch == '|' || sc.ch == '!' || sc.ch == '?' || sc.ch == ':') { +				sc.SetState(SCE_ESCRIPT_OPERATOR); +			} else if (sc.ch == '{' || sc.ch == '}') { +				sc.SetState(SCE_ESCRIPT_BRACE); +			} +		} + +	} +	sc.Complete(); +} + + +static int classifyFoldPointESCRIPT(const char* s, const char* prevWord) { +	int lev = 0; +	if (strcmp(prevWord, "end") == 0) return lev; +	if ((strcmp(prevWord, "else") == 0 && strcmp(s, "if") == 0) || strcmp(s, "elseif") == 0) +		return -1; + +        if (strcmp(s, "for") == 0 || strcmp(s, "foreach") == 0 +	    || strcmp(s, "program") == 0 || strcmp(s, "function") == 0 +	    || strcmp(s, "while") == 0 || strcmp(s, "case") == 0 +	    || strcmp(s, "if") == 0 ) { +		lev = 1; +	} else if ( strcmp(s, "endfor") == 0 || strcmp(s, "endforeach") == 0 +	    || strcmp(s, "endprogram") == 0 || strcmp(s, "endfunction") == 0 +	    || strcmp(s, "endwhile") == 0 || strcmp(s, "endcase") == 0 +	    || strcmp(s, "endif") == 0 ) { +		lev = -1; +	} + +	return lev; +} + + +static bool IsStreamCommentStyle(int style) { +	return style == SCE_ESCRIPT_COMMENT || +	       style == SCE_ESCRIPT_COMMENTDOC || +	       style == SCE_ESCRIPT_COMMENTLINE; +} + +static void FoldESCRIPTDoc(unsigned int startPos, int length, int initStyle, WordList *[], Accessor &styler) { +	//~ bool foldComment = styler.GetPropertyInt("fold.comment") != 0; +	// Do not know how to fold the comment at the moment. +	bool foldCompact = styler.GetPropertyInt("fold.compact", 1) != 0; +        bool foldComment = true; +	unsigned int endPos = startPos + length; +	int visibleChars = 0; +	int lineCurrent = styler.GetLine(startPos); +	int levelPrev = styler.LevelAt(lineCurrent) & SC_FOLDLEVELNUMBERMASK; +	int levelCurrent = levelPrev; +	char chNext = styler[startPos]; +	int styleNext = styler.StyleAt(startPos); +	int style = initStyle; + +	int lastStart = 0; +	char prevWord[32] = ""; + +	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 && IsStreamCommentStyle(style)) { +			if (!IsStreamCommentStyle(stylePrev)) { +				levelCurrent++; +			} else if (!IsStreamCommentStyle(styleNext) && !atEOL) { +				// Comments don't end at end of line and the next character may be unstyled. +				levelCurrent--; +			} +		} + +		if (foldComment && (style == SCE_ESCRIPT_COMMENTLINE)) { +			if ((ch == '/') && (chNext == '/')) { +				char chNext2 = styler.SafeGetCharAt(i + 2); +				if (chNext2 == '{') { +					levelCurrent++; +				} else if (chNext2 == '}') { +					levelCurrent--; +				} +			} +		} + +		if (stylePrev == SCE_ESCRIPT_DEFAULT && style == SCE_ESCRIPT_WORD3) +		{ +			// Store last word start point. +			lastStart = i; +		} + +		if (style == SCE_ESCRIPT_WORD3) { +			if(iswordchar(ch) && !iswordchar(chNext)) { +				char s[32]; +				unsigned int j; +				for(j = 0; ( j < 31 ) && ( j < i-lastStart+1 ); j++) { +					s[j] = static_cast<char>(tolower(styler[lastStart + j])); +				} +				s[j] = '\0'; +				levelCurrent += classifyFoldPointESCRIPT(s, prevWord); +				strcpy(prevWord, s); +			} +		} +		if (atEOL) { +			int lev = levelPrev; +			if (visibleChars == 0 && foldCompact) +				lev |= SC_FOLDLEVELWHITEFLAG; +			if ((levelCurrent > levelPrev) && (visibleChars > 0)) +				lev |= SC_FOLDLEVELHEADERFLAG; +			if (lev != styler.LevelAt(lineCurrent)) { +				styler.SetLevel(lineCurrent, lev); +			} +			lineCurrent++; +			levelPrev = levelCurrent; +			visibleChars = 0; +			strcpy(prevWord, ""); +		} + +		if (!isspacechar(ch)) +			visibleChars++; +	} + +	// Fill in the real level of the next line, keeping the current flags as they will be filled in later +	int flagsNext = styler.LevelAt(lineCurrent) & ~SC_FOLDLEVELNUMBERMASK; +	styler.SetLevel(lineCurrent, levelPrev | flagsNext); +} + + + +static const char * const ESCRIPTWordLists[] = { +	"Primary keywords and identifiers", +	"Intrinsic functions", +	"Extended and user defined functions", +	0, +}; + +LexerModule lmESCRIPT(SCLEX_ESCRIPT, ColouriseESCRIPTDoc, "escript", FoldESCRIPTDoc, ESCRIPTWordLists); diff --git a/vcbuild/SciLexer.dsp b/vcbuild/SciLexer.dsp index e1b44fb0c..2d21a9e27 100644 --- a/vcbuild/SciLexer.dsp +++ b/vcbuild/SciLexer.dsp @@ -242,6 +242,10 @@ SOURCE=..\src\LexErlang.cxx  # End Source File  # Begin Source File +SOURCE=..\src\LexEScript.cxx +# End Source File +# Begin Source File +  SOURCE=..\src\LexFlagship.cxx  # End Source File  # Begin Source File diff --git a/win32/deps.mak b/win32/deps.mak index a308efa62..d41c20a13 100644 --- a/win32/deps.mak +++ b/win32/deps.mak @@ -116,6 +116,10 @@ LexErlang.o: ../src/LexErlang.cxx ../include/Platform.h \    ../include/PropSet.h ../include/SString.h ../include/Accessor.h \    ../src/StyleContext.h ../include/KeyWords.h ../include/Scintilla.h \    ../include/SciLexer.h +LexEScript.o: ../src/LexEScript.cxx ../include/Platform.h \ +  ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ +  ../src/StyleContext.h ../include/KeyWords.h ../include/Scintilla.h \ +  ../include/SciLexer.h  LexFlagship.o: ../src/LexFlagship.cxx ../include/Platform.h \    ../include/PropSet.h ../include/SString.h ../include/Accessor.h \    ../src/StyleContext.h ../include/KeyWords.h ../include/Scintilla.h \ diff --git a/win32/makefile b/win32/makefile index 67020ae0b..d0f2eec4f 100644 --- a/win32/makefile +++ b/win32/makefile @@ -54,12 +54,12 @@ LEXOBJS=\  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 \  LexCOBOL.o LexConf.o LexCPP.o LexCrontab.o LexCsound.o LexCSS.o LexD.o \ -LexEiffel.o LexErlang.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 LexMagik.o LexMatlab.o LexMetapost.o LexMMIXAL.o LexMPT.o LexMSSQL.o \ -LexMySQL.o LexNsis.o LexOpal.o LexOthers.o LexPascal.o LexPB.o LexPerl.o \ -LexPLM.o LexPOV.o LexPowerPro.o LexPowerShell.o LexProgress.o LexPS.o \ -LexPython.o LexR.o LexRebol.o LexRuby.o LexScriptol.o LexSmalltalk.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 LexMagik.o LexMatlab.o LexMetapost.o LexMMIXAL.o LexMPT.o \ +LexMSSQL.o LexMySQL.o LexNsis.o LexOpal.o LexOthers.o LexPascal.o LexPB.o \ +LexPerl.o LexPLM.o LexPOV.o LexPowerPro.o LexPowerShell.o LexProgress.o \ +LexPS.o LexPython.o LexR.o LexRebol.o LexRuby.o LexScriptol.o LexSmalltalk.o \  LexSorcus.o LexSpecman.o LexSpice.o LexSQL.o LexTACL.o LexTADS3.o LexTAL.o \  LexTCL.o LexTeX.o LexVB.o LexVerilog.o LexVHDL.o LexYAML.o  #--Autogenerated -- end of automatically generated section diff --git a/win32/scintilla.mak b/win32/scintilla.mak index 3ed660f76..2dad3609e 100644 --- a/win32/scintilla.mak +++ b/win32/scintilla.mak @@ -137,6 +137,7 @@ LEXOBJS=\  	$(DIR_O)\LexD.obj \  	$(DIR_O)\LexEiffel.obj \  	$(DIR_O)\LexErlang.obj \ +	$(DIR_O)\LexEScript.obj \  	$(DIR_O)\LexFlagship.obj \  	$(DIR_O)\LexForth.obj \  	$(DIR_O)\LexFortran.obj \ @@ -358,6 +359,8 @@ $(DIR_O)\LexEiffel.obj: ..\src\LexEiffel.cxx $(LEX_HEADERS)  $(DIR_O)\LexErlang.obj: ..\src\LexErlang.cxx $(LEX_HEADERS) +$(DIR_O)\LexEScript.obj: ..\src\LexEScript.cxx $(LEX_HEADERS) +  $(DIR_O)\LexFlagship.obj: ..\src\LexFlagship.cxx $(LEX_HEADERS)  $(DIR_O)\LexForth.obj: ..\src\LexForth.cxx $(LEX_HEADERS) diff --git a/win32/scintilla_vc6.mak b/win32/scintilla_vc6.mak index 9708ff2f1..8c6e55f90 100644 --- a/win32/scintilla_vc6.mak +++ b/win32/scintilla_vc6.mak @@ -139,6 +139,7 @@ LEXOBJS=\  	$(DIR_O)\LexD.obj \  	$(DIR_O)\LexEiffel.obj \  	$(DIR_O)\LexErlang.obj \ +	$(DIR_O)\LexEScript.obj \  	$(DIR_O)\LexFlagship.obj \  	$(DIR_O)\LexForth.obj \  	$(DIR_O)\LexFortran.obj \ @@ -360,6 +361,8 @@ $(DIR_O)\LexEiffel.obj: ..\src\LexEiffel.cxx $(LEX_HEADERS)  $(DIR_O)\LexErlang.obj: ..\src\LexErlang.cxx $(LEX_HEADERS) +$(DIR_O)\LexEScript.obj: ..\src\LexEScript.cxx $(LEX_HEADERS) +  $(DIR_O)\LexFlagship.obj: ..\src\LexFlagship.cxx $(LEX_HEADERS)  $(DIR_O)\LexForth.obj: ..\src\LexForth.cxx $(LEX_HEADERS) | 
