Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(332)

Side by Side Diff: src/json.js

Issue 2877004: Update JSON.stringify to floor the space parameter (fixes issue 753) (Closed) Base URL: http://v8.googlecode.com/svn/branches/bleeding_edge/
Patch Set: '' Created 10 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | test/es5conform/es5conform.status » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 223 matching lines...) Expand 10 before | Expand all | Expand 10 after
234 if (IS_OBJECT(space)) { 234 if (IS_OBJECT(space)) {
235 // Unwrap 'space' if it is wrapped 235 // Unwrap 'space' if it is wrapped
236 if (IS_NUMBER_WRAPPER(space)) { 236 if (IS_NUMBER_WRAPPER(space)) {
237 space = $Number(space); 237 space = $Number(space);
238 } else if (IS_STRING_WRAPPER(space)) { 238 } else if (IS_STRING_WRAPPER(space)) {
239 space = $String(space); 239 space = $String(space);
240 } 240 }
241 } 241 }
242 var gap; 242 var gap;
243 if (IS_NUMBER(space)) { 243 if (IS_NUMBER(space)) {
244 space = $Math.min(space, 10); 244 space = $Math.min(ToInteger(space), 10);
245 gap = ""; 245 gap = "";
246 for (var i = 0; i < space; i++) { 246 for (var i = 0; i < space; i++) {
247 gap += " "; 247 gap += " ";
248 } 248 }
249 } else if (IS_STRING(space)) { 249 } else if (IS_STRING(space)) {
250 if (space.length > 10) { 250 if (space.length > 10) {
251 gap = space.substring(0, 10); 251 gap = space.substring(0, 10);
252 } else { 252 } else {
253 gap = space; 253 gap = space;
254 } 254 }
255 } else { 255 } else {
256 gap = ""; 256 gap = "";
257 } 257 }
258 return JSONSerialize('', {'': value}, replacer, stack, indent, gap); 258 return JSONSerialize('', {'': value}, replacer, stack, indent, gap);
259 } 259 }
260 260
261 function SetupJSON() { 261 function SetupJSON() {
262 InstallFunctions($JSON, DONT_ENUM, $Array( 262 InstallFunctions($JSON, DONT_ENUM, $Array(
263 "parse", JSONParse, 263 "parse", JSONParse,
264 "stringify", JSONStringify 264 "stringify", JSONStringify
265 )); 265 ));
266 } 266 }
267 267
268 SetupJSON(); 268 SetupJSON();
OLDNEW
« no previous file with comments | « no previous file | test/es5conform/es5conform.status » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698