diff options
| -rw-r--r-- | src/corelib/text/qunicodetables.cpp | 16 | ||||
| -rw-r--r-- | util/unicode/main.cpp | 28 |
2 files changed, 20 insertions, 24 deletions
diff --git a/src/corelib/text/qunicodetables.cpp b/src/corelib/text/qunicodetables.cpp index e38623dfc3..9c6aa477f8 100644 --- a/src/corelib/text/qunicodetables.cpp +++ b/src/corelib/text/qunicodetables.cpp @@ -6695,14 +6695,6 @@ static const unsigned short uc_property_trie[] = { 2891, 2891, 2891, 2891, 2891, 2891, 2885, 2885 }; -#define GET_PROP_INDEX(ucs4) \ - (ucs4 < 0x11000 \ - ? (uc_property_trie[uc_property_trie[ucs4>>5] + (ucs4 & 0x1f)]) \ - : (uc_property_trie[uc_property_trie[((ucs4 - 0x11000)>>8) + 0x880] + (ucs4 & 0xff)])) - -#define GET_PROP_INDEX_UCS2(ucs2) \ - (uc_property_trie[uc_property_trie[ucs2>>5] + (ucs2 & 0x1f)]) - static const Properties uc_properties[] = { { 9, 18, 0, 0, -1, 0, 1, 0, { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 3, 0, 21, 0, 2 }, { 9, 8, 0, 0, -1, 0, 1, 0, { {0, 0}, {0, 0}, {0, 0}, {0, 0} }, 3, 0, 17, 5, 2 }, @@ -9600,12 +9592,16 @@ static const Properties uc_properties[] = { Q_DECL_CONST_FUNCTION static inline const Properties *qGetProp(char32_t ucs4) noexcept { - return uc_properties + GET_PROP_INDEX(ucs4); + if (ucs4 < 0x11000) + return uc_properties + uc_property_trie[uc_property_trie[ucs4 >> 5] + (ucs4 & 0x1f)]; + + return uc_properties + + uc_property_trie[uc_property_trie[((ucs4 - 0x11000) >> 8) + 0x880] + (ucs4 & 0xff)]; } Q_DECL_CONST_FUNCTION static inline const Properties *qGetProp(char16_t ucs2) noexcept { - return uc_properties + GET_PROP_INDEX_UCS2(ucs2); + return uc_properties + uc_property_trie[uc_property_trie[ucs2 >> 5] + (ucs2 & 0x1f)]; } Q_DECL_CONST_FUNCTION Q_CORE_EXPORT const Properties * QT_FASTCALL properties(char32_t ucs4) noexcept diff --git a/util/unicode/main.cpp b/util/unicode/main.cpp index f082ab0ca1..66ebb22d0a 100644 --- a/util/unicode/main.cpp +++ b/util/unicode/main.cpp @@ -2439,17 +2439,6 @@ static QByteArray createPropertyInfo() out.chop(2); out += "\n};\n\n"; - out += "#define GET_PROP_INDEX(ucs4) \\\n" - " (ucs4 < 0x" + QByteArray::number(BMP_END, 16) + " \\\n" - " ? (uc_property_trie[uc_property_trie[ucs4>>" + QByteArray::number(BMP_SHIFT) + - "] + (ucs4 & 0x" + QByteArray::number(BMP_BLOCKSIZE-1, 16)+ ")]) \\\n" - " : (uc_property_trie[uc_property_trie[((ucs4 - 0x" + QByteArray::number(BMP_END, 16) + - ")>>" + QByteArray::number(SMP_SHIFT) + ") + 0x" + QByteArray::number(BMP_END/BMP_BLOCKSIZE, 16) + "]" - " + (ucs4 & 0x" + QByteArray::number(SMP_BLOCKSIZE-1, 16) + ")]))\n\n" - "#define GET_PROP_INDEX_UCS2(ucs2) \\\n" - " (uc_property_trie[uc_property_trie[ucs2>>" + QByteArray::number(BMP_SHIFT) + - "] + (ucs2 & 0x" + QByteArray::number(BMP_BLOCKSIZE-1, 16)+ ")])\n\n"; - out += "static const Properties uc_properties[] = {"; // keep in sync with the property declaration for (int i = 0; i < uniqueProperties.size(); ++i) { @@ -2520,15 +2509,26 @@ static QByteArray createPropertyInfo() out.chop(1); out += "\n};\n\n"; - out += "Q_DECL_CONST_FUNCTION static inline const Properties *qGetProp(char32_t ucs4) noexcept\n" "{\n" - " return uc_properties + GET_PROP_INDEX(ucs4);\n" + " if (ucs4 < 0x" + QByteArray::number(BMP_END, 16) + ")\n" + " return uc_properties + uc_property_trie[uc_property_trie[ucs4 >> " + + QByteArray::number(BMP_SHIFT) + "] + (ucs4 & 0x" + + QByteArray::number(BMP_BLOCKSIZE - 1, 16)+ ")];\n" + "\n" + " return uc_properties\n" + " + uc_property_trie[uc_property_trie[((ucs4 - 0x" + + QByteArray::number(BMP_END, 16) + ") >> " + + QByteArray::number(SMP_SHIFT) + ") + 0x" + + QByteArray::number(BMP_END / BMP_BLOCKSIZE, 16) + "] + (ucs4 & 0x" + + QByteArray::number(SMP_BLOCKSIZE - 1, 16) + ")];\n" "}\n" "\n" "Q_DECL_CONST_FUNCTION static inline const Properties *qGetProp(char16_t ucs2) noexcept\n" "{\n" - " return uc_properties + GET_PROP_INDEX_UCS2(ucs2);\n" + " return uc_properties + uc_property_trie[uc_property_trie[ucs2 >> " + + QByteArray::number(BMP_SHIFT) + "] + (ucs2 & 0x" + + QByteArray::number(BMP_BLOCKSIZE - 1, 16) + ")];\n" "}\n" "\n" "Q_DECL_CONST_FUNCTION Q_CORE_EXPORT const Properties * QT_FASTCALL properties(char32_t ucs4) noexcept\n" |