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 175 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
186 } | 186 } |
187 if (!%PushIfAbsent(stack, value)) { | 187 if (!%PushIfAbsent(stack, value)) { |
188 throw MakeTypeError('circular_structure', $Array()); | 188 throw MakeTypeError('circular_structure', $Array()); |
189 } | 189 } |
190 builder.push("["); | 190 builder.push("["); |
191 var val = value[0]; | 191 var val = value[0]; |
192 if (IS_STRING(val)) { | 192 if (IS_STRING(val)) { |
193 // First entry is a string. Remaining entries are likely to be strings too. | 193 // First entry is a string. Remaining entries are likely to be strings too. |
194 var array_string = %QuoteJSONStringArray(value); | 194 var array_string = %QuoteJSONStringArray(value); |
195 if (!IS_UNDEFINED(array_string)) { | 195 if (!IS_UNDEFINED(array_string)) { |
196 builder[builder.length - 1] = array_string; | 196 // array_string also includes bracket characters so we are done. |
| 197 builder[builder.length - 1] = array_string; |
| 198 stack.pop(); |
| 199 return; |
197 } else { | 200 } else { |
198 builder.push(%QuoteJSONString(val)); | 201 builder.push(%QuoteJSONString(val)); |
199 for (var i = 1; i < len; i++) { | 202 for (var i = 1; i < len; i++) { |
200 val = value[i]; | 203 val = value[i]; |
201 if (IS_STRING(val)) { | 204 if (IS_STRING(val)) { |
202 builder.push(%QuoteJSONStringComma(val)); | 205 builder.push(%QuoteJSONStringComma(val)); |
203 } else { | 206 } else { |
204 builder.push(","); | 207 builder.push(","); |
205 var before = builder.length; | 208 var before = builder.length; |
206 BasicJSONSerialize(i, val, stack, builder); | 209 BasicJSONSerialize(i, val, stack, builder); |
(...skipping 128 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
335 } | 338 } |
336 | 339 |
337 function SetupJSON() { | 340 function SetupJSON() { |
338 InstallFunctions($JSON, DONT_ENUM, $Array( | 341 InstallFunctions($JSON, DONT_ENUM, $Array( |
339 "parse", JSONParse, | 342 "parse", JSONParse, |
340 "stringify", JSONStringify | 343 "stringify", JSONStringify |
341 )); | 344 )); |
342 } | 345 } |
343 | 346 |
344 SetupJSON(); | 347 SetupJSON(); |
OLD | NEW |