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

restore parser and test

Browse Source
This commit is contained in:
ToruNiina
2017-05-17 14:07:34 +09:00
parent 430940f766 d77ec7dc88
commit 2c92142d5c
2 changed files with 30 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
toml/parser.hpp
View File

@@ -7,8 +7,6 @@
#include <iostream>
#include <fstream>
#include <sstream>
#include <codecvt>
#include <locale>
namespace toml
{
@@ -1058,40 +1056,6 @@ struct parse_data
};
#ifdef _MSC_VER
template<typename traits = std::char_traits<wchar_t>>
toml::Table parse(std::basic_istream<wchar_t, traits>& is)
{
const auto curloc = is.getloc();
is.imbue(std::locale(std::locale::empty(), new std::codecvt_utf8<wchar_t>));
const auto initial = is.tellg();
is.seekg(0, std::ios::end);
const auto eofpos = is.tellg();
const std::size_t size = eofpos - initial;
is.seekg(initial);
std::vector<wchar_t> contents(size);
is.read(contents.data(), size);
is.imbue(curloc);
std::wstring wstr(size, ' ');
std::copy(contents.cbegin(), contents.cend(), wstr.begin());
std::wstring_convert<std::codecvt_utf8<wchar_t>, wchar_t> cvter;
std::string u8str = cvter.to_bytes(wstr);
return parse_data::invoke(u8str.cbegin(), u8str.cend());
}
toml::Table parse(const std::string& filename)
{
std::wifstream ifs(filename);
if(!ifs.good()) throw std::runtime_error("file open error: " + filename);
return parse(ifs);
}
#else
template<typename traits = std::char_traits<toml::character>>
toml::Table parse(std::basic_istream<toml::character, traits>& is)
{
@@ -1111,8 +1075,6 @@ toml::Table parse(const std::string& filename)
if(!ifs.good()) throw std::runtime_error("file open error: " + filename);
return parse(ifs);
}
#endif
}// toml
#endif// TOML11_PARSER