diff options
author | nyamatongwe <unknown> | 2002-02-12 03:34:52 +0000 |
---|---|---|
committer | nyamatongwe <unknown> | 2002-02-12 03:34:52 +0000 |
commit | 2c7158c928c73f02f4fc448fdd96ba4f45d0ea76 (patch) | |
tree | d1656678b1feffb7d5b8e089d5da63f74dc8ffce /src | |
parent | f540bc2de8cefe784c71b3401ebaf971043546e7 (diff) | |
download | scintilla-mirror-2c7158c928c73f02f4fc448fdd96ba4f45d0ea76.tar.gz |
Made lexer objects const so they do not show up in map as static / globals.
File specific inline functions marker as static to ensure no bad linking.
Diffstat (limited to 'src')
-rw-r--r-- | src/KeyWords.cxx | 16 | ||||
-rw-r--r-- | src/LexAVE.cxx | 2 | ||||
-rw-r--r-- | src/LexAda.cxx | 4 | ||||
-rw-r--r-- | src/LexBaan.cxx | 6 | ||||
-rw-r--r-- | src/LexBullant.cxx | 2 | ||||
-rw-r--r-- | src/LexCPP.cxx | 12 | ||||
-rw-r--r-- | src/LexConf.cxx | 2 | ||||
-rw-r--r-- | src/LexCrontab.cxx | 2 | ||||
-rw-r--r-- | src/LexEiffel.cxx | 10 | ||||
-rw-r--r-- | src/LexHTML.cxx | 16 | ||||
-rw-r--r-- | src/LexLisp.cxx | 6 | ||||
-rw-r--r-- | src/LexLua.cxx | 19 | ||||
-rw-r--r-- | src/LexOthers.cxx | 12 | ||||
-rw-r--r-- | src/LexPascal.cxx | 3 | ||||
-rw-r--r-- | src/LexPerl.cxx | 2 | ||||
-rw-r--r-- | src/LexPython.cxx | 2 | ||||
-rw-r--r-- | src/LexRuby.cxx | 2 | ||||
-rw-r--r-- | src/LexSQL.cxx | 2 | ||||
-rw-r--r-- | src/LexVB.cxx | 12 | ||||
-rw-r--r-- | src/ScintillaBase.h | 2 |
20 files changed, 58 insertions, 76 deletions
diff --git a/src/KeyWords.cxx b/src/KeyWords.cxx index a02d14b1e..7aa56d5fe 100644 --- a/src/KeyWords.cxx +++ b/src/KeyWords.cxx @@ -19,7 +19,7 @@ #include "Scintilla.h" #include "SciLexer.h" -LexerModule *LexerModule::base = 0; +const LexerModule *LexerModule::base = 0; int LexerModule::nextLanguage = SCLEX_AUTOMATIC+1; LexerModule::LexerModule(int language_, LexerFunction fnLexer_, @@ -36,8 +36,8 @@ LexerModule::LexerModule(int language_, LexerFunction fnLexer_, } } -LexerModule *LexerModule::Find(int language) { - LexerModule *lm = base; +const LexerModule *LexerModule::Find(int language) { + const LexerModule *lm = base; while (lm) { if (lm->language == language) { return lm; @@ -47,9 +47,9 @@ LexerModule *LexerModule::Find(int language) { return 0; } -LexerModule *LexerModule::Find(const char *languageName) { +const LexerModule *LexerModule::Find(const char *languageName) { if (languageName) { - LexerModule *lm = base; + const LexerModule *lm = base; while (lm) { if (lm->languageName && 0 == strcmp(lm->languageName, languageName)) { return lm; @@ -61,13 +61,13 @@ LexerModule *LexerModule::Find(const char *languageName) { } void LexerModule::Lex(unsigned int startPos, int lengthDoc, int initStyle, - WordList *keywordlists[], Accessor &styler) { + WordList *keywordlists[], Accessor &styler) const { if (fnLexer) fnLexer(startPos, lengthDoc, initStyle, keywordlists, styler); } void LexerModule::Fold(unsigned int startPos, int lengthDoc, int initStyle, - WordList *keywordlists[], Accessor &styler) { + WordList *keywordlists[], Accessor &styler) const { if (fnFolder) { int lineCurrent = styler.GetLine(startPos); // Move back one line in case deletion wrecked current line fold state @@ -95,7 +95,7 @@ static void ColouriseNullDoc(unsigned int startPos, int length, int, WordList *[ } } -LexerModule lmNull(SCLEX_NULL, ColouriseNullDoc, "null"); +const LexerModule lmNull(SCLEX_NULL, ColouriseNullDoc, "null"); #ifdef __vms #define LINK_LEXERS diff --git a/src/LexAVE.cxx b/src/LexAVE.cxx index dfd15f02f..4410ce342 100644 --- a/src/LexAVE.cxx +++ b/src/LexAVE.cxx @@ -185,4 +185,4 @@ static void ColouriseAveDoc(unsigned int startPos, int length, int initStyle, Wo } } -LexerModule lmAVE(SCLEX_AVE, ColouriseAveDoc, "ave"); +const LexerModule lmAVE(SCLEX_AVE, ColouriseAveDoc, "ave"); diff --git a/src/LexAda.cxx b/src/LexAda.cxx index 91bf00ede..563fe2ba7 100644 --- a/src/LexAda.cxx +++ b/src/LexAda.cxx @@ -49,7 +49,7 @@ inline void classifyWordAda(unsigned int start, unsigned int end, } -inline bool isAdaOperator(char ch) { +static inline bool isAdaOperator(char ch) { if (ch == '&' || ch == '\'' || ch == '(' || ch == ')' || ch == '*' || ch == '+' || ch == ',' || ch == '-' || @@ -195,4 +195,4 @@ static void ColouriseAdaDoc(unsigned int startPos, int length, int initStyle, // } } -LexerModule lmAda(SCLEX_ADA, ColouriseAdaDoc, "ada"); +const LexerModule lmAda(SCLEX_ADA, ColouriseAdaDoc, "ada"); diff --git a/src/LexBaan.cxx b/src/LexBaan.cxx index a8a9d6054..9727473f9 100644 --- a/src/LexBaan.cxx +++ b/src/LexBaan.cxx @@ -21,11 +21,11 @@ #include "Scintilla.h" #include "SciLexer.h" -inline bool IsAWordChar(const int ch) { +static inline bool IsAWordChar(const int ch) { return (ch < 0x80) && (isalnum(ch) || ch == '.' || ch == '_' || ch == '$' || ch == ':'); } -inline bool IsAWordStart(const int ch) { +static inline bool IsAWordStart(const int ch) { return (ch < 0x80) && (isalnum(ch) || ch == '_'); } @@ -186,4 +186,4 @@ static void FoldBaanDoc(unsigned int startPos, int length, int initStyle, WordLi styler.SetLevel(lineCurrent, levelPrev | flagsNext); } -LexerModule lmBaan(SCLEX_BAAN, ColouriseBaanDoc, "baan", FoldBaanDoc); +const LexerModule lmBaan(SCLEX_BAAN, ColouriseBaanDoc, "baan", FoldBaanDoc); diff --git a/src/LexBullant.cxx b/src/LexBullant.cxx index 1f76ffcf0..69971b6e4 100644 --- a/src/LexBullant.cxx +++ b/src/LexBullant.cxx @@ -230,4 +230,4 @@ static void ColouriseBullantDoc(unsigned int startPos, int length, int initStyle } } -LexerModule lmBullant(SCLEX_BULLANT, ColouriseBullantDoc, "bullant"); +const LexerModule lmBullant(SCLEX_BULLANT, ColouriseBullantDoc, "bullant"); diff --git a/src/LexCPP.cxx b/src/LexCPP.cxx index cc7827973..b76fcc70b 100644 --- a/src/LexCPP.cxx +++ b/src/LexCPP.cxx @@ -28,18 +28,18 @@ static inline bool IsAWordChar(const int ch) { return (ch < 0x80) && (isalnum(ch) || ch == '.' || ch == '_'); } -inline bool IsAWordStart(const int ch) { +static inline bool IsAWordStart(const int ch) { return (ch < 0x80) && (isalnum(ch) || ch == '_'); } -inline bool IsADoxygenChar(const int ch) { +static inline bool IsADoxygenChar(const int ch) { return (islower(ch) || ch == '$' || ch == '@' || ch == '\\' || ch == '&' || ch == '<' || ch == '>' || ch == '#' || ch == '{' || ch == '}' || ch == '[' || ch == ']'); } -inline bool IsStateComment(const int state) { +static inline bool IsStateComment(const int state) { return ((state == SCE_C_COMMENT) || (state == SCE_C_COMMENTLINE) || (state == SCE_C_COMMENTDOC) || @@ -47,7 +47,7 @@ inline bool IsStateComment(const int state) { (state == SCE_C_COMMENTDOCKEYWORDERROR)); } -inline bool IsStateString(const int state) { +static inline bool IsStateString(const int state) { return ((state == SCE_C_STRING) || (state == SCE_C_VERBATIM)); } @@ -316,5 +316,5 @@ static void FoldCppDoc(unsigned int startPos, int length, int initStyle, WordLis styler.SetLevel(lineCurrent, levelPrev | flagsNext); } -LexerModule lmCPP(SCLEX_CPP, ColouriseCppDoc, "cpp", FoldCppDoc); -LexerModule lmTCL(SCLEX_TCL, ColouriseCppDoc, "tcl", FoldCppDoc); +const LexerModule lmCPP(SCLEX_CPP, ColouriseCppDoc, "cpp", FoldCppDoc); +const LexerModule lmTCL(SCLEX_TCL, ColouriseCppDoc, "tcl", FoldCppDoc); diff --git a/src/LexConf.cxx b/src/LexConf.cxx index c8441f41e..a8cbd2238 100644 --- a/src/LexConf.cxx +++ b/src/LexConf.cxx @@ -175,4 +175,4 @@ static void ColouriseConfDoc(unsigned int startPos, int length, int, WordList *k delete []buffer; } -LexerModule lmConf(SCLEX_CONF, ColouriseConfDoc, "conf"); +const LexerModule lmConf(SCLEX_CONF, ColouriseConfDoc, "conf"); diff --git a/src/LexCrontab.cxx b/src/LexCrontab.cxx index 94a172cfc..e0cfe8466 100644 --- a/src/LexCrontab.cxx +++ b/src/LexCrontab.cxx @@ -201,4 +201,4 @@ static void ColouriseNncrontabDoc(unsigned int startPos, int length, int, WordLi } } -LexerModule lmNncrontab(SCLEX_NNCRONTAB, ColouriseNncrontabDoc, "nncrontab"); +const LexerModule lmNncrontab(SCLEX_NNCRONTAB, ColouriseNncrontabDoc, "nncrontab"); diff --git a/src/LexEiffel.cxx b/src/LexEiffel.cxx index 647094320..9daa98fd5 100644 --- a/src/LexEiffel.cxx +++ b/src/LexEiffel.cxx @@ -21,7 +21,7 @@ #include "Scintilla.h" #include "SciLexer.h" -inline bool isEiffelOperator(unsigned int ch) { +static inline bool isEiffelOperator(unsigned int ch) { // '.' left out as it is used to make up numbers return ch == '*' || ch == '/' || ch == '\\' || ch == '-' || ch == '+' || ch == '(' || ch == ')' || ch == '=' || @@ -32,11 +32,11 @@ inline bool isEiffelOperator(unsigned int ch) { ch == '!' || ch == '@' || ch == '?'; } -inline bool IsAWordChar(unsigned int ch) { +static inline bool IsAWordChar(unsigned int ch) { return (ch < 0x80) && (isalnum(ch) || ch == '.' || ch == '_'); } -inline bool IsAWordStart(unsigned int ch) { +static inline bool IsAWordStart(unsigned int ch) { return (ch < 0x80) && (isalnum(ch) || ch == '_'); } @@ -226,5 +226,5 @@ static void FoldEiffelDocKeyWords(unsigned int startPos, int length, int /* init styler.SetLevel(lineCurrent, levelPrev | flagsNext); } -LexerModule lmEiffel(SCLEX_EIFFEL, ColouriseEiffelDoc, "eiffel", FoldEiffelDocIndent); -LexerModule lmEiffelkw(SCLEX_EIFFELKW, ColouriseEiffelDoc, "eiffelkw", FoldEiffelDocKeyWords); +const LexerModule lmEiffel(SCLEX_EIFFEL, ColouriseEiffelDoc, "eiffel", FoldEiffelDocIndent); +const LexerModule lmEiffelkw(SCLEX_EIFFELKW, ColouriseEiffelDoc, "eiffelkw", FoldEiffelDocKeyWords); diff --git a/src/LexHTML.cxx b/src/LexHTML.cxx index b2dfce7d6..f4d662234 100644 --- a/src/LexHTML.cxx +++ b/src/LexHTML.cxx @@ -27,11 +27,11 @@ enum { eScriptNone = 0, eScriptJS, eScriptVBS, eScriptPython, eScriptPHP, eScriptXML, eScriptSGML, eScriptSGMLblock }; enum { eHtml = 0, eNonHtmlScript, eNonHtmlPreProc, eNonHtmlScriptPreProc }; -inline bool IsAWordChar(const int ch) { +static inline bool IsAWordChar(const int ch) { return (ch < 0x80) && (isalnum(ch) || ch == '.' || ch == '_'); } -inline bool IsAWordStart(const int ch) { +static inline bool IsAWordStart(const int ch) { return (ch < 0x80) && (isalnum(ch) || ch == '_'); } @@ -358,11 +358,11 @@ static int StateForScript(int scriptLanguage) { return Result; } -inline bool ishtmlwordchar(char ch) { +static inline bool ishtmlwordchar(char ch) { return isalnum(ch) || ch == '.' || ch == '-' || ch == '_' || ch == ':' || ch == '!' || ch == '#'; } -inline bool issgmlwordchar(char ch) { +static inline bool issgmlwordchar(char ch) { return isalnum(ch) || ch == '.' || ch == '_' || ch == ':' || ch == '!' || ch == '#' || ch == '['; } @@ -1842,7 +1842,7 @@ static void ColourisePHPDoc(unsigned int startPos, int length, int initStyle, Wo sc.Complete(); } -LexerModule lmHTML(SCLEX_HTML, ColouriseHyperTextDoc, "hypertext"); -LexerModule lmXML(SCLEX_XML, ColouriseHyperTextDoc, "xml"); -LexerModule lmASP(SCLEX_ASP, ColouriseASPDoc, "asp"); -LexerModule lmPHP(SCLEX_PHP, ColourisePHPDoc, "php"); +const LexerModule lmHTML(SCLEX_HTML, ColouriseHyperTextDoc, "hypertext"); +const LexerModule lmXML(SCLEX_XML, ColouriseHyperTextDoc, "xml"); +const LexerModule lmASP(SCLEX_ASP, ColouriseASPDoc, "asp"); +const LexerModule lmPHP(SCLEX_PHP, ColourisePHPDoc, "php"); diff --git a/src/LexLisp.cxx b/src/LexLisp.cxx index 623ca7cfa..032054100 100644 --- a/src/LexLisp.cxx +++ b/src/LexLisp.cxx @@ -21,7 +21,7 @@ #include "SciLexer.h" -inline bool isLispoperator(char ch) { +static inline bool isLispoperator(char ch) { if (isascii(ch) && isalnum(ch)) return false; if (ch == '\'' || ch == '(' || ch == ')' ) @@ -29,7 +29,7 @@ inline bool isLispoperator(char ch) { return false; } -inline bool isLispwordstart(char ch) { +static inline bool isLispwordstart(char ch) { return isascii(ch) && ch != ';' && !isspacechar(ch) && !isLispoperator(ch) && ch != '\n' && ch != '\r' && ch != '\"'; } @@ -192,4 +192,4 @@ static void FoldLispDoc(unsigned int startPos, int length, int /* initStyle */, styler.SetLevel(lineCurrent, levelPrev | flagsNext); } -LexerModule lmLISP(SCLEX_LISP, ColouriseLispDoc, "lisp", FoldLispDoc); +const LexerModule lmLISP(SCLEX_LISP, ColouriseLispDoc, "lisp", FoldLispDoc); diff --git a/src/LexLua.cxx b/src/LexLua.cxx index dfa5d848e..253d9ba85 100644 --- a/src/LexLua.cxx +++ b/src/LexLua.cxx @@ -64,9 +64,6 @@ static void ColouriseLuaDoc(unsigned int startPos, int length, int initStyle, Wo if (initStyle == SCE_LUA_STRINGEOL) initStyle = SCE_LUA_DEFAULT; - int chPrevNonWhite = ' '; - int visibleChars = 0; - StyleContext sc(startPos, length, initStyle, styler); if(startPos == 0 && sc.ch == '#') sc.SetState(SCE_LUA_COMMENTLINE); for (; sc.More(); sc.Forward()) { @@ -117,7 +114,6 @@ static void ColouriseLuaDoc(unsigned int startPos, int length, int initStyle, Wo } else if (sc.state == SCE_LUA_COMMENTLINE ) { if (sc.atLineEnd) { sc.SetState(SCE_LUA_DEFAULT); - visibleChars = 0; } } else if (sc.state == SCE_LUA_STRING) { if (sc.ch == '\\') { @@ -129,7 +125,6 @@ static void ColouriseLuaDoc(unsigned int startPos, int length, int initStyle, Wo } else if (sc.atLineEnd) { sc.ChangeState(SCE_LUA_STRINGEOL); sc.ForwardSetState(SCE_LUA_DEFAULT); - visibleChars = 0; } } else if (sc.state == SCE_LUA_CHARACTER) { @@ -142,7 +137,6 @@ static void ColouriseLuaDoc(unsigned int startPos, int length, int initStyle, Wo } else if (sc.atLineEnd) { sc.ChangeState(SCE_LUA_STRINGEOL); sc.ForwardSetState(SCE_LUA_DEFAULT); - visibleChars = 0; } } else if (sc.state == SCE_LUA_LITERALSTRING) { if (sc.chPrev == '[' && sc.ch == '[' && literalStringFlag != 1) { @@ -175,17 +169,6 @@ static void ColouriseLuaDoc(unsigned int startPos, int length, int initStyle, Wo sc.SetState(SCE_LUA_OPERATOR); } } - - if (sc.atLineEnd) { - // Reset states to begining of colourise so no surprises - // if different sets of lines lexed. - chPrevNonWhite = ' '; - visibleChars = 0; - } - if (!IsASpace(sc.ch)) { - chPrevNonWhite = sc.ch; - visibleChars++; - } } sc.Complete(); } @@ -255,4 +238,4 @@ static void FoldLuaDoc(unsigned int startPos, int length, int /* initStyle */, W styler.SetLevel(lineCurrent, levelPrev | flagsNext); } -LexerModule lmLua(SCLEX_LUA, ColouriseLuaDoc, "lua", FoldLuaDoc); +const LexerModule lmLua(SCLEX_LUA, ColouriseLuaDoc, "lua", FoldLuaDoc); diff --git a/src/LexOthers.cxx b/src/LexOthers.cxx index 2c9c3e444..efc4dafd6 100644 --- a/src/LexOthers.cxx +++ b/src/LexOthers.cxx @@ -521,9 +521,9 @@ static void ColouriseLatexDoc(unsigned int startPos, int length, int initStyle, styler.ColourTo(lengthDoc, state); } -LexerModule lmBatch(SCLEX_BATCH, ColouriseBatchDoc, "batch"); -LexerModule lmDiff(SCLEX_DIFF, ColouriseDiffDoc, "diff"); -LexerModule lmProps(SCLEX_PROPERTIES, ColourisePropsDoc, "props"); -LexerModule lmMake(SCLEX_MAKEFILE, ColouriseMakeDoc, "makefile"); -LexerModule lmErrorList(SCLEX_ERRORLIST, ColouriseErrorListDoc, "errorlist"); -LexerModule lmLatex(SCLEX_LATEX, ColouriseLatexDoc, "latex"); +const LexerModule lmBatch(SCLEX_BATCH, ColouriseBatchDoc, "batch"); +const LexerModule lmDiff(SCLEX_DIFF, ColouriseDiffDoc, "diff"); +const LexerModule lmProps(SCLEX_PROPERTIES, ColourisePropsDoc, "props"); +const LexerModule lmMake(SCLEX_MAKEFILE, ColouriseMakeDoc, "makefile"); +const LexerModule lmErrorList(SCLEX_ERRORLIST, ColouriseErrorListDoc, "errorlist"); +const LexerModule lmLatex(SCLEX_LATEX, ColouriseLatexDoc, "latex"); diff --git a/src/LexPascal.cxx b/src/LexPascal.cxx index 51b24f2ff..8d2766e9c 100644 --- a/src/LexPascal.cxx +++ b/src/LexPascal.cxx @@ -18,7 +18,6 @@ #include "Scintilla.h" #include "SciLexer.h" - static int classifyWordPascal(unsigned int start, unsigned int end, WordList &keywords, Accessor &styler) { char s[100]; for (unsigned int i = 0; i < end - start + 1 && i < 30; i++) { @@ -219,4 +218,4 @@ static void ColourisePascalDoc(unsigned int startPos, int length, int initStyle, } } -LexerModule lmPascal(SCLEX_PASCAL, ColourisePascalDoc, "pascal"); +const LexerModule lmPascal(SCLEX_PASCAL, ColourisePascalDoc, "pascal"); diff --git a/src/LexPerl.cxx b/src/LexPerl.cxx index 590d05d2a..71942091b 100644 --- a/src/LexPerl.cxx +++ b/src/LexPerl.cxx @@ -659,4 +659,4 @@ static void ColourisePerlDoc(unsigned int startPos, int length, int initStyle, styler.ColourTo(lengthDoc, state); } -LexerModule lmPerl(SCLEX_PERL, ColourisePerlDoc, "perl"); +const LexerModule lmPerl(SCLEX_PERL, ColourisePerlDoc, "perl"); diff --git a/src/LexPython.cxx b/src/LexPython.cxx index 4af4ca225..8439d3dd6 100644 --- a/src/LexPython.cxx +++ b/src/LexPython.cxx @@ -402,4 +402,4 @@ static void FoldPyDoc(unsigned int startPos, int length, int /*initStyle - unuse //styler.SetLevel(lineCurrent, indentCurrent); } -LexerModule lmPython(SCLEX_PYTHON, ColourisePyDoc, "python", FoldPyDoc); +const LexerModule lmPython(SCLEX_PYTHON, ColourisePyDoc, "python", FoldPyDoc); diff --git a/src/LexRuby.cxx b/src/LexRuby.cxx index 44bbf7216..806a1991f 100644 --- a/src/LexRuby.cxx +++ b/src/LexRuby.cxx @@ -352,4 +352,4 @@ static void FoldRbDoc(unsigned int startPos, int length, int initStyle, } } -LexerModule lmRuby(SCLEX_RUBY, ColouriseRbDoc, "ruby", FoldRbDoc); +const LexerModule lmRuby(SCLEX_RUBY, ColouriseRbDoc, "ruby", FoldRbDoc); diff --git a/src/LexSQL.cxx b/src/LexSQL.cxx index 5af86d9f4..5c8e3d459 100644 --- a/src/LexSQL.cxx +++ b/src/LexSQL.cxx @@ -155,4 +155,4 @@ static void ColouriseSQLDoc(unsigned int startPos, int length, styler.ColourTo(lengthDoc - 1, state); } -LexerModule lmSQL(SCLEX_SQL, ColouriseSQLDoc, "sql"); +const LexerModule lmSQL(SCLEX_SQL, ColouriseSQLDoc, "sql"); diff --git a/src/LexVB.cxx b/src/LexVB.cxx index bfd34d1e4..c9ba63ee3 100644 --- a/src/LexVB.cxx +++ b/src/LexVB.cxx @@ -24,19 +24,19 @@ static bool IsVBComment(Accessor &styler, int pos, int len) { return len>0 && styler[pos]=='\''; } -inline bool IsTypeCharacter(const int ch) { +static inline bool IsTypeCharacter(const int ch) { return ch == '%' || ch == '&' || ch == '@' || ch == '!' || ch == '#' || ch == '$'; } -inline bool IsAWordChar(const int ch) { +static inline bool IsAWordChar(const int ch) { return (ch < 0x80) && (isalnum(ch) || ch == '.' || ch == '_'); } -inline bool IsAWordStart(const int ch) { +static inline bool IsAWordStart(const int ch) { return (ch < 0x80) && (isalnum(ch) || ch == '_'); } -inline bool IsADateCharacter(const int ch) { +static inline bool IsADateCharacter(const int ch) { return (ch < 0x80) && (isalnum(ch) || ch == '|' || ch == '-' || ch == '/' || ch == ':' || ch == ' ' || ch == '\t'); } @@ -200,6 +200,6 @@ static void ColouriseVBScriptDoc(unsigned int startPos, int length, int initStyl ColouriseVBDoc(startPos, length, initStyle, keywordlists, styler, true); } -LexerModule lmVB(SCLEX_VB, ColouriseVBNetDoc, "vb", FoldVBDoc); -LexerModule lmVBScript(SCLEX_VBSCRIPT, ColouriseVBScriptDoc, "vbscript", FoldVBDoc); +const LexerModule lmVB(SCLEX_VB, ColouriseVBNetDoc, "vb", FoldVBDoc); +const LexerModule lmVBScript(SCLEX_VBSCRIPT, ColouriseVBScriptDoc, "vbscript", FoldVBDoc); diff --git a/src/ScintillaBase.h b/src/ScintillaBase.h index 913144309..7e3887c15 100644 --- a/src/ScintillaBase.h +++ b/src/ScintillaBase.h @@ -41,7 +41,7 @@ protected: #ifdef SCI_LEXER int lexLanguage; - LexerModule *lexCurrent; + const LexerModule *lexCurrent; PropSet props; enum {numWordLists=6}; WordList *keyWordLists[numWordLists+1]; |