wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1074591 (part 2) - Remove Pointer{Element,Property}() from JSONWriter. r=froydnj.

Browse Source 
--HG--
extra : rebase_source : db07aa93df880e201eba866cb791ccaa245f0ef8
This commit is contained in:
Nicholas Nethercote 2014-10-02 18:01:32 -07:00
parent d18635e7ce
commit f322a5675d
2 changed files with 6 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
mfbt/JSONWriter.h
View File

@ -51,13 +51,12 @@
// w.NullProperty("null");
// w.BoolProperty("bool", true);
// w.IntProperty("int", 1);
// w.StringProperty("string", "hello");
// w.StartArrayProperty("array");
// {
// w.DoubleElement(3.4);
// w.StringElement("string");
// w.StartObjectElement();
// {
// w.PointerProperty("ptr", (void*)0x12345678);
// w.DoubleProperty("double", 3.4);
// w.StartArrayProperty("single-line array", w.SingleLineStyle);
// {
// w.IntElement(1);
@ -78,11 +77,10 @@
// "null": null,
// "bool": true,
// "int": 1,
// "string": "hello",
// "array": [
// 3.4,
// "string",
// {
// "ptr": "0x12345678",
// "double": 3.4,
// "single-line array": [1, {}]
// }
// ]
@ -422,19 +420,6 @@ public:
// Prints: "<aStr>"
void StringElement(const char* aStr) { StringProperty(nullptr, aStr); }
// Prints: "<aName>": "<aPtr>"
// The pointer is printed as a hexadecimal integer with a leading '0x'.
void PointerProperty(const char* aName, const void* aPtr)
{
char buf[32];
sprintf(buf, "0x%" PRIxPTR, uintptr_t(aPtr));
QuotedScalar(aName, buf);
}
// Prints: "<aPtr>"
// The pointer is printed as a hexadecimal integer with a leading '0x'.
void PointerElement(const void* aPtr) { PointerProperty(nullptr, aPtr); }
// Prints: "<aName>": [
void StartArrayProperty(const char* aName,
CollectionStyle aStyle = MultiLineStyle)

18
mfbt/tests/TestJSONWriter.cpp
View File

@ -70,9 +70,6 @@ void TestBasicProperties()
\"string2\": \"1234\",\n\
\"string3\": \"hello\",\n\
\"string4\": \"\\\" \\\\ \\u0007 \\b \\t \\n \\u000b \\f \\r\",\n\
\"ptr1\": \"0x0\",\n\
\"ptr2\": \"0xdeadbeef\",\n\
\"ptr3\": \"0xfacade\",\n\
\"len 0 array, multi-line\": [\n\
],\n\
\"len 0 array, single-line\": [],\n\
@ -127,10 +124,6 @@ void TestBasicProperties()
w.StringProperty("string3", "hello");
w.StringProperty("string4", "\" \\ \a \b \t \n \v \f \r");
w.PointerProperty("ptr1", (void*)0x0);
w.PointerProperty("ptr2", (void*)0xdeadbeef);
w.PointerProperty("ptr3", (void*)0xFaCaDe);
w.StartArrayProperty("len 0 array, multi-line", w.MultiLineStyle);
w.EndArray();
@ -235,9 +228,6 @@ void TestBasicElements()
\"1234\",\n\
\"hello\",\n\
\"\\\" \\\\ \\u0007 \\b \\t \\n \\u000b \\f \\r\",\n\
\"0x0\",\n\
\"0xdeadbeef\",\n\
\"0xfacade\",\n\
[\n\
],\n\
[],\n\
@ -294,10 +284,6 @@ void TestBasicElements()
w.StringElement("hello");
w.StringElement("\" \\ \a \b \t \n \v \f \r");
w.PointerElement((void*)0x0);
w.PointerElement((void*)0xdeadbeef);
w.PointerElement((void*)0xFaCaDe);
w.StartArrayElement();
w.EndArray();
@ -436,7 +422,7 @@ void TestStringEscaping()
\"\xD5\xA2\xD5\xA1\xD6\x80\xD5\xA5\xD6\x82 \xD5\xB9\xD5\xAF\xD5\xA1\": -123,\n\
\"\xE4\xBD\xA0\xE5\xA5\xBD\": 1.234,\n\
\"\xCE\xB3\xCE\xB5\xCE\xB9\xCE\xB1 \xCE\xB5\xCE\xBA\xCE\xB5\xCE\xAF\": \"\xD8\xB3\xD9\x84\xD8\xA7\xD9\x85\",\n\
\"hall\xC3\xB3 \xC3\xBE" "arna\": \"0x1234\",\n\
\"hall\xC3\xB3 \xC3\xBE" "arna\": 4660,\n\
\"\xE3\x81\x93\xE3\x82\x93\xE3\x81\xAB\xE3\x81\xA1\xE3\x81\xAF\": {\n\
\"\xD0\xBF\xD1\x80\xD0\xB8\xD0\xB2\xD0\xB5\xD1\x82\": [\n\
]\n\
@ -462,7 +448,7 @@ void TestStringEscaping()
w.IntProperty("\xD5\xA2\xD5\xA1\xD6\x80\xD5\xA5\xD6\x82 \xD5\xB9\xD5\xAF\xD5\xA1", -123);
w.DoubleProperty("\xE4\xBD\xA0\xE5\xA5\xBD", 1.234);
w.StringProperty("\xCE\xB3\xCE\xB5\xCE\xB9\xCE\xB1 \xCE\xB5\xCE\xBA\xCE\xB5\xCE\xAF", "\xD8\xB3\xD9\x84\xD8\xA7\xD9\x85");
w.PointerProperty("hall\xC3\xB3 \xC3\xBE" "arna", (void*)0x1234);
w.IntProperty("hall\xC3\xB3 \xC3\xBE" "arna", 0x1234);
w.StartObjectProperty("\xE3\x81\x93\xE3\x82\x93\xE3\x81\xAB\xE3\x81\xA1\xE3\x81\xAF");
{
w.StartArrayProperty("\xD0\xBF\xD1\x80\xD0\xB8\xD0\xB2\xD0\xB5\xD1\x82");