From 035bfb3df8ef12439e833751ac82802db87bf3d4 Mon Sep 17 00:00:00 2001 From: "J. Daniel Smith" Date: Mon, 11 Sep 2023 16:04:56 -0400 Subject: [PATCH] account for toString changes in CODA-OSS (#696) * latest from CODA-OSS * build existing code * u8FromString() -> u8FromNative() * u8FromString() -> u8FromNative() * toString() -> to_native() * Squashed 'externals/coda-oss/' changes from e87c32b4d..589aacfd7 589aacfd7 str::to_native() for when conversion to std::string really is needed 743feb41e try hard not to lose string encoding (#734) 1854a9b46 hide use of str::cast() inside `details` namespace (#733) fbe0c85f9 compile-time getSIMDInstructionSet() (#732) ee2c46358 more consistent naming for routines to convert between encodings (#731) 00e2dd928 another FmtX() overload 165a799c5 more FmtX() overloads (#729) 8dee6f7a6 revert toString() changes (#728) bf7ae4a71 use overloads rather than varargs for std::format() (#727) 22e050207 utility routines to reduce duplicated code (#726) a5ea60647 remove str::EncodedStringView (#725) 168cbae01 reduce differences between 'main' and 'cpp17' (#724) 5b892bf5f release 2023-08-18 (#723) 0b1327d1e restore mem::AutoPtr; too much of a hassle moving it to numpyutils :-( (#722) 7691adb56 normalize line endings (#721) b7d50efdd update to HDF5 1.14.2 (#720) fcc96ec69 Update .gitattributes (#719) bb82a94c9 xerces-c 3.2.4 (#718) ef4ad7cf3 Update to e2fsprogs 1.47.0 (#717) b4ca18a11 fix compiler warning about order of operations a5df5b823 update to HighFive 2.7.1 (#716) 4109ee5d2 `mem::AutoPtr` is only for Python bindings (#715) 00d843f87 remove hdf5.lite (#714) 443dd3825 Reduce compiler warnings, speed up builds (#713) d60861821 get optional working with partial C++17 (#712) d5bd0d804 "warning STL4036: is removed in C++20." c19ece7f9 Don't interfere with a partial C++20 implementation (#711) 065e86ddc operator==() for QName (#710) 1c16380ce remove zint* typedefs; don't want to encourage use of types::Complex (#709) 6dd247991 our optional<> is now closer to C++17 (#708) 87ac61739 strict checking on `std::complex` is too much of a hassle for now 034d52c86 overloads to byte-swap type::Complex are too much trouble (#707) 42d449c33 sys::byteSwap overloads for types::Complex (#705) 4092fd8e7 remove work-around for NITRO bug (#704) e2472acfc build in NITRO and SIX (#703) 32ccf9105 Use same build paths as Visual Studio (#701) 366ac9f43 Another round of removing compiler warnings (#702) a7f8ef260 Fix compile warnings from building CODA (#700) f70b4202f account for coda-oss.vcxproj being in other SLNs af3faebfc Remove more compiler/code-analysis warnings (#699) 82be2a6db unittests should work w/o install (#698) dbb90a06d add msbuild for coda-oss.sln (#697) 5a417140a reduce compiler warnings (#696) 288619dfa all modules now part of coda-oss.vcxproj (#695) c2fc5fc66 add more projects to coda-oss-lite.vcxproj (#694) ceb86c186 support $(PlatformToolset) as a "special" environment variable (#693) d78a8595a OS::getSIMDInstructionSet() utility (#692) 2d2df467d fix `python3 waf dumplib` 54033e70e Merge branch 'main' into feature/complex_short 3c63f9f65 std::numbers from C++20 (#691) 892dd0e00 ComplexInteger and ComplexReal to better match existing naming conventions (#690) b3872181e match coda-oss naming conventions (#688) 704d6867f beef-up our complex type (#687) 47c1c1cd6 check is_absolute() for URLs (#686) c042373e1 be sure our Path::isAbolute() matches std::filesystem::path::absolute() (#684) ad10286bc volatile is about "special" memory, not threading (#685) f4d42005f fix build error in NITRO ff11a5557 keep using std::complex for now (#682) c88b9c053 types::complex (#681) d1244a080 don't need our own make_unique in C++14 (#680) aeec0131c assert()s for mem::CopyablePtr (#679) 72b0ebd60 add types::complex_short (#678) 932130a58 patch to build other projects c00c1f203 coda-oss release 2023-06-06 (#677) ef54bbcd5 remove more compiler warnings (#676) dadfc5ce6 distinguish between byte-swapping a buffer and single value (#674) 90187f6cd more xml.lite tweaks for SIDD-3.0/ISM (#675) eb9960772 stronger type-checking for byteSwap() (#673) ff4f820ed xml.lite tweaks to support SIDD 3.0 ISM (#672) b1de8c0e5 std::byte should be a unique type (#671) c05bf9a02 allow enums to be byte-swapped too 1f9fd88d6 remove spurious 47684c45b byteSwap now uses byte buffers (#670) cbc659db2 add swapBytes() utility from SIX (#669) 891481b64 simplify byte-swapping (#668) 540ae763e more byteSwap() tweaks 0774c03c4 threaded byteSwap() (#667) d156370d3 swapping a single-byte value makes no sense c120e3255 be sure parameter is used to avoid compiler warning e85ec9331 --output-on-failure for CTest (#666) e80376197 turn off "there is no warning number" warning c5f0a5d15 A C-string may not be NULL-terminated (#665) 0c5eb29ae use platform-specific routines for byteSwap() (#664) 0b7d581fa remove transform_async() (#663) f6489b6be Merge branch 'main' into feature/xml.lite_tweaks 836c426a2 use function-pointers so that isConsoleOutput is only checked once 56e3c45b1 move depthPrint() functionality into non-member function in preparation for future changes ddcd26d97 Merge branch 'main' into feature/xml.lite_tweaks 69cc0e506 use the more rigorous create_and_check_datatype() 9efb87558 Merge branch 'main' into feature/hdf5 4d2f2f417 more HighFive unittests (#662) 14191a844 HighFive::create_datatype() goes from C++ to HighFive 98583473f utility routines to read string attributes 1fa75ce81 use the C API to read a string attribute 71e7b69f5 still can't figure out how to read a string attribute :-( e96f37a69 test reading the file attributes a25244519 getAttribute() unittest 8f12a3000 getDataType() unittest 857ff0af3 HighFive utility routines (#661) 1d687db57 writeDataSet() utility overload 106aa6894 sigh ... H5Easy::dump() fill fails on Windows/WAF :-( 2641b60b2 Merge branch 'main' into feature/hdf5 35c19e7e8 change actions to @v3 (#660) 212bbd3a3 works on local machine, but not build server ... ? 7125118b0 dump of 1D vector doesn't work :-( c704db435 sigh ... WAF build still failing :-( 01aae4616 does dump() of a 1D vector work? 76a53c813 comment-out H5 writing :-( 0f0e19aff test_highfive_dump() cb8f73795 trying to get highfive_dump() unittest working w/Windows-WAF 6584a264a does test_highfive_create() work? cde6147ce tweak HighFive wrappers (#659) 316566854 Revert "trying HighFive "write" unittests again" a9ec24ca4 trying HighFive "write" unittests again 585ad49a5 tweak names of utility routines 4c91a4d97 make it easier to read a std::vector and std::vecotr 0217ffa26 readDataSet() now works for 1D data 95e8973f2 trying to get hdf5::lite::load() working 4d294611d "const" correctness 5e6305c3f fix load_complex() 4a134dc5f start work on utility routines to read complex data from HDF5 9d76a7f41 Merge branch 'main' into feature/hdf5 8f9667a24 whitepsace ebd3fc99e Merge branch 'main' into feature/hdf5 40091b069 comment-out writing tests for now ... need to figure our WAF bulid failure 935aa3459 be sure the dataset has real data 114b9bf33 update release notes bd9c0b26c tweak HighFive utility routines acda1ef57 turn off diagnostics around expected failures 22a748840 readDataSet() utility routine for HighFive bd88a8c25 HighFive writeDataSet() utility to work with our SpanRC 6142f5b33 use HighFive routines to write a HDF5 file 5bbf1abaf Use HiveFive routines to get info about the file 84fbc8378 duplicate unittests with H5Easy f1f054c03 Merge branch 'main' into feature/hdf5 9b63ca470 fix directory names f6f826689 fix directory names 7aeb82c33 Merge branch 'main' into feature/hdf5 d028baaeb hook up HighFive header-only library (#653) 3083b0a31 Revert "HighFive 2.6.2" 246985a7f Revert ""build" HighFive HDF5 library" a8b75a586 Revert "turn off HighFive Boost support" ec68d5f83 Revert "Add HighFive unittests" f1f85b9e7 Revert "get test_high_five_base more-or-less compiling" 5ea634ee1 Revert "more work on getting HighFive unittests to build" ecc45433c more work on getting HighFive unittests to build bb194788a get test_high_five_base more-or-less compiling d42bde000 Add HighFive unittests ddc86bb32 turn off HighFive Boost support b255122d4 "build" HighFive HDF5 library 396cc3ef2 HighFive 2.6.2 5e5f9d9c0 Merge branch 'main' into feature/hdf5 ee938b4a5 changes from SIX bb764df90 Merge branch 'main' into feature/xml.lite_tweaks de2a24380 make derived classes 'final' if possible 14e19bcd2 Change xml lite function to virtual (#645) 8f42ac8e9 Merge branch 'main' into feature/xml.lite_tweaks 18ad90645 hdf5Write unittest 3462e1179 createFile() and writeFile() overloads ecee81d53 fix typos 197eecfa6 sketch-out hdf5::lite::writeFile() bd2311795 use SpanRC for writeFile(), not yet implemented ea9af7510 simple SpanRC to hold a 2D-size and pointer 027c19ee8 createFile() unittest 1f9d07ecb hook up createFile() 8c7e4473f start hooking up HDF5 writing 146e0bea3 Merge branch 'main' into feature/hdf5 88ca9fcb7 Merge branch 'main' into feature/hdf5 42b604b46 Squashed commit of the following: 10ee602c2 Merge branch 'main' into feature/hdf5 67aa42b69 restore changes from "main" 8bbfcbfbf unittests can be simplified to match fewer "view" classes 126bb802e Merge branch 'main' into feature/hdf5 3f8ba7a42 again, don't need a class just to convert from std::vector<> to std::span<> 24c2b489c Squashed commit of the following: 2703c119d Squashed commit of the following: 9d5228a2b don't need an entire class just to convert a std::vector<> into std::span<> 51bc931dc Merge branch 'main' into feature/hdf5 a84f25816 Squashed commit of the following: c4d2ed696 add missing #include guards, fix type in existing #include guard d541525a0 use a single ComplexViewConstIterator for all views 86e6a459f CODA_OSS_disable_warning causes GCC errors :-( 5d4b9c2cb only need an custom iterator for ComplexSpansView d9f0fb128 hook up iterators b9329e4db initial pass at a ComplexViewConstIterator 635238873 remove compiler warning about unused "constexpr" variables b39f6096f use the casing from H5 to make copy/pasting code slightly easier 0887b13eb Merge branch 'main' into feature/hdf5 bd07df1ca Consistent casing for Dataset, Datatype, Dataspace 7acd30ee2 tweak hdf5.lite dependencies 38ab914df Jupyter notebook for creating H5 files 95a040e0b _small.h5 is now (correctly) FLOAT32 107e7c487 make a simple values() member function to avoid template magic e1feca919 use TEST_SPECIFIC_EXCEPTION macro instead of try/catch 738333688 readDatasetT() now throws for the wrong buffer type 6b2cc2529 Merge branch 'feature/hdf5' of github.com:mdaus/coda-oss into feature/hdf5 310f8fd3d can't get template magic right for copy_axis() 86b306d59 stepping through copy ctors in the debugger is annoying f243e92d6 trying to make wrong type of buffer fail 2b10d9652 read in new sample file a28e59d8c help the compiler with type deduction 49bf5e9bc nested_complex_float_data_small.h5 e029325fc utility routines to "deconstruct" and array of std::complex dede3bd39 Merge branch 'main' into feature/hdf5 904b1ef5e tweak class names, make_() and copy() utility routines 8237b9efb make it harder to pass the wrong types to ComplexViews 4d9aeda2c ComplexArrayView and ComplexParallelView utility classes f5e367dfa test std::span> a4a2844f2 read in the nested "i" and "r" data 115615265 sample file has subgroups 8e1b7869a Merge branch 'feature/hdf5' of github.com:mdaus/coda-oss into feature/hdf5 9f4232a1d update sample H5 file 8c55db73a walk through HDF5 sub-groups 7775ed9c4 Update 123_barfoo_catdog_cx.h5 677975d7c Matlab code to create sample H5 file a0e7dfe07 Update test_hdf5info.cpp 0b67e1602 pass __FILE__ and __LINE__ from calling site for a more accurate exception message 86a677321 skeleton for more sample data 85f79b099 Merge branch 'main' into feature/hdf5 18088e942 Merge branch 'main' into feature/hdf5 3a1d17692 Merge branch 'main' into feature/hdf5 1755c69d7 Merge branch 'main' into feature/hdf5 9ad015432 No more "11" suffix on exception names c20d96251 Squashed commit of the following: c88cee999 other values to be filled-in bca4a4ecd incorporation NamedObject from HDF5 docs 61fa68f72 groupInfo() 460e7d766 datasetInfo() 14eb9b764 start filling in DatasetInfo afe5f1c3a start to fill in DatasetInfo 77a968c72 start filling in GroupInfo d81bcdfd9 openGroup() to open groups (loc) a0cd29469 comment-out "dataset" unittest for now 86e006024 begin filling in FileInfo 366dda6ab a return_type_of utility is needed to deduce the return type e21928263 explicitly pass return type to template 4937ccd11 template to reduce boilerplate when calling try_catch_H5Exceptions b3b5ebde7 use new exception utility routines ea1c03ef0 put exception handling/conversion in a utility routine 819a99d39 utility routine for exception handling 6f34eea97 put utilities in a separate file for easier reuse fcbde4f24 break utility routines into smaller pieces for easier reuse 52358ea8a WIN32 no longer automatically defined? 5a4286472 Revert "build HDF5 with C89" 680e599e9 build HDF5 with C89 a87a07121 Merge branch 'main' into feature/hdf5 8447c1a90 Revert "sym-links instead of copying files" db3b5e12b Merge branch 'main' into feature/xml.lite_tweaks fb60b5696 Merge branch 'main' into feature/hdf5 5110a5cc8 Comments about _u and _q 1a937d32c Merge branch 'main' into feature/xml.lite_tweaks fa06f04d7 get ready for hdf5.lite enhancdements b040c7c43 sym-links instead of copying files aa431bb47 use _u for xml::lite::Uri 3d0c6d58c fix case-sensitive #include filename 93dcd0e52 operator() for getElementByName() 75a93af85 more operator[] overloads to make attribute management easier 4ab8216f8 user-defined string literals to remove some noise around xml::lite::QName f82f0b0fc Merge branch 'main' into feature/xml.lite_tweaks ae30e3644 Merge branch 'feature/xml.lite_tweaks' of github.com:mdaus/coda-oss into feature/xml.lite_tweaks ffdd9beb0 simplify attribute creation 9bf5414f5 simplify attribute creation 82d7a4e95 SWIG gets confused about namespaces 7a61d0741 fix bug on Element ctor uncovered by unittest fdd7e58c1 QName is also in the xerces namespace which confuses SWIG bindings a325b7053 operator+=() overload for addChild daf30e6c0 Merge branch 'feature/xml.lite_tweaks' of github.com:mdaus/coda-oss into feature/xml.lite_tweaks b887d2b47 provide overloads for Element& rather than creating new "reference" types 1fa6bba38 rename test_xmleasy.cpp 7c8c9e0f1 += overload 850da6f63 overload for std::string 4547fc5a7 use UIT-8 strings for characterData 4723462a3 convenient addChild() overloads e48720753 copy over ElementReference from xml.easy a4ca30a0d Merge branch 'main' into feature/xml.lite_tweaks 6ae9f0b71 Revert "check-in of new xml.easy (to move code between computers)" f7466a6d7 Revert "simple routines for single element" a5490230d Revert "make some operators simplier ways of calling functions" c9a25630a Revert "get document creation working" 8af8710b0 Revert "free functions instead of member functions" 16c3847cb Revert "ElementReference distinct from Element" 7d68e156f Revert "ElementMutableReference" 00eb2a282 Merge branch 'main' into feature/xml.lite_tweaks a42969c1f ElementMutableReference a20ae9355 ElementReference distinct from Element 14eeeea0b free functions instead of member functions 4aae014b3 get document creation working 883569269 make some operators simplier ways of calling functions 053bd1212 simple routines for single element 8bf701a2e check-in of new xml.easy (to move code between computers) 41f959051 unittests for creating XML documents from scratch 9752d50ae Merge branch 'main' into feature/xml.lite_tweaks 1531d5709 by default, don't validate strings passed to Uri() 46d13d4bf Merge branch 'master' into feature/xml.lite_tweaks 39b547d32 remove more vestiges of Expat and LibXML ec8274d52 remove LibXML and Expat as they're no longer used/supported. 20eeefeef Merge branch 'master' into feature/xml.lite_tweaks 95074b9b1 update for newer Intel compiler 7024f71e1 Merge branch 'master' into feature/xml.lite_tweaks 57b1cbc83 Merge branch 'master' into feature/xml.lite_tweaks 4b67561c3 remove validate() overload that nobody is using fa15f1e5d Squashed commit of the following: 1484a9090 test the new validate() API 470da70fb hookup StringStreamT routines 2cddf2504 begin hooking up validate() overloads 1b5d910f3 overload validate() for UTF-8 and Windows-1252 03309b8c9 Squashed commit of the following: b72c6c5bf older compiler doesn't like our make_unique af8f00307 validate UTF-8 XML on Linux 211188613 unit-test for LEGACY XML validation 3c1169d2b Squashed commit of the following: 3afff19ca std::filesystem::path for FileInputStreamOS 908d452f8 WIP: validate all of our sample XML files 00f9bb16b validate against a XML schema 243d8c356 Merge branch 'master' into feature/xml.lite_tweaks 2815d707d fix to work with SWIG bindings. :-( 460862132 trying (again) to remove vestiages of old code e3c83a858 Revert "new code should use UTF-8" 811207c92 new code should use UTF-8 0ffd835f9 Squashed commit of the following: 1e7e03ded Merge branch 'master' into feature/xml.lite_tweaks c1d806aff Merge branch 'master' into feature/xml.lite_tweaks 850d3c811 str::strip() that can be easier to use than str::trim() 580ba9c8c explicitly =delete move 2b39831a8 Squashed commit of the following: 39eebdc23 Merge branch 'master' into feature/xml.lite_tweaks 9adf86cba force calling new UTF-8 write() routines ea61b6204 Merge branch 'master' into feature/xml.lite_tweaks 8a34583fa overload to take schemaPaths as filesystem::path 8671b442f parse XML embedded in a binary file ec4a902f1 updates from xerces.lite 80dc4d963 updates from xerces.lite 549766d6c Attributes::contains() no longer catches an exception 8a645ceac need "sys/" when building in other environments 36af08269 super-simple URI validation 78ef28a3e SWIG bindings are a PITA! :-( e9cba8491 SWIG needs help with Uri 8a8d8dc07 another routines used by pre-build SWIG bindings 818e1ec5d pre-build SWIG bindings use getElementByTagName() member function 067cac5d8 old compiler gets confused on unadorned QName ba92c0ae7 more use of Uri and QName 446c7d17a use QName in new code d6f8b0c83 more direct use of QName 90fff1c73 use xml::lite::QName instead of tuple 646cbb5ed more direct use of QName and Uri ba589ea3b make QName more robust bab0ee8b5 createElement() -> addNewElement() e3a145747 grab changes from six-library 32285e95c Merge branch 'master' into feature/xml.lite_tweaks 9f79f0bf6 Merge branch 'master' into feature/xml.lite_tweaks a12bbc32c make it easier to create new Elements with a value fc9967f98 make it easy for callers to addChild() keep a reference to the Element 4627766b7 be sure test_xmlparser works in "externals" of other projects bf2276396 "private" is part of the name-mangling fad92bcc8 making sure copy-ctor is implemented f90fdcead consolidate common XML test code 9fc53f2d5 use str:: utility for casting 6da6f794b still trying to find the right macro for SWIG 0c1b86c56 still trying to fix SWIG fdc6fc9bd trying to fix SWIG build error 7835e8c27 SWIG needs copy-ctor 585695942 disable copy/assignment for Element, it's probably almost always wrong 391fed613 fix double-delete caused by copying 61790fe69 retry parsing XML with Windows-1252 if first parse() fails 63cffac59 change string_encoding to match coda-oss style of PascalCase 010479bbe read an XML file we know is wrongly encoded as Windows-1252 9a0505062 more references instead of pointers 2d44b6951 Reading Windows-1252 w/o "encoding" fails 63dc7b076 read Windows-1252 too c9434c9cb test as UIT-8 too f310ccf0c get reading from UTF-8 XML working on Windows 1fa39c2be get testReadUtf8XmlFile working on Linux 1a83cd815 sys::Path is too much trouble right now ed60aa22c unit-test to read XML from a file a9336db7c Squashed commit of the following: 0825beb0d Merge branch 'master' into feature/xml.lite_tweaks c618489be Merge branch 'master' into feature/xml.lite_tweaks e8e4b8fe1 determine string_encoding based on platform 1f43bcfc2 create a new Element by using the platform to determine "characterData" encoding 961bef66b Merge branch 'master' into feature/xml.lite_tweaks e9798a5cb fix static_assert() 6f7772874 Merge branch 'master' into feature/xml.lite_tweaks b98d4f5a9 Merge branch 'master' into feature/xml.lite_tweaks 1b5abba2a The (old) version of SWIG we're using doesn't like certain C++11 features. 53bdeabaf Merge branch 'master' into feature/xml.lite_tweaks 60cf8ae80 "" doesn't work with decltype() in older C++ 97e72477a reduce getValue() overloads by making "key" a template argument 5e6373e55 reduce code duplication f9e7cfeee provide castValue instead of getValue(T&) cbd0bd8f2 castValue throws instead of returning a bool like getValue(T&) 87c7514fc Merge branch 'master' into feature/xml.lite_tweaks 10cc61223 make getElement*() consistent for zero or >1 results f5b137e3c Merge branch 'master' into feature/xml.lite_tweaks 1765efc62 allow clients to specify toType() and toString() for getValue() and setValue() df8b746e1 allow clients to specify their own toType/toString routines 66702726a Merge branch 'master' into feature/xml.lite_tweaks 6956311f1 Merge branch 'master' into feature/xml.lite_tweaks d505f3593 Merge branch 'master' into feature/xml.lite_tweaks fbd106115 catch a BadCastException and return false from getValue() 3a78377b5 use a template to reduce duplicated code 0ad4b8606 Merge branch 'master' into feature/xml.lite_tweaks a848aa3a2 get & set the characer data as a type f3ee1ee12 utility routines to set an attribute value 595227683 templates to get an attribute value convert to a specific type 06639227b miised a change in last commit 1aa458ef8 add getValue() overloads that return true/false rather than throwing faa6d3075 added getElementByTagName() overloads as that's a very common use-case git-subtree-dir: externals/coda-oss git-subtree-split: 589aacfd7a5449843812db00b738ca565175c107 * Squashed 'externals/nitro/' changes from c8ecbe9ae..72cd86cbf 72cd86cbf latest from CODA-OSS (#580) e4920a743 FmtX() -> str::Format() e488297c3 Merge commit '81ea6f1789863f26f06dc447f7784383dc7cb595' 81ea6f178 Squashed 'externals/coda-oss/' changes from e87c32b4de..8dee6f7a68 72209535d toString() changes from CODA-OSS (#579) fc1f59799 latest from CODA-OSS (#578) 02e8f80c6 latest from CODA-OSS (#577) e7ea728ec reduce differences between cpp17 and main branches (#576) 547d0aa9f NITRO-2.11.4 (#575) fe309c4ba Merge branch 'main' of github.com:mdaus/nitro 10efa9990 latest from CODA-OSS (#574) d08f1c0a1 CRLF db5d3d484 latest from CODA-OSS 98c755048 CRLF aa1482543 CRLF bfdbe69a4 Latest from CODA-OSS (#573) 9e4ce0b58 latest from CODA-OSS (#572) 227a8a8f4 trust coda-oss for right -std flags 13869687e latest from CODA-OSS (#571) 5724d8c18 latest from CODA-OSS (#570) fb794f0fe latest from CODA-OSS (#569) 7a6132ba0 update files changes in cpp17 branch (#568) de91d4977 Fix bug creating NITFException (#567) 225273436 fix YAML for 'main' 5d1c83d11 single project for unittests (#566) 102a019db latest from CODA-OSS (known broken build) (#565) b4ae2d429 match YAML from coda-oss 176bcaf6d build NITRO.SLN using msbuild (#562) 85e9043b8 latest from CODA-OSS (#561) 49ec50325 use new "PlatformToolkit" special environment variable (#560) 6c06e3711 latest from CODA-OSS (#559) cee9feb42 latest from CODA-OSS (#558) 3f01809fa latest from coda-oss (#557) 471fb3fc1 Update test_j2k_loading++.cpp b12caf2fc latest from CODA-OSS (#556) 0cd432624 use sys::make_span (#555) 05dae18a3 patch to build other projects 8f974e995 NITRO-2.11.3 (#554) 870aa6afd update to coda-oss 2023-06-05 (#553) 2fd7a0bfa latest from coda-oss (#552) 0eecce004 invoke() utility to reduce code duplication (#550) 59fb02fe9 latest from coda-oss (#551) 9fbf2b7b8 Fill out adapter free block which is used for nitf decompression (#549) 089ba0b5b latest from coda-oss 3b52f0025 latest from coda-oss (#547) 90c6263e2 latest from coda-oss (#544) 90d513ac5 latest from coda-oss (#543) git-subtree-dir: externals/nitro git-subtree-split: 72cd86cbf6abb1122350388c98ea448484d76d91 --- .../.github/workflows/build_unittest.yml | 29 +++- .../coda-oss/modules/c++/include/TestCase.h | 10 +- .../coda-oss/modules/c++/include/UnitTest.h | 2 +- .../modules/c++/str/include/str/Convert.h | 25 ++-- .../modules/c++/str/include/str/Encoding.h | 126 +++++++++++++--- .../modules/c++/str/source/Encoding.cpp | 61 +++----- .../c++/str/unittests/test_base_convert.cpp | 136 +++++++++--------- .../modules/c++/sys/include/sys/AbstractOS.h | 14 ++ .../c++/sys/source/CppUnitTestAssert_.cpp_ | 2 +- .../modules/c++/sys/source/sys_filesystem.cpp | 4 +- .../c++/xml.lite/include/xml/lite/Element.h | 2 +- .../modules/c++/xml.lite/source/Element.cpp | 10 +- .../c++/xml.lite/source/MinidomHandler.cpp | 2 +- .../c++/xml.lite/source/ValidatorXerces.cpp | 6 +- .../c++/xml.lite/unittests/test_xmlcreate.cpp | 6 +- .../c++/xml.lite/unittests/test_xmlparser.cpp | 4 +- .../c++/cphd/source/CPHDXMLControl.cpp | 6 +- .../cphd/unittests/test_cphd_xml_control.cpp | 2 +- .../c++/cphd03/source/CPHDXMLControl.cpp | 6 +- six/modules/c++/six.sicd/source/Utilities.cpp | 4 +- .../unittests/test_CollectionInfo.cpp | 8 +- .../six.sidd/source/GeoTIFFReadControl.cpp | 4 +- .../six.sidd/source/GeoTIFFWriteControl.cpp | 4 +- six/modules/c++/six.sidd/source/Utilities.cpp | 4 +- .../six.sidd/unittests/test_valid_sixsidd.cpp | 2 +- .../six/include/six/CollectionInformation.h | 2 +- six/modules/c++/six/include/six/XsElement.h | 2 +- .../c++/six/source/CollectionInformation.cpp | 2 +- .../c++/six/source/NITFWriteControl.cpp | 2 +- six/modules/c++/six/source/Utilities.cpp | 4 +- .../c++/six/source/XMLControlFactory.cpp | 4 +- six/modules/c++/six/source/XmlLite.cpp | 5 + six/projects/csm/tests/utilities.h | 2 +- 33 files changed, 297 insertions(+), 205 deletions(-) diff --git a/externals/coda-oss/.github/workflows/build_unittest.yml b/externals/coda-oss/.github/workflows/build_unittest.yml index b96a17a63..fe1bae58d 100644 --- a/externals/coda-oss/.github/workflows/build_unittest.yml +++ b/externals/coda-oss/.github/workflows/build_unittest.yml @@ -89,7 +89,7 @@ jobs: # searchFolder: D:\a\nitro\nitro\${{ matrix.platform }}\${{ matrix.configuration }} # runInParallel: true - build-linux-cmake: + build-linux-cmake-default: strategy: matrix: os: [ubuntu-latest] @@ -109,8 +109,7 @@ jobs: run: | env which python - mkdir target - cd target + mkdir target && cd target cmake .. -DCMAKE_INSTALL_PREFIX=install${{ matrix.os }}CMake-Github -DPYTHON_VERSION=${{ matrix.python-version }} -DENABLE_SWIG=ON - name: build run: | @@ -127,6 +126,30 @@ jobs: cd target cmake --build . --target install + build-linux-cmake: + strategy: + matrix: + os: [ubuntu-latest] + configuration: [Debug, Release] + name: ${{ matrix.os }}-${{ matrix.configuration }}-CMake + runs-on: ${{ matrix.os }} + steps: + - uses: actions/checkout@v3 + - name: configure + run: | + mkdir out && cd out + cmake .. -DENABLE_PYTHON=OFF + - name: build + run: | + cd out + # "-j" spawns too many processes causing GCC to crash + cmake --build . --config ${{ matrix.configuration }} -j 12 + - name: test + # should run w/o install + run: | + cd out + ctest -C ${{ matrix.configuration }} --output-on-failure + build-waf: strategy: matrix: diff --git a/externals/coda-oss/modules/c++/include/TestCase.h b/externals/coda-oss/modules/c++/include/TestCase.h index b572b7c4d..08aa1a4fd 100644 --- a/externals/coda-oss/modules/c++/include/TestCase.h +++ b/externals/coda-oss/modules/c++/include/TestCase.h @@ -20,9 +20,9 @@ * */ -#ifndef __TEST_CASE_H__ -#define __TEST_CASE_H__ #pragma once +#ifndef CODA_OSS_TestCase_h_INCLUDED_ +#define CODA_OSS_TestCase_h_INCLUDED_ #ifdef __cplusplus @@ -75,6 +75,10 @@ inline std::string toString(const TX& X) { return str::toString(X); } +inline std::string toString(const coda_oss::u8string& X) +{ + return str::to_native(X); +} template inline void diePrintf_(const char* format, const std::string& testName, const char* file, const char* func, int line, @@ -276,4 +280,4 @@ inline int main(TFunc f) #endif -#endif +#endif // CODA_OSS_TestCase_h_INCLUDED_ diff --git a/externals/coda-oss/modules/c++/include/UnitTest.h b/externals/coda-oss/modules/c++/include/UnitTest.h index b99a2cde4..2ca366b68 100644 --- a/externals/coda-oss/modules/c++/include/UnitTest.h +++ b/externals/coda-oss/modules/c++/include/UnitTest.h @@ -132,7 +132,7 @@ inline void assert_almost_eq(const std::string& testName, long double X1, long d #define TEST_ASSERT_EQ_MSG(msg, X1, X2) testName, Microsoft::VisualStudio::CppUnitTestFramework::Logger::WriteMessage(msg.c_str()); TEST_ASSERT_EQ(X1, X2) #undef TEST_FAIL_MSG -#define TEST_FAIL_MSG(msg) { (void)testName; Microsoft::VisualStudio::CppUnitTestFramework::Assert::Fail(str::toWString(msg).c_str()); } +#define TEST_FAIL_MSG(msg) { (void)testName; Microsoft::VisualStudio::CppUnitTestFramework::Assert::Fail(str::details::to_wstring(msg).c_str()); } #undef TEST_EXCEPTION #undef TEST_THROWS diff --git a/externals/coda-oss/modules/c++/str/include/str/Convert.h b/externals/coda-oss/modules/c++/str/include/str/Convert.h index 83afad5b7..f58f233da 100644 --- a/externals/coda-oss/modules/c++/str/include/str/Convert.h +++ b/externals/coda-oss/modules/c++/str/include/str/Convert.h @@ -85,27 +85,25 @@ inline std::string toString(const std::string& value) { return value; } -// can't be a template; `bool` overload above is a better match +// Prevent the template above from getting used; instead, use routines from **Encoding.h**. +std::string toString(const std::wstring&) = delete; +std::string toString(const std::u16string&) = delete; +std::string toString(const std::u32string&) = delete; +std::string toString(const coda_oss::u8string&) = delete; +std::string toString(const str::W1252string&) = delete; + inline std::string toString(std::string::const_pointer pStr) { return toString(std::string(pStr)); } - -// The resultant `std::string`s have "native" encoding (which is lost) depending -// on the platform: UTF-8 on Linux and Windows-1252 on Windows. -CODA_OSS_API std::string toString(const coda_oss::u8string&); -CODA_OSS_API std::string toString(const str::W1252string&); -CODA_OSS_API std::string toString(const std::wstring&); // input is UTF-16 or UTF-32 depending on the platform // can't be a template; `bool` overload above is a better match std::string toString(std::wstring::const_pointer) = delete; // only used in unittests std::string toString(std::u16string::const_pointer) = delete; // only used in unittests std::string toString(std::u32string::const_pointer) = delete; // only used in unittests -CODA_OSS_API coda_oss::u8string u8FromString(const std::string&); // platform determines Windows-1252 or UTF-8 input - inline std::ostream& operator<<(std::ostream& os, const coda_oss::u8string& s) { - os << toString(s); + os << to_native(s); return os; } @@ -127,13 +125,6 @@ inline std::string toString(const T& real, const T& imag) return toString(std::complex(real, imag)); } -CODA_OSS_API std::wstring toWString(const std::string&); // platform determines Windows-1252 or UTF-8 input and output encoding -CODA_OSS_API std::wstring toWString(const coda_oss::u8string&); // platform determines UTF-16 or UTF-32 output encoding -CODA_OSS_API std::wstring toWString(const str::W1252string&); // platform determines UTF-16 or UTF-32 output encoding - -CODA_OSS_API coda_oss::u8string u8FromWString(const std::wstring&); // platform determines UTF16 or UTF-32 input - - template T toType(const std::string& s) { diff --git a/externals/coda-oss/modules/c++/str/include/str/Encoding.h b/externals/coda-oss/modules/c++/str/include/str/Encoding.h index 9709ff5c6..4dbaa76f5 100644 --- a/externals/coda-oss/modules/c++/str/include/str/Encoding.h +++ b/externals/coda-oss/modules/c++/str/include/str/Encoding.h @@ -40,6 +40,8 @@ namespace str { +namespace details +{ template inline auto cast(const TChar* s) { @@ -52,24 +54,26 @@ inline auto cast(const TChar* s) static_assert(sizeof(*retval) == sizeof(*s), "sizeof(*TReturn) != sizeof(*TChar)"); return retval; } +} template inline auto c_str(const std::basic_string& s) { using return_t = typename TBasicStringT::const_pointer; - return cast(s.c_str()); + return details::cast(s.c_str()); } template -inline TBasicStringT str(const std::basic_string& s) +inline auto str(const std::basic_string& s) { return TBasicStringT(c_str(s), s.length()); // avoid extra strlen() call } template inline TBasicStringT make_string(TChar* p) { - using return_t = typename TBasicStringT::const_pointer; - return cast(p); // copy into RV + using const_pointer = typename TBasicStringT::const_pointer; + return details::cast(p); // copy into RV } +/************************************************************************/ // When the encoding is important, we want to "traffic" in coda_oss::u8string (UTF-8), not // str::W1252string (Windows-1252) or std::string (unknown). Make it easy to get those from other encodings. CODA_OSS_API coda_oss::u8string to_u8string(str::W1252string::const_pointer, size_t); @@ -79,16 +83,70 @@ inline coda_oss::u8string to_u8string(coda_oss::u8string::const_pointer p, size_ { return coda_oss::u8string(p, sz); } +// Explicit overloads so template can be used for a different purpose. +inline auto to_u8string(const coda_oss::u8string& s) +{ + return to_u8string(s.c_str(), s.length()); +} +inline auto to_u8string(const str::W1252string& s) +{ + return to_u8string(s.c_str(), s.length()); +} +inline auto to_u8string(const std::u16string& s) +{ + return to_u8string(s.c_str(), s.length()); +} +inline auto to_u8string(const std::u32string& s) +{ + return to_u8string(s.c_str(), s.length()); +} +// These two routines are "dangerous" as they make it easy to convert +// a `char*` **already** in UTF-8 encoding to UTF-8; the result is garbage. +// Use u8FromNative() or u8FromNative() which is a bit more explicit. +coda_oss::u8string to_u8string(std::string::const_pointer, size_t) = delete; +coda_oss::u8string to_u8string(std::wstring::const_pointer, size_t) = delete; + +// Template parameter specifies how `std::string` is encoded. As opposed +// to figuring it out a run-time based on the platform. +template +inline auto to_u8string(const std::string& s) // UTF-8 or Windows-1252 +{ + return to_u8string(str::c_str(s), s.length()); +} +template +inline auto to_u8string(const std::wstring& s) // UTF-16 or UTF-32 +{ + return to_u8string(str::c_str(s), s.length()); +} +/************************************************************************/ // UTF-16 is the default on Windows. CODA_OSS_API std::u16string to_u16string(coda_oss::u8string::const_pointer, size_t); CODA_OSS_API std::u16string to_u16string(str::W1252string::const_pointer, size_t); +inline auto to_u16string(const coda_oss::u8string& s) +{ + return to_u16string(s.c_str(), s.length()); +} +inline auto to_u16string(const str::W1252string& s) +{ + return to_u16string(s.c_str(), s.length()); +} +/************************************************************************/ // UTF-32 is convenient because each code-point is a single 32-bit integer. // It's typically std::wstring::value_type on Linux, but NOT Windows. CODA_OSS_API std::u32string to_u32string(coda_oss::u8string::const_pointer, size_t); CODA_OSS_API std::u32string to_u32string(str::W1252string::const_pointer, size_t); +inline auto to_u32string(const coda_oss::u8string& s) +{ + return to_u32string(s.c_str(), s.length()); +} +inline auto to_u32string(const str::W1252string& s) +{ + return to_u32string(s.c_str(), s.length()); +} +/************************************************************************/ // Windows-1252 (almost the same as ISO8859-1) is the default single-byte encoding on Windows. CODA_OSS_API str::W1252string to_w1252string(coda_oss::u8string::const_pointer p, size_t sz); inline auto to_w1252string(const coda_oss::u8string& s) @@ -96,26 +154,58 @@ inline auto to_w1252string(const coda_oss::u8string& s) return to_w1252string(s.c_str(), s.length()); } -// These two routines are "dangerous" as they make it easy to convert -// a `char*` **already** in UTF-8 encoding to UTF-8; the result is garbage. -// Use u8FromString() or u8FromWString() which is a bit more explicit. -coda_oss::u8string to_u8string(std::string::const_pointer, size_t) = delete; -coda_oss::u8string to_u8string(std::wstring::const_pointer, size_t) = delete; +/************************************************************************/ -template -inline auto to_u8string(const std::basic_string& s) +inline auto u8FromNative(const std::string& s) // platform determines Windows-1252 or UTF-8 input { - return to_u8string(s.c_str(), s.length()); + #if _WIN32 + const auto p = str::c_str(s); // std::string is Windows-1252 on Windows + #else + const auto p = str::c_str(s); // assume std::string is UTF-8 on any non-Windows platform + #endif + return str::to_u8string(p, s.length()); } -template -inline auto to_u16string(const std::basic_string& s) + +namespace details { - return to_u16string(s.c_str(), s.length()); +inline auto c_str(const std::wstring& s) +{ + #if _WIN32 + return str::c_str(s); // std::wstring is UTF-16 on Windows + #else + return str::c_str(s); // assume std::wstring is UTF-32 on any non-Windows platform + #endif } -template -inline auto to_u32string(const std::basic_string& s) +} +inline auto u8FromNative(const std::wstring& s) // platform determines UTF16 or UTF-32 input { - return to_u32string(s.c_str(), s.length()); + return str::to_u8string(details::c_str(s), s.length()); +} + +/************************************************************************/ + +// The resultant `std::string`s have "native" encoding (which is lost) depending +// on the platform: UTF-8 on Linux and Windows-1252 on Windows. +namespace details +{ + inline std::string to_string(const std::string& s) + { + return s; + } +CODA_OSS_API std::string to_string(const coda_oss::u8string&); +CODA_OSS_API std::string to_string(const std::wstring&); // input is UTF-16 or UTF-32 depending on the platform +CODA_OSS_API std::wstring to_wstring(const std::string&); // platform determines Windows-1252 or UTF-8 input and output encoding +CODA_OSS_API std::wstring to_wstring(const coda_oss::u8string&); // platform determines UTF-16 or UTF-32 output encoding +} +namespace testing +{ +CODA_OSS_API std::string to_string(const str::W1252string&); +CODA_OSS_API std::wstring to_wstring(const str::W1252string&); // platform determines UTF-16 or UTF-32 output encoding +} + +inline std::string to_native(const coda_oss::u8string& s) // cf., std::filesystem::native(), https://en.cppreference.com/w/cpp/filesystem/path/native +{ + return details::to_string(s); } } diff --git a/externals/coda-oss/modules/c++/str/source/Encoding.cpp b/externals/coda-oss/modules/c++/str/source/Encoding.cpp index 98795b259..eacc016d8 100644 --- a/externals/coda-oss/modules/c++/str/source/Encoding.cpp +++ b/externals/coda-oss/modules/c++/str/source/Encoding.cpp @@ -218,7 +218,7 @@ inline void w1252to16(str::W1252string::const_pointer p, size_t sz, std::u16stri w1252_to_string(p, sz, result); #if defined(_WIN32) && (!defined(_NDEBUG) || defined(DEBUG)) - const _bstr_t bstr(std::string(str::cast(p), sz).c_str()); // no _bstr_t ctor taking sz + const _bstr_t bstr(std::string(str::details::cast(p), sz).c_str()); // no _bstr_t ctor taking sz const std::wstring wstr(static_cast(bstr)); assert(result == str::str(wstr)); #endif @@ -385,7 +385,7 @@ inline auto to_uXXstring(const std::basic_string& s) #endif } template -static std::wstring toWString_(const std::basic_string& s, bool is_utf8) +static std::wstring to_wstring_(const std::basic_string& s, bool is_utf8) { const auto result = is_utf8 ? to_uXXstring(s) @@ -395,21 +395,21 @@ static std::wstring toWString_(const std::basic_string& s, bool is_utf8) /***********************************************************************************/ -std::string str::toString(const coda_oss::u8string& s) +std::string str::details::to_string(const coda_oss::u8string& s) { #if _WIN32 std::string retval; utf8to1252(s.c_str(), s.length(), retval); return retval; #else - return str::str(s); + return str(s); #endif } -std::string str::toString(const str::W1252string& s) +std::string str::testing::to_string(const str::W1252string& s) { #if _WIN32 - return str::str(s); + return str(s); #else std::string retval; w1252to8(s.c_str(), s.length(), retval); @@ -417,18 +417,9 @@ std::string str::toString(const str::W1252string& s) #endif } -inline auto c_str_(const std::wstring& s) +std::string str::details::to_string(const std::wstring& s) { - #if _WIN32 - return str::c_str(s); // std::wstring is UTF-16 on Windows - #else - return str::c_str(s); // assume std::wstring is UTF-32 on any non-Windows platform - #endif -} - -std::string str::toString(const std::wstring& s) -{ - const auto p = c_str_(s); + const auto p = details::c_str(s); const auto sz = s.length(); std::string retval; @@ -440,39 +431,21 @@ std::string str::toString(const std::wstring& s) return retval; } -std::wstring str::toWString(const std::string& s) +std::wstring str::details::to_wstring(const std::string& s) { #if _WIN32 - return toWString_(s, false /*is_utf8*/); // Input is Windows-1252 on Windows + return to_wstring_(s, false /*is_utf8*/); // Input is Windows-1252 on Windows #else - return toWString_(s, true /*is_utf8*/); // Input is UTF-8 everywhere except Windows + return to_wstring_(s, true /*is_utf8*/); // Input is UTF-8 everywhere except Windows #endif } -std::wstring str::toWString(const coda_oss::u8string& s) -{ - return toWString_(s, true /*is_utf8*/); -} -std::wstring str::toWString(const str::W1252string& s) +std::wstring str::details::to_wstring(const coda_oss::u8string& s) { - return toWString_(s, false /*is_utf8*/); + return to_wstring_(s, true /*is_utf8*/); } - -inline auto c_str_(const std::string& s) -{ - #if _WIN32 - return str::c_str(s); // std::string is Windows-1252 on Windows - #else - return str::c_str(s); // assume std::string is UTF-8 on any non-Windows platform - #endif -} -coda_oss::u8string str::u8FromString(const std::string& s) -{ - return str::to_u8string(c_str_(s), s.length()); -} - -coda_oss::u8string str::u8FromWString(const std::wstring& s) +std::wstring str::testing::to_wstring(const str::W1252string& s) { - return str::to_u8string(c_str_(s), s.length()); + return to_wstring_(s, false /*is_utf8*/); } /***********************************************************************************/ @@ -506,7 +479,7 @@ coda_oss::u8string str::to_u8string(std::u16string::const_pointer p, size_t sz) std::u16string str::to_u16string(coda_oss::u8string::const_pointer p_, size_t sz) { - auto p = str::cast(p_); + auto p = details::cast(p_); std::u16string retval; utf8::utf8to16(p, p + sz, std::back_inserter(retval)); return retval; @@ -514,7 +487,7 @@ std::u16string str::to_u16string(coda_oss::u8string::const_pointer p_, size_t sz std::u32string str::to_u32string(coda_oss::u8string::const_pointer p_, size_t sz) { - auto p = str::cast(p_); + auto p = details::cast(p_); std::u32string retval; utf8::utf8to32(p, p + sz, std::back_inserter(retval)); return retval; diff --git a/externals/coda-oss/modules/c++/str/unittests/test_base_convert.cpp b/externals/coda-oss/modules/c++/str/unittests/test_base_convert.cpp index 785cc327c..fe7bfc309 100644 --- a/externals/coda-oss/modules/c++/str/unittests/test_base_convert.cpp +++ b/externals/coda-oss/modules/c++/str/unittests/test_base_convert.cpp @@ -78,25 +78,16 @@ TEST_CASE(testCharToString) template static constexpr std::u8string::value_type cast8(T ch) { - static_assert(sizeof(std::u8string::value_type) == sizeof(char), "sizeof(Char8_T) != sizeof(char)"); - return static_cast(ch); -} -template -static inline constexpr std::u32string::value_type U(TChar ch) -{ - return static_cast(ch); -} - -static auto from_windows1252(const std::string& w1252) -{ - return to_u8string(str::c_str(w1252), w1252.length()); + using u8ch_t = std::u8string::value_type; + static_assert(sizeof(u8ch_t) == sizeof(char), "sizeof(Char8_T) != sizeof(char)"); + return static_cast(ch); } TEST_CASE(test_string_to_u8string_ascii) { { const std::string input = "|\x00"; // ASCII, "|" - const auto actual = from_windows1252(input); + const auto actual = str::to_u8string(input); const std::u8string expected{cast8('|')}; // '\x00' is the end of the string in C/C++ TEST_ASSERT_EQ(actual, expected); } @@ -105,10 +96,10 @@ TEST_CASE(test_string_to_u8string_ascii) for (uint8_t ch = start_of_heading; ch <= delete_character; ch++) // ASCII { const std::string input { '|', static_cast(ch), '|'}; - const auto actual = from_windows1252(input); + const auto actual = str::to_u8string(input); const std::u8string expected8{cast8('|'), cast8(ch), cast8('|')}; TEST_ASSERT_EQ(actual, expected8); - const std::u32string expected{U'|', U(ch), U'|'}; + const std::u32string expected{U'|', ch, U'|'}; test_assert_eq(testName, actual, expected); } } @@ -130,7 +121,7 @@ TEST_CASE(test_string_to_u8string_windows_1252) // Windows-1252 only characters must be mapped to UTF-8 { const std::string input = "|\x80|"; // Windows-1252, "|€|" - const auto actual = from_windows1252(input); + const auto actual = str::to_u8string(input); const std::u8string expected8{cast8('|'), cast8('\xE2'), cast8('\x82'), cast8('\xAC'), cast8('|')}; // UTF-8, "|€|" TEST_ASSERT_EQ(actual, expected8); const std::u32string expected{U"|\u20AC|"}; // UTF-32, "|€|" @@ -138,7 +129,7 @@ TEST_CASE(test_string_to_u8string_windows_1252) } { const std::string input = "|\x9F|"; // Windows-1252, "|Ÿ|" - const auto actual = from_windows1252(input); + const auto actual = str::to_u8string(input); const std::u8string expected8{cast8('|'), cast8('\xC5'), cast8('\xB8'), cast8('|')}; // UTF-8, "|Ÿ|" TEST_ASSERT_EQ(actual, expected8); const std::u32string expected{U"|\u0178|"}; // UTF-32, "|Ÿ|" @@ -149,7 +140,7 @@ TEST_CASE(test_string_to_u8string_windows_1252) for (const auto& ch : undefined) { const std::string input{'|', ch, '|'}; - const auto actual = from_windows1252(input); + const auto actual = str::to_u8string(input); TEST_ASSERT_TRUE(!actual.empty()); //const std::u8string expected8{cast8('|'), cast8('\xEF'), cast8('\xBF'), cast8('\xBD'), cast8('|')}; // UTF-8, "||" const std::u8string expected8{cast8('|'), cast8(194), cast8(ch), cast8('|')}; @@ -217,7 +208,7 @@ TEST_CASE(test_string_to_u8string_iso8859_1) const std::string input_ { '|', static_cast(ch), '|'}; const auto input(str::str(input_)); const auto actual = to_u8string(input); - const std::u32string expected{U'|', U(ch), U'|'}; + const std::u32string expected{U'|', ch, U'|'}; test_assert_eq(testName, actual, expected); TEST_ASSERT(str::to_u8string(input) == actual); @@ -276,34 +267,39 @@ static const str::W1252string& classificationText_w1252() return retval; } + static auto toString(const coda_oss::u8string& s) + { + return str::to_native(s); + } + // UTF-16 on Windows, UTF-32 on Linux -static const wchar_t* classificationText_wide_() { return L"A\xc9IOU"; } // UTF-8 "AÉIOU" -static std::u16string classificationText_u16() { return u"A\xc9IOU"; } // UTF-16 "AÉIOU" -static std::u32string classificationText_u32() { return U"A\xc9IOU"; } // UTF-32 "AÉIOU" +static const wchar_t* classificationText_wide_() { return L"A\x00c9IOU"; } // "wide characters" "AÉIOU" +static std::u16string classificationText_u16() { return u"A\u00c9IOU"; } // UTF-16 "AÉIOU" +static std::u32string classificationText_u32() { return U"A\u00c9IOU"; } // UTF-32 "AÉIOU" static std::string classificationText_platform() { return - sys::Platform == sys::PlatformType::Linux ? str::toString(classificationText_u8()) : str::toString(classificationText_w1252()); } + sys::Platform == sys::PlatformType::Linux ? toString(classificationText_u8()) : str::testing::to_string(classificationText_w1252()); } TEST_CASE(test_u8string_to_string) { - auto actual = str::toString(classificationText_u8()); + auto actual = toString(classificationText_u8()); TEST_ASSERT_EQ(classificationText_platform(), actual); - actual = str::toString(classificationText_w1252()); + actual = str::testing::to_string(classificationText_w1252()); TEST_ASSERT_EQ(classificationText_platform(), actual); } -static auto to_w1252string(const std::wstring& s) +static auto w1252FromNative(const std::wstring& s) { - return str::to_w1252string(str::u8FromWString(s)); + return str::to_w1252string(str::u8FromNative(s)); } -static auto to_u16string(const str::W1252string& s) +static auto toWString(const str::W1252string& s) { - return str::to_u16string(s.c_str(), s.length()); + return str::testing::to_wstring(s); } -static auto to_u32string(const str::W1252string& s) +static auto toWString(const coda_oss::u8string& s) { - return str::to_u32string(s.c_str(), s.length()); + return str::details::to_wstring(s); } TEST_CASE(test_u8string_to_u16string) @@ -316,12 +312,12 @@ TEST_CASE(test_u8string_to_u16string) #endif const auto u8 = classificationText_u8(); - TEST_ASSERT(str::u8FromWString(wide) == u8); - TEST_ASSERT(wide == str::toWString(u8)); + TEST_ASSERT(str::u8FromNative(wide) == u8); + TEST_ASSERT(wide == toWString(u8)); const auto w1252 = str::c_str(classificationText_w1252()); - TEST_ASSERT(to_w1252string(wide) == w1252); - TEST_ASSERT(wide == str::toWString(w1252)); + TEST_ASSERT(w1252FromNative(wide) == w1252); + TEST_ASSERT(wide == toWString(w1252)); TEST_ASSERT(classificationText_u16() == actual); // _EQ wants to do toString() TEST_ASSERT(classificationText_u16() == to_u16string(w1252)); // _EQ wants to do toString() @@ -337,37 +333,28 @@ TEST_CASE(test_u8string_to_u32string) const std::wstring wide(classificationText_wide_()); const auto u8 = classificationText_u8(); - TEST_ASSERT(str::u8FromWString(wide) == u8); - TEST_ASSERT(wide == str::toWString(u8)); + TEST_ASSERT(str::u8FromNative(wide) == u8); + TEST_ASSERT(wide == toWString(u8)); const auto w1252 = str::c_str(classificationText_w1252()); - TEST_ASSERT(to_w1252string(wide) == w1252); - TEST_ASSERT(wide == str::toWString(w1252)); + TEST_ASSERT(w1252FromNative(wide) == w1252); + TEST_ASSERT(wide == toWString(w1252)); TEST_ASSERT(classificationText_u32() == actual); // _EQ wants to do toString() TEST_ASSERT(classificationText_u32() == to_u32string(w1252)); // _EQ wants to do toString() } -static auto as_windows1252(const coda_oss::u8string& s) -{ - const auto w1252 = str::to_w1252string(s.c_str(), s.length()); - return str::toString(w1252); -} -static auto from_utf8(const std::string& utf8) -{ - return str::str(utf8); -} -static auto as_utf8(const coda_oss::u8string& s) +static auto toWString(const std::u16string& s) { - return str::str(s); + return toWString(str::to_u8string(s)); } -static auto toWString(const std::u16string& s) +static auto toWString(const std::string& s) { - return str::toWString(str::to_u8string(s)); + return str::details::to_wstring(s); } static auto toString(const std::u16string& s) { - return str::toString(str::to_u8string(s)); + return str::details::to_string(str::to_u8string(s)); } static void test_wide_(const std::string& testName, const char* pStr, std::u16string::const_pointer pUtf16, @@ -379,14 +366,14 @@ static void test_wide_(const std::string& testName, const char* pStr, std::u16st #if _WIN32 // Since we're using UTF-16, on Windows that can be cast to wchar_t - auto pWide = str::cast(pUtf16); + const auto wide = str::make_string(pUtf16); const _bstr_t str(pStr); const std::wstring std_wstr(static_cast(str)); // Windows-1252 -> UTF-16 TEST_ASSERT(wstring == std_wstr); - TEST_ASSERT(std_wstr == pWide); + TEST_ASSERT(std_wstr == wide); - const _bstr_t wide_str(pWide); + const _bstr_t wide_str(wide.c_str()); const std::string std_str(static_cast(wide_str)); // UTF-16 -> Windows-1252 TEST_ASSERT_EQ(native, std_str); TEST_ASSERT_EQ(std_str, pStr); @@ -399,18 +386,19 @@ static void test_wide_(const std::string& testName, const char* pStr, std::u16st static void test_Windows1252_ascii(const std::string& testName, const char* pStr, std::u16string::const_pointer pUtf16) { // For both UTF-8 and Windows-1252, ASCII is the same (they only differ for 0x80-0xff). - const auto u8 = as_utf8(from_utf8(pStr)); + const auto u8 = str::str(str::to_u8string(pStr)); TEST_ASSERT_EQ(pStr, u8); // native() is the same on all platforms/encodings for ASCII { - const auto w1252 = as_windows1252(from_windows1252(pStr)); - TEST_ASSERT_EQ(pStr, w1252); // native() is the same on all platforms/encodings for ASCII + const auto w1252 = str::make_string(pStr); + const auto str1252 = str::testing::to_string(w1252); + TEST_ASSERT_EQ(pStr, str1252); // native() is the same on all platforms/encodings for ASCII } - const auto u16 = str::to_u16string(str::u8FromString(pStr)); + const auto u16 = str::to_u16string(str::u8FromNative(pStr)); TEST_ASSERT(u16 == pUtf16); - auto wstring = str::toWString(pStr); + auto wstring = toWString(pStr); std::string native = pStr; - auto w1252 = str::cast(pStr); + auto w1252 = str::make_string(pStr); test_wide_(testName, pStr, pUtf16, wstring, native, w1252); native = toString(pUtf16); @@ -442,13 +430,17 @@ static auto to_w1252string(const std::u16string& s) { return str::to_w1252string(str::to_u8string(s)); } +inline static auto toString(const std::wstring& s) +{ + return str::details::to_string(s); +} static void test_Windows1252_(const std::string& testName, const char* pStr, std::u16string::const_pointer pUtf16) { - const auto u16 = str::to_u16string(from_windows1252(pStr)); + const auto u16 = str::to_u16string(str::to_u8string(pStr)); TEST_ASSERT(u16 == pUtf16); - auto wstring = str::toWString(from_windows1252(pStr)); - auto s = str::toString(from_windows1252(pStr)); + auto wstring = toWString(str::to_u8string(pStr)); + auto s = toString(str::to_u8string(pStr)); auto w1252 = str::make_string(pStr); test_wide_(testName, pStr, pUtf16, wstring, s, w1252); @@ -550,7 +542,7 @@ TEST_CASE(test_Windows1252) { const std::string expected(1, ch.first); const std::wstring input(1, ch.second); // `std::wstring` is UTF-16 on Windows - const auto actual = str::toString(input); + const auto actual = toString(input); TEST_ASSERT_EQ(expected, actual); } #endif @@ -572,14 +564,14 @@ static void test_Encodeding_(const std::string& testName, const coda_oss::u8stri TEST_ASSERT_EQ(utf_8_view, expected); TEST_ASSERT_EQ(iso8859_1_view, expected); } -TEST_CASE(test_Encodeding) +TEST_CASE(test_Encoding) { - const auto utf_8 = str::toString(classificationText_u8()); - const auto iso8859_1 = str::toString(classificationText_w1252()); + const auto utf_8 = toString(classificationText_u8()); + const auto iso8859_1 = str::testing::to_string(classificationText_w1252()); const auto utf_8_u8 = classificationText_u8(); const auto iso8859_1_u8 = str::to_u8string(classificationText_w1252()); - const auto utf_8_view = as_utf8(classificationText_u8()); - const auto iso8859_1_view = as_utf8(from_windows1252(str::c_str(classificationText_w1252()))); + const auto utf_8_view = str::str(classificationText_u8()); + const auto iso8859_1_view = str::str(str::to_u8string(classificationText_w1252())); test_Encodeding_(testName, classificationText_u8(), utf_8, iso8859_1, @@ -606,5 +598,5 @@ TEST_MAIN( TEST_CHECK(test_ASCII); TEST_CHECK(test_Windows1252_WIN32); TEST_CHECK(test_Windows1252); - TEST_CHECK(test_Encodeding); + TEST_CHECK(test_Encoding); ) diff --git a/externals/coda-oss/modules/c++/sys/include/sys/AbstractOS.h b/externals/coda-oss/modules/c++/sys/include/sys/AbstractOS.h index 1b040790e..efd80de08 100644 --- a/externals/coda-oss/modules/c++/sys/include/sys/AbstractOS.h +++ b/externals/coda-oss/modules/c++/sys/include/sys/AbstractOS.h @@ -63,6 +63,20 @@ enum class SIMDInstructionSet AVX512F, // https://en.wikipedia.org/wiki/AVX-512 }; +constexpr auto getSIMDInstructionSet() { return SIMDInstructionSet:: + // https://learn.microsoft.com/en-us/cpp/preprocessor/predefined-macros?view=msvc-170 + + #if __AVX512F__ + AVX512F + #elif __AVX2__ + AVX2 + #elif _M_X64 /*MSVC*/ || __SSE2__ /*GCC*/ + SSE2 + #else + #error "Can't determine SIMDInstructionSet'" + #endif +; } + /*! * \class AbstractOS * \brief Interface for system independent function calls diff --git a/externals/coda-oss/modules/c++/sys/source/CppUnitTestAssert_.cpp_ b/externals/coda-oss/modules/c++/sys/source/CppUnitTestAssert_.cpp_ index 072d66db9..03f941aea 100644 --- a/externals/coda-oss/modules/c++/sys/source/CppUnitTestAssert_.cpp_ +++ b/externals/coda-oss/modules/c++/sys/source/CppUnitTestAssert_.cpp_ @@ -35,5 +35,5 @@ void test::Assert::FailOnCondition(bool condition, const unsigned short* message std::wstring GetAssertMessage(bool equality, const std::wstring& expected, const std::wstring& actual, const wchar_t *message); // declare caller std::wstring test::Assert::GetAssertMessage(bool equality, const std::string& expected, const std::string& actual, const wchar_t *message) { - return ::GetAssertMessage(equality, str::toWString(expected), str::toWString(actual), message); // and call! + return ::GetAssertMessage(equality, str::details::to_wstring(expected), str::details::to_wstring(actual), message); // and call! } diff --git a/externals/coda-oss/modules/c++/sys/source/sys_filesystem.cpp b/externals/coda-oss/modules/c++/sys/source/sys_filesystem.cpp index 13d77f7a9..fb3126f73 100644 --- a/externals/coda-oss/modules/c++/sys/source/sys_filesystem.cpp +++ b/externals/coda-oss/modules/c++/sys/source/sys_filesystem.cpp @@ -48,7 +48,7 @@ fs::path::string_type fs::path::to_native(const std::string& s_) { #ifdef _WIN32 - return str::toWString(s_); + return str::details::to_wstring(s_); #else return s_; #endif @@ -103,7 +103,7 @@ fs::path::operator string_type() const std::string fs::path::string() const { - return str::toString(p_); + return str::details::to_string(p_); } fs::path fs::path::root_path() const diff --git a/externals/coda-oss/modules/c++/xml.lite/include/xml/lite/Element.h b/externals/coda-oss/modules/c++/xml.lite/include/xml/lite/Element.h index 01c5aab0c..323b77aba 100644 --- a/externals/coda-oss/modules/c++/xml.lite/include/xml/lite/Element.h +++ b/externals/coda-oss/modules/c++/xml.lite/include/xml/lite/Element.h @@ -319,7 +319,7 @@ struct CODA_OSS_API Element // SOAPElement derives :-( * \return the charater data */ std::string getCharacterData() const; - coda_oss::u8string& getCharacterData(coda_oss::u8string& result) const; + const coda_oss::u8string& getCharacterData(coda_oss::u8string& result) const; //explicit operator coda_oss::u8string() const //{ // coda_oss::u8string result; diff --git a/externals/coda-oss/modules/c++/xml.lite/source/Element.cpp b/externals/coda-oss/modules/c++/xml.lite/source/Element.cpp index 80470ab02..5da980aba 100644 --- a/externals/coda-oss/modules/c++/xml.lite/source/Element.cpp +++ b/externals/coda-oss/modules/c++/xml.lite/source/Element.cpp @@ -259,9 +259,9 @@ void xml::lite::Element::prettyConsoleOutput_(io::OutputStream& stream, std::string xml::lite::Element::getCharacterData() const { - return str::toString(mCharacterData); + return str::to_native(mCharacterData); } -coda_oss::u8string& xml::lite::Element::getCharacterData(coda_oss::u8string& result) const +const coda_oss::u8string& xml::lite::Element::getCharacterData(coda_oss::u8string& result) const { result = mCharacterData; return result; @@ -278,7 +278,7 @@ static void writeCharacterData_utf8(io::OutputStream& stream, const std::u8strin } static void writeCharacterData_native(io::OutputStream& stream, const std::u8string& characterData) { - stream.write(str::toString(characterData)); + stream.write(str::to_native(characterData)); } static void depthPrint_(const xml::lite::Element& element, @@ -465,7 +465,7 @@ void xml::lite::Element::setNamespaceURI( void xml::lite::Element::setCharacterData(const std::string& characters) { - mCharacterData = str::u8FromString(characters); + mCharacterData = str::u8FromNative(characters); } xml::lite::Element& xml::lite::Element::operator=(const std::string& characterData) { @@ -506,7 +506,7 @@ xml::lite::Element& xml::lite::addChild(Element& e, const QName& qname, const co } xml::lite::Element& xml::lite::addChild(Element& e, const QName& qname, const std::string& characterData) { - return addChild(e, qname, str::u8FromString(characterData)); + return addChild(e, qname, str::u8FromNative(characterData)); } xml::lite::Element& xml::lite::addChild(Element& e, const QName& qname) { diff --git a/externals/coda-oss/modules/c++/xml.lite/source/MinidomHandler.cpp b/externals/coda-oss/modules/c++/xml.lite/source/MinidomHandler.cpp index f895562c4..009ab29e5 100644 --- a/externals/coda-oss/modules/c++/xml.lite/source/MinidomHandler.cpp +++ b/externals/coda-oss/modules/c++/xml.lite/source/MinidomHandler.cpp @@ -73,7 +73,7 @@ void xml::lite::MinidomHandler::characters(const char *value, int length) // If we're still here despite use_char() being "false" then the // wide-character routine "failed." On Windows, that means the char* value // is encoded as Windows-1252 (more-or-less ISO8859-1). - characters(str::u8FromString(std::string(value, length))); + characters(str::u8FromNative(std::string(value, length))); } bool xml::lite::MinidomHandler::vcharacters(const void /*XMLCh*/* chars_, size_t length) diff --git a/externals/coda-oss/modules/c++/xml.lite/source/ValidatorXerces.cpp b/externals/coda-oss/modules/c++/xml.lite/source/ValidatorXerces.cpp index 46d5c7bc8..0d5280881 100644 --- a/externals/coda-oss/modules/c++/xml.lite/source/ValidatorXerces.cpp +++ b/externals/coda-oss/modules/c++/xml.lite/source/ValidatorXerces.cpp @@ -207,7 +207,7 @@ using XMLCh_t = wchar_t; static_assert(std::is_same<::XMLCh, XMLCh_t>::value, "XMLCh should be wchar_t"); inline void reset(const std::u8string& xml, std::unique_ptr& pWString) { - pWString = std::make_unique(str::toWString(xml)); + pWString = std::make_unique(str::details::to_wstring(xml)); } #else using XMLCh_t = char16_t; @@ -283,8 +283,8 @@ static coda_oss::u8string encodeXml(const std::string& xml) return to_u8string(str::str(xml)); } - // No "... encoding= ..."; let u8FromString() deal with it - return str::u8FromString(xml); + // No "... encoding= ..."; let u8FromNative() deal with it + return str::u8FromNative(xml); } bool ValidatorXerces::validate(const std::string& xml, diff --git a/externals/coda-oss/modules/c++/xml.lite/unittests/test_xmlcreate.cpp b/externals/coda-oss/modules/c++/xml.lite/unittests/test_xmlcreate.cpp index 7d982ef18..08cffd845 100644 --- a/externals/coda-oss/modules/c++/xml.lite/unittests/test_xmlcreate.cpp +++ b/externals/coda-oss/modules/c++/xml.lite/unittests/test_xmlcreate.cpp @@ -115,11 +115,11 @@ TEST_CASE(testXmlCreateWhitespace) xml::lite::MinidomParser xmlParser; auto& document = getDocument(xmlParser); - const auto text = str::u8FromString(" "); + const auto text = str::u8FromNative(" "); auto documents_ = document.createElement(xml::lite::QName(""_u, "text"), text); auto& documents = *documents_; - auto strXml = str::u8FromString(print(documents)); - const auto expected = str::u8FromString("") + text + str::u8FromString(""); + auto strXml = str::u8FromNative(print(documents)); + const auto expected = str::u8FromNative("") + text + str::u8FromNative(""); TEST_ASSERT(strXml == expected); { diff --git a/externals/coda-oss/modules/c++/xml.lite/unittests/test_xmlparser.cpp b/externals/coda-oss/modules/c++/xml.lite/unittests/test_xmlparser.cpp index 32deee263..3dad8420c 100644 --- a/externals/coda-oss/modules/c++/xml.lite/unittests/test_xmlparser.cpp +++ b/externals/coda-oss/modules/c++/xml.lite/unittests/test_xmlparser.cpp @@ -59,7 +59,7 @@ static const std::u8string& text8() static const auto& iso88591Text1252() { - static const str::W1252string retval = str::cast("T\xc9XT"); // ISO8859-1, "TÉXT" + static const auto retval = str::make_string("T\xc9XT"); // ISO8859-1, "TÉXT" return retval; } static auto pIso88591Text_() @@ -70,7 +70,7 @@ static auto pIso88591Text_() static const auto& utf8Text8() { - static const coda_oss::u8string retval = str::cast("T\xc3\x89XT"); // UTF-8, "TÉXT" + static const auto retval = str::make_string("T\xc3\x89XT"); // UTF-8, "TÉXT" return retval; } static const auto pUtf8Text_() diff --git a/six/modules/c++/cphd/source/CPHDXMLControl.cpp b/six/modules/c++/cphd/source/CPHDXMLControl.cpp index fd7d1092b..57dc869d1 100644 --- a/six/modules/c++/cphd/source/CPHDXMLControl.cpp +++ b/six/modules/c++/cphd/source/CPHDXMLControl.cpp @@ -90,7 +90,7 @@ std::string CPHDXMLControl::toXMLString_( bool prettyPrint) { const auto result = toXMLString(metadata, schemaPaths, prettyPrint); - return str::toString(result); + return str::to_native(result); } std::unique_ptr CPHDXMLControl::toXML( @@ -134,7 +134,7 @@ std::unique_ptr CPHDXMLControl::fromXML(const std::string& xmlString, std::transform(schemaPaths_.begin(), schemaPaths_.end(), std::back_inserter(schemaPaths), [](const std::string& s) { return s; }); - return fromXML(str::u8FromString(xmlString), schemaPaths); + return fromXML(str::u8FromNative(xmlString), schemaPaths); } std::unique_ptr CPHDXMLControl::fromXML(const std::u8string& xmlString, const std::vector& schemaPaths) @@ -210,4 +210,4 @@ std::string cphd::to_string(Version siddVersion) default: break; } throw std::logic_error("Unkown 'Version' value."); -} \ No newline at end of file +} diff --git a/six/modules/c++/cphd/unittests/test_cphd_xml_control.cpp b/six/modules/c++/cphd/unittests/test_cphd_xml_control.cpp index 16ee18daa..a5cf13280 100644 --- a/six/modules/c++/cphd/unittests/test_cphd_xml_control.cpp +++ b/six/modules/c++/cphd/unittests/test_cphd_xml_control.cpp @@ -893,7 +893,7 @@ std::string testCPHDXML_(cphd::Version version) } std::u8string testCPHDXML(cphd::Version version) { - return str::u8FromString(testCPHDXML_(version)); + return str::u8FromNative(testCPHDXML_(version)); } void runTest(const std::string& testName, cphd::Version version) diff --git a/six/modules/c++/cphd03/source/CPHDXMLControl.cpp b/six/modules/c++/cphd03/source/CPHDXMLControl.cpp index 9b6223c8a..38d3d35bc 100644 --- a/six/modules/c++/cphd03/source/CPHDXMLControl.cpp +++ b/six/modules/c++/cphd03/source/CPHDXMLControl.cpp @@ -70,11 +70,11 @@ std::u8string CPHDXMLControl::toXMLString(const Metadata& metadata) io::U8StringStream ss; doc->getRootElement()->print(ss); - return str::u8FromString("") + ss.stream().str(); + return str::u8FromNative("") + ss.stream().str(); } std::string CPHDXMLControl::toXMLString_(const Metadata& metadata) { - return str::toString(toXMLString(metadata)); + return str::to_native(toXMLString(metadata)); } size_t CPHDXMLControl::getXMLsize(const Metadata& metadata) @@ -493,7 +493,7 @@ XMLElem CPHDXMLControl::areaSampleDirectionParametersToXML( std::unique_ptr CPHDXMLControl::fromXML(const std::string& xmlString) { - auto result = fromXML(str::u8FromString(xmlString)); + auto result = fromXML(str::u8FromNative(xmlString)); return std::unique_ptr(result.release()); } std::unique_ptr CPHDXMLControl::fromXML(const std::u8string& xmlString) diff --git a/six/modules/c++/six.sicd/source/Utilities.cpp b/six/modules/c++/six.sicd/source/Utilities.cpp index 6b8fac025..81f3f3fdf 100644 --- a/six/modules/c++/six.sicd/source/Utilities.cpp +++ b/six/modules/c++/six.sicd/source/Utilities.cpp @@ -1024,7 +1024,7 @@ std::unique_ptr Utilities::parseDataFromString( const std::vector& schemaPaths_, logging::Logger& log) { - const auto xmlStr = str::u8FromString(xmlStr_); + const auto xmlStr = str::u8FromNative(xmlStr_); std::vector schemaPaths; std::transform(schemaPaths_.begin(), schemaPaths_.end(), std::back_inserter(schemaPaths), @@ -1049,7 +1049,7 @@ std::string Utilities::toXMLString(const ComplexData& data, [](const std::string& s) { return s; }); const auto result = toXMLString(data, &schemaPaths, logger); - return str::toString(result); + return str::to_native(result); } std::u8string Utilities::toXMLString(const ComplexData& data, const std::vector* pSchemaPaths, logging::Logger* pLogger) diff --git a/six/modules/c++/six.sicd/unittests/test_CollectionInfo.cpp b/six/modules/c++/six.sicd/unittests/test_CollectionInfo.cpp index a7db81ab7..c91291290 100644 --- a/six/modules/c++/six.sicd/unittests/test_CollectionInfo.cpp +++ b/six/modules/c++/six.sicd/unittests/test_CollectionInfo.cpp @@ -125,10 +125,10 @@ TEST_CASE(ClassificationCanada) { #ifdef _WIN32 const std::string classificationText("NON CLASSIFI\xc9 / UNCLASSIFIED"); // ISO8859-1 "NON CLASSIFIÉ / UNCLASSIFIED" - const auto E_ = str::u8FromString("\xc9"); // ISO8859-1 "É" + const auto E_ = str::u8FromNative("\xc9"); // ISO8859-1 "É" #else const std::string classificationText("NON CLASSIFI\xc3\x89 / UNCLASSIFIED"); // UTF-8 "NON CLASSIFIÉ / UNCLASSIFIED" - const auto E_ = str::u8FromString("\xc3\x89"); // UTF-8 "É" + const auto E_ = str::u8FromNative("\xc3\x89"); // UTF-8 "É" #endif auto data = createData(types::RowCol(10, 10)); @@ -137,9 +137,9 @@ TEST_CASE(ClassificationCanada) const auto strXml = six::sicd::Utilities::toXMLString(*data, nullptr /*pSchemaPaths*/); - const auto NON_CLASSIFI = strXml.find(str::u8FromString("NON CLASSIFI")); + const auto NON_CLASSIFI = strXml.find(str::u8FromNative("NON CLASSIFI")); TEST_ASSERT(NON_CLASSIFI != std::string::npos); - const auto UNCLASSIFIED = strXml.find(str::u8FromString(" / UNCLASSIFIED")); + const auto UNCLASSIFIED = strXml.find(str::u8FromNative(" / UNCLASSIFIED")); TEST_ASSERT(UNCLASSIFIED != std::string::npos); const auto utf8 = strXml.substr(NON_CLASSIFI, UNCLASSIFIED - NON_CLASSIFI); TEST_ASSERT_EQ(utf8.size(), std::string("NON CLASSIFI\xc3\x89").size()); // UTF-8, "NON CLASSIFIÉ" diff --git a/six/modules/c++/six.sidd/source/GeoTIFFReadControl.cpp b/six/modules/c++/six.sidd/source/GeoTIFFReadControl.cpp index 693d2d2a8..ea9c28f14 100644 --- a/six/modules/c++/six.sidd/source/GeoTIFFReadControl.cpp +++ b/six/modules/c++/six.sidd/source/GeoTIFFReadControl.cpp @@ -59,7 +59,7 @@ void parseXMLEntry(const tiff::IFDEntry *entry, str::trim(curStr); if (!curStr.empty()) { - entries.emplace_back(str::u8FromString(curStr)); + entries.emplace_back(str::u8FromNative(curStr)); curStr.clear(); } } @@ -75,7 +75,7 @@ void parseXMLEntry(const tiff::IFDEntry *entry, str::trim(curStr); if (!curStr.empty()) { - entries.emplace_back(str::u8FromString(curStr)); + entries.emplace_back(str::u8FromNative(curStr)); } } } diff --git a/six/modules/c++/six.sidd/source/GeoTIFFWriteControl.cpp b/six/modules/c++/six.sidd/source/GeoTIFFWriteControl.cpp index 7dae50f65..7d2c469c2 100644 --- a/six/modules/c++/six.sidd/source/GeoTIFFWriteControl.cpp +++ b/six/modules/c++/six.sidd/source/GeoTIFFWriteControl.cpp @@ -234,12 +234,12 @@ void GeoTIFFWriteControl::setupIFD(const DerivedData* data, tiff::IFDEntry* const xmlEntry = (*ifd)[Constants::GT_XML_TAG]; auto xml = six::toValidXMLString(data, schemaPaths, mLog); - xmlEntry->addValues(str::toString(xml)); + xmlEntry->addValues(str::to_native(xml)); for (size_t jj = 0; jj < mComplexData.size(); ++jj) { xml = six::toValidXMLString(mComplexData[jj], schemaPaths, mLog); - xmlEntry->addValues(str::toString(xml)); + xmlEntry->addValues(str::to_native(xml)); } } diff --git a/six/modules/c++/six.sidd/source/Utilities.cpp b/six/modules/c++/six.sidd/source/Utilities.cpp index 498b5e2a6..89ffee2a5 100644 --- a/six/modules/c++/six.sidd/source/Utilities.cpp +++ b/six/modules/c++/six.sidd/source/Utilities.cpp @@ -563,7 +563,7 @@ std::unique_ptr Utilities::parseDataFromFile(const std::filesystem: std::unique_ptr Utilities::parseDataFromString(const std::string& xmlStr_, const std::vector& schemaPaths_, logging::Logger& log) { - const auto xmlStr = str::u8FromString(xmlStr_); + const auto xmlStr = str::u8FromNative(xmlStr_); std::vector schemaPaths; std::transform(schemaPaths_.begin(), schemaPaths_.end(), std::back_inserter(schemaPaths), @@ -588,7 +588,7 @@ std::string Utilities::toXMLString(const DerivedData& data, [](const std::string& s) { return s; }); const auto result = toXMLString(data, &schemaPaths, logger); - return str::toString(result); + return str::to_native(result); } std::u8string Utilities::toXMLString(const DerivedData& data, const std::vector* pSchemaPaths, logging::Logger* pLogger) diff --git a/six/modules/c++/six.sidd/unittests/test_valid_sixsidd.cpp b/six/modules/c++/six.sidd/unittests/test_valid_sixsidd.cpp index c92f29217..609f95e2a 100644 --- a/six/modules/c++/six.sidd/unittests/test_valid_sixsidd.cpp +++ b/six/modules/c++/six.sidd/unittests/test_valid_sixsidd.cpp @@ -74,7 +74,7 @@ static std::unique_ptr test_assert_round_trip(const std: const auto strXML = six::sidd::Utilities::toXMLString(derivedData, pSchemaPaths); TEST_ASSERT_FALSE(strXML.empty()); - const auto xml_ = str::toString(strXML); // for debugging + const auto xml_ = str::to_native(strXML); // for debugging TEST_ASSERT_FALSE(xml_.empty()); return six::sidd::Utilities::parseDataFromString(strXML, pSchemaPaths); diff --git a/six/modules/c++/six/include/six/CollectionInformation.h b/six/modules/c++/six/include/six/CollectionInformation.h index e3726a4f0..876a13cc4 100644 --- a/six/modules/c++/six/include/six/CollectionInformation.h +++ b/six/modules/c++/six/include/six/CollectionInformation.h @@ -118,7 +118,7 @@ struct CollectionInformation virtual std::string getClassificationLevel() const; inline virtual void setClassificationLevel(const std::string& classification) { - mClassification = str::u8FromString(classification); + mClassification = str::u8FromNative(classification); } virtual void getClassificationLevel(std::u8string&) const; diff --git a/six/modules/c++/six/include/six/XsElement.h b/six/modules/c++/six/include/six/XsElement.h index 28acc5764..7f0f32a66 100644 --- a/six/modules/c++/six/include/six/XsElement.h +++ b/six/modules/c++/six/include/six/XsElement.h @@ -149,7 +149,7 @@ inline std::ostream& operator<<(std::ostream& os, const XsElement& v) template <> inline std::ostream& operator<<(std::ostream& os, const XsElement& v) { - os << "\t" << v.tag() << "\t: " << str::toString(value(v)); + os << "\t" << v.tag() << "\t: " << str::to_native(value(v)); return os; } diff --git a/six/modules/c++/six/source/CollectionInformation.cpp b/six/modules/c++/six/source/CollectionInformation.cpp index 587b38812..ac524f965 100644 --- a/six/modules/c++/six/source/CollectionInformation.cpp +++ b/six/modules/c++/six/source/CollectionInformation.cpp @@ -48,7 +48,7 @@ CollectionInformation* CollectionInformation::clone() const std::string CollectionInformation::getClassificationLevel() const { - return str::toString(mClassification); + return str::to_native(mClassification); } void CollectionInformation::getClassificationLevel(std::u8string& result) const { diff --git a/six/modules/c++/six/source/NITFWriteControl.cpp b/six/modules/c++/six/source/NITFWriteControl.cpp index 64f73b3a0..aa5906229 100644 --- a/six/modules/c++/six/source/NITFWriteControl.cpp +++ b/six/modules/c++/six/source/NITFWriteControl.cpp @@ -568,7 +568,7 @@ void NITFWriteControl::addDataAndWrite(const std::vector& schemaPat const Data* data = getContainer()->getData(ii); const auto xml = six::toValidXMLString(data, schemaPaths, mLog, mXMLRegistry); - desStrs[ii] = str::toString(xml); + desStrs[ii] = str::to_native(xml); nitf::SegmentWriter deWriter = mWriter.newDEWriter(gsl::narrow(ii)); nitf::SegmentMemorySource segSource(desStrs[ii], 0, 0, false); deWriter.attachSource(segSource); diff --git a/six/modules/c++/six/source/Utilities.cpp b/six/modules/c++/six/source/Utilities.cpp index 03746abc3..5f5cc558f 100644 --- a/six/modules/c++/six/source/Utilities.cpp +++ b/six/modules/c++/six/source/Utilities.cpp @@ -716,7 +716,7 @@ std::unique_ptr six::parseDataFromString(const XMLControlRegistry& xmlReg, std::transform(schemaPaths_.begin(), schemaPaths_.end(), std::back_inserter(schemaPaths), [](const std::string& s) { return s; }); - auto result = parseDataFromString(xmlReg, str::u8FromString(xmlStr), dataType, &schemaPaths, &log); + auto result = parseDataFromString(xmlReg, str::u8FromNative(xmlStr), dataType, &schemaPaths, &log); return std::unique_ptr(result.release()); } @@ -967,4 +967,4 @@ std::u8string six::DataParser::DataParser::toXML(const Data& data) const void six::DataParser::DataParser::preserveCharacterData(bool preserve) { mPreserveCharacterData = preserve; -} \ No newline at end of file +} diff --git a/six/modules/c++/six/source/XMLControlFactory.cpp b/six/modules/c++/six/source/XMLControlFactory.cpp index 2807f8e39..4970d6059 100644 --- a/six/modules/c++/six/source/XMLControlFactory.cpp +++ b/six/modules/c++/six/source/XMLControlFactory.cpp @@ -82,7 +82,7 @@ std::string six::toXMLString_(const Data* data, const six::XMLControlRegistry* xmlRegistry) { const auto result = toXMLString(data, xmlRegistry); - return str::toString(result); + return str::to_native(result); } template @@ -126,4 +126,4 @@ std::u8string six::toValidXMLString(const Data& data, logging::Logger* log, const six::XMLControlRegistry* xmlRegistry) { return six_toValidXMLString(data, pSchemaPaths, log, xmlRegistry); -} \ No newline at end of file +} diff --git a/six/modules/c++/six/source/XmlLite.cpp b/six/modules/c++/six/source/XmlLite.cpp index 7c3370437..c483c21e5 100644 --- a/six/modules/c++/six/source/XmlLite.cpp +++ b/six/modules/c++/six/source/XmlLite.cpp @@ -195,6 +195,11 @@ inline std::string toString_(const xml::lite::QName& name, const T& v, const xml { return toString(name, v, parent); } +template<> +inline std::string toString_(const xml::lite::QName& name, const std::u8string& v, const xml::lite::Element& parent) +{ + return toString(name, str::to_native(v), parent); +} template static xml::lite::Element& createValue(const xml::lite::QName& name, diff --git a/six/projects/csm/tests/utilities.h b/six/projects/csm/tests/utilities.h index ce410802b..8b024bf33 100644 --- a/six/projects/csm/tests/utilities.h +++ b/six/projects/csm/tests/utilities.h @@ -137,7 +137,7 @@ inline std::unique_ptr constructIsd(const std::string& pathname, // The DES's data is just the XML string const auto xml = six::toXMLString(data, ®istry); - des.setData(str::toString(xml)); + des.setData(str::to_native(xml)); nitfIsd->addFileDes(des); return nitfIsd;