Commit 8d9c2bea authored by Niels's avatar Niels

+ applied style guide

parent 80b5db16
...@@ -24,4 +24,4 @@ after_success: ...@@ -24,4 +24,4 @@ after_success:
- make clean - make clean
- make json_unit CXXFLAGS="-fprofile-arcs -ftest-coverage" - make json_unit CXXFLAGS="-fprofile-arcs -ftest-coverage"
- ./json_unit - ./json_unit
- coveralls --exclude benchmark --exclude test --gcov-options '\-lp' --gcov 'gcov-4.8' - coveralls --exclude benchmark --exclude test --exclude header_only --gcov-options '\-lp' --gcov 'gcov-4.8'
...@@ -165,7 +165,10 @@ class json ...@@ -165,7 +165,10 @@ class json
/// dump the object (with pretty printer) /// dump the object (with pretty printer)
std::string dump(const bool, const unsigned int, unsigned int = 0) const noexcept; std::string dump(const bool, const unsigned int, unsigned int = 0) const noexcept;
/// replaced a character in a string with another string
void replaceChar(std::string& str, char c, const std::string& replacement) const;
/// escapes special characters to safely dump the string
std::string escapeString(const std::string&) const;
public: public:
/// explicit value conversion /// explicit value conversion
template<typename T> template<typename T>
...@@ -935,7 +938,7 @@ std::string json::dump(const bool prettyPrint, const unsigned int indentStep, ...@@ -935,7 +938,7 @@ std::string json::dump(const bool prettyPrint, const unsigned int indentStep,
{ {
case (value_type::string): case (value_type::string):
{ {
return std::string("\"") + *value_.string + "\""; return std::string("\"") + escapeString(*value_.string) + "\"";
} }
case (value_type::boolean): case (value_type::boolean):
...@@ -1032,6 +1035,50 @@ std::string json::dump(const bool prettyPrint, const unsigned int indentStep, ...@@ -1032,6 +1035,50 @@ std::string json::dump(const bool prettyPrint, const unsigned int indentStep,
} }
} }
/*!
Internal function to replace all occurrences of a character in a given string
with another string.
\param str the string that contains tokens to replace
\param c the character that needs to be replaced
\param replacement the string that is the replacement for the character
*/
void json::replaceChar(std::string& str, char c, const std::string& replacement)
const
{
size_t start_pos = 0;
while ((start_pos = str.find(c, start_pos)) != std::string::npos)
{
str.replace(start_pos, 1, replacement);
start_pos += replacement.length();
}
}
/*!
Escapes all special characters in the given string according to ECMA-404.
Necessary as some characters such as quotes, backslashes and so on
can't be used as is when dumping a string value.
\param str the string that should be escaped.
\return a copy of the given string with all special characters escaped.
*/
std::string json::escapeString(const std::string& str) const
{
std::string result(str);
// we first need to escape the backslashes as all other methods will insert
// legitimate backslashes into the result.
replaceChar(result, '\\', "\\\\");
// replace all other characters
replaceChar(result, '"', "\\\"");
replaceChar(result, '\n', "\\n");
replaceChar(result, '\r', "\\r");
replaceChar(result, '\f', "\\f");
replaceChar(result, '\b', "\\b");
replaceChar(result, '\t', "\\t");
return result;
}
/*! /*!
Serialization function for JSON objects. The function tries to mimick Python's Serialization function for JSON objects. The function tries to mimick Python's
\p json.dumps() function, and currently supports its \p indent parameter. \p json.dumps() function, and currently supports its \p indent parameter.
......
...@@ -598,10 +598,11 @@ with another string. ...@@ -598,10 +598,11 @@ with another string.
\param replacement the string that is the replacement for the character \param replacement the string that is the replacement for the character
*/ */
void json::replaceChar(std::string& str, char c, const std::string& replacement) void json::replaceChar(std::string& str, char c, const std::string& replacement)
const const
{ {
size_t start_pos = 0; size_t start_pos = 0;
while((start_pos = str.find(c, start_pos)) != std::string::npos) { while ((start_pos = str.find(c, start_pos)) != std::string::npos)
{
str.replace(start_pos, 1, replacement); str.replace(start_pos, 1, replacement);
start_pos += replacement.length(); start_pos += replacement.length();
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment