wt/json
1
0 Fork 0
mirror of https://github.com/nlohmann/json.git synced 2026-11-06 15:51:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

🔨 cleaner exception interface

Browse Source
This commit is contained in:
Niels Lohmann committed 2018-03-11 22:47:25 +01:00
1 parent ad47b0fbde
commit 3d4f6a2940
6 files changed
+73 -60
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

include/nlohmann/detail/input/parser.hpp
+9 -8
View File
@@ -117,7 +117,7 @@ class parser
{
sdp.parse_error(m_lexer.get_position(),
m_lexer.get_token_string(),
exception_message(token_type::end_of_input));
parse_error::create(101, m_lexer.get_position(), exception_message(token_type::end_of_input)));
}
// in case of an error, return discarded value
@@ -456,7 +456,7 @@ class parser
{
return sax->parse_error(m_lexer.get_position(),
m_lexer.get_token_string(),
exception_message(token_type::value_string));
parse_error::create(101, m_lexer.get_position(), exception_message(token_type::value_string)));
}
else
{
@@ -472,7 +472,7 @@ class parser
{
return sax->parse_error(m_lexer.get_position(),
m_lexer.get_token_string(),
exception_message(token_type::name_separator));
parse_error::create(101, m_lexer.get_position(), exception_message(token_type::name_separator)));
}
// parse value
@@ -499,7 +499,8 @@ class parser
{
return sax->parse_error(m_lexer.get_position(),
m_lexer.get_token_string(),
exception_message(token_type::end_object));
parse_error::create(101, m_lexer.get_position(), exception_message(token_type::end_object)));
}
}
}
@@ -546,7 +547,7 @@ class parser
{
return sax->parse_error(m_lexer.get_position(),
m_lexer.get_token_string(),
exception_message(token_type::end_array));
parse_error::create(101, m_lexer.get_position(), exception_message(token_type::end_array)));
}
}
}
@@ -559,7 +560,7 @@ class parser
{
return sax->parse_error(m_lexer.get_position(),
m_lexer.get_token_string(),
"number overflow");
out_of_range::create(406, "number overflow parsing '" + m_lexer.get_token_string() + "'"));
}
else
{
@@ -602,14 +603,14 @@ class parser
// using "uninitialized" to avoid "expected" message
return sax->parse_error(m_lexer.get_position(),
m_lexer.get_token_string(),
exception_message(token_type::uninitialized));
parse_error::create(101, m_lexer.get_position(), exception_message(token_type::uninitialized)));
}
default: // the last token was unexpected
{
return sax->parse_error(m_lexer.get_position(),
m_lexer.get_token_string(),
exception_message(token_type::literal_or_value));
parse_error::create(101, m_lexer.get_position(), exception_message(token_type::literal_or_value)));
}
}
}