diff options
Diffstat (limited to 'lexers')
-rw-r--r-- | lexers/LexAsm.cxx | 3 | ||||
-rw-r--r-- | lexers/LexBaan.cxx | 3 | ||||
-rw-r--r-- | lexers/LexBasic.cxx | 3 | ||||
-rw-r--r-- | lexers/LexD.cxx | 3 | ||||
-rw-r--r-- | lexers/LexDMIS.cxx | 3 | ||||
-rw-r--r-- | lexers/LexEDIFACT.cxx | 3 | ||||
-rw-r--r-- | lexers/LexHaskell.cxx | 3 | ||||
-rw-r--r-- | lexers/LexJSON.cxx | 3 | ||||
-rw-r--r-- | lexers/LexPerl.cxx | 3 | ||||
-rw-r--r-- | lexers/LexProgress.cxx | 5 | ||||
-rw-r--r-- | lexers/LexPython.cxx | 3 | ||||
-rw-r--r-- | lexers/LexRegistry.cxx | 3 | ||||
-rw-r--r-- | lexers/LexRust.cxx | 3 | ||||
-rw-r--r-- | lexers/LexSQL.cxx | 3 | ||||
-rw-r--r-- | lexers/LexVerilog.cxx | 3 | ||||
-rw-r--r-- | lexers/LexVisualProlog.cxx | 3 |
16 files changed, 33 insertions, 17 deletions
diff --git a/lexers/LexAsm.cxx b/lexers/LexAsm.cxx index 78550bba1..16b32443c 100644 --- a/lexers/LexAsm.cxx +++ b/lexers/LexAsm.cxx @@ -30,6 +30,7 @@ #include "CharacterSet.h" #include "LexerModule.h" #include "OptionSet.h" +#include "DefaultLexer.h" #ifdef SCI_NAMESPACE using namespace Scintilla; @@ -139,7 +140,7 @@ struct OptionSetAsm : public OptionSet<OptionsAsm> { } }; -class LexerAsm : public ILexer { +class LexerAsm : public DefaultLexer { WordList cpuInstruction; WordList mathInstruction; WordList registers; diff --git a/lexers/LexBaan.cxx b/lexers/LexBaan.cxx index ab96a0db5..9d1f20972 100644 --- a/lexers/LexBaan.cxx +++ b/lexers/LexBaan.cxx @@ -34,6 +34,7 @@ #include "CharacterSet.h" #include "LexerModule.h" #include "OptionSet.h" +#include "DefaultLexer.h" # ifdef SCI_NAMESPACE using namespace Scintilla; @@ -381,7 +382,7 @@ public: } -class LexerBaan : public ILexer { +class LexerBaan : public DefaultLexer { WordListAbridged keywords; WordListAbridged keywords2; WordListAbridged keywords3; diff --git a/lexers/LexBasic.cxx b/lexers/LexBasic.cxx index 4aa449d43..8aa64267b 100644 --- a/lexers/LexBasic.cxx +++ b/lexers/LexBasic.cxx @@ -37,6 +37,7 @@ #include "CharacterSet.h" #include "LexerModule.h" #include "OptionSet.h" +#include "DefaultLexer.h" #ifdef SCI_NAMESPACE using namespace Scintilla; @@ -226,7 +227,7 @@ struct OptionSetBasic : public OptionSet<OptionsBasic> { } }; -class LexerBasic : public ILexer { +class LexerBasic : public DefaultLexer { char comment_char; int (*CheckFoldPoint)(char const *, int &); WordList keywordlists[4]; diff --git a/lexers/LexD.cxx b/lexers/LexD.cxx index ededccdf4..c09498407 100644 --- a/lexers/LexD.cxx +++ b/lexers/LexD.cxx @@ -27,6 +27,7 @@ #include "CharacterSet.h" #include "LexerModule.h" #include "OptionSet.h" +#include "DefaultLexer.h" #ifdef SCI_NAMESPACE using namespace Scintilla; @@ -145,7 +146,7 @@ struct OptionSetD : public OptionSet<OptionsD> { } }; -class LexerD : public ILexer { +class LexerD : public DefaultLexer { bool caseSensitive; WordList keywords; WordList keywords2; diff --git a/lexers/LexDMIS.cxx b/lexers/LexDMIS.cxx index 8700d5329..9db391971 100644 --- a/lexers/LexDMIS.cxx +++ b/lexers/LexDMIS.cxx @@ -21,6 +21,7 @@ #include "StyleContext.h" #include "CharacterSet.h" #include "LexerModule.h" +#include "DefaultLexer.h" #ifdef SCI_NAMESPACE using namespace Scintilla; @@ -38,7 +39,7 @@ static const char *const DMISWordListDesc[] = { }; -class LexerDMIS : public ILexer +class LexerDMIS : public DefaultLexer { private: char *m_wordListSets; diff --git a/lexers/LexEDIFACT.cxx b/lexers/LexEDIFACT.cxx index f7e55bfe9..63805b04e 100644 --- a/lexers/LexEDIFACT.cxx +++ b/lexers/LexEDIFACT.cxx @@ -18,12 +18,13 @@ #include "LexAccessor.h" #include "LexerModule.h" +#include "DefaultLexer.h" #ifdef SCI_NAMESPACE using namespace Scintilla; #endif -class LexerEDIFACT : public ILexer +class LexerEDIFACT : public DefaultLexer { public: LexerEDIFACT(); diff --git a/lexers/LexHaskell.cxx b/lexers/LexHaskell.cxx index 26657830c..00e6b8cbf 100644 --- a/lexers/LexHaskell.cxx +++ b/lexers/LexHaskell.cxx @@ -41,6 +41,7 @@ #include "CharacterCategory.h" #include "LexerModule.h" #include "OptionSet.h" +#include "DefaultLexer.h" #ifdef SCI_NAMESPACE using namespace Scintilla; @@ -269,7 +270,7 @@ struct OptionSetHaskell : public OptionSet<OptionsHaskell> { } }; -class LexerHaskell : public ILexer { +class LexerHaskell : public DefaultLexer { bool literate; Sci_Position firstImportLine; int firstImportIndent; diff --git a/lexers/LexJSON.cxx b/lexers/LexJSON.cxx index 32b71926c..516aeb933 100644 --- a/lexers/LexJSON.cxx +++ b/lexers/LexJSON.cxx @@ -27,6 +27,7 @@ #include "CharacterSet.h" #include "LexerModule.h" #include "OptionSet.h" +#include "DefaultLexer.h" #ifdef SCI_NAMESPACE using namespace Scintilla; @@ -128,7 +129,7 @@ struct OptionSetJSON : public OptionSet<OptionsJSON> { } }; -class LexerJSON : public ILexer { +class LexerJSON : public DefaultLexer { OptionsJSON options; OptionSetJSON optSetJSON; EscapeSequence escapeSeq; diff --git a/lexers/LexPerl.cxx b/lexers/LexPerl.cxx index 03e371738..5e4071b20 100644 --- a/lexers/LexPerl.cxx +++ b/lexers/LexPerl.cxx @@ -27,6 +27,7 @@ #include "CharacterSet.h" #include "LexerModule.h" #include "OptionSet.h" +#include "DefaultLexer.h" #ifdef SCI_NAMESPACE using namespace Scintilla; @@ -398,7 +399,7 @@ struct OptionSetPerl : public OptionSet<OptionsPerl> { } }; -class LexerPerl : public ILexer { +class LexerPerl : public DefaultLexer { CharacterSet setWordStart; CharacterSet setWord; CharacterSet setSpecialVar; diff --git a/lexers/LexProgress.cxx b/lexers/LexProgress.cxx index aaa3d4b2d..c4a0e6a41 100644 --- a/lexers/LexProgress.cxx +++ b/lexers/LexProgress.cxx @@ -38,6 +38,7 @@ Differentiate between labels and variables #include "LexerModule.h" #include "OptionSet.h" #include "SparseState.h" +#include "DefaultLexer.h" #ifdef SCI_NAMESPACE using namespace Scintilla; @@ -122,7 +123,7 @@ namespace { }; } -class LexerABL : public ILexer { +class LexerABL : public DefaultLexer { CharacterSet setWord; CharacterSet setNegationOp; CharacterSet setArithmethicOp; @@ -172,7 +173,7 @@ public: void * SCI_METHOD PrivateCall(int, void *) override { return 0; } - int SCI_METHOD LineEndTypesSupported() { + int SCI_METHOD LineEndTypesSupported() override { return SC_LINE_END_TYPE_DEFAULT; } static ILexer *LexerFactoryABL() { diff --git a/lexers/LexPython.cxx b/lexers/LexPython.cxx index 97943ca24..50c3baa8c 100644 --- a/lexers/LexPython.cxx +++ b/lexers/LexPython.cxx @@ -30,6 +30,7 @@ #include "LexerModule.h" #include "OptionSet.h" #include "SubStyles.h" +#include "DefaultLexer.h" #ifdef SCI_NAMESPACE using namespace Scintilla; @@ -310,7 +311,7 @@ const char styleSubable[] = { SCE_P_IDENTIFIER, 0 }; } -class LexerPython : public ILexerWithSubStyles { +class LexerPython : public DefaultLexer { WordList keywords; WordList keywords2; OptionsPython options; diff --git a/lexers/LexRegistry.cxx b/lexers/LexRegistry.cxx index 43519e2e2..b02a0d265 100644 --- a/lexers/LexRegistry.cxx +++ b/lexers/LexRegistry.cxx @@ -27,6 +27,7 @@ #include "CharacterSet.h" #include "LexerModule.h" #include "OptionSet.h" +#include "DefaultLexer.h" #ifdef SCI_NAMESPACE using namespace Scintilla; @@ -53,7 +54,7 @@ struct OptionSetRegistry : public OptionSet<OptionsRegistry> { } }; -class LexerRegistry : public ILexer { +class LexerRegistry : public DefaultLexer { OptionsRegistry options; OptionSetRegistry optSetRegistry; diff --git a/lexers/LexRust.cxx b/lexers/LexRust.cxx index 4f2c6617a..ff5e816ba 100644 --- a/lexers/LexRust.cxx +++ b/lexers/LexRust.cxx @@ -29,6 +29,7 @@ #include "CharacterSet.h" #include "LexerModule.h" #include "OptionSet.h" +#include "DefaultLexer.h" #ifdef SCI_NAMESPACE using namespace Scintilla; @@ -116,7 +117,7 @@ struct OptionSetRust : public OptionSet<OptionsRust> { } }; -class LexerRust : public ILexer { +class LexerRust : public DefaultLexer { WordList keywords[NUM_RUST_KEYWORD_LISTS]; OptionsRust options; OptionSetRust osRust; diff --git a/lexers/LexSQL.cxx b/lexers/LexSQL.cxx index 6562839e4..871f4dce1 100644 --- a/lexers/LexSQL.cxx +++ b/lexers/LexSQL.cxx @@ -31,6 +31,7 @@ #include "LexerModule.h" #include "OptionSet.h" #include "SparseState.h" +#include "DefaultLexer.h" #ifdef SCI_NAMESPACE using namespace Scintilla; @@ -302,7 +303,7 @@ struct OptionSetSQL : public OptionSet<OptionsSQL> { } }; -class LexerSQL : public ILexer { +class LexerSQL : public DefaultLexer { public : LexerSQL() {} diff --git a/lexers/LexVerilog.cxx b/lexers/LexVerilog.cxx index 28b8dfbdb..6be3392f1 100644 --- a/lexers/LexVerilog.cxx +++ b/lexers/LexVerilog.cxx @@ -31,6 +31,7 @@ #include "OptionSet.h" #include "SubStyles.h" +#include "DefaultLexer.h" #ifdef SCI_NAMESPACE using namespace Scintilla; @@ -172,7 +173,7 @@ const char styleSubable[] = {0}; } -class LexerVerilog : public ILexerWithSubStyles { +class LexerVerilog : public DefaultLexer { CharacterSet setWord; WordList keywords; WordList keywords2; diff --git a/lexers/LexVisualProlog.cxx b/lexers/LexVisualProlog.cxx index 6c61c1874..c03069075 100644 --- a/lexers/LexVisualProlog.cxx +++ b/lexers/LexVisualProlog.cxx @@ -39,6 +39,7 @@ #include "CharacterCategory.h" #include "LexerModule.h" #include "OptionSet.h" +#include "DefaultLexer.h" #ifdef SCI_NAMESPACE using namespace Scintilla; @@ -64,7 +65,7 @@ struct OptionSetVisualProlog : public OptionSet<OptionsVisualProlog> { } }; -class LexerVisualProlog : public ILexer { +class LexerVisualProlog : public DefaultLexer { WordList majorKeywords; WordList minorKeywords; WordList directiveKeywords; |