tomasz.sowa/pikotools
1
0
Fork 0
Code Issues 1 Pull Requests Releases Activity

added: to methods Toull(), Toll(), Toul(), Toui(), Tol(), Toi()

Browse Source 
a new parameter: bool allow_skip_whitechars default true
added:   new methods: Toull_b(), Toll_b(), Toul_b(), Toui_b(), Tol_b(), Toi_b()
         automatically detects the base (radix):
           4323 - base 10
           0122 - base 8  (string starts with 0)
           #fff - base 16 (string starts with #)
           &101 - base 2  (string starts with &)
added:   CharType * SkipWhiteFromBack(CharType * str, bool check_additional_chars = true, bool treat_new_line_as_white = true)
         skipping white characters from the end of a string
changed: Toll_b(), Toull_b(), Tol_b() and Toul_b() are used in Space now
         for methods ToInt() etc so we are able to use a different base now
changed: some work in Space (const correctness)
       




git-svn-id: svn://ttmath.org/publicrep/pikotools/trunk@1070 e52654a7-88a9-db11-a3e9-0013d4bc506e
This commit is contained in:
Tomasz Sowa
2018-01-05 20:03:11 +00:00
parent e24112b79b
commit cb23304885
4 changed files with 325 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

145
space/space.cpp
View File

@@ -50,7 +50,7 @@ namespace PT
Space::Space()
{
parent = 0;
parent = nullptr;
}
@@ -116,7 +116,7 @@ Space::Value * Space::GetValue(const std::wstring & name)
if( t == table.end() )
{
return 0;
return nullptr;
}
else
{
@@ -138,7 +138,7 @@ const Space::Value * Space::GetValue(const std::wstring & name) const
if( t == table.cend() )
{
return 0;
return nullptr;
}
else
{
@@ -164,7 +164,7 @@ std::wstring * Space::GetFirstValue(const std::wstring & name)
if( t == table.end() || t->second.empty() )
{
return 0;
return nullptr;
}
else
{
@@ -187,7 +187,7 @@ const std::wstring * Space::GetFirstValue(const std::wstring & name) const
if( t == table.end() || t->second.empty() )
{
return 0;
return nullptr;
}
else
{
@@ -403,72 +403,36 @@ std::string Space::TextA(const std::wstring & name, const std::wstring & def) co
int Space::CheckIntegerBase(const std::wstring & value, const wchar_t ** save_ptr)
{
const wchar_t * ptr = SkipWhite(value.c_str());
int base = 10;
if( *ptr == '0' )
{
base = 8;
ptr += 1; // we can skip the first zero
}
else
if( *ptr == '-' && *(ptr+1) == '0' )
{
base = 8;
// ptr is pointing to '-', do not increment it here
}
*save_ptr = ptr;
return base;
}
unsigned int Space::ToUInt(const std::wstring & value)
{
const wchar_t * ptr;
int base = CheckIntegerBase(value, &ptr);
return Toui(ptr, base);
return Toui_b(value.c_str());
}
int Space::ToInt(const std::wstring & value)
{
const wchar_t * ptr;
int base = CheckIntegerBase(value, &ptr);
return Toi(ptr, base);
return Toi_b(value.c_str());
}
unsigned long Space::ToULong(const std::wstring & value)
{
const wchar_t * ptr;
int base = CheckIntegerBase(value, &ptr);
return Toul(ptr, base);
return Toul_b(value.c_str());
}
long Space::ToLong(const std::wstring & value)
{
const wchar_t * ptr;
int base = CheckIntegerBase(value, &ptr);
return Tol(ptr, base);
return Tol_b(value.c_str());
}
unsigned long long Space::ToULongLong(const std::wstring & value)
{
const wchar_t * ptr;
int base = CheckIntegerBase(value, &ptr);
return Toull(ptr, base);
return Toull_b(value.c_str());
}
long long Space::ToLongLong(const std::wstring & value)
{
const wchar_t * ptr;
int base = CheckIntegerBase(value, &ptr);
return Toll(ptr, base);
return Toll_b(value.c_str());
}
@@ -486,10 +450,12 @@ size_t Space::ToSize(const std::wstring & value)
bool Space::ToBool(const std::wstring & value)
{
// IMPROVE ME add support for trimming white chars?
return (EqualNoCase(value.c_str(), L"true") ||
EqualNoCase(value.c_str(), L"yes") ||
EqualNoCase(value.c_str(), L"1")
const wchar_t * str_begin = SkipWhite(value.c_str());
const wchar_t * str_end = SkipWhiteFromBack(str_begin);
return (EqualNoCase(str_begin, str_end, L"true") ||
EqualNoCase(str_begin, str_end, L"yes") ||
EqualNoCase(str_begin, str_end, L"1")
);
}
@@ -498,7 +464,7 @@ bool Space::ToBool(const std::wstring & value)
int Space::Int(const wchar_t * name, int def)
int Space::Int(const wchar_t * name, int def) const
{
tmp_name = name;
return Int(tmp_name, def);
@@ -507,9 +473,9 @@ int Space::Int(const wchar_t * name, int def)
int Space::Int(const std::wstring & name, int def)
int Space::Int(const std::wstring & name, int def) const
{
std::wstring * value = GetFirstValue(name);
const std::wstring * value = GetFirstValue(name);
if( value )
return ToInt(*value);
@@ -519,16 +485,16 @@ return def;
unsigned int Space::UInt(const wchar_t * name, unsigned int def)
unsigned int Space::UInt(const wchar_t * name, unsigned int def) const
{
tmp_name = name;
return UInt(tmp_name, def);
}
unsigned int Space::UInt(const std::wstring & name, unsigned int def)
unsigned int Space::UInt(const std::wstring & name, unsigned int def) const
{
std::wstring * value = GetFirstValue(name);
const std::wstring * value = GetFirstValue(name);
if( value )
return ToUInt(*value);
@@ -540,16 +506,16 @@ return def;
long Space::Long(const wchar_t * name, long def)
long Space::Long(const wchar_t * name, long def) const
{
tmp_name = name;
return Long(tmp_name, def);
}
long Space::Long(const std::wstring & name, long def)
long Space::Long(const std::wstring & name, long def) const
{
std::wstring * value = GetFirstValue(name);
const std::wstring * value = GetFirstValue(name);
if( value )
return ToLong(*value);
@@ -558,16 +524,16 @@ return def;
}
unsigned long Space::ULong(const wchar_t * name, unsigned long def)
unsigned long Space::ULong(const wchar_t * name, unsigned long def) const
{
tmp_name = name;
return ULong(tmp_name, def);
}
unsigned long Space::ULong(const std::wstring & name, unsigned long def)
unsigned long Space::ULong(const std::wstring & name, unsigned long def) const
{
std::wstring * value = GetFirstValue(name);
const std::wstring * value = GetFirstValue(name);
if( value )
return ToULong(*value);
@@ -577,15 +543,15 @@ return def;
long long Space::LongLong(const wchar_t * name, long long def)
long long Space::LongLong(const wchar_t * name, long long def) const
{
tmp_name = name;
return LongLong(tmp_name, def);
}
long long Space::LongLong(const std::wstring & name, long long def)
long long Space::LongLong(const std::wstring & name, long long def) const
{
std::wstring * value = GetFirstValue(name);
const std::wstring * value = GetFirstValue(name);
if( value )
return ToLongLong(*value);
@@ -593,15 +559,15 @@ long long Space::LongLong(const std::wstring & name, long long def)
return def;
}
unsigned long long Space::ULongLong(const wchar_t * name, unsigned long long def)
unsigned long long Space::ULongLong(const wchar_t * name, unsigned long long def) const
{
tmp_name = name;
return ULongLong(tmp_name, def);
}
unsigned long long Space::ULongLong(const std::wstring & name, unsigned long long def)
unsigned long long Space::ULongLong(const std::wstring & name, unsigned long long def) const
{
std::wstring * value = GetFirstValue(name);
const std::wstring * value = GetFirstValue(name);
if( value )
return ToULongLong(*value);
@@ -613,16 +579,16 @@ return def;
size_t Space::Size(const wchar_t * name, size_t def)
size_t Space::Size(const wchar_t * name, size_t def) const
{
tmp_name = name;
return Size(tmp_name, def);
}
size_t Space::Size(const std::wstring & name, size_t def)
size_t Space::Size(const std::wstring & name, size_t def) const
{
std::wstring * value = GetFirstValue(name);
const std::wstring * value = GetFirstValue(name);
if( value )
return ToSize(*value);
@@ -633,7 +599,7 @@ return def;
bool Space::Bool(const wchar_t * name, bool def)
bool Space::Bool(const wchar_t * name, bool def) const
{
tmp_name = name;
return Bool(tmp_name, def);
@@ -641,9 +607,9 @@ bool Space::Bool(const wchar_t * name, bool def)
bool Space::Bool(const std::wstring & name, bool def)
bool Space::Bool(const std::wstring & name, bool def) const
{
std::wstring * value = GetFirstValue(name);
const std::wstring * value = GetFirstValue(name);
if( value )
return ToBool(*value);
@@ -928,7 +894,7 @@ Space * Space::FindSpace(const wchar_t * name)
return spaces[i];
}
return 0;
return nullptr;
}
@@ -940,7 +906,7 @@ Space * Space::FindSpace(const std::wstring & name)
return spaces[i];
}
return 0;
return nullptr;
}
@@ -1042,6 +1008,8 @@ return c;
}
// IMPROVE ME
// move me to a better place
bool Space::EqualNoCase(const wchar_t * str1, const wchar_t * str2)
{
while( *str1 && *str2 && ToSmall(*str1) == ToSmall(*str2) )
@@ -1057,6 +1025,29 @@ return false;
}
/*
*
* the first string is trimmed
* str1_end is pointing one character after the last valid character
*
*/
// IMPROVE ME
// move me to a better place
bool Space::EqualNoCase(const wchar_t * str1_begin, const wchar_t * str1_end, const wchar_t * str2)
{
while( str1_begin < str1_end && *str2 && ToSmall(*str1_begin) == ToSmall(*str2) )
{
++str1_begin;
++str2;
}
if( str1_begin == str1_end && *str2 == 0 )
return true;
return false;
}
/*
those white characters here should be the same as in spaceparser.cpp
*/