diff options
Diffstat (limited to 'src/LexTCL.cpp')
| -rw-r--r-- | src/LexTCL.cpp | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/src/LexTCL.cpp b/src/LexTCL.cpp index c782141..4a651bc 100644 --- a/src/LexTCL.cpp +++ b/src/LexTCL.cpp @@ -43,7 +43,7 @@ static void ColouriseTCLDoc(unsigned int startPos, int length, int , WordList *k bool foldComment = styler.GetPropertyInt("fold.comment") != 0; bool commentLevel = false; bool subBrace = false; // substitution begin with a brace ${.....} - enum tLineState {LS_DEFAULT, LS_OPEN_COMMENT, LS_OPEN_DOUBLE_QUOTE, LS_COMMENT_BOX, LS_MASK_STATE = 0xf, + enum tLineState {LS_DEFAULT, LS_OPEN_COMMENT, LS_OPEN_DOUBLE_TQUOTE, LS_COMMENT_BOX, LS_MASK_STATE = 0xf, LS_COMMAND_EXPECTED = 16, LS_BRACE_ONLY = 32 } lineState = LS_DEFAULT; bool prevSlash = false; int currentLevel = 0; @@ -89,8 +89,8 @@ next: sc.SetState(SCE_TCL_DEFAULT); if (lineState == LS_OPEN_COMMENT) sc.SetState(SCE_TCL_COMMENTLINE); - else if (lineState == LS_OPEN_DOUBLE_QUOTE) - sc.SetState(SCE_TCL_IN_QUOTE); + else if (lineState == LS_OPEN_DOUBLE_TQUOTE) + sc.SetState(SCE_TCL_IN_TQUOTE); else if (lineState == LS_COMMENT_BOX && (sc.ch == '#' || (sc.ch == ' ' && sc.chNext=='#'))) sc.SetState(SCE_TCL_COMMENT_BOX); lineState = LS_DEFAULT; @@ -144,16 +144,16 @@ next: w[strlen(w)-1]=0; while(*s == ':') // ignore leading : like in ::set a 10 ++s; - bool quote = sc.state == SCE_TCL_IN_QUOTE; + bool quote = sc.state == SCE_TCL_IN_TQUOTE; if (commentLevel || expected) { if (keywords.InList(s)) { - sc.ChangeState(quote ? SCE_TCL_WORD_IN_QUOTE : SCE_TCL_WORD); + sc.ChangeState(quote ? SCE_TCL_WORD_IN_TQUOTE : SCE_TCL_WORD); } else if (keywords2.InList(s)) { - sc.ChangeState(quote ? SCE_TCL_WORD_IN_QUOTE : SCE_TCL_WORD2); + sc.ChangeState(quote ? SCE_TCL_WORD_IN_TQUOTE : SCE_TCL_WORD2); } else if (keywords3.InList(s)) { - sc.ChangeState(quote ? SCE_TCL_WORD_IN_QUOTE : SCE_TCL_WORD3); + sc.ChangeState(quote ? SCE_TCL_WORD_IN_TQUOTE : SCE_TCL_WORD3); } else if (keywords4.InList(s)) { - sc.ChangeState(quote ? SCE_TCL_WORD_IN_QUOTE : SCE_TCL_WORD4); + sc.ChangeState(quote ? SCE_TCL_WORD_IN_TQUOTE : SCE_TCL_WORD4); } else if (sc.GetRelative(-static_cast<int>(strlen(s))-1) == '{' && keywords5.InList(s) && sc.ch == '}') { // {keyword} exactly no spaces sc.ChangeState(SCE_TCL_EXPAND); @@ -169,7 +169,7 @@ next: } } expected = false; - sc.SetState(quote ? SCE_TCL_IN_QUOTE : SCE_TCL_DEFAULT); + sc.SetState(quote ? SCE_TCL_IN_TQUOTE : SCE_TCL_DEFAULT); } else if (sc.state == SCE_TCL_MODIFIER || sc.state == SCE_TCL_IDENTIFIER) { sc.SetState(SCE_TCL_DEFAULT); } @@ -199,8 +199,8 @@ next: styler.SetLevel(currentLine, flag + previousLevel + SC_FOLDLEVELBASE + (currentLevel << 17) + (commentLevel << 16)); // Update the line state, so it can be seen by next line - if (sc.state == SCE_TCL_IN_QUOTE) - lineState = LS_OPEN_DOUBLE_QUOTE; + if (sc.state == SCE_TCL_IN_TQUOTE) + lineState = LS_OPEN_DOUBLE_TQUOTE; else { if (prevSlash) { if (isComment(sc.state)) @@ -213,8 +213,8 @@ next: (expected ? LS_COMMAND_EXPECTED : 0) | lineState); if (lineState == LS_COMMENT_BOX) sc.ForwardSetState(SCE_TCL_COMMENT_BOX); - else if (lineState == LS_OPEN_DOUBLE_QUOTE) - sc.ForwardSetState(SCE_TCL_IN_QUOTE); + else if (lineState == LS_OPEN_DOUBLE_TQUOTE) + sc.ForwardSetState(SCE_TCL_IN_TQUOTE); else sc.ForwardSetState(SCE_TCL_DEFAULT); prevSlash = false; @@ -233,7 +233,7 @@ next: continue; if (sc.atLineStart) { visibleChars = false; - if (sc.state!=SCE_TCL_IN_QUOTE && !isComment(sc.state)) + if (sc.state!=SCE_TCL_IN_TQUOTE && !isComment(sc.state)) { sc.SetState(SCE_TCL_DEFAULT); expected = IsAWordStart(sc.ch)|| isspacechar(static_cast<unsigned char>(sc.ch)); @@ -245,7 +245,7 @@ next: if (!IsANumberChar(sc.ch)) sc.SetState(SCE_TCL_DEFAULT); break; - case SCE_TCL_IN_QUOTE: + case SCE_TCL_IN_TQUOTE: if (sc.ch == '"') { sc.ForwardSetState(SCE_TCL_DEFAULT); visibleChars = true; // necessary if a " is the first and only character on a line @@ -253,7 +253,7 @@ next: } else if (sc.ch == '[' || sc.ch == ']' || sc.ch == '$') { sc.SetState(SCE_TCL_OPERATOR); expected = sc.ch == '['; - sc.ForwardSetState(SCE_TCL_IN_QUOTE); + sc.ForwardSetState(SCE_TCL_IN_TQUOTE); goto next; } continue; @@ -264,7 +264,7 @@ next: if (sc.ch == '#') { if (visibleChars) { - if (sc.state != SCE_TCL_IN_QUOTE && expected) + if (sc.state != SCE_TCL_IN_TQUOTE && expected) sc.SetState(SCE_TCL_COMMENT); } else { sc.SetState(SCE_TCL_COMMENTLINE); @@ -293,7 +293,7 @@ next: } else { switch (sc.ch) { case '\"': - sc.SetState(SCE_TCL_IN_QUOTE); + sc.SetState(SCE_TCL_IN_TQUOTE); break; case '{': sc.SetState(SCE_TCL_OPERATOR); |