Update of /cvsroot/pywin32/pywin32/Pythonwin/Scintilla/include In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18959/include Modified Files: Accessor.h KeyWords.h Platform.h PropSet.h SString.h SciLexer.h Scintilla.h WindowAccessor.h Log Message: upgrade to scintilla 1.75 Index: WindowAccessor.h =================================================================== RCS file: /cvsroot/pywin32/pywin32/Pythonwin/Scintilla/include/WindowAccessor.h,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** WindowAccessor.h 2 Aug 2002 12:53:11 -0000 1.6 --- WindowAccessor.h 10 Feb 2008 11:01:46 -0000 1.7 *************** *** 7,10 **** --- 7,14 ---- // The License.txt file describes the conditions under which this software may be distributed. + #ifdef SCI_NAMESPACE + namespace Scintilla { + #endif + /** */ *************** *** 55,57 **** --- 59,66 ---- void SetLevel(int line, int level); int IndentAmount(int line, int *flags, PFNIsCommentLeader pfnIsCommentLeader = 0); + void IndicatorFill(int start, int end, int indicator, int value); }; + + #ifdef SCI_NAMESPACE + } + #endif Index: Platform.h =================================================================== RCS file: /cvsroot/pywin32/pywin32/Pythonwin/Scintilla/include/Platform.h,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** Platform.h 25 Nov 2003 10:45:20 -0000 1.11 --- Platform.h 10 Feb 2008 11:01:46 -0000 1.12 *************** *** 17,20 **** --- 17,21 ---- #define PLAT_GTK 0 #define PLAT_GTK_WIN32 0 + #define PLAT_MACOSX 0 #define PLAT_WIN 0 #define PLAT_WX 0 *************** *** 33,41 **** #define PLAT_GTK 1 ! #ifdef _MSC_VER #undef PLAT_GTK_WIN32 #define PLAT_GTK_WIN32 1 #endif #else #undef PLAT_WIN --- 34,46 ---- #define PLAT_GTK 1 ! #if defined(__WIN32__) || defined(_MSC_VER) #undef PLAT_GTK_WIN32 #define PLAT_GTK_WIN32 1 #endif + #elif defined(MACOSX) + #undef PLAT_MACOSX + #define PLAT_MACOSX 1 + #else #undef PLAT_WIN *************** *** 44,47 **** --- 49,55 ---- #endif + #ifdef SCI_NAMESPACE + namespace Scintilla { + #endif // Underlying the implementation of the platform classes are platform specific types. *************** *** 65,69 **** int y; ! Point(int x_=0, int y_=0) : x(x_), y(y_) { } --- 73,77 ---- int y; ! explicit Point(int x_=0, int y_=0) : x(x_), y(y_) { } *************** *** 115,118 **** --- 123,129 ---- int Width() { return right - left; } int Height() { return bottom - top; } + bool Empty() { + return (Height() <= 0) || (Width() <= 0); + } }; *************** *** 237,246 **** class Palette { int used; ! enum {numEntries = 100}; ! ColourPair entries[numEntries]; #if PLAT_GTK void *allocatedPalette; // GdkColor * int allocatedLen; #endif public: #if PLAT_WIN --- 248,260 ---- class Palette { int used; ! int size; ! ColourPair *entries; #if PLAT_GTK void *allocatedPalette; // GdkColor * int allocatedLen; #endif + // Private so Palette objects can not be copied + Palette(const Palette &) {} + Palette &operator=(const Palette &) { return *this; } public: #if PLAT_WIN *************** *** 280,284 **** virtual ~Font(); ! virtual void Create(const char *faceName, int characterSet, int size, bool bold, bool italic); virtual void Release(); --- 294,299 ---- virtual ~Font(); ! virtual void Create(const char *faceName, int characterSet, int size, ! bool bold, bool italic, bool extraFontFlag=false); virtual void Release(); *************** *** 287,290 **** --- 302,306 ---- void SetID(FontID id_) { id = id_; } friend class Surface; + friend class SurfaceImpl; }; *************** *** 318,321 **** --- 334,339 ---- virtual void FillRectangle(PRectangle rc, Surface &surfacePattern)=0; virtual void RoundedRectangle(PRectangle rc, ColourAllocated fore, ColourAllocated back)=0; + virtual void AlphaRectangle(PRectangle rc, int cornerSize, ColourAllocated fill, int alphaFill, + ColourAllocated outline, int alphaOutline, int flags)=0; virtual void Ellipse(PRectangle rc, ColourAllocated fore, ColourAllocated back)=0; virtual void Copy(PRectangle rc, Point from, Surface &surfaceSource)=0; *************** *** 354,360 **** protected: WindowID id; public: ! Window() : id(0), cursorLast(cursorInvalid) {} ! Window(const Window &source) : id(source.id), cursorLast(cursorInvalid) {} virtual ~Window(); Window &operator=(WindowID id_) { --- 372,392 ---- protected: WindowID id; + #if PLAT_MACOSX + void *windowRef; + void *control; + #endif public: ! Window() : id(0), cursorLast(cursorInvalid) { ! #if PLAT_MACOSX ! windowRef = 0; ! control = 0; ! #endif ! } ! Window(const Window &source) : id(source.id), cursorLast(cursorInvalid) { ! #if PLAT_MACOSX ! windowRef = 0; ! control = 0; ! #endif ! } virtual ~Window(); Window &operator=(WindowID id_) { *************** *** 377,380 **** --- 409,417 ---- void SetCursor(Cursor curs); void SetTitle(const char *s); + PRectangle GetMonitorRect(Point pt); + #if PLAT_MACOSX + void SetWindow(void *ref) { windowRef = ref; }; + void SetControl(void *_control) { control = _control; }; + #endif private: Cursor cursorLast; *************** *** 392,398 **** virtual void SetFont(Font &font)=0; ! virtual void Create(Window &parent, int ctrlID, int lineHeight_, bool unicodeMode_)=0; virtual void SetAverageCharWidth(int width)=0; virtual void SetVisibleRows(int rows)=0; virtual PRectangle GetDesiredRect()=0; virtual int CaretFromEdge()=0; --- 429,436 ---- virtual void SetFont(Font &font)=0; ! virtual void Create(Window &parent, int ctrlID, Point location, int lineHeight_, bool unicodeMode_)=0; virtual void SetAverageCharWidth(int width)=0; virtual void SetVisibleRows(int rows)=0; + virtual int GetVisibleRows() const=0; virtual PRectangle GetDesiredRect()=0; virtual int CaretFromEdge()=0; *************** *** 407,410 **** --- 445,449 ---- virtual void ClearRegisteredImages()=0; virtual void SetDoubleClickAction(CallBackAction, void *)=0; + virtual void SetList(const char* list, char separator, char typesep)=0; }; *************** *** 498,503 **** --- 537,550 ---- #define PLATFORM_ASSERT(c) ((void)0) #else + #ifdef SCI_NAMESPACE + #define PLATFORM_ASSERT(c) ((c) ? (void)(0) : Scintilla::Platform::Assert(#c, __FILE__, __LINE__)) + #else #define PLATFORM_ASSERT(c) ((c) ? (void)(0) : Platform::Assert(#c, __FILE__, __LINE__)) #endif + #endif + + #ifdef SCI_NAMESPACE + } + #endif // Shut up annoying Visual C++ warnings: Index: SString.h =================================================================== RCS file: /cvsroot/pywin32/pywin32/Pythonwin/Scintilla/include/SString.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** SString.h 25 Nov 2003 10:45:20 -0000 1.4 --- SString.h 10 Feb 2008 11:01:46 -0000 1.5 *************** *** 3,7 **** ** A simple string class. **/ ! // Copyright 1998-2001 by Neil Hodgson <ne...@sc...> // The License.txt file describes the conditions under which this software may be distributed. --- 3,7 ---- ** A simple string class. **/ ! // Copyright 1998-2004 by Neil Hodgson <ne...@sc...> // The License.txt file describes the conditions under which this software may be distributed. *************** *** 9,12 **** --- 9,13 ---- #define SSTRING_H + // These functions are implemented because each platform calls them something different. int CompareCaseInsensitive(const char *a, const char *b); *************** *** 14,17 **** --- 15,22 ---- bool EqualCaseInsensitive(const char *a, const char *b); + #ifdef SCI_NAMESPACE + namespace Scintilla { + #endif + // Define another string class. // While it would be 'better' to use std::string, that doubles the executable size. *************** *** 19,30 **** /** ! * @brief A simple string class. ! * ! * Hold the length of the string for quick operations, ! * can have a buffer bigger than the string to avoid too many memory allocations and copies. ! * May have embedded zeroes as a result of @a substitute, but relies too heavily on C string ! * functions to allow reliable manipulations of these strings, other than simple appends, etc. ! **/ ! class SString { public: /** Type of string lengths (sizes) and positions (indexes). */ --- 24,31 ---- /** ! * Base class from which the two other classes (SBuffer & SString) ! * are derived. ! */ ! class SContainer { public: /** Type of string lengths (sizes) and positions (indexes). */ *************** *** 33,90 **** enum { measure_length=0xffffffffU}; ! private: char *s; ///< The C string lenpos_t sSize; ///< The size of the buffer, less 1: ie. the maximum size of the string ! lenpos_t sLen; ///< The size of the string in s ! lenpos_t sizeGrowth; ///< Minimum growth size when appending strings ! enum { sizeGrowthDefault = 64 }; ! bool grow(lenpos_t lenNew) { ! while (sizeGrowth * 6 < lenNew) { ! sizeGrowth *= 2; ! } ! char *sNew = new char[lenNew + sizeGrowth + 1]; ! if (sNew) { ! if (s) { ! memcpy(sNew, s, sLen); ! delete []s; ! } ! s = sNew; ! s[sLen] = '\0'; ! sSize = lenNew + sizeGrowth; } - return sNew != 0; } ! SString &assign(const char *sOther, lenpos_t sSize_=measure_length) { ! if (!sOther) { ! sSize_ = 0; ! } else if (sSize_ == measure_length) { ! sSize_ = strlen(sOther); ! } ! if (sSize > 0 && sSize_ <= sSize) { // Does not allocate new buffer if the current is big enough ! if (s && sSize_) { ! memcpy(s, sOther, sSize_); ! } ! s[sSize_] = '\0'; ! sLen = sSize_; } else { delete []s; ! s = StringAllocate(sOther, sSize_); ! if (s) { ! sSize = sSize_; // Allow buffer bigger than real string, thus providing space to grow ! sLen = strlen(s); ! } else { ! sSize = sLen = 0; ! } } return *this; } - public: ! SString() : s(0), sSize(0), sLen(0), sizeGrowth(sizeGrowthDefault) { } ! SString(const SString &source) : sizeGrowth(sizeGrowthDefault) { ! s = StringAllocate(source.s); ! sSize = sLen = (s) ? strlen(s) : 0; } SString(const char *s_) : sizeGrowth(sizeGrowthDefault) { --- 34,150 ---- enum { measure_length=0xffffffffU}; ! protected: char *s; ///< The C string lenpos_t sSize; ///< The size of the buffer, less 1: ie. the maximum size of the string ! ! SContainer() : s(0), sSize(0) {} ! ~SContainer() { ! delete []s; // Suppose it was allocated using StringAllocate ! s = 0; ! sSize = 0; ! } ! /** Size of buffer. */ ! lenpos_t size() const { ! if (s) { ! return sSize; ! } else { ! return 0; } } + public: + /** + * Allocate uninitialized memory big enough to fit a string of the given length. + * @return the pointer to the new string + */ + static char *StringAllocate(lenpos_t len); + /** + * Duplicate a buffer/C string. + * Allocate memory of the given size, or big enough to fit the string if length isn't given; + * then copy the given string in the allocated memory. + * @return the pointer to the new string + */ + static char *StringAllocate( + const char *s, ///< The string to duplicate + lenpos_t len=measure_length); ///< The length of memory to allocate. Optional. + }; ! ! /** ! * @brief A string buffer class. ! * ! * Main use is to ask an API the length of a string it can provide, ! * then to allocate a buffer of the given size, and to provide this buffer ! * to the API to put the string. ! * This class is intended to be shortlived, to be transformed as SString ! * as soon as it holds the string, so it has little members. ! * Note: we assume the buffer is filled by the API. If the length can be shorter, ! * we should set sLen to strlen(sb.ptr()) in related SString constructor and assignment. ! */ ! class SBuffer : protected SContainer { ! public: ! SBuffer(lenpos_t len) { ! s = StringAllocate(len); ! if (s) { ! *s = '\0'; ! sSize = len; } else { + sSize = 0; + } + } + private: + /// Copy constructor + // Here only to be on the safe size, user should avoid returning SBuffer values. + SBuffer(const SBuffer &source) : SContainer() { + s = StringAllocate(source.s, source.sSize); + sSize = (s) ? source.sSize : 0; + } + /// Default assignment operator + // Same here, shouldn't be used + SBuffer &operator=(const SBuffer &source) { + if (this != &source) { delete []s; ! s = StringAllocate(source.s, source.sSize); ! sSize = (s) ? source.sSize : 0; } return *this; } public: ! /** Provide direct read/write access to buffer. */ ! char *ptr() { ! return s; } ! /** Ownership of the buffer have been taken, so release it. */ ! void reset() { ! s = 0; ! sSize = 0; ! } ! /** Size of buffer. */ ! lenpos_t size() const { ! return SContainer::size(); ! } ! }; ! ! ! /** ! * @brief A simple string class. ! * ! * Hold the length of the string for quick operations, ! * can have a buffer bigger than the string to avoid too many memory allocations and copies. ! * May have embedded zeroes as a result of @a substitute, but relies too heavily on C string ! * functions to allow reliable manipulations of these strings, other than simple appends, etc. ! */ ! class SString : protected SContainer { ! lenpos_t sLen; ///< The size of the string in s ! lenpos_t sizeGrowth; ///< Minimum growth size when appending strings ! enum { sizeGrowthDefault = 64 }; ! ! bool grow(lenpos_t lenNew); ! SString &assign(const char *sOther, lenpos_t sSize_=measure_length); ! ! public: ! SString() : sLen(0), sizeGrowth(sizeGrowthDefault) {} ! SString(const SString &source) : SContainer(), sizeGrowth(sizeGrowthDefault) { ! s = StringAllocate(source.s, source.sLen); ! sSize = sLen = (s) ? source.sLen : 0; } SString(const char *s_) : sizeGrowth(sizeGrowthDefault) { *************** *** 92,116 **** sSize = sLen = (s) ? strlen(s) : 0; } SString(const char *s_, lenpos_t first, lenpos_t last) : sizeGrowth(sizeGrowthDefault) { // note: expects the "last" argument to point one beyond the range end (a la STL iterators) s = StringAllocate(s_ + first, last - first); ! sSize = sLen = (s) ? strlen(s) : 0; ! } ! SString(int i) : sizeGrowth(sizeGrowthDefault) { ! char number[32]; ! sprintf(number, "%0d", i); ! s = StringAllocate(number); ! sSize = sLen = (s) ? strlen(s) : 0; ! } ! SString(double d, int precision) : sizeGrowth(sizeGrowthDefault) { ! char number[32]; ! sprintf(number, "%.*f", precision, d); ! s = StringAllocate(number); ! sSize = sLen = (s) ? strlen(s) : 0; } ~SString() { - delete []s; - s = 0; - sSize = 0; sLen = 0; } --- 152,169 ---- sSize = sLen = (s) ? strlen(s) : 0; } + SString(SBuffer &buf) : sizeGrowth(sizeGrowthDefault) { + s = buf.ptr(); + sSize = sLen = buf.size(); + // Consumes the given buffer! + buf.reset(); + } SString(const char *s_, lenpos_t first, lenpos_t last) : sizeGrowth(sizeGrowthDefault) { // note: expects the "last" argument to point one beyond the range end (a la STL iterators) s = StringAllocate(s_ + first, last - first); ! sSize = sLen = (s) ? last - first : 0; } + SString(int i); + SString(double d, int precision); ~SString() { sLen = 0; } *************** *** 123,130 **** /** Size of buffer. */ lenpos_t size() const { ! if (s) ! return sSize; ! else ! return 0; } /** Size of string in buffer. */ --- 176,180 ---- /** Size of buffer. */ lenpos_t size() const { ! return SContainer::size(); } /** Size of string in buffer. */ *************** *** 132,135 **** --- 182,189 ---- return sLen; } + /** Read access to a character of the string. */ + char operator[](lenpos_t i) const { + return (s && i < sSize) ? s[i] : '\0'; + } SString &operator=(const char *source) { return assign(source); *************** *** 137,169 **** SString &operator=(const SString &source) { if (this != &source) { ! assign(source.c_str()); } return *this; } ! bool operator==(const SString &sOther) const { ! if ((s == 0) && (sOther.s == 0)) ! return true; ! if ((s == 0) || (sOther.s == 0)) ! return false; ! return strcmp(s, sOther.s) == 0; ! } bool operator!=(const SString &sOther) const { return !operator==(sOther); } ! bool operator==(const char *sOther) const { ! if ((s == 0) && (sOther == 0)) ! return true; ! if ((s == 0) || (sOther == 0)) ! return false; ! return strcmp(s, sOther) == 0; ! } bool operator!=(const char *sOther) const { return !operator==(sOther); } ! bool contains(char ch) { ! if (s && *s) ! return strchr(s, ch) != 0; ! else ! return false; } void setsizegrowth(lenpos_t sizeGrowth_) { --- 191,208 ---- SString &operator=(const SString &source) { if (this != &source) { ! assign(source.s, source.sLen); } return *this; } ! bool operator==(const SString &sOther) const; bool operator!=(const SString &sOther) const { return !operator==(sOther); } ! bool operator==(const char *sOther) const; bool operator!=(const char *sOther) const { return !operator==(sOther); } ! bool contains(char ch) const { ! return (s && *s) ? strchr(s, ch) != 0 : false; } void setsizegrowth(lenpos_t sizeGrowth_) { *************** *** 171,178 **** } const char *c_str() const { ! if (s) ! return s; ! else ! return ""; } /** Give ownership of buffer to caller which must use delete[] to free buffer. */ --- 210,214 ---- } const char *c_str() const { ! return s ? s : ""; } /** Give ownership of buffer to caller which must use delete[] to free buffer. */ *************** *** 184,238 **** return sRet; } ! char operator[](lenpos_t i) const { ! if (s && i < sSize) // Or < sLen? Depends on the use, both are OK ! return s[i]; ! else ! return '\0'; ! } ! SString substr(lenpos_t subPos, lenpos_t subLen=measure_length) const { ! if (subPos >= sLen) { ! return SString(); // return a null string if start index is out of bounds ! } ! if ((subLen == measure_length) || (subPos + subLen > sLen)) { ! subLen = sLen - subPos; // can't substr past end of source string ! } ! return SString(s, subPos, subPos + subLen); ! } ! SString &lowercase(lenpos_t subPos = 0, lenpos_t subLen=measure_length) { ! if ((subLen == measure_length) || (subPos + subLen > sLen)) { ! subLen = sLen - subPos; // don't apply past end of string ! } ! for (lenpos_t i = subPos; i < subPos + subLen; i++) { ! if (s[i] < 'A' || s[i] > 'Z') ! continue; ! else ! s[i] = static_cast<char>(s[i] - 'A' + 'a'); ! } ! return *this; ! } ! SString &append(const char *sOther, lenpos_t sLenOther=measure_length, char sep = '\0') { ! if (!sOther) { ! return *this; ! } ! if (sLenOther == measure_length) { ! sLenOther = strlen(sOther); ! } ! int lenSep = 0; ! if (sLen && sep) { // Only add a separator if not empty ! lenSep = 1; ! } ! lenpos_t lenNew = sLen + sLenOther + lenSep; ! // Conservative about growing the buffer: don't do it, unless really needed ! if ((lenNew + 1 < sSize) || (grow(lenNew))) { ! if (lenSep) { ! s[sLen] = sep; ! sLen++; ! } ! memcpy(&s[sLen], sOther, sLenOther); ! sLen += sLenOther; ! s[sLen] = '\0'; ! } ! return *this; ! } SString &operator+=(const char *sOther) { return append(sOther, static_cast<lenpos_t>(measure_length)); --- 220,227 ---- return sRet; } ! SString substr(lenpos_t subPos, lenpos_t subLen=measure_length) const; ! SString &lowercase(lenpos_t subPos = 0, lenpos_t subLen=measure_length); ! SString &uppercase(lenpos_t subPos = 0, lenpos_t subLen=measure_length); ! SString &append(const char *sOther, lenpos_t sLenOther=measure_length, char sep = '\0'); SString &operator+=(const char *sOther) { return append(sOther, static_cast<lenpos_t>(measure_length)); *************** *** 247,365 **** return append(sOther, strlen(sOther), sep); } ! SString &insert(lenpos_t pos, const char *sOther, lenpos_t sLenOther=measure_length) { ! if (!sOther) { ! return *this; ! } ! if (sLenOther == measure_length) { ! sLenOther = strlen(sOther); ! } ! lenpos_t lenNew = sLen + sLenOther; ! // Conservative about growing the buffer: don't do it, unless really needed ! if ((lenNew + 1 < sSize) || grow(lenNew)) { ! lenpos_t moveChars = sLen - pos + 1; ! for (lenpos_t i = moveChars; i > 0; i--) { ! s[pos + sLenOther + i - 1] = s[pos + i - 1]; ! } ! memcpy(s + pos, sOther, sLenOther); ! sLen = lenNew; ! } ! return *this; ! } ! /** Remove @a len characters from the @a pos position, included. * Characters at pos + len and beyond replace characters at pos. * If @a len is 0, or greater than the length of the string * starting at @a pos, the string is just truncated at @a pos. */ ! void remove(lenpos_t pos, lenpos_t len) { ! if (len < 1 || pos + len >= sLen) { ! s[pos] = '\0'; ! sLen = pos; ! } else { ! for (lenpos_t i = pos; i < sLen - len + 1; i++) { ! s[i] = s[i+len]; ! } ! sLen -= len; ! } ! } SString &change(lenpos_t pos, char ch) { ! if (pos >= sLen) { // character changed must be in string bounds ! return *this; } - *(s + pos) = ch; return *this; } /** Read an integral numeric value from the string. */ int value() const { ! if (s) ! return atoi(s); ! else ! return 0; ! } ! int search(const char *sFind, lenpos_t start=0) const { ! if (start < sLen) { ! const char *sFound = strstr(s + start, sFind); ! if (sFound) { ! return sFound - s; ! } ! } ! return -1; } ! bool contains(const char *sFind) { return search(sFind) >= 0; } ! int substitute(char chFind, char chReplace) { ! int c = 0; ! char *t = s; ! while (t) { ! t = strchr(t, chFind); ! if (t) { ! *t = chReplace; ! t++; ! c++; ! } ! } ! return c; ! } ! int substitute(const char *sFind, const char *sReplace) { ! int c = 0; ! lenpos_t lenFind = strlen(sFind); ! lenpos_t lenReplace = strlen(sReplace); ! int posFound = search(sFind); ! while (posFound >= 0) { ! remove(posFound, lenFind); ! insert(posFound, sReplace, lenReplace); ! posFound = search(sFind, posFound + lenReplace); ! c++; ! } ! return c; ! } int remove(const char *sFind) { return substitute(sFind, ""); } - /** - * Duplicate a C string. - * Allocate memory of the given size, or big enough to fit the string if length isn't given; - * then copy the given string in the allocated memory. - * @return the pointer to the new string - */ - static char *StringAllocate( - const char *s, ///< The string to duplicate - lenpos_t len=measure_length) ///< The length of memory to allocate. Optional. - { - if (s == 0) { - return 0; - } - if (len == measure_length) { - len = strlen(s); - } - char *sNew = new char[len + 1]; - if (sNew) { - memcpy(sNew, s, len); - sNew[len] = '\0'; - } - return sNew; - } }; /** * Duplicate a C string. --- 236,273 ---- return append(sOther, strlen(sOther), sep); } ! SString &insert(lenpos_t pos, const char *sOther, lenpos_t sLenOther=measure_length); ! ! /** ! * Remove @a len characters from the @a pos position, included. * Characters at pos + len and beyond replace characters at pos. * If @a len is 0, or greater than the length of the string * starting at @a pos, the string is just truncated at @a pos. */ ! void remove(lenpos_t pos, lenpos_t len); ! SString &change(lenpos_t pos, char ch) { ! if (pos < sLen) { // character changed must be in string bounds ! *(s + pos) = ch; } return *this; } /** Read an integral numeric value from the string. */ int value() const { ! return s ? atoi(s) : 0; } ! bool startswith(const char *prefix); ! bool endswith(const char *suffix); ! int search(const char *sFind, lenpos_t start=0) const; ! bool contains(const char *sFind) const { return search(sFind) >= 0; } ! int substitute(char chFind, char chReplace); ! int substitute(const char *sFind, const char *sReplace); int remove(const char *sFind) { return substitute(sFind, ""); } }; + /** * Duplicate a C string. *************** *** 370,377 **** inline char *StringDup( const char *s, ///< The string to duplicate ! SString::lenpos_t len=SString::measure_length) ///< The length of memory to allocate. Optional. { ! return SString::StringAllocate(s, len); } #endif --- 278,289 ---- inline char *StringDup( const char *s, ///< The string to duplicate ! SContainer::lenpos_t len=SContainer::measure_length) ///< The length of memory to allocate. Optional. { ! return SContainer::StringAllocate(s, len); ! } ! ! #ifdef SCI_NAMESPACE } + #endif #endif Index: Accessor.h =================================================================== RCS file: /cvsroot/pywin32/pywin32/Pythonwin/Scintilla/include/Accessor.h,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** Accessor.h 2 Aug 2002 12:53:10 -0000 1.7 --- Accessor.h 10 Feb 2008 11:01:46 -0000 1.8 *************** *** 76,78 **** --- 76,79 ---- virtual void SetLevel(int line, int level)=0; virtual int IndentAmount(int line, int *flags, PFNIsCommentLeader pfnIsCommentLeader = 0)=0; + virtual void IndicatorFill(int start, int end, int indicator, int value)=0; }; Index: Scintilla.h =================================================================== RCS file: /cvsroot/pywin32/pywin32/Pythonwin/Scintilla/include/Scintilla.h,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** Scintilla.h 25 Nov 2003 10:45:20 -0000 1.14 --- Scintilla.h 10 Feb 2008 11:01:46 -0000 1.15 *************** *** 12,15 **** --- 12,19 ---- #define SCINTILLA_H + #if LCCWIN + typedef BOOL bool; + #endif + #if PLAT_WIN // Return false on failure: *************** *** 114,117 **** --- 118,123 ---- #define SC_MARK_ARROWS 24 #define SC_MARK_PIXMAP 25 + #define SC_MARK_FULLRECT 26 + #define SC_MARK_LEFTRECT 27 #define SC_MARK_CHARACTER 10000 #define SC_MARKNUM_FOLDEREND 25 *************** *** 133,138 **** --- 139,148 ---- #define SCI_MARKERPREVIOUS 2048 #define SCI_MARKERDEFINEPIXMAP 2049 + #define SCI_MARKERADDSET 2466 + #define SCI_MARKERSETALPHA 2476 #define SC_MARGIN_SYMBOL 0 #define SC_MARGIN_NUMBER 1 + #define SC_MARGIN_BACK 2 + #define SC_MARGIN_FORE 3 #define SCI_SETMARGINTYPEN 2240 #define SCI_GETMARGINTYPEN 2241 *************** *** 149,154 **** #define STYLE_CONTROLCHAR 36 #define STYLE_INDENTGUIDE 37 #define STYLE_LASTPREDEFINED 39 ! #define STYLE_MAX 127 #define SC_CHARSET_ANSI 0 #define SC_CHARSET_DEFAULT 1 --- 159,165 ---- #define STYLE_CONTROLCHAR 36 #define STYLE_INDENTGUIDE 37 + #define STYLE_CALLTIP 38 #define STYLE_LASTPREDEFINED 39 ! #define STYLE_MAX 255 #define SC_CHARSET_ANSI 0 #define SC_CHARSET_DEFAULT 1 *************** *** 162,165 **** --- 173,177 ---- #define SC_CHARSET_OEM 255 #define SC_CHARSET_RUSSIAN 204 + #define SC_CHARSET_CYRILLIC 1251 #define SC_CHARSET_SHIFTJIS 128 #define SC_CHARSET_SYMBOL 2 *************** *** 170,173 **** --- 182,186 ---- #define SC_CHARSET_VIETNAMESE 163 #define SC_CHARSET_THAI 222 + #define SC_CHARSET_8859_15 1000 #define SCI_STYLECLEARALL 2050 #define SCI_STYLESETFORE 2051 *************** *** 183,186 **** --- 196,212 ---- #define SC_CASE_UPPER 1 #define SC_CASE_LOWER 2 + #define SCI_STYLEGETFORE 2481 + #define SCI_STYLEGETBACK 2482 + #define SCI_STYLEGETBOLD 2483 + #define SCI_STYLEGETITALIC 2484 + #define SCI_STYLEGETSIZE 2485 + #define SCI_STYLEGETFONT 2486 + #define SCI_STYLEGETEOLFILLED 2487 + #define SCI_STYLEGETUNDERLINE 2488 + #define SCI_STYLEGETCASE 2489 + #define SCI_STYLEGETCHARACTERSET 2490 + #define SCI_STYLEGETVISIBLE 2491 + #define SCI_STYLEGETCHANGEABLE 2492 + #define SCI_STYLEGETHOTSPOT 2493 #define SCI_STYLESETCASE 2060 #define SCI_STYLESETCHARACTERSET 2066 *************** *** 188,191 **** --- 214,221 ---- #define SCI_SETSELFORE 2067 #define SCI_SETSELBACK 2068 + #define SCI_GETSELALPHA 2477 + #define SCI_SETSELALPHA 2478 + #define SCI_GETSELEOLFILLED 2479 + #define SCI_SETSELEOLFILLED 2480 #define SCI_SETCARETFORE 2069 #define SCI_ASSIGNCMDKEY 2070 *************** *** 199,203 **** #define SCI_BEGINUNDOACTION 2078 #define SCI_ENDUNDOACTION 2079 - #define INDIC_MAX 7 #define INDIC_PLAIN 0 #define INDIC_SQUIGGLE 1 --- 229,232 ---- *************** *** 207,210 **** --- 236,242 ---- #define INDIC_HIDDEN 5 #define INDIC_BOX 6 + #define INDIC_ROUNDBOX 7 + #define INDIC_MAX 31 + #define INDIC_CONTAINER 8 #define INDIC0_MASK 0x20 #define INDIC1_MASK 0x40 *************** *** 215,218 **** --- 247,252 ---- #define SCI_INDICSETFORE 2082 #define SCI_INDICGETFORE 2083 + #define SCI_INDICSETUNDER 2510 + #define SCI_INDICGETUNDER 2511 #define SCI_SETWHITESPACEFORE 2084 #define SCI_SETWHITESPACEBACK 2085 *************** *** 252,255 **** --- 286,293 ---- #define SCI_AUTOCGETTYPESEPARATOR 2285 #define SCI_AUTOCSETTYPESEPARATOR 2286 + #define SCI_AUTOCSETMAXWIDTH 2208 + #define SCI_AUTOCGETMAXWIDTH 2209 + #define SCI_AUTOCSETMAXHEIGHT 2210 + #define SCI_AUTOCGETMAXHEIGHT 2211 #define SCI_SETINDENT 2122 #define SCI_GETINDENT 2123 *************** *** 262,265 **** --- 300,307 ---- #define SCI_SETHSCROLLBAR 2130 #define SCI_GETHSCROLLBAR 2131 + #define SC_IV_NONE 0 + #define SC_IV_REAL 1 + #define SC_IV_LOOKFORWARD 2 + #define SC_IV_LOOKBOTH 3 #define SCI_SETINDENTATIONGUIDES 2132 #define SCI_GETINDENTATIONGUIDES 2133 *************** *** 347,352 **** --- 389,396 ---- #define SCI_CALLTIPSETFORE 2206 #define SCI_CALLTIPSETFOREHLT 2207 + #define SCI_CALLTIPUSESTYLE 2212 #define SCI_VISIBLEFROMDOCLINE 2220 #define SCI_DOCLINEFROMVISIBLE 2221 + #define SCI_WRAPCOUNT 2235 #define SC_FOLDLEVELBASE 0x400 #define SC_FOLDLEVELWHITEFLAG 0x1000 *************** *** 387,392 **** --- 431,449 ---- #define SC_WRAP_NONE 0 #define SC_WRAP_WORD 1 + #define SC_WRAP_CHAR 2 #define SCI_SETWRAPMODE 2268 #define SCI_GETWRAPMODE 2269 + #define SC_WRAPVISUALFLAG_NONE 0x0000 + #define SC_WRAPVISUALFLAG_END 0x0001 + #define SC_WRAPVISUALFLAG_START 0x0002 + #define SCI_SETWRAPVISUALFLAGS 2460 + #define SCI_GETWRAPVISUALFLAGS 2461 + #define SC_WRAPVISUALFLAGLOC_DEFAULT 0x0000 + #define SC_WRAPVISUALFLAGLOC_END_BY_TEXT 0x0001 + #define SC_WRAPVISUALFLAGLOC_START_BY_TEXT 0x0002 + #define SCI_SETWRAPVISUALFLAGSLOCATION 2462 + #define SCI_GETWRAPVISUALFLAGSLOCATION 2463 + #define SCI_SETWRAPSTARTINDENT 2464 + #define SCI_GETWRAPSTARTINDENT 2465 #define SC_CACHE_NONE 0 #define SC_CACHE_CARET 1 *************** *** 397,400 **** --- 454,459 ---- #define SCI_SETSCROLLWIDTH 2274 #define SCI_GETSCROLLWIDTH 2275 + #define SCI_SETSCROLLWIDTHTRACKING 2516 + #define SCI_GETSCROLLWIDTHTRACKING 2517 #define SCI_TEXTWIDTH 2276 #define SCI_SETENDATLASTLINE 2277 *************** *** 448,451 **** --- 507,511 ---- #define SCI_DELWORDLEFT 2335 #define SCI_DELWORDRIGHT 2336 + #define SCI_DELWORDRIGHTEND 2518 #define SCI_LINECUT 2337 #define SCI_LINEDELETE 2338 *************** *** 533,539 **** --- 593,603 ---- #define SCI_GETPRINTWRAPMODE 2407 #define SCI_SETHOTSPOTACTIVEFORE 2410 + #define SCI_GETHOTSPOTACTIVEFORE 2494 #define SCI_SETHOTSPOTACTIVEBACK 2411 + #define SCI_GETHOTSPOTACTIVEBACK 2495 #define SCI_SETHOTSPOTACTIVEUNDERLINE 2412 + #define SCI_GETHOTSPOTACTIVEUNDERLINE 2496 #define SCI_SETHOTSPOTSINGLELINE 2421 + #define SCI_GETHOTSPOTSINGLELINE 2497 #define SCI_PARADOWN 2413 #define SCI_PARADOWNEXTEND 2414 *************** *** 570,573 **** --- 634,672 ---- #define SCI_SETWHITESPACECHARS 2443 #define SCI_SETCHARSDEFAULT 2444 + #define SCI_AUTOCGETCURRENT 2445 + #define SCI_ALLOCATE 2446 + #define SCI_TARGETASUTF8 2447 + #define SCI_SETLENGTHFORENCODE 2448 + #define SCI_ENCODEDFROMUTF8 2449 + #define SCI_FINDCOLUMN 2456 + #define SCI_GETCARETSTICKY 2457 + #define SCI_SETCARETSTICKY 2458 + #define SCI_TOGGLECARETSTICKY 2459 + #define SCI_SETPASTECONVERTENDINGS 2467 + #define SCI_GETPASTECONVERTENDINGS 2468 + #define SCI_SELECTIONDUPLICATE 2469 + #define SC_ALPHA_TRANSPARENT 0 + #define SC_ALPHA_OPAQUE 255 + #define SC_ALPHA_NOALPHA 256 + #define SCI_SETCARETLINEBACKALPHA 2470 + #define SCI_GETCARETLINEBACKALPHA 2471 + #define CARETSTYLE_INVISIBLE 0 + #define CARETSTYLE_LINE 1 + #define CARETSTYLE_BLOCK 2 + #define SCI_SETCARETSTYLE 2512 + #define SCI_GETCARETSTYLE 2513 + #define SCI_SETINDICATORCURRENT 2500 + #define SCI_GETINDICATORCURRENT 2501 + #define SCI_SETINDICATORVALUE 2502 + #define SCI_GETINDICATORVALUE 2503 + #define SCI_INDICATORFILLRANGE 2504 + #define SCI_INDICATORCLEARRANGE 2505 + #define SCI_INDICATORALLONFOR 2506 + #define SCI_INDICATORVALUEAT 2507 + #define SCI_INDICATORSTART 2508 + #define SCI_INDICATOREND 2509 + #define SCI_SETPOSITIONCACHE 2514 + #define SCI_GETPOSITIONCACHE 2515 + #define SCI_COPYALLOWLINE 2519 #define SCI_STARTRECORD 3001 #define SCI_STOPRECORD 3002 *************** *** 580,583 **** --- 679,686 ---- #define SCI_SETLEXERLANGUAGE 4006 #define SCI_LOADLEXERLIBRARY 4007 + #define SCI_GETPROPERTY 4008 + #define SCI_GETPROPERTYEXPANDED 4009 + #define SCI_GETPROPERTYINT 4010 + #define SCI_GETSTYLEBITSNEEDED 4011 #define SC_MOD_INSERTTEXT 0x1 #define SC_MOD_DELETETEXT 0x2 *************** *** 587,595 **** #define SC_PERFORMED_UNDO 0x20 #define SC_PERFORMED_REDO 0x40 #define SC_LASTSTEPINUNDOREDO 0x100 #define SC_MOD_CHANGEMARKER 0x200 #define SC_MOD_BEFOREINSERT 0x400 #define SC_MOD_BEFOREDELETE 0x800 ! #define SC_MODEVENTMASKALL 0xF77 #define SCEN_CHANGE 768 #define SCEN_SETFOCUS 512 --- 690,703 ---- #define SC_PERFORMED_UNDO 0x20 #define SC_PERFORMED_REDO 0x40 + #define SC_MULTISTEPUNDOREDO 0x80 #define SC_LASTSTEPINUNDOREDO 0x100 #define SC_MOD_CHANGEMARKER 0x200 #define SC_MOD_BEFOREINSERT 0x400 #define SC_MOD_BEFOREDELETE 0x800 ! #define SC_MULTILINEUNDOREDO 0x1000 ! #define SC_STARTACTION 0x2000 ! #define SC_MOD_CHANGEINDICATOR 0x4000 ! #define SC_MOD_CHANGELINESTATE 0x8000 ! #define SC_MODEVENTMASKALL 0xFFFF #define SCEN_CHANGE 768 #define SCEN_SETFOCUS 512 *************** *** 612,615 **** --- 720,727 ---- #define SCK_SUBTRACT 311 #define SCK_DIVIDE 312 + #define SCK_WIN 313 + #define SCK_RWIN 314 + #define SCK_MENU 315 + #define SCMOD_NORM 0 #define SCMOD_SHIFT 1 #define SCMOD_CTRL 2 *************** *** 636,639 **** --- 748,754 ---- #define SCN_HOTSPOTDOUBLECLICK 2020 #define SCN_CALLTIPCLICK 2021 + #define SCN_AUTOCSELECTION 2022 + #define SCN_INDICATORCLICK 2023 + #define SCN_INDICATORRELEASE 2024 //--Autogenerated -- end of section automatically generated from Scintilla.iface *************** *** 642,645 **** --- 757,764 ---- // So older code that treats Scintilla as a RichEdit will work. + #ifdef SCI_NAMESPACE + namespace Scintilla { + #endif + struct CharacterRange { long cpMin; *************** *** 674,682 **** struct NotifyHeader { ! // hwndFrom is really an environment specifc window handle or pointer // but most clients of Scintilla.h do not have this type visible. - //WindowID hwndFrom; void *hwndFrom; ! unsigned int idFrom; unsigned int code; }; --- 793,801 ---- struct NotifyHeader { ! // Compatible with Windows NMHDR. ! // hwndFrom is really an environment specific window handle or pointer // but most clients of Scintilla.h do not have this type visible. void *hwndFrom; ! uptr_t idFrom; unsigned int code; }; *************** *** 688,692 **** int modifiers; // SCN_KEY int modificationType; // SCN_MODIFIED ! const char *text; // SCN_MODIFIED int length; // SCN_MODIFIED int linesAdded; // SCN_MODIFIED --- 807,811 ---- int modifiers; // SCN_KEY int modificationType; // SCN_MODIFIED ! const char *text; // SCN_MODIFIED, SCN_USERLISTSELECTION, SCN_AUTOCSELECTION int length; // SCN_MODIFIED int linesAdded; // SCN_MODIFIED *************** *** 703,706 **** --- 822,829 ---- }; + #ifdef SCI_NAMESPACE + } + #endif + // Deprecation section listing all API features that are deprecated and will // will be removed completely in a future version. Index: KeyWords.h =================================================================== RCS file: /cvsroot/pywin32/pywin32/Pythonwin/Scintilla/include/KeyWords.h,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** KeyWords.h 15 Apr 2002 15:11:51 -0000 1.5 --- KeyWords.h 10 Feb 2008 11:01:46 -0000 1.6 *************** *** 6,9 **** --- 6,13 ---- // The License.txt file describes the conditions under which this software may be distributed. + #ifdef SCI_NAMESPACE + namespace Scintilla { + #endif + typedef void (*LexerFunction)(unsigned int startPos, int lengthDoc, int initStyle, WordList *keywordlists[], Accessor &styler); *************** *** 21,24 **** --- 25,29 ---- LexerFunction fnFolder; const char * const * wordListDescriptions; + int styleBits; static const LexerModule *base; *************** *** 27,33 **** public: const char *languageName; ! LexerModule(int language_, LexerFunction fnLexer_, ! const char *languageName_=0, LexerFunction fnFolder_=0, ! const char * const wordListDescriptions_[] = NULL); int GetLanguage() const { return language; } --- 32,43 ---- public: const char *languageName; ! 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; } *************** *** 36,39 **** --- 46,51 ---- const char *GetWordListDescription(int index) const; + int GetStyleBitsNeeded() const; + virtual void Lex(unsigned int startPos, int lengthDoc, int initStyle, WordList *keywordlists[], Accessor &styler) const; *************** *** 44,47 **** --- 56,63 ---- }; + #ifdef SCI_NAMESPACE + } + #endif + /** * Check if a character is a space. Index: PropSet.h =================================================================== RCS file: /cvsroot/pywin32/pywin32/Pythonwin/Scintilla/include/PropSet.h,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** PropSet.h 25 Nov 2003 10:45:20 -0000 1.10 --- PropSet.h 10 Feb 2008 11:01:46 -0000 1.11 *************** *** 14,17 **** --- 14,21 ---- bool isprefix(const char *target, const char *prefix); + #ifdef SCI_NAMESPACE + namespace Scintilla { + #endif + struct Property { unsigned int hash; *************** *** 39,43 **** return ret; } ! static bool IncludesVar(const char *value, const char *key); public: PropSet *superPS; --- 43,47 ---- return ret; } ! public: PropSet *superPS; *************** *** 46,60 **** void Set(const char *key, const char *val, int lenKey=-1, int lenVal=-1); void Set(const char *keyVal); void SetMultiple(const char *s); ! SString Get(const char *key); ! SString GetExpanded(const char *key); ! SString Expand(const char *withVars, int maxExpands=100); ! int GetInt(const char *key, int defaultValue=0); ! SString GetWild(const char *keybase, const char *filename); ! SString GetNewExpand(const char *keybase, const char *filename=""); void Clear(); ! char *ToString(); // Caller must delete[] the return value ! bool GetFirst(char **key, char **val); ! bool GetNext(char **key, char **val); }; --- 50,66 ---- void Set(const char *key, const char *val, int lenKey=-1, int lenVal=-1); void Set(const char *keyVal); + void Unset(const char *key, int lenKey=-1); void SetMultiple(const char *s); ! SString Get(const char *key) const; ! SString GetExpanded(const char *key) const; ! SString Expand(const char *withVars, int maxExpands=100) const; ! int GetInt(const char *key, int defaultValue=0) const; void Clear(); ! char *ToString() const; // Caller must delete[] the return value ! ! private: ! // copy-value semantics not implemented ! PropSet(const PropSet ©); ! void operator=(const PropSet &assign); }; *************** *** 65,69 **** // Each word contains at least one character - a empty word acts as sentinel at the end. char **words; - char **wordsNoCase; char *list; int len; --- 71,74 ---- *************** *** 72,88 **** int starts[256]; WordList(bool onlyLineEnds_ = false) : ! words(0), wordsNoCase(0), list(0), len(0), onlyLineEnds(onlyLineEnds_), sorted(false) {} ~WordList() { Clear(); } operator bool() { return len ? true : false; } - char *operator[](int ind) { return words[ind]; } void Clear(); void Set(const char *s); - char *Allocate(int size); - void SetFromAllocated(); bool InList(const char *s); ! const char *GetNearestWord(const char *wordStart, int searchLen = -1, ! bool ignoreCase = false, SString wordCharacters="", int wordIndex = -1); ! char *GetNearestWords(const char *wordStart, int searchLen=-1, ! bool ignoreCase=false, char otherSeparator='\0'); }; --- 77,89 ---- 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); }; *************** *** 91,93 **** --- 92,104 ---- } + #ifdef SCI_NAMESPACE + } + #endif + + #ifdef _MSC_VER + // Visual C++ doesn't like the private copy idiom for disabling + // the default copy constructor and operator=, but it's fine. + #pragma warning(disable: 4511 4512) + #endif + #endif Index: SciLexer.h =================================================================== RCS file: /cvsroot/pywin32/pywin32/Pythonwin/Scintilla/include/SciLexer.h,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** SciLexer.h 25 Nov 2003 10:45:20 -0000 1.11 --- SciLexer.h 10 Feb 2008 11:01:46 -0000 1.12 *************** *** 44,49 **** #define SCLEX_BULLANT 27 #define SCLEX_VBSCRIPT 28 - #define SCLEX_ASP 29 - #define SCLEX_PHP 30 #define SCLEX_BAAN 31 #define SCLEX_MATLAB 32 --- 44,47 ---- *************** *** 69,72 **** --- 67,105 ---- #define SCLEX_FORTH 52 #define SCLEX_ERLANG 53 + #define SCLEX_OCTAVE 54 + #define SCLEX_MSSQL 55 + #define SCLEX_VERILOG 56 + #define SCLEX_KIX 57 + #define SCLEX_GUI4CLI 58 + #define SCLEX_SPECMAN 59 + #define SCLEX_AU3 60 + #define SCLEX_APDL 61 + #define SCLEX_BASH 62 + #define SCLEX_ASN1 63 + #define SCLEX_VHDL 64 + #define SCLEX_CAML 65 + #define SCLEX_BLITZBASIC 66 + #define SCLEX_PUREBASIC 67 + #define SCLEX_HASKELL 68 + #define SCLEX_PHPSCRIPT 69 + #define SCLEX_TADS3 70 + #define SCLEX_REBOL 71 + #define SCLEX_SMALLTALK 72 + #define SCLEX_FLAGSHIP 73 + #define SCLEX_CSOUND 74 + #define SCLEX_FREEBASIC 75 + #define SCLEX_INNOSETUP 76 + #define SCLEX_OPAL 77 + #define SCLEX_SPICE 78 + #define SCLEX_D 79 + #define SCLEX_CMAKE 80 + #define SCLEX_GAP 81 + #define SCLEX_PLM 82 + #define SCLEX_PROGRESS 83 + #define SCLEX_ABAQUS 84 + #define SCLEX_ASYMPTOTE 85 + #define SCLEX_R 86 + #define SCLEX_MAGIK 87 + #define SCLEX_POWERSHELL 88 #define SCLEX_AUTOMATIC 1000 #define SCE_P_DEFAULT 0 *************** *** 84,87 **** --- 117,122 ---- #define SCE_P_COMMENTBLOCK 12 #define SCE_P_STRINGEOL 13 + #define SCE_P_WORD2 14 + #define SCE_P_DECORATOR 15 #define SCE_C_DEFAULT 0 #define SCE_C_COMMENT 1 *************** *** 104,107 **** --- 139,182 ---- #define SCE_C_COMMENTDOCKEYWORDERROR 18 #define SCE_C_GLOBALCLASS 19 + #define SCE_D_DEFAULT 0 + #define SCE_D_COMMENT 1 + #define SCE_D_COMMENTLINE 2 + #define SCE_D_COMMENTDOC 3 + #define SCE_D_COMMENTNESTED 4 + #define SCE_D_NUMBER 5 + #define SCE_D_WORD 6 + #define SCE_D_WORD2 7 + #define SCE_D_WORD3 8 + #define SCE_D_TYPEDEF 9 + #define SCE_D_STRING 10 + #define SCE_D_STRINGEOL 11 + #define SCE_D_CHARACTER 12 + #define SCE_D_OPERATOR 13 + #define SCE_D_IDENTIFIER 14 + #define SCE_D_COMMENTLINEDOC 15 + #define SCE_D_COMMENTDOCKEYWORD 16 + #define SCE_D_COMMENTDOCKEYWORDERROR 17 + #define SCE_TCL_DEFAULT 0 + #define SCE_TCL_COMMENT 1 + #define SCE_TCL_COMMENTLINE 2 + #define SCE_TCL_NUMBER 3 + #define SCE_TCL_WORD_IN_QUOTE 4 + #define SCE_TCL_IN_QUOTE 5 + #define SCE_TCL_OPERATOR 6 + #define SCE_TCL_IDENTIFIER 7 + #define SCE_TCL_SUBSTITUTION 8 + #define SCE_TCL_SUB_BRACE 9 + #define SCE_TCL_MODIFIER 10 + #define SCE_TCL_EXPAND 11 + #define SCE_TCL_WORD 12 + #define SCE_TCL_WORD2 13 + #define SCE_TCL_WORD3 14 + #define SCE_TCL_WORD4 15 + #define SCE_TCL_WORD5 16 + #define SCE_TCL_WORD6 17 + #define SCE_TCL_WORD7 18 + #define SCE_TCL_WORD8 19 + #define SCE_TCL_COMMENT_BOX 20 + #define SCE_TCL_BLOCK_COMMENT 21 #define SCE_H_DEFAULT 0 #define SCE_H_TAG 1 *************** *** 191,194 **** --- 266,270 ---- #define SCE_HP_OPERATOR 101 #define SCE_HP_IDENTIFIER 102 + #define SCE_HPHP_COMPLEX_VARIABLE 104 #define SCE_HPA_START 105 #define SCE_HPA_DEFAULT 106 *************** *** 230,233 **** --- 306,310 ---- #define SCE_PL_HASH 14 #define SCE_PL_SYMBOLTABLE 15 + #define SCE_PL_VARIABLE_INDEXER 16 #define SCE_PL_REGEX 17 #define SCE_PL_REGSUBST 18 *************** *** 244,247 **** --- 321,362 ---- #define SCE_PL_STRING_QR 29 #define SCE_PL_STRING_QW 30 + #define SCE_PL_POD_VERB 31 + #define SCE_PL_SUB_PROTOTYPE 40 + #define SCE_PL_FORMAT_IDENT 41 + #define SCE_PL_FORMAT 42 + #define SCE_RB_DEFAULT 0 + #define SCE_RB_ERROR 1 + #define SCE_RB_COMMENTLINE 2 + #define SCE_RB_POD 3 + #define SCE_RB_NUMBER 4 + #define SCE_RB_WORD 5 + #define SCE_RB_STRING 6 + #define SCE_RB_CHARACTER 7 + #define SCE_RB_CLASSNAME 8 + #define SCE_RB_DEFNAME 9 + #define SCE_RB_OPERATOR 10 + #define SCE_RB_IDENTIFIER 11 + #define SCE_RB_REGEX 12 + #define SCE_RB_GLOBAL 13 + #define SCE_RB_SYMBOL 14 + #define SCE_RB_MODULE_NAME 15 + #define SCE_RB_INSTANCE_VAR 16 + #define SCE_RB_CLASS_VAR 17 + #define SCE_RB_BACKTICKS 18 + #define SCE_RB_DATASECTION 19 + #define SCE_RB_HERE_DELIM 20 + #define SCE_RB_HERE_Q 21 + #define SCE_RB_HERE_QQ 22 + #define SCE_RB_HERE_QX 23 + #define SCE_RB_STRING_Q 24 + #define SCE_RB_STRING_QQ 25 + #define SCE_RB_STRING_QX 26 + #define SCE_RB_STRING_QR 27 + #define SCE_RB_STRING_QW 28 + #define SCE_RB_WORD_DEMOTED 29 + #define SCE_RB_STDIN 30 + #define SCE_RB_STDOUT 31 + #define SCE_RB_STDERR 40 + #define SCE_RB_UPPER_BOUND 41 #define SCE_B_DEFAULT 0 #define SCE_B_COMMENT 1 *************** *** 253,256 **** --- 368,381 ---- #define SCE_B_IDENTIFIER 7 #define SCE_B_DATE 8 + #define SCE_B_STRINGEOL 9 + #define SCE_B_KEYWORD2 10 + #define SCE_B_KEYWORD3 11 + #define SCE_B_KEYWORD4 12 + #define SCE_B_CONSTANT 13 + #define SCE_B_ASM 14 + #define SCE_B_LABEL 15 + #define SCE_B_ERROR 16 + #define SCE_B_HEXNUMBER 17 + #define SCE_B_BINNUMBER 18 #define SCE_PROPS_DEFAULT 0 #define SCE_PROPS_COMMENT 1 *************** *** 258,261 **** --- 383,387 ---- #define SCE_PROPS_ASSIGNMENT 3 #define SCE_PROPS_DEFVAL 4 + #define SCE_PROPS_KEY 5 #define SCE_L_DEFAULT 0 #define SCE_L_COMMAND 1 *************** *** 300,303 **** --- 426,434 ---- #define SCE_ERR_ELF 15 #define SCE_ERR_IFC 16 + #define SCE_ERR_IFORT 17 + #define SCE_ERR_ABSF 18 + #define SCE_ERR_TIDY 19 + #define SCE_ERR_JAVA_STACK 20 + #define SCE_ERR_VALUE 21 #define SCE_BAT_DEFAULT 0 #define SCE_BAT_COMMENT 1 *************** *** 374,381 **** --- 505,516 ---- #define SCE_LISP_NUMBER 2 #define SCE_LISP_KEYWORD 3 + #define SCE_LISP_KEYWORD_KW 4 + #define SCE_LISP_SYMBOL 5 #define SCE_LISP_STRING 6 #define SCE_LISP_STRINGEOL 8 #define SCE_LISP_IDENTIFIER 9 #define SCE_LISP_OPERATOR 10 + #define SCE_LISP_SPECIAL 11 + #define SCE_LISP_MULTI_COMMENT 12 #define SCE_EIFFEL_DEFAULT 0 #define SCE_EIFFEL_COMMENTLINE 1 *************** *** 418,421 **** --- 553,557 ---- #define SCE_MATLAB_OPERATOR 6 #define SCE_MATLAB_IDENTIFIER 7 + #define SCE_MATLAB_DOUBLEQUOTESTRING 8 #define SCE_SCRIPTOL_DEFAULT 0 #define SCE_SCRIPTOL_WHITE 1 *************** *** 479,482 **** --- 615,620 ---- #define SCE_CSS_DOUBLESTRING 13 #define SCE_CSS_SINGLESTRING 14 + #define SCE_CSS_IDENTIFIER2 15 + #define SCE_CSS_ATTRIBUTE 16 #define SCE_POV_DEFAULT 0 #define SCE_POV_COMMENT 1 *************** *** 549,552 **** --- 687,695 ---- #define SCE_NSIS_MACRODEF 12 #define SCE_NSIS_STRINGVAR 13 + #define SCE_NSIS_NUMBER 14 + #define SCE_NSIS_SECTIONGROUP 15 + #define SCE_NSIS_PAGEEX 16 + #define SCE_NSIS_FUNCTIONDEF 17 + #define SCE_NSIS_COMMENTBOX 18 #define SCE_MMIXAL_LEADWS 0 #define SCE_MMIXAL_COMMENT 1 *************** *** 577,585 **** #define SCE_CLW_KEYWORD 8 #define SCE_CLW_COMPILER_DIRECTIVE 9 ! #define SCE_CLW_BUILTIN_PROCEDURES_FUNCTION 10 ! #define SCE_CLW_STRUCTURE_DATA_TYPE 11 ! #define SCE_CLW_ATTRIBUTE 12 ! #define SCE_CLW_STANDARD_EQUATE 13 ! #define SCE_CLW_ERROR 14 #define SCE_LOT_DEFAULT 0 #define SCE_LOT_HEADER 1 --- 720,730 ---- #define SCE_CLW_KEYWORD 8 #define SCE_CLW_COMPILER_DIRECTIVE 9 ! #define SCE_CLW_RUNTIME_EXPRESSIONS 10 ! #define SCE_CLW_BUILTIN_PROCEDURES_FUNCTION 11 ! #define SCE_CLW_STRUCTURE_DATA_TYPE 12 ! #define SCE_CLW_ATTRIBUTE 13 ! #define SCE_CLW_STANDARD_EQUATE 14 ! #define SCE_CLW_ERROR 15 ! #define SCE_CLW_DEPRECATED 16 #define SCE_LOT_DEFAULT 0 #define SCE_LOT_HEADER 1 *************** *** 598,601 **** --- 743,747 ---- #define SCE_YAML_TEXT 7 #define SCE_YAML_ERROR 8 + #define SCE_YAML_OPERATOR 9 #define SCE_TEX_DEFAULT 0 #define SCE_TEX_SPECIAL 1 *************** *** 626,629 **** --- 772,1239 ---- #define SCE_ERLANG_NODE_NAME 13 #define SCE_ERLANG_UNKNOWN 31 + #define SCE_MSSQL_DEFAULT 0 + #define SCE_MSSQL_COMMENT 1 + #define SCE_MSSQL_LINE_COMMENT 2 + #define SCE_MSSQL_NUMBER 3 + #define SCE_MSSQL_STRING 4 + #define SCE_MSSQL_OPERATOR 5 + #define SCE_MSSQL_IDENTIFIER 6 + #define SCE_MSSQL_VARIABLE 7 + #define SCE_MSSQL_COLUMN_NAME 8 + #define SCE_MSSQL_STATEMENT 9 + #define SCE_MSSQL_DATATYPE 10 + #define SCE_MSSQL_SYSTABLE 11 + #define SCE_MSSQL_GLOBAL_VARIABLE 12 + #define SCE_MSSQL_FUNCTION 13 + #define SCE_MSSQL_STORED_PROCEDURE 14 + #define SCE_MSSQL_DEFAULT_PREF_DATATYPE 15 + #define SCE_MSSQL_COLUMN_NAME_2 16 + #define SCE_V_DEFAULT 0 + #define SCE_V_COMMENT 1 + #define SCE_V_COMMENTLINE 2 + #define SCE_V_COMMENTLINEBANG 3 + #define SCE_V_NUMBER 4 + #define SCE_V_WORD 5 + #define SCE_V_STRING 6 + #define SCE_V_WORD2 7 + #define SCE_V_WORD3 8 + #define SCE_V_PREPROCESSOR 9 + #define SCE_V_OPERATOR 10 + #define SCE_V_IDENTIFIER 11 + #define SCE_V_STRINGEOL 12 + #define SCE_V_USER 19 + #define SCE_KIX_DEFAULT 0 + #define SCE_KIX_COMMENT 1 + #define SCE_KIX_STRING1 2 + #define SCE_KIX_STRING2 3 + #define SCE_KIX_NUMBER 4 + #define SCE_KIX_VAR 5 + #define SCE_KIX_MACRO 6 + #define SCE_KIX_KEYWORD 7 + #define SCE_KIX_FUNCTIONS 8 + #define SCE_KIX_OPERATOR 9 + #define SCE_KIX_IDENTIFIER 31 + #define SCE_GC_DEFAULT 0 + #define SCE_GC_COMMENTLINE 1 + #define SCE_GC_COMMENTBLOCK 2 + #define SCE_GC_GLOBAL 3 + #define SCE_GC_EVENT 4 + #define SCE_GC_ATTRIBUTE 5 + #define SCE_GC_CONTROL 6 + #define SCE_GC_COMMAND 7 + #define SCE_GC_STRING 8 + #define SCE_GC_OPERATOR 9 + #define SCE_SN_DEFAULT 0 + #define SCE_SN_CODE 1 + #define SCE_SN_COMMENTLINE 2 + #define SCE_SN_COMMENTLINEBANG 3 + #define SCE_SN_NUMBER 4 + #define SCE_SN_WORD 5 + #define SCE_SN_STRING 6 + #define SCE_SN_WORD2 7 + #define SCE_SN_WORD3 8 + #define SCE_SN_PREPROCESSOR 9 + #define SCE_SN_OPERATOR 10 + #define SCE_SN_IDENTIFIER 11 + #define SCE_SN_STRINGEOL 12 + #define SCE_SN_REGEXTAG 13 + #define SCE_SN_SIGNAL 14 + #define SCE_SN_USER 19 + #define SCE_AU3_DEFAULT 0 + #define SCE_AU3_COMMENT 1 + #define SCE_AU3_COMMENTBLOCK 2 + #define SCE_AU3_NUMBER 3 + #define SCE_AU3_FUNCTION 4 + #define SCE_AU3_KEYWORD 5 + #define SCE_AU3_MACRO 6 + #define SCE_AU3_STRING 7 + #define SCE_AU3_OPERATOR 8 + #define SCE_AU3_VARIABLE 9 + #define SCE_AU3_SENT 10 + #define SCE_AU3_PREPROCESSOR 11 + #define SCE_AU3_SPECIAL 12 + #define SCE_AU3_EXPAND 13 + #define SCE_AU3_COMOBJ 14 + #define SCE_AU3_UDF 15 + #define SCE_APDL_DEFAULT 0 + #define SCE_APDL_COMMENT 1 + #define SCE_APDL_COMMENTBLOCK 2 + #define SCE_APDL_NUMBER 3 + #define SCE_APDL_STRING 4 + #define SCE_APDL_OPERATOR 5 + #define SCE_APDL_WORD 6 + #define SCE_APDL_PROCESSOR 7 + #define SCE_APDL_COMMAND 8 + #define SCE_APDL_SLASHCOMMAND 9 + #define SCE_APDL_STARCOMMAND 10 + #define SCE_APDL_ARGUMENT 11 + #define SCE_APDL_FUNCTION 12 + #define SCE_SH_DEFAULT 0 + #define SCE_SH_ERROR 1 + #define SCE_SH_COMMENTLINE 2 + #define SCE_SH_NUMBER 3 + #define SCE_SH_WORD 4 + #define SCE_SH_STRING 5 + #define SCE_SH_CHARACTER 6 + #define SCE_SH_OPERATOR 7 + #define SCE_SH_IDENTIFIER 8 + #define SCE_SH_SCALAR 9 + #define SCE_SH_PARAM 10 + #define SCE_SH_BACKTICKS 11 + #define SCE_SH_HERE_DELIM 12 + #define SCE_SH_HERE_Q 13 + #define SCE_ASN1_DEFAULT 0 + #define SCE_ASN1_COMMENT 1 + #define SCE_ASN1_IDENTIFIER 2 + #define SCE_ASN1_STRING 3 + #define SCE_ASN1_OID 4 + #define SCE_ASN1_SCALAR 5 + #define SCE_ASN1_KEYWORD 6 + #define SCE_ASN1_ATTRIBUTE 7 + #define SCE_ASN1_DESCRIPTOR 8 + #define SCE_ASN1_TYPE 9 + #define SCE_ASN1_OPERATOR 10 + #define SCE_VHDL_DEFAULT 0 + #define SCE_VHDL_COMMENT 1 + #define SCE_VHDL_COMMENTLINEBANG 2 + #define SCE_VHDL_NUMBER 3 + #define SCE_VHDL_STRING 4 + #define SCE_VHDL_OPERATOR 5 + #define SCE_VHDL_IDENTIFIER 6 + #define SCE_VHDL_STRINGEOL 7 + #define SCE_VHDL_KEYWORD 8 + #define SCE_VHDL_STDOPERATOR 9 + #define SCE_VHDL_ATTRIBUTE 10 + #define SCE_VHDL_STDFUNCTION 11 + #define SCE_VHDL_STDPACKAGE 12 + #define SCE_VHDL_STDTYPE 13 + #define SCE_VHDL_USERWORD 14 + #define SCE_CAML_DEFAULT 0 + #define SCE_CAML_IDENTIFIER 1 + #define SCE_CAML_TAGNAME 2 + #define SCE_CAML_KEYWORD 3 + #define SCE_CAML_KEYWORD2 4 + #define SCE_CAML_KEYWORD3 5 + #define SCE_CAML_LINENUM 6 + #define SCE_CAML_OPERATOR 7 + #define SCE_CAML_NUMBER 8 + #define SCE_CAML_CHAR 9 + #define SCE_CAML_STRING 11 + #define SCE_CAML_COMMENT 12 + #define SCE_CAML_COMMENT1 13 + #define SCE_CAML_COMMENT2 14 + #define SCE_CAML_COMMENT3 15 + #define SCE_HA_DEFAULT 0 + #define SCE_HA_IDENTIFIER 1 + #define SCE_HA_KEYWORD 2 + #define SCE_HA_NUMBER 3 + #define SCE_HA_STRING 4 + #define SCE_HA_CHARACTER 5 + #define SCE_HA_CLASS 6 + #define SCE_HA_MODULE 7 + #define SCE_HA_CAPITAL 8 + #define SCE_HA_DATA 9 + #define SCE_HA_IMPORT 10 + #define SCE_HA_OPERATOR 11 + #define SCE_HA_INSTANCE 12 + #define SCE_HA_COMMENTLINE 13 + #define SCE_HA_COMMENTBLOCK 14 + #define SCE_HA_COMMENTBLOCK2 15 + #define SCE_HA_COMMENTBLOCK3 16 + #define SCE_T3_DEFAULT 0 + #define SCE_T3_X_DEFAULT 1 + #define SCE_T3_PREPROCESSOR 2 + #define SCE_T3_BLOCK_COMMENT 3 + #define SCE_T3_LINE_COMMENT 4 + #define SCE_T3_OPERATOR 5 + #define SCE_T3_KEYWORD 6 + #define SCE_T3_NUMBER 7 + #define SCE_T3_IDENTIFIER 8 + #define SCE_T3_S_STRING 9 + #define SCE_T3_D_STRING 10 + #define SCE_T3_X_STRING 11 + #define SCE_T3_LIB_DIRECTIVE 12 + #define SCE_T3_MSG_PARAM 13 + #define SCE_T3_HTML_TAG 14 + #define SCE_T3_HTML_DEFAULT 15 + #define SCE_T3_HTML_STRING 16 + #define SCE_T3_USER1 17 + #define SCE_T3_USER2 18 + #define SCE_T3_USER3 19 + #define SCE_T3_BRACE 20 + #define SCE_REBOL_DEFAULT 0 + #define SCE_REBOL_COMMENTLINE 1 + #define SCE_REBOL_COMMENTBLOCK 2 + #define SCE_REBOL_PREFACE 3 + #define SCE_REBOL_OPERATOR 4 + #define SCE_REBOL_CHARACTER 5 + #define SCE_REBOL_QUOTEDSTRING 6 + #define SCE_REBOL_BRACEDSTRING 7 + #define SCE_REBOL_NUMBER 8 + #define SCE_REBOL_PAIR 9 + #define SCE_REBOL_TUPLE 10 + #define SCE_REBOL_BINARY 11 + #define SCE_REBOL_MONEY 12 + #define SCE_REBOL_ISSUE 13 + #define SCE_REBOL_TAG 14 + #define SCE_REBOL_FILE 15 + #define SCE_REBOL_EMAIL 16 + #define SCE_REBOL_URL 17 + #define SCE_REBOL_DATE 18 + #define SCE_REBOL_TIME 19 + #define SCE_REBOL_IDENTIFIER 20 + #define SCE_REBOL_WORD 21 + #define SCE_REBOL_WORD2 22 + #define SCE_REBOL_WORD3 23 + #define SCE_REBOL_WORD4 24 + #define SCE_REBOL_WORD5 25 + #define SCE_REBOL_WORD6 26 + #define SCE_REBOL_WORD7 27 + #define SCE_REBOL_WORD8 28 + #define SCE_SQL_DEFAULT 0 + #define SCE_SQL_COMMENT 1 + #define SCE_SQL_COMMENTLINE 2 + #define SCE_SQL_COMMENTDOC 3 + #define SCE_SQL_NUMBER 4 + #define SCE_SQL_WORD 5 + #define SCE_SQL_STRING 6 + #define SCE_SQL_CHARACTER 7 + #define SCE_SQL_SQLPLUS 8 + #define SCE_SQL_SQLPLUS_PROMPT 9 + #define SCE_SQL_OPERATOR 10 + #define SCE_SQL_IDENTIFIER 11 + #define SCE_SQL_SQLPLUS_COMMENT 13 + #define SCE_SQL_COMMENTLINEDOC 15 + #define SCE_SQL_WORD2 16 + #define SCE_SQL_COMMENTDOCKEYWORD 17 + #define SCE_SQL_COMMENTDOCKEYWORDERROR 18 + #define SCE_SQL_USER1 19 + #define SCE_SQL_USER2 20 + #define SCE_SQL_USER3 21 + #define SCE_SQL_USER4 22 + #define SCE_SQL_QUOTEDIDENTIFIER 23 + #define SCE_ST_DEFAULT 0 + #define SCE_ST_STRING 1 + #define SCE_ST_NUMBER 2 + #define SCE_ST_COMMENT 3 + #define SCE_ST_SYMBOL 4 + #define SCE_ST_BINARY 5 + #define SCE_ST_BOOL 6 + #define SCE_ST_SELF 7 + #define SCE_ST_SUPER 8 + #define SCE_ST_NIL 9 + #define SCE_ST_GLOBAL 10 + #define SCE_ST_RETURN 11 + #define SCE_ST_SPECIAL 12 + #define SCE_ST_KWSEND 13 + #define SCE_ST_ASSIGN 14 + #define SCE_ST_CHARACTER 15 + #define SCE_ST_SPEC_SEL 16 + #define SCE_FS_DEFAULT 0 + #define SCE_FS_COMMENT 1 + #define SCE_FS_COMMENTLINE 2 + #define SCE_FS_COMMENTDOC 3 + #define SCE_FS_COMMENTLINEDOC 4 + #define SCE_FS_COMMENTDOCKEYWORD 5 + #define SCE_FS_COMMENTDOCKEYWORDERROR 6 + #define SCE_FS_KEYWORD 7 + #define SCE_FS_KEYWORD2 8 + #define SCE_FS_KEYWORD3 9 + #define SCE_FS_KEYWORD4 10 + #define SCE_FS_NUMBER 11 + #define SCE_FS_STRING 12 + #define SCE_FS_PREPROCESSOR 13 + #define SCE_FS_OPERATOR 14 + #define SCE_FS_IDENTIFIER 15 + #define SCE_FS_DATE 16 + #define SCE_FS_STRINGEOL 17 + #define SCE_FS_CONSTANT 18 + #define SCE_FS_ASM 19 + #define SCE_FS_LABEL 20 + #define SCE_FS_ERROR 21 + #define SCE_FS_HEXNUMBER 22 + #define SCE_FS_BINNUMBER 23 + #define SCE_CSOUND_DEFAULT 0 + #define SCE_CSOUND_COMMENT 1 + #define SCE_CSOUND_NUMBER 2 + #define SCE_CSOUND_OPERATOR 3 + #define SCE_CSOUND_INSTR 4 + #define SCE_CSOUND_IDENTIFIER 5 + #define SCE_CSOUND_OPCODE 6 + #define SCE_CSOUND_HEADERSTMT 7 + #define SCE_CSOUND_USERKEYWORD 8 + #define SCE_CSOUND_COMMENTBLOCK 9 + #define SCE_CSOUND_PARAM 10 + #define SCE_CSOUND_ARATE_VAR 11 + #define SCE_CSOUND_KRATE_VAR 12 + #define SCE_CSOUND_IRATE_VAR 13 + #define SCE_CSOUND_GLOBAL_VAR 14 + #define SCE_CSOUND_STRINGEOL 15 + #define SCE_INNO_DEFAULT 0 + #define SCE_INNO_COMMENT 1 + #define SCE_INNO_KEYWORD 2 + #define SCE_INNO_PARAMETER 3 + #define SCE_INNO_SECTION 4 + #define SCE_INNO_PREPROC 5 + #define SCE_INNO_PREPROC_INLINE 6 + #define SCE_INNO_COMMENT_PASCAL 7 + #define SCE_INNO_KEYWORD_PASCAL 8 + #define SCE_INNO_KEYWORD_USER 9 + #define SCE_INNO_STRING_DOUBLE 10 + #define SCE_INNO_STRING_SINGLE 11 + #define SCE_INNO_IDENTIFIER 12 + #define SCE_OPAL_SPACE 0 + #define SCE_OPAL_COMMENT_BLOCK 1 + #define SCE_OPAL_COMMENT_LINE 2 + #define SCE_OPAL_INTEGER 3 + #define SCE_OPAL_KEYWORD 4 + #define SCE_OPAL_SORT 5 + #define SCE_OPAL_STRING 6 + #define SCE_OPAL_PAR 7 + #define SCE_OPAL_BOOL_CONST 8 + #define SCE_OPAL_DEFAULT 32 + #define SCE_SPICE_DEFAULT 0 + #define SCE_SPICE_IDENTIFIER 1 + #define SCE_SPICE_KEYWORD 2 + #define SCE_SPICE_KEYWORD2 3 + #define SCE_SPICE_KEYWORD3 4 + #define SCE_SPICE_NUMBER 5 + #define SCE_SPICE_DELIMITER 6 + #define SCE_SPICE_VALUE 7 + #define SCE_SPICE_COMMENTLINE 8 + #define SCE_CMAKE_DEFAULT 0 + #define SCE_CMAKE_COMMENT 1 + #define SCE_CMAKE_STRINGDQ 2 + #define SCE_CMAKE_STRINGLQ 3 + #define SCE_CMAKE_STRINGRQ 4 + #define SCE_CMAKE_COMMANDS 5 + #define SCE_CMAKE_PARAMETERS 6 + #define SCE_CMAKE_VARIABLE 7 + #define SCE_CMAKE_USERDEFINED 8 + #define SCE_CMAKE_WHILEDEF 9 + #define SCE_CMAKE_FOREACHDEF 10 + #define SCE_CMAKE_IFDEFINEDEF 11 + #define SCE_CMAKE_MACRODEF 12 + #define SCE_CMAKE_STRINGVAR 13 + #define SCE_CMAKE_NUMBER 14 + #define SCE_GAP_DEFAULT 0 + #define SCE_GAP_IDENTIFIER 1 + #define SCE_GAP_KEYWORD 2 + #define SCE_GAP_KEYWORD2 3 + #define SCE_GAP_KEYWORD3 4 + #define SCE_GAP_KEYWORD4 5 + #define SCE_GAP_STRING 6 + #define SCE_GAP_CHAR 7 + #define SCE_GAP_OPERATOR 8 + #define SCE_GAP_COMMENT ... [truncated message content] |
