- Improve the formatting of generated source text.

runtime/vm/dart.cc

Index: runtime/vm/dart.cc
===================================================================
--- runtime/vm/dart.cc	(revision 9912)
+++ runtime/vm/dart.cc	(working copy)
@@ -22,6 +22,7 @@
 
 namespace dart {
 
+DECLARE_FLAG(bool, print_bootstrap);
 DECLARE_FLAG(bool, print_class_table);
 DECLARE_FLAG(bool, trace_isolates);
 
@@ -93,6 +94,32 @@
 }
 
 
+static void PrintLibrarySources(Isolate* isolate) {
+  const GrowableObjectArray& libs = GrowableObjectArray::Handle(
+      isolate->object_store()->libraries());
+  intptr_t lib_count = libs.Length();
+  Library& lib = Library::Handle();
+  Array& scripts = Array::Handle();
+  Script& script = Script::Handle();
+  String& url = String::Handle();
+  String& source = String::Handle();
+  for (int i = 0; i < lib_count; i++) {
+    lib ^= libs.At(i);
+    url = lib.url();
+    OS::Print("Library %s:\n", url.ToCString());
+    scripts = lib.LoadedScripts();
+    intptr_t script_count = scripts.Length();
+    for (intptr_t i = 0; i < script_count; i++) {
+      script ^= scripts.At(i);
+      url = script.url();
+      source = script.Source();
+      OS::Print("Source for %s:\n", url.ToCString());
+      OS::Print("%s\n", source.ToCString());
+    }

[siva, 2012/07/26 00:51:05]

In the non snapshot case the print-bootstrap flat prints in the following
format:

  if (FLAG_print_bootstrap) {
    OS::Print("Bootstrap source '%s':\n%s\n",
        String::Handle(script.url()).ToCString(),
        String::Handle(script.Source()).ToCString());
  }

We should probably make the two consistent, Also I don't think the non snapshot
version prints dart:io etc.

I would think the best option might be to remove the existing implementation and
always call this new code in both cases from here.

+  }
+}
+
+
 RawError* Dart::InitializeIsolate(const uint8_t* snapshot_buffer, void* data) {
   // Initialize the new isolate.
   TIMERSCOPE(time_isolate_initialization);
@@ -121,6 +148,9 @@
     if (FLAG_trace_isolates) {
       isolate->heap()->PrintSizes();
     }
+    if (FLAG_print_bootstrap) {
+      PrintLibrarySources(isolate);
+    }
   }
 
   StubCode::Init(isolate);