nerdcruft/libcruft-util
1
0
Fork 0
Code Issues Releases Activity

view: require fully named types for casting

Browse Source
This commit is contained in:
Danny Robson 2018-05-10 12:52:01 +10:00
parent 29702704fb
commit ec44c68ce6
11 changed files with 25 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
cast.hpp
View File

@ -157,14 +157,18 @@ namespace util::cast {
///////////////////////////////////////////////////////////////////////////
/// cast a pointer from one type to another, asserting that the required
/// alignment of the destination type has been satisfied.
template <typename DstT, typename SrcT>
DstT*
alignment (SrcT *src)
template <
typename DstT,
typename SrcT,
typename = std::enable_if_t<std::is_pointer_v<DstT> && std::is_pointer_v<SrcT>>
>
DstT
alignment (SrcT src)
{
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wcast-align"
CHECK_MOD (reinterpret_cast<uintptr_t> (src), alignof (DstT));
return reinterpret_cast<DstT*> (src);
return reinterpret_cast<DstT> (src);
#pragma GCC diagnostic pop
}
};

2
json/schema.cpp
View File

@ -535,6 +535,6 @@ json::schema::validate (json::tree::node &data,
const std::experimental::filesystem::path &schema_path)
{
const util::mapped_file schema_data (schema_path);
auto schema_object = json::tree::parse (util::view(schema_data).cast<const char> ());
auto schema_object = json::tree::parse (util::view(schema_data).cast<const char*> ());
validate (data, schema_object->as_object ());
}

2
json/tree.cpp
View File

@ -242,7 +242,7 @@ std::unique_ptr<json::tree::node>
json::tree::parse (const std::experimental::filesystem::path &src)
{
const util::mapped_file data (src);
return parse (util::view{data}.cast<const char> ());
return parse (util::view{data}.cast<const char*> ());
}

4
test/hash/checksum.cpp
View File

@ -40,13 +40,13 @@ main (int, char**) {
for (const auto &t: TESTS) {
tap.expect_eq (
t.adler,
a (util::view {t.data}.template cast<const uint8_t> ()),
a (util::view {t.data}.template cast<const uint8_t*> ()),
"adler checksum: %s", t.msg
);
tap.expect_eq (
t.bsd,
b (util::view {t.data}.template cast<const uint8_t> ()),
b (util::view {t.data}.template cast<const uint8_t*> ()),
"bsdsum checksum: %s", t.msg);
}

2
test/hash/crc.cpp
View File

@ -34,7 +34,7 @@ main (int, char**)
for (const auto &t: TESTS) {
#define TEST(KLASS) do { \
auto computed = util::hash::KLASS{}(util::view {t.dat}.template cast<const uint8_t> ()); \
auto computed = util::hash::KLASS{}(util::view {t.dat}.template cast<const uint8_t*> ()); \
tap.expect_eq (t.result.KLASS, computed, "%s: %s", #KLASS, t.msg); \
} while (0)

4
test/hash/fasthash.cpp
View File

@ -47,8 +47,8 @@ main (void)
for (const auto &t: TESTS) {
util::view data { t.data };
tap.expect_eq (t.hash32, h32 (t.seed32, data.cast<uint8_t const> ()), "h32(%0" PRIx32 ")", t.seed32);
tap.expect_eq (t.hash64, h64 (t.seed64, data.cast<uint8_t const> ()), "h64(%0" PRIx64 ")", t.seed64);
tap.expect_eq (t.hash32, h32 (t.seed32, data.cast<uint8_t const*> ()), "h32(%0" PRIx32 ")", t.seed32);
tap.expect_eq (t.hash64, h64 (t.seed64, data.cast<uint8_t const*> ()), "h64(%0" PRIx64 ")", t.seed64);
}
tap.expect (success32, "fasthash32");

4
test/hash/fnv1a.cpp
View File

@ -24,8 +24,8 @@ main (void)
const util::hash::fnv1a<uint64_t> h64;
for (const auto &t: TESTS) {
tap.expect_eq (h32 (util::view{t.data}.cast <const uint8_t> ()), t.h32, "fnv1a32: '%s'", t.data);
tap.expect_eq (h64 (util::view{t.data}.cast <const uint8_t> ()), t.h64, "fnv1a64: '%s'", t.data);
tap.expect_eq (h32 (util::view{t.data}.cast <const uint8_t*> ()), t.h32, "fnv1a32: '%s'", t.data);
tap.expect_eq (h64 (util::view{t.data}.cast <const uint8_t*> ()), t.h64, "fnv1a64: '%s'", t.data);
}
return tap.status ();

2
tools/json-clean.cpp
View File

@ -51,7 +51,7 @@ main (int argc, char **argv)
try {
const util::mapped_file src (argv[ARG_INPUT]);
std::cout << *json::tree::parse (util::view{src}.cast<const char> ()) << '\n';
std::cout << *json::tree::parse (util::view{src}.cast<const char*> ()) << '\n';
} catch (const json::error& err) {
std::cerr << err.what () << "\n";
return EXIT_FAILURE;

4
tools/json-schema.cpp
View File

@ -50,8 +50,8 @@ main (int argc, char **argv) {
const util::mapped_file schema_src (argv[ARG_SCHEMA]);
const util::mapped_file input_src (argv[ARG_INPUT]);
auto schema = json::tree::parse (util::view{schema_src}.cast<const char>());
auto input = json::tree::parse (util::view{input_src} .cast<const char>());
auto schema = json::tree::parse (util::view{schema_src}.cast<const char*>());
auto input = json::tree::parse (util::view{input_src} .cast<const char*>());
json::schema::validate (*input, schema->as_object ());
} catch (const json::error &e) {

2
tools/json-validate.cpp
View File

@ -42,7 +42,7 @@ main (int argc, char ** argv) {
try {
const util::mapped_file data (argv[ARG_PATH]);
json::flat::parse (util::view{data}.cast<const char> ());
json::flat::parse (util::view{data}.cast<const char*> ());
} catch (const json::error &x) {
std::cerr << "error: " << x.what () << '\n';
return EXIT_FAILURE;

11
view.hpp
View File

@ -336,18 +336,15 @@ namespace util {
template <
typename ValueT,
typename = std::enable_if_t<
std::is_pointer_v<BeginT> &&
sizeof (*std::declval<BeginT> ()) == sizeof (ValueT)
,
void
std::is_pointer_v<BeginT> && std::is_pointer_v<ValueT>
>
>
view<ValueT*>
view<ValueT>
cast (void) const
{
return {
reinterpret_cast<ValueT*> (m_begin),
reinterpret_cast<ValueT*> (m_end)
reinterpret_cast<ValueT> (m_begin),
reinterpret_cast<ValueT> (m_end)
};
}