rename functions for converting strings to integers to snake case
while here: - add some functions taking std::string/std::wstring
This commit is contained in:
@@ -5,7 +5,7 @@
|
||||
*/
|
||||
|
||||
/*
|
||||
* Copyright (c) 2021, Tomasz Sowa
|
||||
* Copyright (c) 2021-2022, Tomasz Sowa
|
||||
* All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
@@ -35,12 +35,53 @@
|
||||
#ifndef headerfile_pikotools_tests_convert
|
||||
#define headerfile_pikotools_tests_convert
|
||||
|
||||
#include "convert/convert.h"
|
||||
#include "test.h"
|
||||
|
||||
|
||||
namespace pt
|
||||
{
|
||||
|
||||
namespace pt_convert_tests
|
||||
{
|
||||
|
||||
template<typename IntegerType>
|
||||
struct IntegerHelper {
|
||||
const wchar_t * val;
|
||||
IntegerType val_int;
|
||||
int base;
|
||||
const wchar_t * after_str;
|
||||
bool was_overflow;
|
||||
bool allow_skip_whitechars;
|
||||
};
|
||||
|
||||
|
||||
|
||||
template<typename StringType, typename IntegerType>
|
||||
void make_str_to_int_tests(
|
||||
IntegerType (*convert_function1)(const typename StringType::value_type *, int, const typename StringType::value_type **, bool *, bool allow_skip_whitechars),
|
||||
IntegerType (*convert_function2)(const StringType &, int, const typename StringType::value_type **, bool *, bool allow_skip_whitechars),
|
||||
IntegerHelper<IntegerType> * helper_tab,
|
||||
size_t len)
|
||||
{
|
||||
for(size_t i=0 ; i<len ; ++i)
|
||||
{
|
||||
IntegerHelper<IntegerType> & helper = helper_tab[i];
|
||||
std::wstring str1 = helper.val;
|
||||
const wchar_t * after;
|
||||
bool was_overflow;
|
||||
|
||||
test(convert_function1(str1.c_str(), helper.base, &after, &was_overflow, helper.allow_skip_whitechars), helper.val_int);
|
||||
test(helper.after_str, after);
|
||||
test(helper.was_overflow, was_overflow);
|
||||
|
||||
test(convert_function2(str1, helper.base, &after, &was_overflow, helper.allow_skip_whitechars), helper.val_int);
|
||||
test(helper.after_str, after);
|
||||
test(helper.was_overflow, was_overflow);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
void make_tests();
|
||||
|
Reference in New Issue
Block a user