Fixed build issues (not done yet)

Artur Laksberg · Artur Laksberg · commit 5ab488e08fe0 · 2013-12-02T23:53:32.000-08:00
One json test (to_string_escaped_chars) still fails.
diff --git a/Release/src/json/json_parsing.cpp b/Release/src/json/json_parsing.cpp
@@ -810,21 +810,21 @@ bool JSON_StringParser<CharType>::CompleteStringLiteral(typename JSON_Parser<Cha
 }
 
 template <typename CharType>
-bool JSON_StringParser<CharType>::finish_parsing_string_with_unescape_char(Token &token)
+bool JSON_StringParser<CharType>::finish_parsing_string_with_unescape_char(typename JSON_Parser<CharType>::Token &token)
 {
     // This function handles parsing the string when an unescape character is encountered.
     // It is called once the part before the unescape char is copied to the token.spelling string
 
     CharType ch;
 
-    if (!handle_unescape_char(token))
+    if (!JSON_StringParser<CharType>::handle_unescape_char(token))
         return false;
 
     while ((ch = JSON_StringParser<CharType>::NextCharacter()) != '"')
     {
         if (ch == '\\')
         {
-            if (!handle_unescape_char(token))
+            if (!JSON_StringParser<CharType>::handle_unescape_char(token))
                 return false;
         }
         else
@@ -836,7 +836,7 @@ bool JSON_StringParser<CharType>::finish_parsing_string_with_unescape_char(Token
         }
     }
 
-    token.kind = Token::TKN_StringLiteral;
+    token.kind = JSON_StringParser<CharType>::Token::TKN_StringLiteral;
     token.end.m_column = this->m_currentColumn;
     token.end.m_line = this->m_currentLine;
 
diff --git a/Release/src/json/json_serialization.cpp b/Release/src/json/json_serialization.cpp
@@ -154,7 +154,7 @@ void web::json::details::_Number::format(std::basic_string<char>& stream) const
         _itoa_s(m_intval, tempBuffer, tempSize, 10);
         const auto numChars = strnlen_s(tempBuffer, tempSize);
 #else
-        const auto numChars = std::snprintf(tempBuffer, tempSize, "i", m_value);
+        const auto numChars = std::snprintf(tempBuffer, tempSize, "%i", m_intval);
 #endif
         stream.append(tempBuffer, numChars);
     }
@@ -263,7 +263,7 @@ bool web::json::details::_String::has_escape_chars(const _String &str)
 {
 	if (str.is_wide())
 	{
-		const wchar_t *escapes = L"\"\\\b\f\r\n\t";
+		const utf16char *escapes = u"\"\\\b\f\r\n\t";
 		return str.m_wstring->find_first_of(escapes) != std::wstring::npos;
 	}
 	else
@@ -382,7 +382,7 @@ bool json::value::operator==(const json::value &other) const
     case Array:
         return static_cast<const json::details::_Array*>(this->m_value.get())->is_equal(static_cast<const json::details::_Array*>(other.m_value.get()));
     }
-    return false;
+    UNREACHABLE;
 }
             
 web::json::value& web::json::value::operator [] (const utility::string_t &key)

Original file line number	Diff line number	Diff line change
`@@ -810,21 +810,21 @@ bool JSON_StringParser<CharType>::CompleteStringLiteral(typename JSON_Parser<Cha`
`810`	`810`	`}`
`811`	`811`
`812`	`812`	`template <typename CharType>`
`813`		`-bool JSON_StringParser<CharType>::finish_parsing_string_with_unescape_char(Token &token)`
	`813`	`+bool JSON_StringParser<CharType>::finish_parsing_string_with_unescape_char(typename JSON_Parser<CharType>::Token &token)`
`814`	`814`	`{`
`815`	`815`	`// This function handles parsing the string when an unescape character is encountered.`
`816`	`816`	`// It is called once the part before the unescape char is copied to the token.spelling string`
`817`	`817`
`818`	`818`	`CharType ch;`
`819`	`819`
`820`		`- if (!handle_unescape_char(token))`
	`820`	`+ if (!JSON_StringParser<CharType>::handle_unescape_char(token))`
`821`	`821`	`return false;`
`822`	`822`
`823`	`823`	`while ((ch = JSON_StringParser<CharType>::NextCharacter()) != '"')`
`824`	`824`	`{`
`825`	`825`	`if (ch == '\\')`
`826`	`826`	`{`
`827`		`- if (!handle_unescape_char(token))`
	`827`	`+ if (!JSON_StringParser<CharType>::handle_unescape_char(token))`
`828`	`828`	`return false;`
`829`	`829`	`}`
`830`	`830`	`else`
`@@ -836,7 +836,7 @@ bool JSON_StringParser<CharType>::finish_parsing_string_with_unescape_char(Token`
`836`	`836`	`}`
`837`	`837`	`}`
`838`	`838`
`839`		`- token.kind = Token::TKN_StringLiteral;`
	`839`	`+ token.kind = JSON_StringParser<CharType>::Token::TKN_StringLiteral;`
`840`	`840`	`token.end.m_column = this->m_currentColumn;`
`841`	`841`	`token.end.m_line = this->m_currentLine;`
`842`	`842`
Original file line number	Diff line number	Diff line change
`@@ -154,7 +154,7 @@ void web::json::details::_Number::format(std::basic_string<char>& stream) const`
`154`	`154`	`_itoa_s(m_intval, tempBuffer, tempSize, 10);`
`155`	`155`	`const auto numChars = strnlen_s(tempBuffer, tempSize);`
`156`	`156`	`#else`
`157`		`- const auto numChars = std::snprintf(tempBuffer, tempSize, "i", m_value);`
	`157`	`+ const auto numChars = std::snprintf(tempBuffer, tempSize, "%i", m_intval);`
`158`	`158`	`#endif`
`159`	`159`	`stream.append(tempBuffer, numChars);`
`160`	`160`	`}`
`@@ -263,7 +263,7 @@ bool web::json::details::_String::has_escape_chars(const _String &str)`
`263`	`263`	`{`
`264`	`264`	`if (str.is_wide())`
`265`	`265`	`{`
`266`		`- const wchar_t *escapes = L"\"\\\b\f\r\n\t";`
	`266`	`+ const utf16char *escapes = u"\"\\\b\f\r\n\t";`
`267`	`267`	`return str.m_wstring->find_first_of(escapes) != std::wstring::npos;`
`268`	`268`	`}`
`269`	`269`	`else`
`@@ -382,7 +382,7 @@ bool json::value::operator==(const json::value &other) const`
`382`	`382`	`case Array:`
`383`	`383`	`return static_cast<const json::details::_Array>(this->m_value.get())->is_equal(static_cast<const json::details::_Array>(other.m_value.get()));`
`384`	`384`	`}`
`385`		`- return false;`
	`385`	`+ UNREACHABLE;`
`386`	`386`	`}`
`387`	`387`
`388`	`388`	`web::json::value& web::json::value::operator [] (const utility::string_t &key)`