Avoid an assert when m_dir is empty

[wxWidgets.git] / src / stc / scintilla / include / KeyWords.h

diff --git a/src/stc/scintilla/include/KeyWords.h b/src/stc/scintilla/include/KeyWords.h
index df4e870c580f507203f57f61f2cc58a7af04a2fe..5593b7d091ae3241901be36467acd0f71c96088a 100644 (file)
--- a/src/stc/scintilla/include/KeyWords.h
+++ b/src/stc/scintilla/include/KeyWords.h
@@ -5,6 +5,33 @@
 // Copyright 1998-2001 by Neil Hodgson <neilh@scintilla.org>
 // The License.txt file describes the conditions under which this software may be distributed.
 
+#ifdef SCI_NAMESPACE
+namespace Scintilla {
+#endif
+
+/**
+ */
+class WordList {
+public:
+       // Each word contains at least one character - a empty word acts as sentinel at the end.
+       char **words;
+       char *list;
+       int len;
+       bool onlyLineEnds;      ///< Delimited by any white space or only line ends
+       bool sorted;
+       int starts[256];
+       WordList(bool onlyLineEnds_ = false) :
+               words(0), list(0), len(0), onlyLineEnds(onlyLineEnds_),
+               sorted(false)
+               {}
+       ~WordList() { Clear(); }
+       operator bool() { return len ? true : false; }
+       void Clear();
+       void Set(const char *s);
+       bool InList(const char *s);
+       bool InListAbbreviated(const char *s, const char marker);
+};
+
 typedef void (*LexerFunction)(unsigned int startPos, int lengthDoc, int initStyle,
                   WordList *keywordlists[], Accessor &styler);
                   
@@ -20,21 +47,29 @@ protected:
        LexerFunction fnLexer;
        LexerFunction fnFolder;
        const char * const * wordListDescriptions;
+       int styleBits;
 
        static const LexerModule *base;
        static int nextLanguage;
 
 public:
        const char *languageName;
-       LexerModule(int language_, LexerFunction fnLexer_, 
-               const char *languageName_=0, LexerFunction fnFolder_=0,
-               const char * const wordListDescriptions_[] = NULL);
+       LexerModule(int language_, 
+               LexerFunction fnLexer_, 
+               const char *languageName_=0, 
+               LexerFunction fnFolder_=0,
+               const char * const wordListDescriptions_[] = NULL,
+               int styleBits_=5);
+       virtual ~LexerModule() {
+       }
        int GetLanguage() const { return language; }
 
        // -1 is returned if no WordList information is available
        int GetNumWordLists() const;
        const char *GetWordListDescription(int index) const;
 
+       int GetStyleBitsNeeded() const;
+
        virtual void Lex(unsigned int startPos, int lengthDoc, int initStyle,
                   WordList *keywordlists[], Accessor &styler) const;
        virtual void Fold(unsigned int startPos, int lengthDoc, int initStyle,
@@ -43,6 +78,10 @@ public:
        static const LexerModule *Find(const char *languageName);
 };
 
+#ifdef SCI_NAMESPACE
+}
+#endif
+
 /**
  * Check if a character is a space.
  * This is ASCII specific but is safe with chars >= 0x80.