diff options
| -rw-r--r-- | doc/ScintillaHistory.html | 1 | ||||
| -rw-r--r-- | gtk/makefile | 3 | ||||
| -rw-r--r-- | gtk/scintilla.mak | 3 | ||||
| -rw-r--r-- | src/KeyWords.cxx | 1 | ||||
| -rw-r--r-- | src/LexScriptol.cxx | 427 | ||||
| -rw-r--r-- | win32/makefile | 3 | ||||
| -rw-r--r-- | win32/scintilla.mak | 3 | ||||
| -rw-r--r-- | win32/scintilla_vc6.mak | 3 |
8 files changed, 442 insertions, 2 deletions
diff --git a/doc/ScintillaHistory.html b/doc/ScintillaHistory.html index 38bd7f982..43542b805 100644 --- a/doc/ScintillaHistory.html +++ b/doc/ScintillaHistory.html @@ -134,6 +134,7 @@ <li>Sergey Puljajev</li> <li>Mathias Rauen</li> <li>Angelo Mandato</li> + <li>Denis Sureau</li> </ul> <p> Images used in GTK+ version diff --git a/gtk/makefile b/gtk/makefile index c4ec839cc..55b2cda08 100644 --- a/gtk/makefile +++ b/gtk/makefile @@ -51,7 +51,8 @@ LEXOBJS=\ LexAda.o LexAsm.o LexAVE.o LexBaan.o LexBullant.o LexConf.o LexCPP.o \ LexCrontab.o LexCSS.o LexEiffel.o LexEScript.o LexFortran.o LexHTML.o \ LexLisp.o LexLout.o LexLua.o LexMatlab.o LexNsis.o LexOthers.o LexPascal.o \ -LexPerl.o LexPOV.o LexPS.o LexPython.o LexRuby.o LexSQL.o LexVB.o +LexPerl.o LexPOV.o LexPS.o LexPython.o LexRuby.o LexScriptol.o LexSQL.o \ +LexVB.o #--Autogenerated -- end of automatically generated section # The LEXOBJS have to be treated specially as the functions in them are not called from external code diff --git a/gtk/scintilla.mak b/gtk/scintilla.mak index f6db94adf..6df55b8b0 100644 --- a/gtk/scintilla.mak +++ b/gtk/scintilla.mak @@ -145,6 +145,7 @@ LEXOBJS=\ $(DIR_O)\LexPS.obj \ $(DIR_O)\LexPython.obj \ $(DIR_O)\LexRuby.obj \ + $(DIR_O)\LexScriptol.obj \ $(DIR_O)\LexSQL.obj \ $(DIR_O)\LexVB.obj \ @@ -309,6 +310,8 @@ $(DIR_O)\LexPython.obj: ..\src\LexPython.cxx $(LEX_HEADERS) $(DIR_O)\LexRuby.obj: ..\src\LexRuby.cxx $(LEX_HEADERS) +$(DIR_O)\LexScriptol.obj: ..\src\LexScriptol.cxx $(LEX_HEADERS) + $(DIR_O)\LexSQL.obj: ..\src\LexSQL.cxx $(LEX_HEADERS) $(DIR_O)\LexVB.obj: ..\src\LexVB.cxx $(LEX_HEADERS) diff --git a/src/KeyWords.cxx b/src/KeyWords.cxx index a15bae350..be3b26bcc 100644 --- a/src/KeyWords.cxx +++ b/src/KeyWords.cxx @@ -167,6 +167,7 @@ int Scintilla_LinkLexers() { LINK_LEXER(lmPS); LINK_LEXER(lmPython); LINK_LEXER(lmRuby); + LINK_LEXER(lmScriptol); LINK_LEXER(lmSQL); LINK_LEXER(lmVB); LINK_LEXER(lmVBScript); diff --git a/src/LexScriptol.cxx b/src/LexScriptol.cxx new file mode 100644 index 000000000..fda10e316 --- /dev/null +++ b/src/LexScriptol.cxx @@ -0,0 +1,427 @@ +// Scintilla source code edit control +/** @file LexScriptol.cxx + ** Lexer for Scriptol. + **/ + +#include <stdlib.h> +#include <string.h> +#include <ctype.h> +#include <stdio.h> +#include <stdarg.h> + +#include "Platform.h" + +#include "PropSet.h" +#include "Accessor.h" +#include "KeyWords.h" +#include "Scintilla.h" +#include "SciLexer.h" + +static void ClassifyWordSol(unsigned int start, unsigned int end, WordList &keywords, Accessor &styler, char *prevWord) +{ + char s[100]; + bool wordIsNumber = isdigit(styler[start]) != 0; + for (unsigned int i = 0; i < end - start + 1 && i < 30; i++) + { + s[i] = styler[start + i]; + s[i + 1] = '\0'; + } + char chAttr = SCE_P_IDENTIFIER; + if (0 == strcmp(prevWord, "class")) chAttr = SCE_P_CLASSNAME; + else if (wordIsNumber) chAttr = SCE_P_NUMBER; + else if (keywords.InList(s)) chAttr = SCE_P_WORD; + else for (unsigned int i = 0; i < end - start + 1; i++) // test dotted idents + { + if (styler[start + i] == '.') + { + styler.ColourTo(start + i - 1, chAttr); + styler.ColourTo(start + i, SCE_P_OPERATOR); + } + } + styler.ColourTo(end, chAttr); + strcpy(prevWord, s); +} + +static bool IsSolComment(Accessor &styler, int pos, int len) +{ +// return len > 0 && styler[pos]=='`'; + char c; + if(len > 0) + { + c = styler[pos]; + if(c == '`') return true; + if(len > 1) + { + if(c == '/') + { + c = styler[pos + 1]; + if(c == '/') return true; + if(c == '*') return true; + } + } + } + return false; +} + +static bool IsSolStringStart(char ch, char /*chNext*/) +{ + if (ch == '\'' || ch == '"') return true; + //chNext = chNext; // for future use + + return false; +} + +static bool IsSolWordStart(char ch, char chNext) +{ + return (iswordchar(ch) && !IsSolStringStart(ch, chNext)); +} + +/* Return the state to use for the string starting at i; *nextIndex will be set to the first index following the quote(s) */ +static int GetSolStringState(Accessor &styler, int i, int *nextIndex) +{ + char ch = styler.SafeGetCharAt(i); + char chNext = styler.SafeGetCharAt(i + 1); + + if (ch != '"' && ch != '\'') { + *nextIndex = i + 1; + return SCE_P_DEFAULT; + } + + if (ch == chNext && ch == styler.SafeGetCharAt(i + 2)) + { + *nextIndex = i + 3; + if (ch == '"') return SCE_P_TRIPLEDOUBLE; + else return SCE_P_TRIPLE; + } + else + { + *nextIndex = i + 1; + if (ch == '"') return SCE_P_STRING; + else return SCE_P_CHARACTER; + } +} + +static void ColouriseSolDoc(unsigned int startPos, int length, int initStyle, + WordList *keywordlists[], Accessor &styler) + { + + int lengthDoc = startPos + length; + + // Backtrack to previous line in case need to fix its tab whinging + if (startPos > 0) + { + int lineCurrent = styler.GetLine(startPos); + if (lineCurrent > 0) + { + startPos = styler.LineStart(lineCurrent-1); + if (startPos == 0) initStyle = SCE_P_DEFAULT; + else initStyle = styler.StyleAt(startPos-1); + } + } + + styler.StartAt(startPos, 127); + + WordList &keywords = *keywordlists[0]; + + int whingeLevel = styler.GetPropertyInt("tab.timmy.whinge.level"); + char prevWord[200]; + prevWord[0] = '\0'; + if (length == 0) return ; + + int state = initStyle & 31; + + int nextIndex = 0; + char chPrev = ' '; + //char chPrev2 = ' '; + char chNext = styler[startPos]; + styler.StartSegment(startPos); + bool atStartLine = true; + int spaceFlags = 0; + for (int i = startPos; i < lengthDoc; i++) + { + + if (atStartLine) + { + char chBad = static_cast<char>(64); + char chGood = static_cast<char>(0); + char chFlags = chGood; + + if (whingeLevel == 1) + { + chFlags = (spaceFlags & wsInconsistent) ? chBad : chGood; + } + else if (whingeLevel == 2) + { + chFlags = (spaceFlags & wsSpaceTab) ? chBad : chGood; + } + else if (whingeLevel == 3) + { + chFlags = (spaceFlags & wsSpace) ? chBad : chGood; + } + else if (whingeLevel == 4) + { + chFlags = (spaceFlags & wsTab) ? chBad : chGood; + } + styler.SetFlags(chFlags, static_cast<char>(state)); + atStartLine = false; + } + + char ch = chNext; + chNext = styler.SafeGetCharAt(i + 1); + + if ((ch == '\r' && chNext != '\n') || (ch == '\n') || (i == lengthDoc)) + { + if ((state == SCE_P_DEFAULT) || (state == SCE_P_TRIPLE) || (state == SCE_P_TRIPLEDOUBLE)) + { + styler.ColourTo(i, state); + } + atStartLine = true; + } + + if (styler.IsLeadByte(ch)) + { + chNext = styler.SafeGetCharAt(i + 2); + chPrev = ' '; + //chPrev2 = ' '; + i += 1; + continue; + } + + if (state == SCE_P_STRINGEOL) + { + if (ch != '\r' && ch != '\n') + { + styler.ColourTo(i - 1, state); + state = SCE_P_DEFAULT; + } + } + + if (state == SCE_P_DEFAULT) + { + if (IsSolWordStart(ch, chNext)) + { + styler.ColourTo(i - 1, state); + state = SCE_P_WORD; + } + else if (ch == '`') + { + styler.ColourTo(i - 1, state); + state = SCE_P_COMMENTLINE; + } + else if (ch == '/') + { + styler.ColourTo(i - 1, state); + if(chNext == '/') state = SCE_P_COMMENTLINE; + if(chNext == '*') state = SCE_P_COMMENTBLOCK; + } + + else if (ch == '=' && chNext == 'b') + { + // =begin indicates the start of a comment (doc) block + if(styler.SafeGetCharAt(i + 2) == 'e' && styler.SafeGetCharAt(i + 3) == 'g' && styler.SafeGetCharAt(i + 4) == 'i' && styler.SafeGetCharAt(i + 5) == 'n') + { + styler.ColourTo(i - 1, state); + state = SCE_P_TRIPLEDOUBLE; //SCE_C_COMMENT; + } + } + else if (IsSolStringStart(ch, chNext)) + { + styler.ColourTo(i - 1, state); + state = GetSolStringState(styler, i, &nextIndex); + if (nextIndex != i + 1) + { + i = nextIndex - 1; + ch = ' '; + //chPrev = ' '; + chNext = styler.SafeGetCharAt(i + 1); + } + } + else if (isoperator(ch)) + { + styler.ColourTo(i - 1, state); + styler.ColourTo(i, SCE_P_OPERATOR); + } + } + else if (state == SCE_P_WORD) + { + if (!iswordchar(ch)) + { + ClassifyWordSol(styler.GetStartSegment(), i - 1, keywords, styler, prevWord); + state = SCE_P_DEFAULT; + if (ch == '`') + { + state = chNext == '`' ? SCE_P_COMMENTBLOCK : SCE_P_COMMENTLINE; + } + else if (IsSolStringStart(ch, chNext)) + { + styler.ColourTo(i - 1, state); + state = GetSolStringState(styler, i, &nextIndex); + if (nextIndex != i + 1) + { + i = nextIndex - 1; + ch = ' '; + //chPrev = ' '; + chNext = styler.SafeGetCharAt(i + 1); + } + } + else if (isoperator(ch)) + { + styler.ColourTo(i, SCE_P_OPERATOR); + } + } + } + else + { + if (state == SCE_P_COMMENTLINE) + { + if (ch == '\r' || ch == '\n') + { + styler.ColourTo(i - 1, state); + state = SCE_P_DEFAULT; + } + } + else if(state == SCE_P_COMMENTBLOCK) + { + if(ch == '*' && chNext == '/') state = SCE_P_DEFAULT; + } + else if (state == SCE_P_STRING) + { + if ((ch == '\r' || ch == '\n') && (chPrev != '\\')) + { + styler.ColourTo(i - 1, state); + state = SCE_P_STRINGEOL; + } + else if (ch == '\\') + { + if (chNext == '\"' || chNext == '\'' || chNext == '\\') + { + i++; + ch = chNext; + chNext = styler.SafeGetCharAt(i + 1); + } + } + else if (ch == '\"') + { + styler.ColourTo(i, state); + state = SCE_P_DEFAULT; + } + } + else if (state == SCE_P_CHARACTER) + { + if ((ch == '\r' || ch == '\n') && (chPrev != '\\')) + { + styler.ColourTo(i - 1, state); + state = SCE_P_STRINGEOL; + } + else if (ch == '\\') + { + if (chNext == '\"' || chNext == '\'' || chNext == '\\') + { + i++; + ch = chNext; + chNext = styler.SafeGetCharAt(i + 1); + } + } + else if (ch == '\'') + { + styler.ColourTo(i, state); + state = SCE_P_DEFAULT; + } + } + /* + else if (state == SCE_P_TRIPLE) + { + if (ch == '\'' && chPrev == '\'' && chPrev2 == '\'') + { + styler.ColourTo(i, state); + state = SCE_P_DEFAULT; + } + } + else if (state == SCE_P_TRIPLEDOUBLE) + { + // =end terminates the comment block + if (ch == 'd' && chPrev == 'n' && chPrev2 == 'e') + { + if (styler.SafeGetCharAt(i - 3) == '=') + { + styler.ColourTo(i, state); + state = SCE_P_DEFAULT; + } + } + } + */ + } + //chPrev2 = chPrev; + chPrev = ch; + } + if (state == SCE_P_WORD) + { + ClassifyWordSol(styler.GetStartSegment(), lengthDoc-1, keywords, styler, prevWord); + } + else + { + styler.ColourTo(lengthDoc-1, state); + } +} + +static void FoldSolDoc(unsigned int startPos, int length, int initStyle, + WordList *[], Accessor &styler) + { + int lengthDoc = startPos + length; + + // Backtrack to previous line in case need to fix its fold status + int lineCurrent = styler.GetLine(startPos); + if (startPos > 0) { + if (lineCurrent > 0) + { + lineCurrent--; + startPos = styler.LineStart(lineCurrent); + if (startPos == 0) + initStyle = SCE_P_DEFAULT; + else + initStyle = styler.StyleAt(startPos-1); + } + } + int state = initStyle & 31; + int spaceFlags = 0; + int indentCurrent = styler.IndentAmount(lineCurrent, &spaceFlags, IsSolComment); + if ((state == SCE_P_TRIPLE) || (state == SCE_P_TRIPLEDOUBLE)) + indentCurrent |= SC_FOLDLEVELWHITEFLAG; + char chNext = styler[startPos]; + for (int i = startPos; i < lengthDoc; i++) + { + char ch = chNext; + chNext = styler.SafeGetCharAt(i + 1); + int style = styler.StyleAt(i) & 31; + + if ((ch == '\r' && chNext != '\n') || (ch == '\n') || (i == lengthDoc)) + { + int lev = indentCurrent; + int indentNext = styler.IndentAmount(lineCurrent + 1, &spaceFlags, IsSolComment); + if ((style == SCE_P_TRIPLE) || (style== SCE_P_TRIPLEDOUBLE)) + indentNext |= SC_FOLDLEVELWHITEFLAG; + if (!(indentCurrent & SC_FOLDLEVELWHITEFLAG)) + { + // Only non whitespace lines can be headers + if ((indentCurrent & SC_FOLDLEVELNUMBERMASK) < (indentNext & SC_FOLDLEVELNUMBERMASK)) + { + lev |= SC_FOLDLEVELHEADERFLAG; + } else if (indentNext & SC_FOLDLEVELWHITEFLAG) + { + // Line after is blank so check the next - maybe should continue further? + int spaceFlags2 = 0; + int indentNext2 = styler.IndentAmount(lineCurrent + 2, &spaceFlags2, IsSolComment); + if ((indentCurrent & SC_FOLDLEVELNUMBERMASK) < (indentNext2 & SC_FOLDLEVELNUMBERMASK)) + { + lev |= SC_FOLDLEVELHEADERFLAG; + } + } + } + indentCurrent = indentNext; + styler.SetLevel(lineCurrent, lev); + lineCurrent++; + } + } +} + +LexerModule lmScriptol(SCLEX_SCRIPTOL, ColouriseSolDoc, "scriptol", FoldSolDoc); diff --git a/win32/makefile b/win32/makefile index cfdb9f155..ad72d5e80 100644 --- a/win32/makefile +++ b/win32/makefile @@ -49,7 +49,8 @@ LEXOBJS=\ LexAda.o LexAsm.o LexAVE.o LexBaan.o LexBullant.o LexConf.o LexCPP.o \ LexCrontab.o LexCSS.o LexEiffel.o LexEScript.o LexFortran.o LexHTML.o \ LexLisp.o LexLout.o LexLua.o LexMatlab.o LexNsis.o LexOthers.o LexPascal.o \ -LexPerl.o LexPOV.o LexPS.o LexPython.o LexRuby.o LexSQL.o LexVB.o +LexPerl.o LexPOV.o LexPS.o LexPython.o LexRuby.o LexScriptol.o LexSQL.o \ +LexVB.o #--Autogenerated -- end of automatically generated section SOBJS = ScintillaWin.o ScintillaBase.o Editor.o Document.o \ diff --git a/win32/scintilla.mak b/win32/scintilla.mak index ab023e178..c96b8d949 100644 --- a/win32/scintilla.mak +++ b/win32/scintilla.mak @@ -134,6 +134,7 @@ LEXOBJS=\ $(DIR_O)\LexPS.obj \ $(DIR_O)\LexPython.obj \ $(DIR_O)\LexRuby.obj \ + $(DIR_O)\LexScriptol.obj \ $(DIR_O)\LexSQL.obj \ $(DIR_O)\LexVB.obj \ @@ -295,6 +296,8 @@ $(DIR_O)\LexPython.obj: ..\src\LexPython.cxx $(LEX_HEADERS) $(DIR_O)\LexRuby.obj: ..\src\LexRuby.cxx $(LEX_HEADERS) +$(DIR_O)\LexScriptol.obj: ..\src\LexScriptol.cxx $(LEX_HEADERS) + $(DIR_O)\LexSQL.obj: ..\src\LexSQL.cxx $(LEX_HEADERS) $(DIR_O)\LexVB.obj: ..\src\LexVB.cxx $(LEX_HEADERS) diff --git a/win32/scintilla_vc6.mak b/win32/scintilla_vc6.mak index 611163714..54f6308ab 100644 --- a/win32/scintilla_vc6.mak +++ b/win32/scintilla_vc6.mak @@ -136,6 +136,7 @@ LEXOBJS=\ $(DIR_O)\LexPS.obj \ $(DIR_O)\LexPython.obj \ $(DIR_O)\LexRuby.obj \ + $(DIR_O)\LexScriptol.obj \ $(DIR_O)\LexSQL.obj \ $(DIR_O)\LexVB.obj \ @@ -297,6 +298,8 @@ $(DIR_O)\LexPython.obj: ..\src\LexPython.cxx $(LEX_HEADERS) $(DIR_O)\LexRuby.obj: ..\src\LexRuby.cxx $(LEX_HEADERS) +$(DIR_O)\LexScriptol.obj: ..\src\LexScriptol.cxx $(LEX_HEADERS) + $(DIR_O)\LexSQL.obj: ..\src\LexSQL.cxx $(LEX_HEADERS) $(DIR_O)\LexVB.obj: ..\src\LexVB.cxx $(LEX_HEADERS) |