OLD | NEW |
---|---|
1 // Copyright 2009 the V8 project authors. All rights reserved. | 1 // Copyright 2009 the V8 project authors. All rights reserved. |
2 // Redistribution and use in source and binary forms, with or without | 2 // Redistribution and use in source and binary forms, with or without |
3 // modification, are permitted provided that the following conditions are | 3 // modification, are permitted provided that the following conditions are |
4 // met: | 4 // met: |
5 // | 5 // |
6 // * Redistributions of source code must retain the above copyright | 6 // * Redistributions of source code must retain the above copyright |
7 // notice, this list of conditions and the following disclaimer. | 7 // notice, this list of conditions and the following disclaimer. |
8 // * Redistributions in binary form must reproduce the above | 8 // * Redistributions in binary form must reproduce the above |
9 // copyright notice, this list of conditions and the following | 9 // copyright notice, this list of conditions and the following |
10 // disclaimer in the documentation and/or other materials provided | 10 // disclaimer in the documentation and/or other materials provided |
(...skipping 260 matching lines...) Loading... | |
271 | 271 |
272 | 272 |
273 function BasicJSONSerialize(key, value, stack, builder) { | 273 function BasicJSONSerialize(key, value, stack, builder) { |
274 if (IS_SPEC_OBJECT(value)) { | 274 if (IS_SPEC_OBJECT(value)) { |
275 var toJSON = value.toJSON; | 275 var toJSON = value.toJSON; |
276 if (IS_FUNCTION(toJSON)) { | 276 if (IS_FUNCTION(toJSON)) { |
277 value = %_CallFunction(value, ToString(key), toJSON); | 277 value = %_CallFunction(value, ToString(key), toJSON); |
278 } | 278 } |
279 } | 279 } |
280 if (IS_STRING(value)) { | 280 if (IS_STRING(value)) { |
281 builder.push(%QuoteJSONString(value)); | 281 builder.push(value ? %QuoteJSONString(value) : '""'); |
Lasse Reichstein
2011/06/22 13:05:45
use (value !== "") as condition.
sandholm
2011/06/22 14:05:41
Done.
| |
282 } else if (IS_NUMBER(value)) { | 282 } else if (IS_NUMBER(value)) { |
283 builder.push(JSON_NUMBER_TO_STRING(value)); | 283 builder.push(JSON_NUMBER_TO_STRING(value)); |
284 } else if (IS_BOOLEAN(value)) { | 284 } else if (IS_BOOLEAN(value)) { |
285 builder.push(value ? "true" : "false"); | 285 builder.push(value ? "true" : "false"); |
286 } else if (IS_NULL(value)) { | 286 } else if (IS_NULL(value)) { |
287 builder.push("null"); | 287 builder.push("null"); |
288 } else if (IS_SPEC_OBJECT(value) && !(typeof value == "function")) { | 288 } else if (IS_SPEC_OBJECT(value) && !(typeof value == "function")) { |
289 // Value is a non-callable object. | 289 // Value is a non-callable object. |
290 // Unwrap value if necessary | 290 // Unwrap value if necessary |
291 if (IS_NUMBER_WRAPPER(value)) { | 291 if (IS_NUMBER_WRAPPER(value)) { |
(...skipping 46 matching lines...) Loading... | |
338 } | 338 } |
339 | 339 |
340 function SetupJSON() { | 340 function SetupJSON() { |
341 InstallFunctions($JSON, DONT_ENUM, $Array( | 341 InstallFunctions($JSON, DONT_ENUM, $Array( |
342 "parse", JSONParse, | 342 "parse", JSONParse, |
343 "stringify", JSONStringify | 343 "stringify", JSONStringify |
344 )); | 344 )); |
345 } | 345 } |
346 | 346 |
347 SetupJSON(); | 347 SetupJSON(); |
OLD | NEW |