diff options
Diffstat (limited to 'lexers')
-rw-r--r-- | lexers/LexBaan.cxx | 6 | ||||
-rw-r--r-- | lexers/LexEDIFACT.cxx | 4 | ||||
-rw-r--r-- | lexers/LexErrorList.cxx | 2 | ||||
-rw-r--r-- | lexers/LexMaxima.cxx | 18 | ||||
-rw-r--r-- | lexers/LexProgress.cxx | 14 | ||||
-rw-r--r-- | lexers/LexVHDL.cxx | 2 |
6 files changed, 23 insertions, 23 deletions
diff --git a/lexers/LexBaan.cxx b/lexers/LexBaan.cxx index 1c004528d..fa8b46302 100644 --- a/lexers/LexBaan.cxx +++ b/lexers/LexBaan.cxx @@ -142,7 +142,7 @@ static inline int IsAnyOtherIdentifier(char *s, Sci_Position sLength) { switch (sLength) { case 8: if (isalpha(s[0]) && isalpha(s[1]) && isalpha(s[2]) && isalpha(s[3]) && isalpha(s[4]) && IsADigit(s[5]) && IsADigit(s[6]) && IsADigit(s[7])) { - //^^^^^### + //^^^^^### return(SCE_BAAN_TABLEDEF); } break; @@ -522,7 +522,7 @@ void SCI_METHOD LexerBaan::Lex(Sci_PositionU startPos, Sci_Position length, int case SCE_BAAN_OPERATOR: sc.SetState(SCE_BAAN_DEFAULT); break; - case SCE_BAAN_NUMBER: + case SCE_BAAN_NUMBER: if (IsASpaceOrTab(sc.ch) || sc.ch == '\r' || sc.ch == '\n' || IsAnOperator(sc.ch)) { sc.SetState(SCE_BAAN_DEFAULT); } @@ -933,7 +933,7 @@ void SCI_METHOD LexerBaan::Fold(Sci_PositionU startPos, Sci_Position length, int levelCurrent++; } else if (nextLineStyle != 0 && currLineStyle != nextLineStyle - && (priorSectionIsSubSection(lineCurrent -1 ,styler) + && (priorSectionIsSubSection(lineCurrent -1 ,styler) || !nextSectionIsSubSection(lineCurrent + 1, styler))) { for (Sci_Position j = styler.LineStart(lineCurrent + 1); j < styler.LineStart(lineCurrent + 1 + 1) - 1; j++) { if (IsASpaceOrTab(styler[j])) diff --git a/lexers/LexEDIFACT.cxx b/lexers/LexEDIFACT.cxx index aafd5c2a9..d03e60a70 100644 --- a/lexers/LexEDIFACT.cxx +++ b/lexers/LexEDIFACT.cxx @@ -4,7 +4,7 @@ // and more readably here: https://en.wikipedia.org/wiki/EDIFACT // This code is subject to the same license terms as the rest of the scintilla project: // The License.txt file describes the conditions under which this software may be distributed. -// +// // Header order must match order in scripts/HeaderOrder.txt #include <cstdlib> @@ -145,7 +145,7 @@ void LexerEDIFACT::Lex(Sci_PositionU startPos, Sci_Position lengthDoc, int, IDoc if (SegmentStyle == SCE_EDI_UNA) { posCurrent += 9; - styler.ColourTo(posCurrent - 1, SCE_EDI_UNA); // UNA + styler.ColourTo(posCurrent - 1, SCE_EDI_UNA); // UNA continue; } posSegmentStart = posCurrent; diff --git a/lexers/LexErrorList.cxx b/lexers/LexErrorList.cxx index a82d0cf7c..b3dcd2a59 100644 --- a/lexers/LexErrorList.cxx +++ b/lexers/LexErrorList.cxx @@ -104,7 +104,7 @@ static int RecogniseErrorListLine(const char *lineBuffer, Sci_PositionU lengthLi // perl error message: // <message> at <file> line <line> return SCE_ERR_PERL; - } else if ((lengthLine >= 6) && + } else if ((lengthLine >= 6) && (memcmp(lineBuffer, " at ", 6) == 0) && strstr(lineBuffer, ":line ")) { // A .NET traceback diff --git a/lexers/LexMaxima.cxx b/lexers/LexMaxima.cxx index 08f4a0901..4897c995e 100644 --- a/lexers/LexMaxima.cxx +++ b/lexers/LexMaxima.cxx @@ -52,7 +52,7 @@ static void ColouriseMaximaDoc(Sci_PositionU startPos, Sci_Position length, int !((styler.SafeGetCharAt(i+1) == '*') && (styler.SafeGetCharAt(i) == '/'))) i--; } - + for (; i < lengthDoc; i++) { char ch = styler.SafeGetCharAt(i); char chNext = styler.SafeGetCharAt(i + 1); @@ -65,7 +65,7 @@ static void ColouriseMaximaDoc(Sci_PositionU startPos, Sci_Position length, int if((ch == '/') && (chNext == '*')) { i++;i++; - + chNext = styler.SafeGetCharAt(i); for (; i < lengthDoc; i++) { @@ -84,7 +84,7 @@ static void ColouriseMaximaDoc(Sci_PositionU startPos, Sci_Position length, int styler.ColourTo(i, SCE_MAXIMA_COMMENT); continue; } - + // Handle Operators if(isMaximaoperator(ch)) { @@ -98,7 +98,7 @@ static void ColouriseMaximaDoc(Sci_PositionU startPos, Sci_Position length, int styler.ColourTo(i, SCE_MAXIMA_COMMANDENDING); continue; } - + // Handle numbers. Numbers always begin with a digit. if(IsASCII(ch) && isdigit(ch)) { @@ -110,7 +110,7 @@ static void ColouriseMaximaDoc(Sci_PositionU startPos, Sci_Position length, int if(ch == '.') continue; - + // A "e" or similar can be followed by a "+" or a "-" if(((ch == 'e') || (ch == 'b') || (ch == 'g') || (ch == 'f')) && ((chNext == '+') || (chNext == '-'))) @@ -119,7 +119,7 @@ static void ColouriseMaximaDoc(Sci_PositionU startPos, Sci_Position length, int chNext = styler.SafeGetCharAt(i + 1); continue; } - + if(!IsASCII(ch) || !(isdigit(ch) || islower(ch) || isupper(ch))) { i--; @@ -149,7 +149,7 @@ static void ColouriseMaximaDoc(Sci_PositionU startPos, Sci_Position length, int styler.ColourTo(i, SCE_MAXIMA_STRING); continue; } - + // Handle keywords. Maxima treats Non-ASCII chars as ordinary letters. if(((!IsASCII(ch))) || isalpha(ch) || (ch == '_')) { @@ -194,7 +194,7 @@ static void ColouriseMaximaDoc(Sci_PositionU startPos, Sci_Position length, int styler.ColourTo(i, SCE_MAXIMA_COMMAND); continue; } - + // All other keywords are functions if they are followed // by an opening parenthesis char nextNonwhitespace = ' '; @@ -214,7 +214,7 @@ static void ColouriseMaximaDoc(Sci_PositionU startPos, Sci_Position length, int } continue; } - + styler.ColourTo(i-1, SCE_MAXIMA_UNKNOWN); } } diff --git a/lexers/LexProgress.cxx b/lexers/LexProgress.cxx index 5bc8c76eb..0d27fdcdb 100644 --- a/lexers/LexProgress.cxx +++ b/lexers/LexProgress.cxx @@ -11,7 +11,7 @@ SpeedScript support in html lexer Differentiate between labels and variables Option 1: By symbols table - Option 2: As a single unidentified symbol in a sytactical line + Option 2: As a single unidentified symbol in a sytactical line **/ @@ -74,7 +74,7 @@ namespace { bool IsStreamCommentStyle(int style) { return style == SCE_ABL_COMMENT; - // style == SCE_ABL_LINECOMMENT; Only block comments are used for folding + // style == SCE_ABL_LINECOMMENT; Only block comments are used for folding } // Options used for LexerABL @@ -160,7 +160,7 @@ public: return osABL.DescribeProperty(name); } Sci_Position SCI_METHOD PropertySet(const char *key, const char *val) override ; - + const char * SCI_METHOD DescribeWordListSets() override { return osABL.DescribeWordListSets(); } @@ -236,7 +236,7 @@ void SCI_METHOD LexerABL::Lex(Sci_PositionU startPos, Sci_Position length, int i continuationLine = styler.SafeGetCharAt(endLinePrevious-1) == '~'; } } - } + } // Look back to set variables that are actually invisible secondary states. The reason to avoid formal states is to cut down on state's bits if (startPos > 0) { @@ -254,9 +254,9 @@ void SCI_METHOD LexerABL::Lex(Sci_PositionU startPos, Sci_Position length, int i ch = styler.SafeGetCharAt(back); styler.Flush(); // looking at styles so need to flush st = styler.StyleAt(back); - + chPrev = styler.SafeGetCharAt(back-1); - // isSentenceStart is a non-visible state, used to identify where statements and preprocessor declerations can start + // isSentenceStart is a non-visible state, used to identify where statements and preprocessor declerations can start if (checkIsSentenceStart && st != SCE_ABL_COMMENT && st != SCE_ABL_LINECOMMENT && st != SCE_ABL_CHARACTER && st != SCE_ABL_STRING ) { chPrev_1 = styler.SafeGetCharAt(back-2); chPrev_2 = styler.SafeGetCharAt(back-3); @@ -287,7 +287,7 @@ void SCI_METHOD LexerABL::Lex(Sci_PositionU startPos, Sci_Position length, int i // eat the '*' so we don't miscount a /* if we see */*/ --back; } - } + } --back; } } diff --git a/lexers/LexVHDL.cxx b/lexers/LexVHDL.cxx index de87d2792..92b18269b 100644 --- a/lexers/LexVHDL.cxx +++ b/lexers/LexVHDL.cxx @@ -167,7 +167,7 @@ static void ColouriseVHDLDoc( sc.SetState(SCE_VHDL_OPERATOR); } } - + if (advance) sc.Forward(); } |