diff options
Diffstat (limited to 'lexers/LexBaan.cxx')
| -rw-r--r-- | lexers/LexBaan.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lexers/LexBaan.cxx b/lexers/LexBaan.cxx index 8eab3e8aa..c26b2fda1 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; @@ -508,7 +508,7 @@ void SCI_METHOD LexerBaan::Lex(Sci_PositionU startPos, Sci_Position length, int char word[1000]; int wordlen = 0; - std::string preProcessorTags[13] = { "#context_off", "#context_on", + std::string preProcessorTags[13] = { "#context_off", "#context_on", "#define", "#elif", "#else", "#endif", "#ident", "#if", "#ifdef", "#ifndef", "#include", "#pragma", "#undef" }; @@ -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])) |