26592 2009-06-21 16:16:45 -0700 Support standard toJSON functions 2009-06-21 23:36:10 -0700 1 1 1 Unclassified WebKit JavaScriptCore 528+ (Nightly build) Mac OS X 10.5 RESOLVED FIXED P2 Normal --- 26594 20031 1 oliver oliver arv oldest_to_newest 127260 0 oliver 2009-06-21 16:16:45 -0700 ES5 defines toJSON functions on a number of standard objects. For complete JSON support we need to implement these. 127265 1 arv 2009-06-21 17:49:38 -0700 Note that Boolean.prototype.toJSON, Number.prototype.toJSON and String.prototype.toJSON have been deleted from the spec. See section "15.12.3 JSON.stringify" at http://wiki.ecmascript.org/lib/exe/fetch.php?id=es3.1%3Aes3.1_proposal_working_draft&cache=cache&media=es3.1:es5_candidate_errata_june_17.pdf 127285 2 31634 oliver 2009-06-21 22:41:49 -0700 Created attachment 31634 Support Date.toJSON 127286 3 31634 darin 2009-06-21 22:45:37 -0700 Comment on attachment 31634 Support Date.toJSON > + JSValue toISOValue = object->get(exec, Identifier(exec, "toISOString")); Should we make toISOString a common identifier? > + if (!toISOValue.isObject()) > + return throwError(exec, TypeError, "toISOString is not a function"); > + > + JSObject* toISO = asObject(toISOValue); > + CallData callData; > + CallType callType = toISO->getCallData(callData); > + if (callType == CallTypeNone) > + return throwError(exec, TypeError, "toISOString is not a function"); You should just use the JSValue version of getCallData, which does the same thing as above. You could do the asObject() cast in the call. You should add a test case that returns a string wrapper, since that's an easy case to get wrong. r=me 127292 4 oliver 2009-06-21 23:36:10 -0700 Committing to http://svn.webkit.org/repository/webkit/trunk ... M JavaScriptCore/ChangeLog M JavaScriptCore/runtime/CommonIdentifiers.h M JavaScriptCore/runtime/DatePrototype.cpp M LayoutTests/ChangeLog M LayoutTests/fast/js/JSON-stringify-expected.txt M LayoutTests/fast/js/resources/JSON-stringify.js Committed r44931 31634 2009-06-21 22:41:49 -0700 2009-06-21 22:45:37 -0700 Support Date.toJSON Date.toJSON.patch text/plain 6349 oliver ZGlmZiAtLWdpdCBhL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZyBiL0phdmFTY3JpcHRDb3JlL0No YW5nZUxvZwppbmRleCA0MzQxNjU1Li4xMTQ1OGZlIDEwMDY0NAotLS0gYS9KYXZhU2NyaXB0Q29y ZS9DaGFuZ2VMb2cKKysrIGIvSmF2YVNjcmlwdENvcmUvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMTcg QEAKIDIwMDktMDYtMjEgIE9saXZlciBIdW50ICA8b2xpdmVyQGFwcGxlLmNvbT4KIAorICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBCdWcgMjY1OTI6IFN1cHBv cnQgc3RhbmRhcmQgdG9KU09OIGZ1bmN0aW9ucworICAgICAgICA8aHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTI2NTkyPgorCisgICAgICAgIEFkZCBzdXBwb3J0IGZvciB0 aGUgc3RhbmRhcmQgRGF0ZS50b0pTT04gZnVuY3Rpb24uCisKKyAgICAgICAgKiBydW50aW1lL0Rh dGVQcm90b3R5cGUuY3BwOgorICAgICAgICAoSlNDOjpkYXRlUHJvdG9GdW5jVG9KU09OKToKKwor MjAwOS0wNi0yMSAgT2xpdmVyIEh1bnQgIDxvbGl2ZXJAYXBwbGUuY29tPgorCiAgICAgICAgIFJl dmlld2VkIGJ5IFNhbSBXZWluaWcuCiAKICAgICAgICAgQnVnIDI2NTk0OiBKU0MgbmVlZHMgdG8g c3VwcG9ydCBEYXRlLnRvSVNPU3RyaW5nCmRpZmYgLS1naXQgYS9KYXZhU2NyaXB0Q29yZS9ydW50 aW1lL0RhdGVQcm90b3R5cGUuY3BwIGIvSmF2YVNjcmlwdENvcmUvcnVudGltZS9EYXRlUHJvdG90 eXBlLmNwcAppbmRleCAwOTgzNzljLi5kYjViODcwIDEwMDY0NAotLS0gYS9KYXZhU2NyaXB0Q29y ZS9ydW50aW1lL0RhdGVQcm90b3R5cGUuY3BwCisrKyBiL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUv RGF0ZVByb3RvdHlwZS5jcHAKQEAgLTExNSw2ICsxMTUsOCBAQCBzdGF0aWMgSlNWYWx1ZSBKU0Nf SE9TVF9DQUxMIGRhdGVQcm90b0Z1bmNUb1RpbWVTdHJpbmcoRXhlY1N0YXRlKiwgSlNPYmplY3Qq LCBKUwogc3RhdGljIEpTVmFsdWUgSlNDX0hPU1RfQ0FMTCBkYXRlUHJvdG9GdW5jVG9VVENTdHJp bmcoRXhlY1N0YXRlKiwgSlNPYmplY3QqLCBKU1ZhbHVlLCBjb25zdCBBcmdMaXN0Jik7CiBzdGF0 aWMgSlNWYWx1ZSBKU0NfSE9TVF9DQUxMIGRhdGVQcm90b0Z1bmNUb0lTT1N0cmluZyhFeGVjU3Rh dGUqLCBKU09iamVjdCosIEpTVmFsdWUsIGNvbnN0IEFyZ0xpc3QmKTsKIAorc3RhdGljIEpTVmFs dWUgSlNDX0hPU1RfQ0FMTCBkYXRlUHJvdG9GdW5jVG9KU09OKEV4ZWNTdGF0ZSosIEpTT2JqZWN0 KiwgSlNWYWx1ZSwgY29uc3QgQXJnTGlzdCYpOworCiB9CiAKICNpbmNsdWRlICJEYXRlUHJvdG90 eXBlLmx1dC5oIgpAQCAtMzg3LDYgKzM4OSw3IEBAIGNvbnN0IENsYXNzSW5mbyBEYXRlUHJvdG90 eXBlOjppbmZvID0geyJEYXRlIiwgJkRhdGVJbnN0YW5jZTo6aW5mbywgMCwgRXhlY1N0YXRlCiAg IHNldFVUQ0Z1bGxZZWFyICAgICAgICBkYXRlUHJvdG9GdW5jU2V0VVRDRnVsbFllYXIgICAgICAg ICAgRG9udEVudW18RnVuY3Rpb24gICAgICAgMwogICBzZXRZZWFyICAgICAgICAgICAgICAgZGF0 ZVByb3RvRnVuY1NldFllYXIgICAgICAgICAgICAgICAgIERvbnRFbnVtfEZ1bmN0aW9uICAgICAg IDEKICAgZ2V0WWVhciAgICAgICAgICAgICAgIGRhdGVQcm90b0Z1bmNHZXRZZWFyICAgICAgICAg ICAgICAgICBEb250RW51bXxGdW5jdGlvbiAgICAgICAwCisgIHRvSlNPTiAgICAgICAgICAgICAg ICBkYXRlUHJvdG9GdW5jVG9KU09OICAgICAgICAgICAgICAgICAgRG9udEVudW18RnVuY3Rpb24g ICAgICAgMAogQGVuZAogKi8KIApAQCAtMTA3Niw0ICsxMDc5LDMxIEBAIEpTVmFsdWUgSlNDX0hP U1RfQ0FMTCBkYXRlUHJvdG9GdW5jR2V0WWVhcihFeGVjU3RhdGUqIGV4ZWMsIEpTT2JqZWN0Kiwg SlNWYWx1ZSB0CiAgICAgcmV0dXJuIGpzTnVtYmVyKGV4ZWMsIHQueWVhcik7CiB9CiAKK0pTVmFs dWUgSlNDX0hPU1RfQ0FMTCBkYXRlUHJvdG9GdW5jVG9KU09OKEV4ZWNTdGF0ZSogZXhlYywgSlNP YmplY3QqLCBKU1ZhbHVlIHRoaXNWYWx1ZSwgY29uc3QgQXJnTGlzdCYpCit7CisgICAgSlNPYmpl Y3QqIG9iamVjdCA9IHRoaXNWYWx1ZS50b1RoaXNPYmplY3QoZXhlYyk7CisgICAgaWYgKGV4ZWMt PmhhZEV4Y2VwdGlvbigpKQorICAgICAgICByZXR1cm4ganNOdWxsKCk7CisgICAgCisgICAgSlNW YWx1ZSB0b0lTT1ZhbHVlID0gb2JqZWN0LT5nZXQoZXhlYywgSWRlbnRpZmllcihleGVjLCAidG9J U09TdHJpbmciKSk7CisgICAgaWYgKGV4ZWMtPmhhZEV4Y2VwdGlvbigpKQorICAgICAgICByZXR1 cm4ganNOdWxsKCk7CisgICAgCisgICAgaWYgKCF0b0lTT1ZhbHVlLmlzT2JqZWN0KCkpCisgICAg ICAgIHJldHVybiB0aHJvd0Vycm9yKGV4ZWMsIFR5cGVFcnJvciwgInRvSVNPU3RyaW5nIGlzIG5v dCBhIGZ1bmN0aW9uIik7CisgICAgCisgICAgSlNPYmplY3QqIHRvSVNPID0gYXNPYmplY3QodG9J U09WYWx1ZSk7CisgICAgQ2FsbERhdGEgY2FsbERhdGE7CisgICAgQ2FsbFR5cGUgY2FsbFR5cGUg PSB0b0lTTy0+Z2V0Q2FsbERhdGEoY2FsbERhdGEpOworICAgIGlmIChjYWxsVHlwZSA9PSBDYWxs VHlwZU5vbmUpCisgICAgICAgIHJldHVybiB0aHJvd0Vycm9yKGV4ZWMsIFR5cGVFcnJvciwgInRv SVNPU3RyaW5nIGlzIG5vdCBhIGZ1bmN0aW9uIik7CisKKyAgICBKU1ZhbHVlIHJlc3VsdCA9IGNh bGwoZXhlYywgdG9JU08sIGNhbGxUeXBlLCBjYWxsRGF0YSwgb2JqZWN0LCBleGVjLT5lbXB0eUxp c3QoKSk7CisgICAgaWYgKGV4ZWMtPmhhZEV4Y2VwdGlvbigpKQorICAgICAgICByZXR1cm4ganNO dWxsKCk7CisgICAgaWYgKHJlc3VsdC5pc09iamVjdCgpKQorICAgICAgICByZXR1cm4gdGhyb3dF cnJvcihleGVjLCBUeXBlRXJyb3IsICJ0b0lTT1N0cmluZyBkaWQgbm90IHJldHVybiBhIHByaW1p dGl2ZSB2YWx1ZSIpOworICAgIHJldHVybiByZXN1bHQ7Cit9CisKIH0gLy8gbmFtZXNwYWNlIEpT QwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMvQ2hhbmdl TG9nCmluZGV4IDQxNmY5NDkuLjUzYjI2YjAgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL0NoYW5n ZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsNSArMSwxOCBAQAogMjAwOS0w Ni0yMSAgT2xpdmVyIEh1bnQgIDxvbGl2ZXJAYXBwbGUuY29tPgogCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEJ1ZyAyNjU5MjogU3VwcG9ydCBzdGFuZGFy ZCB0b0pTT04gZnVuY3Rpb25zCisKKyAgICAgICAgQWRkIHRlc3RzIG9mIERhdGUudG9KU09OLgor CisgICAgICAgICogZmFzdC9qcy9KU09OLXN0cmluZ2lmeS1leHBlY3RlZC50eHQ6CisgICAgICAg ICogZmFzdC9qcy9yZXNvdXJjZXMvSlNPTi1zdHJpbmdpZnkuanM6CisgICAgICAgIChjcmVhdGVU ZXN0cy5yZXN1bHQpOgorICAgICAgICAoY3JlYXRlVGVzdHMucmVzdWx0LnB1c2guKToKKworMjAw OS0wNi0yMSAgT2xpdmVyIEh1bnQgIDxvbGl2ZXJAYXBwbGUuY29tPgorCiAgICAgICAgIFJldmll d2VkIGJ5IFNhbSBXZWluaWcuCiAKICAgICAgICAgQnVnIDI2NTk0OiBKU0MgbmVlZHMgdG8gc3Vw cG9ydCBEYXRlLnRvSVNPU3RyaW5nCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L2pzL0pT T04tc3RyaW5naWZ5LWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL2Zhc3QvanMvSlNPTi1zdHJp bmdpZnktZXhwZWN0ZWQudHh0CmluZGV4IDY3N2NjZjEuLmI3YmE1MTEgMTAwNjQ0Ci0tLSBhL0xh eW91dFRlc3RzL2Zhc3QvanMvSlNPTi1zdHJpbmdpZnktZXhwZWN0ZWQudHh0CisrKyBiL0xheW91 dFRlc3RzL2Zhc3QvanMvSlNPTi1zdHJpbmdpZnktZXhwZWN0ZWQudHh0CkBAIC0xLDQgKzEsMTYg QEAKIGZ1bmN0aW9uIChqc29uT2JqZWN0KSB7CisgICAgICAgIHJldHVybiBqc29uT2JqZWN0LnN0 cmluZ2lmeShuZXcgRGF0ZSgwKSk7CisgICAgfQorUEFTUyB0ZXN0c1tpXShuYXRpdmVKU09OKSBp cyB0ZXN0c1tpXShKU09OKQorZnVuY3Rpb24gKGpzb25PYmplY3QpIHsKKyAgICAgICAgcmV0dXJu IGpzb25PYmplY3Quc3RyaW5naWZ5KHt0b0pTT046IERhdGUucHJvdG90eXBlLnRvSlNPTn0pOwor ICAgIH0KK1BBU1MgdGVzdHNbaV0obmF0aXZlSlNPTikgdGhyZXcgZXhjZXB0aW9uIFR5cGVFcnJv cjogdG9JU09TdHJpbmcgaXMgbm90IGEgZnVuY3Rpb24uCitmdW5jdGlvbiAoanNvbk9iamVjdCkg eworICAgICAgICByZXR1cm4ganNvbk9iamVjdC5zdHJpbmdpZnkoe3RvSlNPTjogRGF0ZS5wcm90 b3R5cGUudG9KU09OLCB0b0lTT1N0cmluZzogZnVuY3Rpb24oKXsgcmV0dXJuICJjdXN0b20gdG9J U09TdHJpbmciOyB9fSk7CisgICAgfQorUEFTUyB0ZXN0c1tpXShuYXRpdmVKU09OKSBpcyB0ZXN0 c1tpXShKU09OKQorZnVuY3Rpb24gKGpzb25PYmplY3QpIHsKICAgICAgICAgcmV0dXJuIGpzb25P YmplY3Quc3RyaW5naWZ5KHtnZXQgRm9vKCkgeyByZXR1cm4gImJhciI7IH19KTsKICAgICB9CiBQ QVNTIHRlc3RzW2ldKG5hdGl2ZUpTT04pIGlzIHRlc3RzW2ldKEpTT04pCmRpZmYgLS1naXQgYS9M YXlvdXRUZXN0cy9mYXN0L2pzL3Jlc291cmNlcy9KU09OLXN0cmluZ2lmeS5qcyBiL0xheW91dFRl c3RzL2Zhc3QvanMvcmVzb3VyY2VzL0pTT04tc3RyaW5naWZ5LmpzCmluZGV4IGQ2N2UzOWMuLjRi OWEwNjIgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2Zhc3QvanMvcmVzb3VyY2VzL0pTT04tc3Ry aW5naWZ5LmpzCisrKyBiL0xheW91dFRlc3RzL2Zhc3QvanMvcmVzb3VyY2VzL0pTT04tc3RyaW5n aWZ5LmpzCkBAIC02LDYgKzYsMzUgQEAgZnVuY3Rpb24gY3JlYXRlVGVzdHMoKSB7CiAgICAgdmFy IGNvbXBsZXhPYmplY3QgPSB7YToiMSIsIGI6IjIiLCBjOiIzIiwgZDp1bmRlZmluZWQsIGU6bnVs bCwgIiI6MTIsIGdldCBmKCl7IHJldHVybiBzaW1wbGVBcnJheTsgfSwgYXJyYXk6IGNvbXBsZXhB cnJheX07CiAgICAgdmFyIHJlc3VsdCA9IFtdOwogICAgIHJlc3VsdC5wdXNoKGZ1bmN0aW9uKGpz b25PYmplY3QpeworICAgICAgICByZXR1cm4ganNvbk9iamVjdC5zdHJpbmdpZnkobmV3IERhdGUo MCkpOworICAgIH0pOworICAgIHJlc3VsdC5wdXNoKGZ1bmN0aW9uKGpzb25PYmplY3QpeworICAg ICAgICByZXR1cm4ganNvbk9iamVjdC5zdHJpbmdpZnkoe3RvSlNPTjogRGF0ZS5wcm90b3R5cGUu dG9KU09OfSk7CisgICAgfSk7CisgICAgcmVzdWx0W3Jlc3VsdC5sZW5ndGggLSAxXS50aHJvd3Mg PSB0cnVlOworICAgIHJlc3VsdC5wdXNoKGZ1bmN0aW9uKGpzb25PYmplY3QpeworICAgICAgICBy ZXR1cm4ganNvbk9iamVjdC5zdHJpbmdpZnkoe3RvSlNPTjogRGF0ZS5wcm90b3R5cGUudG9KU09O LCB0b0lTT1N0cmluZzogZnVuY3Rpb24oKXsgcmV0dXJuICJjdXN0b20gdG9JU09TdHJpbmciOyB9 fSk7CisgICAgfSk7CisgICAgcmVzdWx0LnB1c2goZnVuY3Rpb24oanNvbk9iamVjdCl7CisgICAg ICAgIHJldHVybiBqc29uT2JqZWN0LnN0cmluZ2lmeSh7dG9KU09OOiBEYXRlLnByb3RvdHlwZS50 b0pTT04sIHRvSVNPU3RyaW5nOiBmdW5jdGlvbigpeyByZXR1cm4ge307IH19KTsKKyAgICB9KTsK KyAgICByZXN1bHRbcmVzdWx0Lmxlbmd0aCAtIDFdLnRocm93cyA9IHRydWU7CisgICAgcmVzdWx0 LnB1c2goZnVuY3Rpb24oanNvbk9iamVjdCl7CisgICAgICAgIHJldHVybiBqc29uT2JqZWN0LnN0 cmluZ2lmeSh7dG9KU09OOiBEYXRlLnByb3RvdHlwZS50b0pTT04sIHRvSVNPU3RyaW5nOiBmdW5j dGlvbigpeyB0aHJvdyAiQW4gZXhjZXB0aW9uIjsgfX0pOworICAgIH0pOworICAgIHJlc3VsdFty ZXN1bHQubGVuZ3RoIC0gMV0udGhyb3dzID0gdHJ1ZTsKKyAgICByZXN1bHQucHVzaChmdW5jdGlv bihqc29uT2JqZWN0KXsKKyAgICAgICAgdmFyIGQgPSBuZXcgRGF0ZSgwKTsKKyAgICAgICAgZC50 b0lTT1N0cmluZyA9IG51bGw7CisgICAgICAgIHJldHVybiBqc29uT2JqZWN0LnN0cmluZ2lmeShk KTsKKyAgICB9KTsKKyAgICByZXN1bHRbcmVzdWx0Lmxlbmd0aCAtIDFdLnRocm93cyA9IHRydWU7 CisgICAgcmVzdWx0LnB1c2goZnVuY3Rpb24oanNvbk9iamVjdCl7CisgICAgICAgIHZhciBkID0g bmV3IERhdGUoMCk7CisgICAgICAgIGQudG9KU09OID0gdW5kZWZpbmVkOworICAgICAgICByZXR1 cm4ganNvbk9iamVjdC5zdHJpbmdpZnkoZCk7CisgICAgfSk7CisgICAgcmVzdWx0LnB1c2goZnVu Y3Rpb24oanNvbk9iamVjdCl7CiAgICAgICAgIHJldHVybiBqc29uT2JqZWN0LnN0cmluZ2lmeSh7 Z2V0IEZvbygpIHsgcmV0dXJuICJiYXIiOyB9fSk7CiAgICAgfSk7CiAgICAgcmVzdWx0LnB1c2go ZnVuY3Rpb24oanNvbk9iamVjdCl7Cg==