Enable gnomeprint support for the .debs

[wxWidgets.git] / src / stc / scintilla / src / LexLua.cxx

diff --git a/src/stc/scintilla/src/LexLua.cxx b/src/stc/scintilla/src/LexLua.cxx
index 338a04e327f0661683fbed476cf9c0f10bfee388..3e4b25cb5e9acb3c600b0077ef09545673d0e900 100644 (file)
--- a/src/stc/scintilla/src/LexLua.cxx
+++ b/src/stc/scintilla/src/LexLua.cxx
@@ -4,7 +4,7 @@
  **
  ** Written by Paul Winwood.
  ** Folder by Alexey Yutkin.
  **
  ** Written by Paul Winwood.
  ** Folder by Alexey Yutkin.

- ** Modified by Marcos E. Wurzius
+ ** Modified by Marcos E. Wurzius & Philippe Lhoste

  **/
 
 #include <stdlib.h>
  **/
 
 #include <stdlib.h>


@@ -23,33 +23,44 @@
 #include "Scintilla.h"
 #include "SciLexer.h"
 
 #include "Scintilla.h"
 #include "SciLexer.h"
 

-

 static inline bool IsAWordChar(const int ch) {
 static inline bool IsAWordChar(const int ch) {

-       return (ch < 0x80) && (isalnum(ch) || ch == '.' || 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 == '_');
 }
 
        return (ch < 0x80) && (isalnum(ch) || ch == '_');
 }
 

+static inline bool IsANumberChar(const int ch) {
+       // Not exactly following number definition (several dots are seen as OK, etc.)
+       // but probably enough in most cases.
+       return (ch < 0x80) &&
+               (isdigit(ch) || toupper(ch) == 'E' ||
+             ch == '.' || ch == '-' || ch == '+');
+}

 
 

-inline bool isLuaOperator(char ch) {
-       if (isalnum(ch))
+static inline bool IsLuaOperator(int ch) {
+       if (ch >= 0x80 || isalnum(ch)) {

                return false;
                return false;

+       }

        // '.' left out as it is used to make up numbers
        if (ch == '*' || ch == '/' || ch == '-' || ch == '+' ||
                ch == '(' || ch == ')' || ch == '=' ||
                ch == '{' || ch == '}' || ch == '~' ||
                ch == '[' || ch == ']' || ch == ';' ||
                ch == '<' || ch == '>' || ch == ',' ||
        // '.' left out as it is used to make up numbers
        if (ch == '*' || ch == '/' || ch == '-' || ch == '+' ||
                ch == '(' || ch == ')' || ch == '=' ||
                ch == '{' || ch == '}' || ch == '~' ||
                ch == '[' || ch == ']' || ch == ';' ||
                ch == '<' || ch == '>' || ch == ',' ||

-               ch == '.' || ch == '^' || ch == '%' || ch == ':')
+               ch == '.' || ch == '^' || ch == '%' || ch == ':') {

                return true;
                return true;

+       }

        return false;
 }
 
        return false;
 }
 

-
-static void ColouriseLuaDoc(unsigned int startPos, int length, int initStyle, WordList *keywordlists[],
-                            Accessor &styler) {
+static void ColouriseLuaDoc(
+       unsigned int startPos,
+       int length,
+       int initStyle,
+       WordList *keywordlists[],
+       Accessor &styler) {

 
        WordList &keywords = *keywordlists[0];
        WordList &keywords2 = *keywordlists[1];
 
        WordList &keywords = *keywordlists[0];
        WordList &keywords2 = *keywordlists[1];


@@ -57,28 +68,63 @@ static void ColouriseLuaDoc(unsigned int startPos, int length, int initStyle, Wo
        WordList &keywords4 = *keywordlists[3];
        WordList &keywords5 = *keywordlists[4];
        WordList &keywords6 = *keywordlists[5];
        WordList &keywords4 = *keywordlists[3];
        WordList &keywords5 = *keywordlists[4];
        WordList &keywords6 = *keywordlists[5];

-       int literalString = 0;
-       int literalStringFlag =0;
+       WordList &keywords7 = *keywordlists[6];
+       WordList &keywords8 = *keywordlists[7];
+
+       int currentLine = styler.GetLine(startPos);
+       // Initialize the literal string [[ ... ]] nesting level, if we are inside such a string.
+       int literalStringLevel = 0;
+       if (initStyle == SCE_LUA_LITERALSTRING) {
+               literalStringLevel = styler.GetLineState(currentLine - 1);
+       }
+       // Initialize the block comment --[[ ... ]] nesting level, if we are inside such a comment
+       int blockCommentLevel = 0;
+       if (initStyle == SCE_LUA_COMMENT) {
+               blockCommentLevel = styler.GetLineState(currentLine - 1);
+       }

 
        // Do not leak onto next line
 
        // Do not leak onto next line

-       if (initStyle == SCE_LUA_STRINGEOL)
+       if (initStyle == SCE_LUA_STRINGEOL) {

                initStyle = SCE_LUA_DEFAULT;
                initStyle = SCE_LUA_DEFAULT;

+       }

 
        StyleContext sc(startPos, length, initStyle, styler);
 
        StyleContext sc(startPos, length, initStyle, styler);

-       if(startPos == 0 && sc.ch == '#') sc.SetState(SCE_LUA_COMMENTLINE);
+       if (startPos == 0 && sc.ch == '#') {
+               // shbang line: # is a comment only if first char of the script
+               sc.SetState(SCE_LUA_COMMENTLINE);
+       }

        for (; sc.More(); sc.Forward()) {
        for (; sc.More(); sc.Forward()) {

-       
-               // Handle line continuation generically.
-               if (sc.ch == '\\') {
-                       if (sc.Match("\\\n")) {
-                               sc.Forward();
-                               sc.Forward();
-                               continue;
+               if (sc.atLineEnd) {
+                       // Update the line state, so it can be seen by next line
+                       currentLine = styler.GetLine(sc.currentPos);
+                       switch (sc.state) {
+                       case SCE_LUA_LITERALSTRING:
+                               // Inside a literal string, we set the line state
+                               styler.SetLineState(currentLine, literalStringLevel);
+                               break;
+                       case SCE_LUA_COMMENT:   // Block comment
+                               // Inside a block comment, we set the line state
+                               styler.SetLineState(currentLine, blockCommentLevel);
+                               break;
+                       default:
+                               // Reset the line state
+                               styler.SetLineState(currentLine, 0);
+                               break;

                        }
                        }

-                       if (sc.Match("\\\r\n")) {
-                               sc.Forward();
-                               sc.Forward();
+               }
+               if (sc.atLineStart && (sc.state == SCE_LUA_STRING)) {
+                       // Prevent SCE_LUA_STRINGEOL from leaking back to previous line
+                       sc.SetState(SCE_LUA_STRING);
+               }
+
+               // Handle string line continuation
+               if ((sc.state == SCE_LUA_STRING || sc.state == SCE_LUA_CHARACTER) &&
+                       sc.ch == '\\') {
+                       if (sc.chNext == '\n' || sc.chNext == '\r') {

                                sc.Forward();
                                sc.Forward();

+                               if (sc.ch == '\r' && sc.chNext == '\n') {
+                                       sc.Forward();
+                               }

                                continue;
                        }
                }
                                continue;
                        }
                }


@@ -87,11 +133,12 @@ static void ColouriseLuaDoc(unsigned int startPos, int length, int initStyle, Wo
                if (sc.state == SCE_LUA_OPERATOR) {
                        sc.SetState(SCE_LUA_DEFAULT);
                } else if (sc.state == SCE_LUA_NUMBER) {
                if (sc.state == SCE_LUA_OPERATOR) {
                        sc.SetState(SCE_LUA_DEFAULT);
                } else if (sc.state == SCE_LUA_NUMBER) {

-                       if (!IsAWordChar(sc.ch)) {
+                       // We stop the number definition on non-numerical non-dot non-eE non-sign char
+                       if (!IsANumberChar(sc.ch)) {

                                sc.SetState(SCE_LUA_DEFAULT);
                        }
                } else if (sc.state == SCE_LUA_IDENTIFIER) {
                                sc.SetState(SCE_LUA_DEFAULT);
                        }
                } else if (sc.state == SCE_LUA_IDENTIFIER) {

-                       if (!IsAWordChar(sc.ch) || (sc.ch == '.')) {
+                       if (!IsAWordChar(sc.ch) || sc.Match('.', '.')) {

                                char s[100];
                                sc.GetCurrent(s, sizeof(s));
                                if (keywords.InList(s)) {
                                char s[100];
                                sc.GetCurrent(s, sizeof(s));
                                if (keywords.InList(s)) {


@@ -106,15 +153,23 @@ static void ColouriseLuaDoc(unsigned int startPos, int length, int initStyle, Wo
                                        sc.ChangeState(SCE_LUA_WORD5);
                                } else if (keywords6.InList(s)) {
                                        sc.ChangeState(SCE_LUA_WORD6);
                                        sc.ChangeState(SCE_LUA_WORD5);
                                } else if (keywords6.InList(s)) {
                                        sc.ChangeState(SCE_LUA_WORD6);

+                               } else if (keywords6.InList(s)) {
+                                       sc.ChangeState(SCE_LUA_WORD6);
+                               } else if (keywords7.InList(s)) {
+                                       sc.ChangeState(SCE_LUA_WORD7);
+                               } else if (keywords8.InList(s)) {
+                                       sc.ChangeState(SCE_LUA_WORD8);

                                }
                                sc.SetState(SCE_LUA_DEFAULT);
                        }
                                }
                                sc.SetState(SCE_LUA_DEFAULT);
                        }

- 
-

                } else if (sc.state == SCE_LUA_COMMENTLINE ) {
                        if (sc.atLineEnd) {
                                sc.SetState(SCE_LUA_DEFAULT);
                        }
                } else if (sc.state == SCE_LUA_COMMENTLINE ) {
                        if (sc.atLineEnd) {
                                sc.SetState(SCE_LUA_DEFAULT);
                        }

+               } else if (sc.state == SCE_LUA_PREPROCESSOR ) {
+                       if (sc.atLineEnd) {
+                               sc.SetState(SCE_LUA_DEFAULT);
+                       }

                } else if (sc.state == SCE_LUA_STRING) {
                        if (sc.ch == '\\') {
                                if (sc.chNext == '\"' || sc.chNext == '\'' || sc.chNext == '\\') {
                } else if (sc.state == SCE_LUA_STRING) {
                        if (sc.ch == '\\') {
                                if (sc.chNext == '\"' || sc.chNext == '\'' || sc.chNext == '\\') {


@@ -126,7 +181,6 @@ static void ColouriseLuaDoc(unsigned int startPos, int length, int initStyle, Wo
                                sc.ChangeState(SCE_LUA_STRINGEOL);
                                sc.ForwardSetState(SCE_LUA_DEFAULT);
                        }
                                sc.ChangeState(SCE_LUA_STRINGEOL);
                                sc.ForwardSetState(SCE_LUA_DEFAULT);
                        }

-                       

                } else if (sc.state == SCE_LUA_CHARACTER) {
                        if (sc.ch == '\\') {
                                if (sc.chNext == '\"' || sc.chNext == '\'' || sc.chNext == '\\') {
                } else if (sc.state == SCE_LUA_CHARACTER) {
                        if (sc.ch == '\\') {
                                if (sc.chNext == '\"' || sc.chNext == '\'' || sc.chNext == '\\') {


@@ -139,33 +193,54 @@ static void ColouriseLuaDoc(unsigned int startPos, int length, int initStyle, Wo
                                sc.ForwardSetState(SCE_LUA_DEFAULT);
                        }
                } else if (sc.state == SCE_LUA_LITERALSTRING) {
                                sc.ForwardSetState(SCE_LUA_DEFAULT);
                        }
                } else if (sc.state == SCE_LUA_LITERALSTRING) {

-                       if (sc.chPrev == '[' && sc.ch == '[' && literalStringFlag != 1)         {
-                               literalString++;
-                               literalStringFlag = 1;
+                       if (sc.Match('[', '[')) {
+                               literalStringLevel++;
+                               sc.Forward();
+                               sc.SetState(SCE_LUA_LITERALSTRING);
+                       } else if (sc.Match(']', ']') && literalStringLevel > 0) {
+                               literalStringLevel--;
+                               sc.Forward();
+                               if (literalStringLevel == 0) {
+                                       sc.ForwardSetState(SCE_LUA_DEFAULT);
+                               }

                        }
                        }

-                       else if (sc.chPrev == ']' && sc.ch == ']' && literalStringFlag != 2 ) {
-                               if((--literalString == 1))
+               } else if (sc.state == SCE_LUA_COMMENT) {       // Lua 5.0's block comment
+                       if (sc.Match('[', '[')) {
+                               blockCommentLevel++;
+                               sc.Forward();
+                       } else if (sc.Match(']', ']') && blockCommentLevel > 0) {
+                               blockCommentLevel--;
+                               sc.Forward();
+                               if (blockCommentLevel == 0) {

                                        sc.ForwardSetState(SCE_LUA_DEFAULT);
                                        sc.ForwardSetState(SCE_LUA_DEFAULT);

-                               literalStringFlag = 2;
+                               }

                        }
                        }

-                       else literalStringFlag = 0;
-               }               
+               }
+

                // Determine if a new state should be entered.
                if (sc.state == SCE_LUA_DEFAULT) {
                        if (IsADigit(sc.ch) || (sc.ch == '.' && IsADigit(sc.chNext))) {
                // Determine if a new state should be entered.
                if (sc.state == SCE_LUA_DEFAULT) {
                        if (IsADigit(sc.ch) || (sc.ch == '.' && IsADigit(sc.chNext))) {

-                                       sc.SetState(SCE_LUA_NUMBER);
-                       } else if (IsAWordStart(sc.ch) || (sc.ch == '@')) {
-                                       sc.SetState(SCE_LUA_IDENTIFIER);
-                       } else if (sc.ch == '\"') {
+                               sc.SetState(SCE_LUA_NUMBER);
+                       } else if (IsAWordStart(sc.ch)) {
+                               sc.SetState(SCE_LUA_IDENTIFIER);
+                       } else if (sc.Match('\"')) {

                                sc.SetState(SCE_LUA_STRING);
                                sc.SetState(SCE_LUA_STRING);

-                       } else if (sc.ch == '\'') {
+                       } else if (sc.Match('\'')) {

                                sc.SetState(SCE_LUA_CHARACTER);
                                sc.SetState(SCE_LUA_CHARACTER);

-                       } else if (sc.ch == '[' && sc.chNext == '[') {
+                       } else if (sc.Match('[', '[')) {
+                               literalStringLevel = 1;

                                sc.SetState(SCE_LUA_LITERALSTRING);
                                sc.SetState(SCE_LUA_LITERALSTRING);

-                               literalString = 1;
-                       } else if (sc.ch == '-' && sc.chNext == '-') {
+                               sc.Forward();
+                       } else if (sc.Match("--[[")) {  // Lua 5.0's block comment
+                               blockCommentLevel = 1;
+                               sc.SetState(SCE_LUA_COMMENT);
+                               sc.Forward(3);
+                       } else if (sc.Match('-', '-')) {

                                sc.SetState(SCE_LUA_COMMENTLINE);
                                sc.SetState(SCE_LUA_COMMENTLINE);

-                       }  else if (isLuaOperator(static_cast<char>(sc.ch))) {
+                               sc.Forward();
+                       } else if (sc.atLineStart && sc.Match('$')) {
+                               sc.SetState(SCE_LUA_PREPROCESSOR);      // Obsolete since Lua 4.0, but still in old code
+                       } else if (IsLuaOperator(static_cast<char>(sc.ch))) {

                                sc.SetState(SCE_LUA_OPERATOR);
                        }
                }
                                sc.SetState(SCE_LUA_OPERATOR);
                        }
                }


@@ -173,7 +248,6 @@ static void ColouriseLuaDoc(unsigned int startPos, int length, int initStyle, Wo
        sc.Complete();
 }
 
        sc.Complete();
 }
 

-

 static void FoldLuaDoc(unsigned int startPos, int length, int /* initStyle */, WordList *[],
                        Accessor &styler) {
        unsigned int lengthDoc = startPos + length;
 static void FoldLuaDoc(unsigned int startPos, int length, int /* initStyle */, WordList *[],
                        Accessor &styler) {
        unsigned int lengthDoc = startPos + length;


@@ -185,6 +259,7 @@ static void FoldLuaDoc(unsigned int startPos, int length, int /* initStyle */, W
        bool foldCompact = styler.GetPropertyInt("fold.compact", 1) != 0;
        int styleNext = styler.StyleAt(startPos);
        char s[10];
        bool foldCompact = styler.GetPropertyInt("fold.compact", 1) != 0;
        int styleNext = styler.StyleAt(startPos);
        char s[10];

+

        for (unsigned int i = startPos; i < lengthDoc; i++) {
                char ch = chNext;
                chNext = styler.SafeGetCharAt(i + 1);
        for (unsigned int i = startPos; i < lengthDoc; i++) {
                char ch = chNext;
                chNext = styler.SafeGetCharAt(i + 1);


@@ -192,36 +267,38 @@ static void FoldLuaDoc(unsigned int startPos, int length, int /* initStyle */, W
                styleNext = styler.StyleAt(i + 1);
                bool atEOL = (ch == '\r' && chNext != '\n') || (ch == '\n');
                if (style == SCE_LUA_WORD) {
                styleNext = styler.StyleAt(i + 1);
                bool atEOL = (ch == '\r' && chNext != '\n') || (ch == '\n');
                if (style == SCE_LUA_WORD) {

-                       if ( ch == 'i' || ch == 'e' || ch == 't' || ch == 'd' || ch == 'f') {
+                       if (ch == 'i' || ch == 'd' || ch == 'f' || ch == 'e') {

                                for (unsigned int j = 0; j < 8; j++) {
                                for (unsigned int j = 0; j < 8; j++) {

-                                       if (!iswordchar(styler[i + j]))
+                                       if (!iswordchar(styler[i + j])) {

                                                break;
                                                break;

+                                       }

                                        s[j] = styler[i + j];
                                        s[j + 1] = '\0';
                                }
                                        s[j] = styler[i + j];
                                        s[j + 1] = '\0';
                                }

-                               
-                               if ((strcmp(s, "if") == 0) || (strcmp(s, "do") == 0)
-                                       || (strcmp(s, "function") == 0))
+
+                               if ((strcmp(s, "if") == 0) || (strcmp(s, "do") == 0) || (strcmp(s, "function") == 0)) {

                                        levelCurrent++;
                                        levelCurrent++;

-                               if ((strcmp(s, "end") == 0) || (strcmp(s, "elseif") == 0))
+                               }
+                               if ((strcmp(s, "end") == 0) || (strcmp(s, "elseif") == 0)) {

                                        levelCurrent--;
                                        levelCurrent--;

-                               
+                               }

                        }
                        }

-               }
-               else if (style == SCE_LUA_OPERATOR)
-               {
-                       if(ch == '{' || ch == '(')
+               } else if (style == SCE_LUA_OPERATOR) {
+                       if (ch == '{' || ch == '(') {

                                levelCurrent++;
                                levelCurrent++;

-                       else if(ch == '}' || ch == ')')
+                       } else if (ch == '}' || ch == ')') {

                                levelCurrent--;
                                levelCurrent--;

+                       }

                }
                }

-                       
+

                if (atEOL) {
                        int lev = levelPrev;
                if (atEOL) {
                        int lev = levelPrev;

-                       if (visibleChars == 0 && foldCompact)
+                       if (visibleChars == 0 && foldCompact) {

                                lev |= SC_FOLDLEVELWHITEFLAG;
                                lev |= SC_FOLDLEVELWHITEFLAG;

-                       if ((levelCurrent > levelPrev) && (visibleChars > 0))
+                       }
+                       if ((levelCurrent > levelPrev) && (visibleChars > 0)) {

                                lev |= SC_FOLDLEVELHEADERFLAG;
                                lev |= SC_FOLDLEVELHEADERFLAG;

+                       }

                        if (lev != styler.LevelAt(lineCurrent)) {
                                styler.SetLevel(lineCurrent, lev);
                        }
                        if (lev != styler.LevelAt(lineCurrent)) {
                                styler.SetLevel(lineCurrent, lev);
                        }


@@ -229,8 +306,9 @@ static void FoldLuaDoc(unsigned int startPos, int length, int /* initStyle */, W
                        levelPrev = levelCurrent;
                        visibleChars = 0;
                }
                        levelPrev = levelCurrent;
                        visibleChars = 0;
                }

-               if (!isspacechar(ch))
+               if (!isspacechar(ch)) {

                        visibleChars++;
                        visibleChars++;

+               }

        }
        // Fill in the real level of the next line, keeping the current flags as they will be filled in later
 
        }
        // Fill in the real level of the next line, keeping the current flags as they will be filled in later
 


@@ -238,4 +316,14 @@ static void FoldLuaDoc(unsigned int startPos, int length, int /* initStyle */, W
        styler.SetLevel(lineCurrent, levelPrev | flagsNext);
 }
 
        styler.SetLevel(lineCurrent, levelPrev | flagsNext);
 }
 

-LexerModule lmLua(SCLEX_LUA, ColouriseLuaDoc, "lua", FoldLuaDoc);
+static const char * const luaWordListDesc[] = {
+       "Keywords",
+       "Basic functions",
+       "String, (table) & math functions",
+       "(coroutines), I/O & system facilities",
+       "XXX",
+       "XXX",
+       0
+};
+
+LexerModule lmLua(SCLEX_LUA, ColouriseLuaDoc, "lua", FoldLuaDoc, luaWordListDesc);