zhangyiss/toml11
1
0
Fork 0
mirror of https://github.com/ToruNiina/toml11.git synced 2025-09-17 09:08:08 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

remove static and indent

Browse Source
This commit is contained in:
ToruNiina
2017-05-13 15:00:02 +09:00
parent 95e48744d1
commit eb9f4dce1e
1 changed files with 28 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
toml/format.hpp
View File

@@ -5,6 +5,7 @@
#include <sstream> #include <sstream>
#include <iostream> #include <iostream>
#include <iomanip> #include <iomanip>
#include <locale>
namespace toml namespace toml
{ {
@@ -79,12 +80,9 @@ template<> struct format_impl<value_t::String>
typedef detail::toml_default_type<value_t::String>::type type; typedef detail::toml_default_type<value_t::String>::type type;
std::size_t max_length; std::size_t max_length;
std::size_t indent_length;
format_impl() : max_length(80), indent_length(0){} format_impl() : max_length(80){}
format_impl(std::size_t mx) : max_length(mx), indent_length(0){} format_impl(std::size_t mx) : max_length(mx){}
format_impl(std::size_t mx, std::size_t idt)
: max_length(mx), indent_length(std::min(mx, idt)){}
std::basic_string<toml::charactor> std::basic_string<toml::charactor>
operator()(const type& val) operator()(const type& val)
@@ -117,8 +115,10 @@ template<> struct format_impl<value_t::String>
{ {
str += 'u'; str += 'u';
std::basic_ostringstream<toml::charactor> oss; std::basic_ostringstream<toml::charactor> oss;
oss << std::setw(4) << std::fill(0) << std::hex oss << std::setw(4) << std::setfill('0') << std::hex
<< static_cast<std::int8_t>(c); << static_cast<std::int8_t>(c);
auto hexdig = oss.str();
std::transform(hexdig.begin(), hexdig.end(), std::toupper);
str += oss.str(); str += oss.str();
break; break;
} }
@@ -145,28 +145,27 @@ template<> struct format_impl<value_t::String>
convert_multiline(std::basic_string<toml::charactor>&& val) convert_multiline(std::basic_string<toml::charactor>&& val)
{ {
std::basic_string<toml::charactor> str; str.reserve(val.size() + 6); std::basic_string<toml::charactor> str; str.reserve(val.size() + 6);
std::basic_string<toml::charactor> indent(' ', indent_length); str += "\"\"\"\n";
str += "\"\"\"\n" + indent; std::size_t current = 0;
std::size_t current = indent_length;
for(auto iter = val.begin()+1; iter != val.end()-1; ++iter) for(auto iter = val.begin()+1; iter != val.end()-1; ++iter)
{ {
if(*iter != '\\') if(*iter != '\\')
{ {
if(current + 1 == max_length){str += "\\\n"; str += indent;} if(current + 1 == max_length) str += "\\\n";
str += *iter; continue; str += *iter; continue;
} }
assert(std::next(iter) < val.end()-1); assert(std::next(iter) < val.end()-1);
if(*std::next(iter) == 'u') if(*std::next(iter) == 'u')
{ {
if(current + 5 == max_length){str += "\\\n"; str += indent;} if(current + 5 == max_length) str += "\\\n";
assert(iter + 5 < val.end()-1); assert(iter + 5 < val.end()-1);
str += *iter; ++iter; // u str += *iter; ++iter; // u
str += *iter; ++iter; // 0 str += *iter; ++iter; // 0
str += *iter; ++iter; // 0 str += *iter; ++iter; // 1
str += *iter; ++iter; // 0 str += *iter; ++iter; // 2
str += *iter; continue;// 0 str += *iter; continue;// 3
} }
if(current + 2 == max_length){str += "\\\n"; str += indent;} if(current + 2 == max_length) str += "\\\n";
str += *iter; ++iter; str += *iter; str += *iter; ++iter; str += *iter;
} }
str += "\"\"\""; str += "\"\"\"";
@@ -194,7 +193,6 @@ template<> struct format_impl<value_t::Array>
typedef detail::toml_default_type<value_t::Array>::type type; typedef detail::toml_default_type<value_t::Array>::type type;
std::size_t max_length; std::size_t max_length;
std::size_t indent_length;
std::basic_string<toml::charactor> std::basic_string<toml::charactor>
operator()(const type& val) operator()(const type& val)
@@ -203,7 +201,7 @@ template<> struct format_impl<value_t::Array>
retval += '['; retval += '[';
for(const auto&& item : val) for(const auto&& item : val)
{ {
auto tmp = format(val, max_length, indent_length); auto tmp = format(val, max_length - 1);
retval += tmp; retval += tmp;
retval += ", "; retval += ", ";
if(tmp.size() * 2 > max_length) retval += '\n'; if(tmp.size() * 2 > max_length) retval += '\n';
@@ -218,8 +216,8 @@ template<> struct format_impl<value_t::Table>
{ {
typedef detail::toml_default_type<value_t::Table>::type type; typedef detail::toml_default_type<value_t::Table>::type type;
static std::basic_string<toml::charactor> std::basic_string<toml::charactor>
invoke(const type& val) operator()(const type& val)
{ {
std::basic_string<toml::charactor> retval; std::basic_string<toml::charactor> retval;
for(const auto&& item : val) for(const auto&& item : val)
@@ -239,15 +237,15 @@ format(const value& v)
{ {
switch(v.type()) switch(v.type())
{ {
case value_t::Boolean : return format_impl<value_t::Boolean >::invoke(v.template cast<value_t::Boolean >()); case value_t::Boolean : return format_impl<value_t::Boolean >{}(v.template cast<value_t::Boolean >());
case value_t::Integer : return format_impl<value_t::Integer >::invoke(v.template cast<value_t::Integer >()); case value_t::Integer : return format_impl<value_t::Integer >{}(v.template cast<value_t::Integer >());
case value_t::Float : return format_impl<value_t::Float >::invoke(v.template cast<value_t::Float >()); case value_t::Float : return format_impl<value_t::Float >{}(v.template cast<value_t::Float >());
case value_t::String : return format_impl<value_t::String >::invoke(v.template cast<value_t::String >()); case value_t::String : return format_impl<value_t::String >{}(v.template cast<value_t::String >());
case value_t::Datetime: return format_impl<value_t::Datetime>::invoke(v.template cast<value_t::Datetime>()); case value_t::Datetime: return format_impl<value_t::Datetime>{}(v.template cast<value_t::Datetime>());
case value_t::Array : return format_impl<value_t::Array >::invoke(v.template cast<value_t::Array >()); case value_t::Array : return format_impl<value_t::Array >{}(v.template cast<value_t::Array >());
case value_t::Table : return format_impl<value_t::Table >::invoke(v.template cast<value_t::Table >()); case value_t::Table : return format_impl<value_t::Table >{}(v.template cast<value_t::Table >());
case value_t::Empty : return format_impl<value_t::Empty >::invoke(v.template cast<value_t::Empty >()); case value_t::Empty : return format_impl<value_t::Empty >{}(v.template cast<value_t::Empty >());
case value_t::Unknown : return format_impl<value_t::Unknown >::invoke(v.template cast<value_t::Unknown >()); case value_t::Unknown : return format_impl<value_t::Unknown >{}(v.template cast<value_t::Unknown >());
default throw std::logic_error("toml::format: unknown enum value"); default throw std::logic_error("toml::format: unknown enum value");
} }
} }