aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorMatt Gilarde <devnull@localhost>2016-02-25 10:40:20 +1100
committerMatt Gilarde <devnull@localhost>2016-02-25 10:40:20 +1100
commit7d65b2507330ccb9f7ec5ee2638c08a335f658d2 (patch)
tree88fa2f67d47a2f5f6ec0bf3e7094ebb11ffffa7b
parentd6e74b800671afa205df8d2d82845963da973c2f (diff)
downloadscintilla-mirror-7d65b2507330ccb9f7ec5ee2638c08a335f658d2.tar.gz
Support hexadecimal numeric literals.
-rw-r--r--doc/ScintillaHistory.html3
-rw-r--r--lexers/LexProgress.cxx4
2 files changed, 5 insertions, 2 deletions
diff --git a/doc/ScintillaHistory.html b/doc/ScintillaHistory.html
index f1f0a514f..758877d9c 100644
--- a/doc/ScintillaHistory.html
+++ b/doc/ScintillaHistory.html
@@ -515,7 +515,8 @@
<a href="http://sourceforge.net/p/scintilla/bugs/1799/">Bug #1799</a>.<br />
</li>
<li>
- The Progress lexer supports single-line comments, abbreviated keywords and
+ The Progress lexer supports hexadecimal numeric literals,
+ single-line comments, abbreviated keywords and
extends nested comments to unlimited levels.
</li>
<li>
diff --git a/lexers/LexProgress.cxx b/lexers/LexProgress.cxx
index 88fed1452..88a840341 100644
--- a/lexers/LexProgress.cxx
+++ b/lexers/LexProgress.cxx
@@ -121,7 +121,9 @@ static void Colourise4glDoc(Sci_PositionU startPos, Sci_Position length, int ini
sc.SetState(SCE_4GL_DEFAULT | mask);
break;
case SCE_4GL_NUMBER:
- if (!(IsADigit(sc.ch))) {
+ // Hex numbers (0xnnnn) are supported so accept any
+ // alphanumeric character if it follows a leading digit.
+ if (!(IsAlphaNumeric(sc.ch))) {
sc.SetState(SCE_4GL_DEFAULT | mask);
}
break;