Use browsers JSON.parse for parsing JSON (#3)

runtime/vm/object.cc

 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #include "vm/object.h"
 
 #include "include/dart_api.h"
 #include "platform/assert.h"
 #include "vm/assembler.h"
 #include "vm/bigint_operations.h"
@@ skipping 623 matching lines @@
 #define INIT_LIBRARY(name, raw_script, raw_lib)                                \
   script ^= raw_script;                                                        \
   Library::Init##name##Library(isolate);                                       \
   lib ^= raw_lib;                                                              \
   ASSERT(!lib.IsNull());                                                       \
   error = Bootstrap::Compile(lib, script);                                     \
   if (!error.IsNull()) {                                                       \
     return error.raw();                                                        \
   }                                                                            \
 
+#define PATCH_LIBRARY(lib, raw_patch_script)                                   \
+  patch_script ^= raw_patch_script;                                            \
+  error = lib.Patch(patch_script);                                             \
+  if (!error.IsNull()) {                                                       \
+    return error.raw();                                                        \
+  }                                                                            \

[siva, 2013/02/22 18:25:39]

Could you leave this the way it was without a macro. Ivan and I  are making some
changes here to streamline this library initialization code and the code here is
going to change a bit. It would be helpful if you just preserved the pattern as
is.

 
 RawError* Object::Init(Isolate* isolate) {
   TIMERSCOPE(time_bootstrap);
   ObjectStore* object_store = isolate->object_store();
 
   Class& cls = Class::Handle();
   Type& type = Type::Handle();
   Array& array = Array::Handle();
 
   // All RawArray fields will be initialized to an empty array, therefore
@@ skipping 344 matching lines @@
   Library::InitNativeWrappersLibrary(isolate);
   ASSERT(isolate->object_store()->native_wrappers_library() != Library::null());
 
   // Finish the initialization by compiling the bootstrap scripts containing the
   // base interfaces and the implementation of the internal classes.
   Error& error = Error::Handle();
   error = Bootstrap::Compile(core_lib, script);
   if (!error.IsNull()) {
     return error.raw();
   }
-  Script& patch_script = Script::Handle(Bootstrap::LoadCoreScript(true));
-  error = core_lib.Patch(patch_script);
-  if (!error.IsNull()) {
-    return error.raw();
-  }
+  Script& patch_script = Script::Handle();
+  PATCH_LIBRARY(core_lib, Bootstrap::LoadCoreScript(true));
+
   Library::InitASyncLibrary(isolate);
   const Script& async_script =
       Script::Handle(Bootstrap::LoadASyncScript(false));
   const Library& async_lib = Library::Handle(Library::ASyncLibrary());
   ASSERT(!async_lib.IsNull());
   error = Bootstrap::Compile(async_lib, async_script);
   if (!error.IsNull()) {
     return error.raw();
   }
-  patch_script = Bootstrap::LoadASyncScript(true);
-  error = async_lib.Patch(patch_script);
-  if (!error.IsNull()) {
-    return error.raw();
-  }
+  PATCH_LIBRARY(async_lib, Bootstrap::LoadASyncScript(true));
+
   const Script& collection_script =
       Script::Handle(Bootstrap::LoadCollectionScript(false));
   const Library& collection_lib =
       Library::Handle(Library::CollectionLibrary());
   ASSERT(!collection_lib.IsNull());
   error = Bootstrap::Compile(collection_lib, collection_script);
   if (!error.IsNull()) {
     return error.raw();
   }
   const Script& collection_dev_script =
       Script::Handle(Bootstrap::LoadCollectionDevScript(false));
   const Library& collection_dev_lib =
       Library::Handle(Library::CollectionDevLibrary());
   ASSERT(!collection_dev_lib.IsNull());
   error = Bootstrap::Compile(collection_dev_lib, collection_dev_script);
   if (!error.IsNull()) {
     return error.raw();
   }
   const Script& math_script = Script::Handle(Bootstrap::LoadMathScript(false));
   const Library& math_lib = Library::Handle(Library::MathLibrary());
   ASSERT(!math_lib.IsNull());
   error = Bootstrap::Compile(math_lib, math_script);
   if (!error.IsNull()) {
     return error.raw();
   }
-  patch_script = Bootstrap::LoadMathScript(true);
-  error = math_lib.Patch(patch_script);
-  if (!error.IsNull()) {
-    return error.raw();
-  }
+  PATCH_LIBRARY(math_lib, Bootstrap::LoadMathScript(true));
+
   const Script& isolate_script = Script::Handle(
       Bootstrap::LoadIsolateScript(false));
   Library::InitIsolateLibrary(isolate);
   const Library& isolate_lib = Library::Handle(Library::IsolateLibrary());
   ASSERT(!isolate_lib.IsNull());
   error = Bootstrap::Compile(isolate_lib, isolate_script);
   if (!error.IsNull()) {
     return error.raw();
   }
-  patch_script = Bootstrap::LoadIsolateScript(true);
-  error = isolate_lib.Patch(patch_script);
-  if (!error.IsNull()) {
-    return error.raw();
-  }
+  PATCH_LIBRARY(isolate_lib, Bootstrap::LoadIsolateScript(true));
+
   const Script& mirrors_script = Script::Handle(
       Bootstrap::LoadMirrorsScript(false));
   Library::InitMirrorsLibrary(isolate);
   const Library& mirrors_lib = Library::Handle(Library::MirrorsLibrary());
   ASSERT(!mirrors_lib.IsNull());
   error = Bootstrap::Compile(mirrors_lib, mirrors_script);
   if (!error.IsNull()) {
     return error.raw();
   }
-  patch_script = Bootstrap::LoadMirrorsScript(true);
-  error = mirrors_lib.Patch(patch_script);
-  if (!error.IsNull()) {
-    return error.raw();
-  }
+  PATCH_LIBRARY(mirrors_lib, Bootstrap::LoadMirrorsScript(true));
+
   const Script& scalarlist_script = Script::Handle(
       Bootstrap::LoadScalarlistScript(false));
   ASSERT(!scalarlist_lib.IsNull());
   error = Bootstrap::Compile(scalarlist_lib, scalarlist_script);
   if (!error.IsNull()) {
     return error.raw();
   }
-  patch_script = Bootstrap::LoadScalarlistScript(true);
-  error = scalarlist_lib.Patch(patch_script);
-  if (!error.IsNull()) {
-    return error.raw();
-  }
+  PATCH_LIBRARY(scalarlist_lib, Bootstrap::LoadScalarlistScript(true));
+
   Library& lib = Library::Handle();
   INIT_LIBRARY(Crypto,
                Bootstrap::LoadCryptoScript(false),
                Library::CryptoLibrary());
   INIT_LIBRARY(Json,
                Bootstrap::LoadJsonScript(false),
                Library::JsonLibrary());
+  PATCH_LIBRARY(lib, Bootstrap::LoadJsonScript(true));

[siva, 2013/02/22 18:25:39]

Just add the patch code inline here.

   INIT_LIBRARY(Utf,
                Bootstrap::LoadUtfScript(false),
                Library::UtfLibrary());
   INIT_LIBRARY(Uri,
                Bootstrap::LoadUriScript(false),
                Library::UriLibrary());
   Bootstrap::SetupNativeResolver();
 
   // Remove the Object superclass cycle by setting the super type to null (not
   // to the type of null).
@@ skipping 11878 matching lines @@
   }
   return result.raw();
 }
 
 
 const char* WeakProperty::ToCString() const {
   return "_WeakProperty";
 }
 
 }  // namespace dart