diff options
| -rw-r--r-- | gtk/makefile | 2 | ||||
| -rw-r--r-- | gtk/scintilla.mak | 3 | ||||
| -rw-r--r-- | include/SciLexer.h | 13 | ||||
| -rw-r--r-- | include/Scintilla.iface | 15 | ||||
| -rw-r--r-- | macosx/makefile | 2 | ||||
| -rw-r--r-- | src/KeyWords.cxx | 1 | ||||
| -rw-r--r-- | src/LexR.cxx | 210 | ||||
| -rw-r--r-- | vcbuild/SciLexer.dsp | 4 | ||||
| -rw-r--r-- | win32/makefile | 2 | ||||
| -rw-r--r-- | win32/scintilla.mak | 3 | ||||
| -rw-r--r-- | win32/scintilla_vc6.mak | 3 |
11 files changed, 255 insertions, 3 deletions
diff --git a/gtk/makefile b/gtk/makefile index b9a49ae3a..ddebd07f2 100644 --- a/gtk/makefile +++ b/gtk/makefile @@ -70,7 +70,7 @@ LexErlang.o LexEScript.o LexFlagship.o LexForth.o LexFortran.o LexGAP.o \ LexGui4Cli.o LexHaskell.o LexHTML.o LexInno.o LexKix.o LexLisp.o LexLout.o \ LexLua.o LexMatlab.o LexMetapost.o LexMMIXAL.o LexMPT.o LexMSSQL.o LexNsis.o \ LexOpal.o LexOthers.o LexPascal.o LexPB.o LexPerl.o LexPLM.o LexPOV.o \ -LexProgress.o LexPS.o LexPython.o LexRebol.o LexRuby.o LexScriptol.o \ +LexProgress.o LexPS.o LexPython.o LexR.o LexRebol.o LexRuby.o LexScriptol.o \ LexSmalltalk.o LexSpecman.o LexSpice.o LexSQL.o LexTADS3.o LexTCL.o LexTeX.o \ LexVB.o LexVerilog.o LexVHDL.o LexYAML.o #--Autogenerated -- end of automatically generated section diff --git a/gtk/scintilla.mak b/gtk/scintilla.mak index e44143ec9..dcf346ead 100644 --- a/gtk/scintilla.mak +++ b/gtk/scintilla.mak @@ -195,6 +195,7 @@ LEXOBJS=\ $(DIR_O)\LexProgress.obj \ $(DIR_O)\LexPS.obj \ $(DIR_O)\LexPython.obj \ + $(DIR_O)\LexR.obj \ $(DIR_O)\LexRebol.obj \ $(DIR_O)\LexRuby.obj \ $(DIR_O)\LexScriptol.obj \ @@ -455,6 +456,8 @@ $(DIR_O)\LexPS.obj: ..\src\LexPS.cxx $(LEX_HEADERS) $(DIR_O)\LexPython.obj: ..\src\LexPython.cxx $(LEX_HEADERS) +$(DIR_O)\LexR.obj: ..\src\LexR.cxx $(LEX_HEADERS) + $(DIR_O)\LexRebol.obj: ..\src\LexRebol.cxx $(LEX_HEADERS) $(DIR_O)\LexRuby.obj: ..\src\LexRuby.cxx $(LEX_HEADERS) diff --git a/include/SciLexer.h b/include/SciLexer.h index d5dc072b0..2354aa876 100644 --- a/include/SciLexer.h +++ b/include/SciLexer.h @@ -98,6 +98,7 @@ #define SCLEX_PROGRESS 83 #define SCLEX_ABAQUS 84 #define SCLEX_ASYMPTOTE 85 +#define SCLEX_R 86 #define SCLEX_AUTOMATIC 1000 #define SCE_P_DEFAULT 0 #define SCE_P_COMMENTLINE 1 @@ -1190,6 +1191,18 @@ #define SCE_ASY_STRINGEOL 9 #define SCE_ASY_COMMENTLINEDOC 10 #define SCE_ASY_WORD2 11 +#define SCE_R_DEFAULT 0 +#define SCE_R_COMMENT 1 +#define SCE_R_KWORD 2 +#define SCE_R_BASEKWORD 3 +#define SCE_R_OTHERKWORD 4 +#define SCE_R_NUMBER 5 +#define SCE_R_STRING 6 +#define SCE_R_STRING2 7 +#define SCE_R_OPERATOR 8 +#define SCE_R_IDENTIFIER 9 +#define SCE_R_INFIX 10 +#define SCE_R_INFIXEOL 11 #define SCLEX_ASP 29 #define SCLEX_PHP 30 //--Autogenerated -- end of section automatically generated from Scintilla.iface diff --git a/include/Scintilla.iface b/include/Scintilla.iface index da124e3d0..0ca831b59 100644 --- a/include/Scintilla.iface +++ b/include/Scintilla.iface @@ -1990,6 +1990,7 @@ val SCLEX_PLM=82 val SCLEX_PROGRESS=83 val SCLEX_ABAQUS=84 val SCLEX_ASYMPTOTE=85 +val SCLEX_R=86 # When a lexer specifies its language as SCLEX_AUTOMATIC it receives a # value assigned in sequence from SCLEX_AUTOMATIC+1. @@ -3241,6 +3242,20 @@ val SCE_ASY_IDENTIFIER=8 val SCE_ASY_STRINGEOL=9 val SCE_ASY_COMMENTLINEDOC=10 val SCE_ASY_WORD2=11 +# Lexical states for SCLEX_R +lex R=SCLEX_R SCE_R_ +val SCE_R_DEFAULT=0 +val SCE_R_COMMENT=1 +val SCE_R_KWORD=2 +val SCE_R_BASEKWORD=3 +val SCE_R_OTHERKWORD=4 +val SCE_R_NUMBER=5 +val SCE_R_STRING=6 +val SCE_R_STRING2=7 +val SCE_R_OPERATOR=8 +val SCE_R_IDENTIFIER=9 +val SCE_R_INFIX=10 +val SCE_R_INFIXEOL=11 # Events diff --git a/macosx/makefile b/macosx/makefile index eda3e3c25..aa1d32e68 100644 --- a/macosx/makefile +++ b/macosx/makefile @@ -60,7 +60,7 @@ LexErlang.o LexEScript.o LexFlagship.o LexForth.o LexFortran.o LexGAP.o \ LexGui4Cli.o LexHaskell.o LexHTML.o LexInno.o LexKix.o LexLisp.o LexLout.o \ LexLua.o LexMatlab.o LexMetapost.o LexMMIXAL.o LexMPT.o LexMSSQL.o LexNsis.o \ LexOpal.o LexOthers.o LexPascal.o LexPB.o LexPerl.o LexPLM.o LexPOV.o \ -LexProgress.o LexPS.o LexPython.o LexRebol.o LexRuby.o LexScriptol.o \ +LexProgress.o LexPS.o LexPython.o LexR.o LexRebol.o LexRuby.o LexScriptol.o \ LexSmalltalk.o LexSpecman.o LexSpice.o LexSQL.o LexTADS3.o LexTCL.o LexTeX.o \ LexVB.o LexVerilog.o LexVHDL.o LexYAML.o #--Autogenerated -- end of automatically generated section diff --git a/src/KeyWords.cxx b/src/KeyWords.cxx index df85e0456..9261e1296 100644 --- a/src/KeyWords.cxx +++ b/src/KeyWords.cxx @@ -209,6 +209,7 @@ int Scintilla_LinkLexers() { LINK_LEXER(lmPS); LINK_LEXER(lmPureBasic); LINK_LEXER(lmPython); + LINK_LEXER(lmr); LINK_LEXER(lmREBOL); LINK_LEXER(lmRuby); LINK_LEXER(lmScriptol); diff --git a/src/LexR.cxx b/src/LexR.cxx new file mode 100644 index 000000000..439e3e56f --- /dev/null +++ b/src/LexR.cxx @@ -0,0 +1,210 @@ +// Scintilla source code edit control +/** @file Lexr.cxx + ** Lexer for R, S, SPlus Statistics Program (Heavily derived from CPP Lexer). + ** + **/ +// Copyright 1998-2002 by Neil Hodgson <neilh@scintilla.org> +// The License.txt file describes the conditions under which this software may be distributed. + +#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 "StyleContext.h" +#include "KeyWords.h" +#include "Scintilla.h" +#include "SciLexer.h" + + +static inline bool IsAWordChar(const int ch) { + return (ch < 0x80) && (isalnum(ch) || ch == '.' || ch == '_'); +} + +static inline bool IsAWordStart(const int ch) { + return (ch < 0x80) && (isalnum(ch) || ch == '_'); +} + +static inline bool IsAnOperator(const int ch) { + if (isascii(ch) && isalnum(ch)) + 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 == '(' || + ch == ')' || ch == '}' || ch == '{' || ch == '[' || + ch == ']') + return true; + return false; +} + +static void ColouriseRDoc(unsigned int startPos, int length, int initStyle, WordList *keywordlists[], + Accessor &styler) { + + WordList &keywords = *keywordlists[0]; + WordList &keywords2 = *keywordlists[1]; + WordList &keywords3 = *keywordlists[2]; + + + // Do not leak onto next line + if (initStyle == SCE_R_INFIXEOL) + initStyle = SCE_R_DEFAULT; + + + StyleContext sc(startPos, length, initStyle, styler); + + for (; sc.More(); sc.Forward()) { + + if (sc.atLineStart && (sc.state == SCE_R_STRING)) { + // Prevent SCE_R_STRINGEOL from leaking back to previous line + sc.SetState(SCE_R_STRING); + } + + // Determine if the current state should terminate. + if (sc.state == SCE_R_OPERATOR) { + sc.SetState(SCE_R_DEFAULT); + } else if (sc.state == SCE_R_NUMBER) { + if (!IsADigit(sc.ch) && !(sc.ch == '.' && IsADigit(sc.chNext))) { + sc.SetState(SCE_R_DEFAULT); + } + } else if (sc.state == SCE_R_IDENTIFIER) { + if (!IsAWordChar(sc.ch) || (sc.ch == '.')) { + char s[100]; + sc.GetCurrentLowered(s, sizeof(s)); + if (keywords.InList(s)) { + sc.ChangeState(SCE_R_KWORD); + } else if (keywords2.InList(s)) { + sc.ChangeState(SCE_R_BASEKWORD); + } else if (keywords3.InList(s)) { + sc.ChangeState(SCE_R_OTHERKWORD); + } + sc.SetState(SCE_R_DEFAULT); + } + } else if (sc.state == SCE_R_COMMENT) { + if (sc.ch == '\r' || sc.ch == '\n') { + sc.SetState(SCE_R_DEFAULT); + } + } else if (sc.state == SCE_R_STRING) { + if (sc.ch == '\\') { + if (sc.chNext == '\"' || sc.chNext == '\'' || sc.chNext == '\\') { + sc.Forward(); + } + } else if (sc.ch == '\"') { + sc.ForwardSetState(SCE_R_DEFAULT); + } + } else if (sc.state == SCE_R_INFIX) { + if (sc.ch == '%') { + sc.ForwardSetState(SCE_R_DEFAULT); + } else if (sc.atLineEnd) { + sc.ChangeState(SCE_R_INFIXEOL); + sc.ForwardSetState(SCE_R_DEFAULT); + } + }else if (sc.state == SCE_R_STRING2) { + if (sc.ch == '\\') { + if (sc.chNext == '\"' || sc.chNext == '\'' || sc.chNext == '\\') { + sc.Forward(); + } + } else if (sc.ch == '\'') { + sc.ForwardSetState(SCE_R_DEFAULT); + } + } + + // Determine if a new state should be entered. + if (sc.state == SCE_R_DEFAULT) { + if (IsADigit(sc.ch) || (sc.ch == '.' && IsADigit(sc.chNext))) { + sc.SetState(SCE_R_NUMBER); + } else if (IsAWordStart(sc.ch) ) { + sc.SetState(SCE_R_IDENTIFIER); + } else if (sc.Match('#')) { + sc.SetState(SCE_R_COMMENT); + } else if (sc.ch == '\"') { + sc.SetState(SCE_R_STRING); + } else if (sc.ch == '%') { + sc.SetState(SCE_R_INFIX); + } else if (sc.ch == '\'') { + sc.SetState(SCE_R_STRING2); + } else if (IsAnOperator(sc.ch)) { + sc.SetState(SCE_R_OPERATOR); + } + } + } + sc.Complete(); +} + +// Store both the current line's fold level and the next lines in the +// level store to make it easy to pick up with each increment +// and to make it possible to fiddle the current level for "} else {". +static void FoldRDoc(unsigned int startPos, int length, int, WordList *[], + Accessor &styler) { + bool foldCompact = styler.GetPropertyInt("fold.compact", 1) != 0; + bool foldAtElse = styler.GetPropertyInt("fold.at.else", 0) != 0; + unsigned int endPos = startPos + length; + int visibleChars = 0; + int lineCurrent = styler.GetLine(startPos); + int levelCurrent = SC_FOLDLEVELBASE; + if (lineCurrent > 0) + levelCurrent = styler.LevelAt(lineCurrent-1) >> 16; + int levelMinCurrent = levelCurrent; + int levelNext = levelCurrent; + char chNext = styler[startPos]; + int styleNext = styler.StyleAt(startPos); + for (unsigned int i = startPos; i < endPos; i++) { + char ch = chNext; + chNext = styler.SafeGetCharAt(i + 1); + int style = styleNext; + styleNext = styler.StyleAt(i + 1); + bool atEOL = (ch == '\r' && chNext != '\n') || (ch == '\n'); + if (style == SCE_R_OPERATOR) { + if (ch == '{') { + // Measure the minimum before a '{' to allow + // folding on "} else {" + if (levelMinCurrent > levelNext) { + levelMinCurrent = levelNext; + } + levelNext++; + } else if (ch == '}') { + levelNext--; + } + } + if (atEOL) { + int levelUse = levelCurrent; + if (foldAtElse) { + levelUse = levelMinCurrent; + } + int lev = levelUse | levelNext << 16; + if (visibleChars == 0 && foldCompact) + lev |= SC_FOLDLEVELWHITEFLAG; + if (levelUse < levelNext) + lev |= SC_FOLDLEVELHEADERFLAG; + if (lev != styler.LevelAt(lineCurrent)) { + styler.SetLevel(lineCurrent, lev); + } + lineCurrent++; + levelCurrent = levelNext; + levelMinCurrent = levelCurrent; + visibleChars = 0; + } + if (!isspacechar(ch)) + visibleChars++; + } +} + + +static const char * const RWordLists[] = { + "Language Keywords", + "Base / Default package function", + "Other Package Functions", + "Unused", + "Unused", + 0, + }; + + + +LexerModule lmr(SCLEX_R, ColouriseRDoc, "r", FoldRDoc, RWordLists); diff --git a/vcbuild/SciLexer.dsp b/vcbuild/SciLexer.dsp index 70267a2c8..3798e2ea1 100644 --- a/vcbuild/SciLexer.dsp +++ b/vcbuild/SciLexer.dsp @@ -354,6 +354,10 @@ SOURCE=..\src\LexPython.cxx # End Source File # Begin Source File +SOURCE=..\src\LexR.cxx +# End Source File +# Begin Source File + SOURCE=..\src\LexRebol.cxx # End Source File # Begin Source File diff --git a/win32/makefile b/win32/makefile index 869419d66..b41e32f3c 100644 --- a/win32/makefile +++ b/win32/makefile @@ -58,7 +58,7 @@ LexErlang.o LexEScript.o LexFlagship.o LexForth.o LexFortran.o LexGAP.o \ LexGui4Cli.o LexHaskell.o LexHTML.o LexInno.o LexKix.o LexLisp.o LexLout.o \ LexLua.o LexMatlab.o LexMetapost.o LexMMIXAL.o LexMPT.o LexMSSQL.o LexNsis.o \ LexOpal.o LexOthers.o LexPascal.o LexPB.o LexPerl.o LexPLM.o LexPOV.o \ -LexProgress.o LexPS.o LexPython.o LexRebol.o LexRuby.o LexScriptol.o \ +LexProgress.o LexPS.o LexPython.o LexR.o LexRebol.o LexRuby.o LexScriptol.o \ LexSmalltalk.o LexSpecman.o LexSpice.o LexSQL.o LexTADS3.o LexTCL.o LexTeX.o \ LexVB.o LexVerilog.o LexVHDL.o LexYAML.o #--Autogenerated -- end of automatically generated section diff --git a/win32/scintilla.mak b/win32/scintilla.mak index 8501e5505..cbd91ae27 100644 --- a/win32/scintilla.mak +++ b/win32/scintilla.mak @@ -165,6 +165,7 @@ LEXOBJS=\ $(DIR_O)\LexProgress.obj \ $(DIR_O)\LexPS.obj \ $(DIR_O)\LexPython.obj \ + $(DIR_O)\LexR.obj \ $(DIR_O)\LexRebol.obj \ $(DIR_O)\LexRuby.obj \ $(DIR_O)\LexScriptol.obj \ @@ -406,6 +407,8 @@ $(DIR_O)\LexPS.obj: ..\src\LexPS.cxx $(LEX_HEADERS) $(DIR_O)\LexPython.obj: ..\src\LexPython.cxx $(LEX_HEADERS) +$(DIR_O)\LexR.obj: ..\src\LexR.cxx $(LEX_HEADERS) + $(DIR_O)\LexRebol.obj: ..\src\LexRebol.cxx $(LEX_HEADERS) $(DIR_O)\LexRuby.obj: ..\src\LexRuby.cxx $(LEX_HEADERS) diff --git a/win32/scintilla_vc6.mak b/win32/scintilla_vc6.mak index c4b120250..5764fd1cc 100644 --- a/win32/scintilla_vc6.mak +++ b/win32/scintilla_vc6.mak @@ -167,6 +167,7 @@ LEXOBJS=\ $(DIR_O)\LexProgress.obj \ $(DIR_O)\LexPS.obj \ $(DIR_O)\LexPython.obj \ + $(DIR_O)\LexR.obj \ $(DIR_O)\LexRebol.obj \ $(DIR_O)\LexRuby.obj \ $(DIR_O)\LexScriptol.obj \ @@ -408,6 +409,8 @@ $(DIR_O)\LexPS.obj: ..\src\LexPS.cxx $(LEX_HEADERS) $(DIR_O)\LexPython.obj: ..\src\LexPython.cxx $(LEX_HEADERS) +$(DIR_O)\LexR.obj: ..\src\LexR.cxx $(LEX_HEADERS) + $(DIR_O)\LexRebol.obj: ..\src\LexRebol.cxx $(LEX_HEADERS) $(DIR_O)\LexRuby.obj: ..\src\LexRuby.cxx $(LEX_HEADERS) |