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

Add location to error string in parse_* functions

Browse Source
This commit is contained in:
Quentin Khan
2019-02-26 14:45:08 +01:00
parent 2220efd682
commit d82814fc86
1 changed files with 16 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
toml/parser.hpp
View File

@@ -34,7 +34,7 @@ parse_boolean(location<Container>& loc)
} }
} }
loc.iter() = first; //rollback loc.iter() = first; //rollback
return err(std::string("[error] toml::parse_boolean: " return err(format_underline("[error] toml::parse_boolean: ", loc,
"the next token is not a boolean")); "the next token is not a boolean"));
} }
@@ -63,7 +63,7 @@ parse_binary_integer(location<Container>& loc)
return ok(std::make_pair(retval, token.unwrap())); return ok(std::make_pair(retval, token.unwrap()));
} }
loc.iter() = first; loc.iter() = first;
return err(std::string("[error] toml::parse_binary_integer:" return err(format_underline("[error] toml::parse_binary_integer:", loc,
"the next token is not an integer")); "the next token is not an integer"));
} }
@@ -84,7 +84,7 @@ parse_octal_integer(location<Container>& loc)
return ok(std::make_pair(retval, token.unwrap())); return ok(std::make_pair(retval, token.unwrap()));
} }
loc.iter() = first; loc.iter() = first;
return err(std::string("[error] toml::parse_octal_integer:" return err(format_underline("[error] toml::parse_octal_integer:", loc,
"the next token is not an integer")); "the next token is not an integer"));
} }
@@ -105,7 +105,7 @@ parse_hexadecimal_integer(location<Container>& loc)
return ok(std::make_pair(retval, token.unwrap())); return ok(std::make_pair(retval, token.unwrap()));
} }
loc.iter() = first; loc.iter() = first;
return err(std::string("[error] toml::parse_hexadecimal_integer" return err(format_underline("[error] toml::parse_hexadecimal_integer", loc,
"the next token is not an integer")); "the next token is not an integer"));
} }
@@ -133,7 +133,7 @@ parse_integer(location<Container>& loc)
return ok(std::make_pair(retval, token.unwrap())); return ok(std::make_pair(retval, token.unwrap()));
} }
loc.iter() = first; loc.iter() = first;
return err(std::string("[error] toml::parse_integer: " return err(format_underline("[error] toml::parse_integer: ", loc,
"the next token is not an integer")); "the next token is not an integer"));
} }
@@ -222,7 +222,7 @@ parse_floating(location<Container>& loc)
return ok(std::make_pair(v, token.unwrap())); return ok(std::make_pair(v, token.unwrap()));
} }
loc.iter() = first; loc.iter() = first;
return err(std::string("[error] toml::parse_floating: " return err(format_underline("[error] toml::parse_floating: ", loc,
"the next token is not a float")); "the next token is not a float"));
} }
@@ -283,7 +283,7 @@ result<std::string, std::string> parse_escape_sequence(location<Container>& loc)
const auto first = loc.iter(); const auto first = loc.iter();
if(first == loc.end() || *first != '\\') if(first == loc.end() || *first != '\\')
{ {
return err(std::string("[error]: toml::parse_escape_sequence: " return err(format_underline("[error]: toml::parse_escape_sequence: ", loc,
"the next token is not an escape sequence \"\\\"")); "the next token is not an escape sequence \"\\\""));
} }
++loc.iter(); ++loc.iter();
@@ -523,7 +523,7 @@ parse_string(location<Container>& loc)
if(const auto rslt = parse_ml_literal_string(loc)) {return rslt;} if(const auto rslt = parse_ml_literal_string(loc)) {return rslt;}
if(const auto rslt = parse_basic_string(loc)) {return rslt;} if(const auto rslt = parse_basic_string(loc)) {return rslt;}
if(const auto rslt = parse_literal_string(loc)) {return rslt;} if(const auto rslt = parse_literal_string(loc)) {return rslt;}
return err(std::string("[error] toml::parse_string: " return err(format_underline("[error] toml::parse_string: ", loc,
"the next token is not a string")); "the next token is not a string"));
} }
@@ -573,7 +573,7 @@ parse_local_date(location<Container>& loc)
else else
{ {
loc.iter() = first; loc.iter() = first;
return err(std::string("[error]: toml::parse_local_date: " return err(format_underline("[error]: toml::parse_local_date: ", loc,
"the next token is not a local_date")); "the next token is not a local_date"));
} }
} }
@@ -656,7 +656,7 @@ parse_local_time(location<Container>& loc)
else else
{ {
loc.iter() = first; loc.iter() = first;
return err(std::string("[error]: toml::parse_local_time: " return err(format_underline("[error]: toml::parse_local_time: ", loc,
"the next token is not a local_time")); "the next token is not a local_time"));
} }
} }
@@ -699,7 +699,7 @@ parse_local_datetime(location<Container>& loc)
else else
{ {
loc.iter() = first; loc.iter() = first;
return err(std::string("[error]: toml::parse_local_datetime: " return err(format_underline("[error]: toml::parse_local_datetime: ", loc,
"the next token is not a local_datetime")); "the next token is not a local_datetime"));
} }
} }
@@ -748,7 +748,7 @@ parse_offset_datetime(location<Container>& loc)
else else
{ {
loc.iter() = first; loc.iter() = first;
return err(std::string("[error]: toml::parse_offset_datetime: " return err(format_underline("[error]: toml::parse_offset_datetime: ", loc,
"the next token is not a local_datetime")); "the next token is not a local_datetime"));
} }
} }
@@ -768,7 +768,7 @@ result<key, std::string> parse_simple_key(location<Container>& loc)
{ {
return ok(bare.unwrap().str()); return ok(bare.unwrap().str());
} }
return err(std::string("[error] toml::parse_simple_key: " return err(format_underline("[error] toml::parse_simple_key: ", loc,
"the next token is not a simple key")); "the next token is not a simple key"));
} }
@@ -822,8 +822,7 @@ result<std::vector<key>, std::string> parse_key(location<Container>& loc)
{ {
return ok(std::vector<key>(1, smpl.unwrap())); return ok(std::vector<key>(1, smpl.unwrap()));
} }
return err(std::string("[error] toml::parse_key: " return err(format_underline("[error] toml::parse_key: ", loc, "is not a valid key"));
"the next token is not a key"));
} }
// forward-decl to implement parse_array and parse_table // forward-decl to implement parse_array and parse_table
@@ -1167,7 +1166,7 @@ parse_inline_table(location<Container>& loc)
table retval; table retval;
if(!(loc.iter() != loc.end() && *loc.iter() == '{')) if(!(loc.iter() != loc.end() && *loc.iter() == '{'))
{ {
return err(std::string("[error] toml::parse_inline_table: " return err(format_underline("[error] toml::parse_inline_table: ", loc,
"the next token is not an inline table")); "the next token is not an inline table"));
} }
++loc.iter(); ++loc.iter();
@@ -1228,7 +1227,7 @@ result<value, std::string> parse_value(location<Container>& loc)
const auto first = loc.iter(); const auto first = loc.iter();
if(first == loc.end()) if(first == loc.end())
{ {
return err(std::string("[error] toml::parse_value: input is empty")); return err(format_underline("[error] toml::parse_value: input is empty", loc, ""));
} }
if(auto r = parse_string (loc)) if(auto r = parse_string (loc))
{return ok(value(std::move(r.unwrap().first), std::move(r.unwrap().second)));} {return ok(value(std::move(r.unwrap().first), std::move(r.unwrap().second)));}