v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to tinyusdz "dev" branch commit 3240ab0

pull/5522/head
Steve M 2024-04-07 20:36:26 -07:00
parent caf3051c67
commit 72559747de
1 changed files with 12 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
contrib/tinyusdz/tinyusdz_repo/src/unicode-xid.hh
View File

@ -18,28 +18,23 @@ constexpr uint32_t kMaxCodepoint = 0x10FFFF;
namespace detail { namespace detail {
// Assume table is sorted by the first key(lower) // Assume table is sorted by the first key(range_begin)
#include "unicode-xid-table.inc" #include "unicode-xid-table.inc"
} }
inline bool is_xid_start(uint32_t codepoint) { inline bool is_xid_start(uint32_t codepoint) {
if (codepoint > kMaxCodepoint) { if (codepoint > kMaxCodepoint) {
return false; return false;
} }
// first find lower location based on the first key, then test with second key with linear search for (lower <= codepoint <= upper) range check. // first a range(range_begin <= codepoint <= range_end) by comparing the second key(range end).
// NOTE: second item in query is not used. fill it T::min just in case. auto it = std::lower_bound(detail::kXID_StartTable.begin(), detail::kXID_StartTable.end(), int(codepoint), [](const std::pair<int, int> &a, const int b) {
auto it = std::lower_bound(detail::kXID_StartTable.begin(), detail::kXID_StartTable.end(), std::make_pair(int(codepoint), (std::numeric_limits<int>::min)())); return a.second < b;
});
// subtract 1 to get the first entry of possible hit(lower <= codepoint <= upper) if (it != detail::kXID_StartTable.end()) {
if ((it != detail::kXID_StartTable.begin() && (int(codepoint) < it->second))) { if ((int(codepoint) >= it->first) && (int(codepoint) <= it->second)) { // range end is inclusive.
it--;
}
for (; it != detail::kXID_StartTable.end(); it++) {
if ((int(codepoint) >= it->first) && (int(codepoint) <= it->second)) { // range end is inclusive.
return true; return true;
} }
} }
@ -52,15 +47,12 @@ inline bool is_xid_continue(uint32_t codepoint) {
return false; return false;
} }
auto it = std::lower_bound(detail::kXID_ContinueTable.begin(), detail::kXID_ContinueTable.end(), std::make_pair(int(codepoint), (std::numeric_limits<int>::min)())); auto it = std::lower_bound(detail::kXID_ContinueTable.begin(), detail::kXID_ContinueTable.end(), int(codepoint), [](const std::pair<int, int> &a, const int b) {
return a.second < b;
});
// subtract 1 to get the first entry of possible hit(lower <= codepoint <= upper) if (it != detail::kXID_ContinueTable.end()) {
if ((it != detail::kXID_ContinueTable.begin() && (int(codepoint) < it->second))) { if ((int(codepoint) >= it->first) && (int(codepoint) <= it->second)) { // range end is inclusive.
it--;
}
for (; it != detail::kXID_ContinueTable.end(); it++) {
if ((int(codepoint) >= it->first) && (int(codepoint) <= it->second)) { // range end is inclusive.
return true; return true;
} }
} }