code: C++/modules/Json/Json.cpp comparison

Json: escape string construct a new string

author	David Demelier <markand@malikania.fr>
date	Mon, 02 Nov 2015 13:46:56 +0100
parents	f5e62f6c1475
children	b681299e6987

comparison

equal deleted inserted replaced

-:f5b491a14a28
+:902b034df6e3
 Document::Document(File file)
 {
 	m_value = convert(json_load_file, file.path.c_str(), 0);
 }
-std::string escape(std::string value) noexcept
+std::string escape(const std::string &value)
 {
+	std::string result;
 	for (auto it = value.begin(); it != value.end(); ++it) {
 		switch (*it) {
 		case '\\':
+			result += "\\\\";
+			break;
 		case '/':
+			result += "\\/";
+			break;
 		case '"':
-			it = value.insert(it, '\\');
+			result += "\\\"";
-			it++;
 			break;
 		case '\b':
-			value.replace(it, it + 1, "\\b");
+			result += "\\b";
-			it += 1;
 			break;
 		case '\f':
-			value.replace(it, it + 1, "\\f");
+			result += "\\f";
-			it += 1;
 			break;
 		case '\n':
-			value.replace(it, it + 1, "\\n");
+			result += "\\n";
-			it += 1;
 			break;
 		case '\r':
-			value.replace(it, it + 1, "\\r");
+			result += "\\r";
-			it += 1;
 			break;
 		case '\t':
-			value.replace(it, it + 1, "\\t");
+			result += "\\t";
-			it += 1;
 			break;
 		default:
+			result += *it;
 			break;
 		}
 	}
-	return value;
+	return result;
 }
 } // !json

Mercurial > code