Skip to content

Commit

Permalink
Define distinct style constants for COBOL SCE_COBOL_* replacing the C…
Browse files Browse the repository at this point in the history 
…OBOL lexers reuse of

the SCE_C_* constants defined for the cpp lexer.
The values are the same to provide binary compatibility.
Related to #284.
  • Loading branch information
@nyamatongwe
nyamatongwe committed Oct 27, 2024
1 parent 464cb58 commit 50373fa
Show file tree
Hide file tree
Showing 3 changed files with 71 additions and 45 deletions.
17 changes: 15 additions & 2 deletions include/LexicalStyles.iface
View file
Original file line number Diff line number Diff line change
Expand Up @@ -179,12 +179,10 @@ val SCE_P_FTRIPLEDOUBLE=19
val SCE_P_ATTRIBUTE=20
# Lexical states for SCLEX_CPP
# Lexical states for SCLEX_BULLANT
# Lexical states for SCLEX_COBOL
# Lexical states for SCLEX_TACL
# Lexical states for SCLEX_TAL
lex Cpp=SCLEX_CPP SCE_C_
lex BullAnt=SCLEX_BULLANT SCE_C_
lex COBOL=SCLEX_COBOL SCE_C_
lex TACL=SCLEX_TACL SCE_C_
lex TAL=SCLEX_TAL SCE_C_
val SCE_C_DEFAULT=0
Expand Down Expand Up @@ -215,6 +213,21 @@ val SCE_C_PREPROCESSORCOMMENTDOC=24
val SCE_C_USERLITERAL=25
val SCE_C_TASKMARKER=26
val SCE_C_ESCAPESEQUENCE=27
# Lexical states for SCLEX_COBOL
lex COBOL=SCLEX_COBOL SCE_COBOL_
val SCE_COBOL_DEFAULT=0
val SCE_COBOL_COMMENT=1
val SCE_COBOL_COMMENTLINE=2
val SCE_COBOL_COMMENTDOC=3
val SCE_COBOL_NUMBER=4
val SCE_COBOL_WORD=5
val SCE_COBOL_STRING=6
val SCE_COBOL_CHARACTER=7
val SCE_COBOL_UUID=8
val SCE_COBOL_PREPROCESSOR=9
val SCE_COBOL_OPERATOR=10
val SCE_COBOL_IDENTIFIER=11
val SCE_COBOL_WORD2=16
# Lexical states for SCLEX_D
lex D=SCLEX_D SCE_D_
val SCE_D_DEFAULT=0
Expand Down
13 changes: 13 additions & 0 deletions include/SciLexer.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -203,6 +203,19 @@
#define SCE_C_USERLITERAL 25
#define SCE_C_TASKMARKER 26
#define SCE_C_ESCAPESEQUENCE 27
#define SCE_COBOL_DEFAULT 0
#define SCE_COBOL_COMMENT 1
#define SCE_COBOL_COMMENTLINE 2
#define SCE_COBOL_COMMENTDOC 3
#define SCE_COBOL_NUMBER 4
#define SCE_COBOL_WORD 5
#define SCE_COBOL_STRING 6
#define SCE_COBOL_CHARACTER 7
#define SCE_COBOL_UUID 8
#define SCE_COBOL_PREPROCESSOR 9
#define SCE_COBOL_OPERATOR 10
#define SCE_COBOL_IDENTIFIER 11
#define SCE_COBOL_WORD2 16
#define SCE_D_DEFAULT 0
#define SCE_D_COMMENT 1
#define SCE_D_COMMENTLINE 2
Expand Down
86 changes: 43 additions & 43 deletions lexers/LexCOBOL.cxx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -92,31 +92,31 @@ int classifyWordCOBOL(Sci_PositionU start, Sci_PositionU end, /*WordList &keywor
s[1] = '\0';
getRange(start, end, styler, s, sizeof(s));

int chAttr = SCE_C_IDENTIFIER;
int chAttr = SCE_COBOL_IDENTIFIER;
if (isdigit(s[0]) || (s[0] == '.') || (s[0] == 'v')) {
chAttr = SCE_C_NUMBER;
chAttr = SCE_COBOL_NUMBER;
char *p = s + 1;
while (*p) {
if ((!isdigit(*p) && (*p) != 'v') && isCOBOLwordchar(*p)) {
chAttr = SCE_C_IDENTIFIER;
chAttr = SCE_COBOL_IDENTIFIER;
break;
}
++p;
}
}
if (chAttr == SCE_C_IDENTIFIER) {
if (chAttr == SCE_COBOL_IDENTIFIER) {
WordList& a_keywords = *keywordlists[0];
WordList& b_keywords = *keywordlists[1];
WordList& c_keywords = *keywordlists[2];

if (a_keywords.InList(s)) {
chAttr = SCE_C_WORD;
chAttr = SCE_COBOL_WORD;
}
else if (b_keywords.InList(s)) {
chAttr = SCE_C_WORD2;
chAttr = SCE_COBOL_WORD2;
}
else if (c_keywords.InList(s)) {
chAttr = SCE_C_UUID;
chAttr = SCE_COBOL_UUID;
}
}
if (*bAarea) {
Expand Down Expand Up @@ -150,8 +150,8 @@ void ColouriseCOBOLDoc(Sci_PositionU startPos, Sci_Position length, int initStyl
styler.StartAt(startPos);

int state = initStyle;
if (state == SCE_C_CHARACTER) // Does not leak onto next line
state = SCE_C_DEFAULT;
if (state == SCE_COBOL_CHARACTER) // Does not leak onto next line
state = SCE_COBOL_DEFAULT;
char chPrev = ' ';
char chNext = styler[startPos];
Sci_PositionU lengthDoc = startPos + length;
Expand Down Expand Up @@ -190,9 +190,9 @@ void ColouriseCOBOLDoc(Sci_PositionU startPos, Sci_Position length, int initStyl
// Trigger on CR only (Mac style) or either on LF from CR+LF (Dos/Win) or on LF alone (Unix)
// Avoid triggering two times on Dos/Win
// End of line
if (state == SCE_C_CHARACTER) {
if (state == SCE_COBOL_CHARACTER) {
ColourTo(styler, i, state);
state = SCE_C_DEFAULT;
state = SCE_COBOL_DEFAULT;
}
styler.SetLineState(currentLine, nContainment);
currentLine++;
Expand All @@ -208,44 +208,44 @@ void ColouriseCOBOLDoc(Sci_PositionU startPos, Sci_Position length, int initStyl
continue;
}

if (state == SCE_C_DEFAULT) {
if (state == SCE_COBOL_DEFAULT) {
if (isCOBOLwordstart(ch) || (ch == '$' && IsASCII(chNext) && isalpha(chNext))) {
ColourTo(styler, i-1, state);
state = SCE_C_IDENTIFIER;
state = SCE_COBOL_IDENTIFIER;
} else if (column == 6 && (ch == '*' || ch == '/')) {
// Cobol comment line: asterisk in column 7.
ColourTo(styler, i-1, state);
state = SCE_C_COMMENTLINE;
state = SCE_COBOL_COMMENTLINE;
} else if (ch == '*' && chNext == '>') {
// Cobol inline comment: asterisk, followed by greater than.
ColourTo(styler, i-1, state);
state = SCE_C_COMMENTLINE;
state = SCE_COBOL_COMMENTLINE;
} else if (column == 0 && ch == '*' && chNext != '*') {
ColourTo(styler, i-1, state);
state = SCE_C_COMMENTLINE;
state = SCE_COBOL_COMMENTLINE;
} else if (column == 0 && ch == '/' && chNext != '*') {
ColourTo(styler, i-1, state);
state = SCE_C_COMMENTLINE;
state = SCE_COBOL_COMMENTLINE;
} else if (column == 0 && ch == '*' && chNext == '*') {
ColourTo(styler, i-1, state);
state = SCE_C_COMMENTDOC;
state = SCE_COBOL_COMMENTDOC;
} else if (column == 0 && ch == '/' && chNext == '*') {
ColourTo(styler, i-1, state);
state = SCE_C_COMMENTDOC;
state = SCE_COBOL_COMMENTDOC;
} else if (ch == '"') {
ColourTo(styler, i-1, state);
state = SCE_C_STRING;
state = SCE_COBOL_STRING;
} else if (ch == '\'') {
ColourTo(styler, i-1, state);
state = SCE_C_CHARACTER;
state = SCE_COBOL_CHARACTER;
} else if (ch == '?' && column == 0) {
ColourTo(styler, i-1, state);
state = SCE_C_PREPROCESSOR;
state = SCE_COBOL_PREPROCESSOR;
} else if (isCOBOLoperator(ch)) {
ColourTo(styler, i-1, state);
ColourTo(styler, i, SCE_C_OPERATOR);
ColourTo(styler, i, SCE_COBOL_OPERATOR);
}
} else if (state == SCE_C_IDENTIFIER) {
} else if (state == SCE_COBOL_IDENTIFIER) {
if (!isCOBOLwordchar(ch)) {
int lStateChange = classifyWordCOBOL(styler.GetStartSegment(), i - 1, keywordlists, styler, nContainment, &bAarea);

Expand All @@ -254,55 +254,55 @@ void ColouriseCOBOLDoc(Sci_PositionU startPos, Sci_Position length, int initStyl
nContainment = lStateChange;
}

state = SCE_C_DEFAULT;
state = SCE_COBOL_DEFAULT;
chNext = styler.SafeGetCharAt(i + 1);
if (column == 6 && (ch == '*' || ch == '/')) {
state = SCE_C_COMMENTLINE;
state = SCE_COBOL_COMMENTLINE;
} else if (ch == '"') {
state = SCE_C_STRING;
state = SCE_COBOL_STRING;
} else if (ch == '\'') {
state = SCE_C_CHARACTER;
state = SCE_COBOL_CHARACTER;
} else if (isCOBOLoperator(ch)) {
ColourTo(styler, i, SCE_C_OPERATOR);
ColourTo(styler, i, SCE_COBOL_OPERATOR);
}
}
} else {
if (state == SCE_C_PREPROCESSOR) {
if (state == SCE_COBOL_PREPROCESSOR) {
if ((ch == '\r' || ch == '\n') && !(chPrev == '\\' || chPrev == '\r')) {
ColourTo(styler, i-1, state);
state = SCE_C_DEFAULT;
state = SCE_COBOL_DEFAULT;
}
} else if (state == SCE_C_COMMENT) {
} else if (state == SCE_COBOL_COMMENT) {
if (ch == '\r' || ch == '\n') {
ColourTo(styler, i-1, state);
state = SCE_C_DEFAULT;
state = SCE_COBOL_DEFAULT;
}
} else if (state == SCE_C_COMMENTDOC) {
} else if (state == SCE_COBOL_COMMENTDOC) {
if (ch == '\r' || ch == '\n') {
if (((i > styler.GetStartSegment() + 2) || (
(initStyle == SCE_C_COMMENTDOC) &&
(initStyle == SCE_COBOL_COMMENTDOC) &&
(styler.GetStartSegment() == static_cast<Sci_PositionU>(startPos))))) {
ColourTo(styler, i-1, state);
state = SCE_C_DEFAULT;
state = SCE_COBOL_DEFAULT;
}
}
} else if (state == SCE_C_COMMENTLINE) {
} else if (state == SCE_COBOL_COMMENTLINE) {
if (ch == '\r' || ch == '\n') {
ColourTo(styler, i-1, state);
state = SCE_C_DEFAULT;
state = SCE_COBOL_DEFAULT;
}
} else if (state == SCE_C_STRING) {
} else if (state == SCE_COBOL_STRING) {
if (ch == '"') {
ColourTo(styler, i, state);
state = SCE_C_DEFAULT;
state = SCE_COBOL_DEFAULT;
} else if (ch == '\r' || ch == '\n') {
ColourTo(styler, i-1, state);
state = SCE_C_DEFAULT;
state = SCE_COBOL_DEFAULT;
}
} else if (state == SCE_C_CHARACTER) {
} else if (state == SCE_COBOL_CHARACTER) {
if (ch == '\'') {
ColourTo(styler, i, state);
state = SCE_C_DEFAULT;
state = SCE_COBOL_DEFAULT;
}
}
}
Expand Down

0 comments on commit 50373fa

Please sign in to comment.