diff options
| author | Neil <nyamatongwe@gmail.com> | 2025-03-27 19:35:43 +1100 |
|---|---|---|
| committer | Neil <nyamatongwe@gmail.com> | 2025-03-27 19:35:43 +1100 |
| commit | ceaa07a1bc4d05a89218d09bd5c5c3ce411845d5 (patch) | |
| tree | bda153bd3f2920efbcb1159470773283db84879e /src | |
| parent | c2189f99d1781b4d676ea9741052df353e0180bd (diff) | |
| download | scintilla-mirror-ceaa07a1bc4d05a89218d09bd5c5c3ce411845d5.tar.gz | |
Use constant definitions to avoid warnings.
Diffstat (limited to 'src')
| -rw-r--r-- | src/DBCS.cxx | 12 | ||||
| -rw-r--r-- | src/DBCS.h | 16 |
2 files changed, 17 insertions, 11 deletions
diff --git a/src/DBCS.cxx b/src/DBCS.cxx index e3ae3d75f..d5512cc14 100644 --- a/src/DBCS.cxx +++ b/src/DBCS.cxx @@ -15,21 +15,21 @@ bool DBCSIsLeadByte(int codePage, char ch) noexcept { // Byte ranges found in Wikipedia articles with relevant search strings in each case const unsigned char uch = ch; switch (codePage) { - case 932: + case cp932: // Shift_jis return ((uch >= 0x81) && (uch <= 0x9F)) || ((uch >= 0xE0) && (uch <= 0xFC)); // Lead bytes F0 to FC may be a Microsoft addition. - case 936: + case cp936: // GBK return (uch >= 0x81) && (uch <= 0xFE); - case 949: + case cp949: // Korean Wansung KS C-5601-1987 return (uch >= 0x81) && (uch <= 0xFE); - case 950: + case cp950: // Big5 return (uch >= 0x81) && (uch <= 0xFE); - case 1361: + case cp1361: // Korean Johab KS C-5601-1992 return ((uch >= 0x84) && (uch <= 0xD3)) || @@ -41,7 +41,7 @@ bool DBCSIsLeadByte(int codePage, char ch) noexcept { bool IsDBCSValidSingleByte(int codePage, int ch) noexcept { switch (codePage) { - case 932: + case cp932: return ch == 0x80 || (ch >= 0xA0 && ch <= 0xDF) || (ch >= 0xFD); diff --git a/src/DBCS.h b/src/DBCS.h index ceeb75929..01830c843 100644 --- a/src/DBCS.h +++ b/src/DBCS.h @@ -10,12 +10,18 @@ namespace Scintilla::Internal { +constexpr int cp932 = 932; +constexpr int cp936 = 936; +constexpr int cp949 = 949; +constexpr int cp950 = 950; +constexpr int cp1361 = 1361; + constexpr bool IsDBCSCodePage(int codePage) noexcept { - return codePage == 932 - || codePage == 936 - || codePage == 949 - || codePage == 950 - || codePage == 1361; + return codePage == cp932 + || codePage == cp936 + || codePage == cp949 + || codePage == cp950 + || codePage == cp1361; } bool DBCSIsLeadByte(int codePage, char ch) noexcept; |