mirror of
https://github.com/netbirdio/FreeBSD-ports.git
synced 2026-05-22 18:42:42 -07:00
Alexey Dokuchaev
5baf43483c
The base template for std::char_traits<> has been removed in LLVM 19; specializations are only provided for char, wchar_t, char8_t, char16_t, and char32_t. This had severely impacted GNU APL which derived its UTF8 and UCS string classes from std::basic_string<>. The author had made several attempts to convert these classes to use std::vector<> instead. Carefully cherry-pick required changes so these fixes could be applied on top of version 1.8 as trunk had diverged significantly. Obtained from: upstream (SVN revisions 1823, 1831, and 1837) Reported by: pkg-fallout
28 lines
751 B
C++
28 lines
751 B
C++
--- src/Quad_CR.cc.orig 2019-06-23 12:39:20 UTC
|
|
+++ src/Quad_CR.cc
|
|
@@ -1041,17 +1041,15 @@ Value_P Z(utf, LOC);
|
|
Value_P
|
|
Quad_CR::do_CR19(const Value & B)
|
|
{
|
|
-UTF8_string utf(B);
|
|
- for (size_t l = 0; l < utf.size();)
|
|
- {
|
|
- int len = 0;
|
|
- const Unicode uni = UTF8_string::toUni(&utf[l], len, false);
|
|
- if (uni == Invalid_Unicode) DOMAIN_ERROR;
|
|
+ if (B.get_rank() > 1) RANK_ERROR;
|
|
+const ShapeItem len_B = B.element_count();
|
|
|
|
- l += len;
|
|
- }
|
|
+UTF8 bytes_utf[len_B + 10];
|
|
+ loop(b, len_B) bytes_utf[b] = B.get_ravel(b).get_byte_value();
|
|
+ bytes_utf[len_B] = 0;
|
|
|
|
-UCS_string ucs(utf);
|
|
+const UTF8_string utf(bytes_utf, len_B);
|
|
+const UCS_string ucs(utf);
|
|
Value_P Z(ucs, LOC);
|
|
return Z;
|
|
}
|