diff options
| author | nyamatongwe <devnull@localhost> | 2010-07-13 21:44:00 +1000 |
|---|---|---|
| committer | nyamatongwe <devnull@localhost> | 2010-07-13 21:44:00 +1000 |
| commit | f5e7b31bb9c60f85e91a0958ae2e7452a2792063 (patch) | |
| tree | b54aacc72daf0121e9c0e2b28583b2372a3b6aab /lexers/LexCsound.cxx | |
| parent | 412fd42d7b9f10cb615e5e0ed01d1d9f51ae5f2d (diff) | |
| download | scintilla-mirror-f5e7b31bb9c60f85e91a0958ae2e7452a2792063.tar.gz | |
For new lexer design change includes to add new files and remove unused files.
Normalise order of includes.
Minor fixes for compatibility with new lexer design.
Diffstat (limited to 'lexers/LexCsound.cxx')
| -rw-r--r-- | lexers/LexCsound.cxx | 23 |
1 files changed, 14 insertions, 9 deletions
diff --git a/lexers/LexCsound.cxx b/lexers/LexCsound.cxx index 3aa2eb897..3f80cf373 100644 --- a/lexers/LexCsound.cxx +++ b/lexers/LexCsound.cxx @@ -8,18 +8,23 @@ #include <stdlib.h> #include <string.h> -#include <ctype.h> #include <stdio.h> #include <stdarg.h> -#include "Platform.h" +#include <assert.h> +#include <ctype.h> -#include "PropSet.h" -#include "Accessor.h" -#include "StyleContext.h" -#include "KeyWords.h" +#include "ILexer.h" #include "Scintilla.h" #include "SciLexer.h" +#include "PropSetSimple.h" +#include "WordList.h" +#include "LexAccessor.h" +#include "Accessor.h" +#include "StyleContext.h" +#include "CharacterSet.h" +#include "LexerModule.h" + #ifdef SCI_NAMESPACE using namespace Scintilla; #endif @@ -72,7 +77,7 @@ static void ColouriseCsoundDoc(unsigned int startPos, int length, int initStyle, continue; } } - + // Determine if the current state should terminate. if (sc.state == SCE_CSOUND_OPERATOR) { if (!IsCsoundOperator(static_cast<char>(sc.ch))) { @@ -119,7 +124,7 @@ static void ColouriseCsoundDoc(unsigned int startPos, int length, int initStyle, sc.SetState(SCE_CSOUND_DEFAULT); } } - + // Determine if a new state should be entered. if (sc.state == SCE_CSOUND_DEFAULT) { if (sc.ch == ';'){ @@ -146,7 +151,7 @@ static void ColouriseCsoundDoc(unsigned int startPos, int length, int initStyle, sc.Complete(); } -static void FoldCsoundInstruments(unsigned int startPos, int length, int /* initStyle */, WordList *[], +static void FoldCsoundInstruments(unsigned int startPos, int length, int /* initStyle */, WordList *[], Accessor &styler) { unsigned int lengthDoc = startPos + length; int visibleChars = 0; |