Minor cleanup.

runtime/vm/bootstrap.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/bootstrap.h"
 
 #include "include/dart_api.h"
 
 #include "vm/bootstrap_natives.h"
 #include "vm/compiler.h"
@@ skipping 72 matching lines @@
 
   { ObjectStore::kNone, NULL, NULL, NULL, NULL }
 };
 
 
 static RawString* GetLibrarySource(const Library& lib,
                                    const String& uri,
                                    bool patch) {
   // First check if this is a valid boot strap library and find it's index
   // in the 'bootstrap_libraries' table above.
-  intptr_t index = 0;
+  intptr_t index;
   const String& lib_uri = String::Handle(lib.url());
-  while (bootstrap_libraries[index].index_ != ObjectStore::kNone) {
+  for (index = 0;
+       bootstrap_libraries[index].index_ != ObjectStore::kNone;
+       ++index) {
     if (lib_uri.Equals(bootstrap_libraries[index].uri_)) {
       break;
     }
-    index += 1;
   }
   if (bootstrap_libraries[index].index_ == ObjectStore::kNone) {
     return String::null();  // Library is not a boot strap library.
   }
 
   // Try to read the source using the path specified for the uri.
   const char** source_paths = patch ?
       bootstrap_libraries[index].patch_paths_ :
       bootstrap_libraries[index].source_paths_;
   if (source_paths == NULL) {
     return String::null();  // No path mapping information exists for library.
   }
-  intptr_t i = 0;
   const char* source_path = NULL;
-  while (source_paths[i] != NULL) {
+  for (intptr_t i = 0; source_paths[i] != NULL; i += 2) {
     if (uri.Equals(source_paths[i])) {
       source_path = source_paths[i + 1];
       break;
     }
-    i += 2;
   }
   if (source_path == NULL) {
     return String::null();  // Uri does not exist in path mapping information.
   }
 
   Dart_FileOpenCallback file_open = Isolate::file_open_callback();
   Dart_FileReadCallback file_read = Isolate::file_read_callback();
   Dart_FileCloseCallback file_close = Isolate::file_close_callback();
   if (file_open == NULL || file_read == NULL || file_close == NULL) {
     return String::null();  // File operations are not supported.
@@ skipping 103 matching lines @@
                                 const Library& lib,
                                 const String& patch_uri,
                                 const char** patch_files) {
   String& patch_file_uri = String::Handle(isolate);
   String& source = String::Handle(isolate);
   Script& script = Script::Handle(isolate);
   Error& error = Error::Handle(isolate);
   const Array& strings = Array::Handle(isolate, Array::New(3));
   strings.SetAt(0, patch_uri);
   strings.SetAt(1, Symbols::Slash());
-  intptr_t j = 0;
-  while (patch_files[j] != NULL) {
+  for (intptr_t j = 0; patch_files[j] != NULL; j += 2) {
     patch_file_uri = String::New(patch_files[j]);
     source = GetLibrarySource(lib, patch_file_uri, true);
     if (source.IsNull()) {
       return Api::UnwrapErrorHandle(
           isolate,
           Api::NewError("Unable to find dart patch source for %s",
                         patch_file_uri.ToCString())).raw();
     }
     // Prepend the patch library URI to form a unique script URI for the patch.
     strings.SetAt(2, patch_file_uri);
     patch_file_uri = String::ConcatAll(strings);
     script = Script::New(patch_file_uri, source, RawScript::kPatchTag);
     error = lib.Patch(script);
     if (!error.IsNull()) {
       return error.raw();
     }
-    j += 2;
   }
   return Error::null();
 }
 
 
 RawError* Bootstrap::LoadandCompileScripts() {
   Isolate* isolate = Isolate::Current();
   String& uri = String::Handle();
   String& patch_uri = String::Handle();
   String& source = String::Handle();
   Script& script = Script::Handle();
   Library& lib = Library::Handle();
   Error& error = Error::Handle();
   Dart_LibraryTagHandler saved_tag_handler = isolate->library_tag_handler();
 
   // Set the library tag handler for the isolate to the bootstrap
   // library tag handler so that we can load all the bootstrap libraries.
   isolate->set_library_tag_handler(BootstrapLibraryTagHandler);
 
   // Enter the Dart Scope as we will be calling back into the library
   // tag handler when compiling the bootstrap libraries.
   Dart_EnterScope();
 
   // Create library objects for all the bootstrap libraries.
-  intptr_t i = 0;
-  while (bootstrap_libraries[i].index_ != ObjectStore::kNone) {
+  for (intptr_t i = 0;
+       bootstrap_libraries[i].index_ != ObjectStore::kNone;
+       ++i) {
     uri = Symbols::New(bootstrap_libraries[i].uri_);
     lib = Library::LookupLibrary(uri);
     if (lib.IsNull()) {
       lib = Library::NewLibraryHelper(uri, false);
       lib.Register();
     }
     isolate->object_store()->set_bootstrap_library(
         bootstrap_libraries[i].index_, lib);
-    i = i + 1;
   }
 
   // Load, compile and patch bootstrap libraries.
-  i = 0;
-  while (bootstrap_libraries[i].index_ != ObjectStore::kNone) {
+  for (intptr_t i = 0;
+       bootstrap_libraries[i].index_ != ObjectStore::kNone;
+       ++i) {
     uri = Symbols::New(bootstrap_libraries[i].uri_);
     lib = Library::LookupLibrary(uri);
     ASSERT(!lib.IsNull());
     source = GetLibrarySource(lib, uri, false);
     if (source.IsNull()) {
       error ^= Api::UnwrapErrorHandle(
           isolate, Api::NewError("Unable to find dart source for %s",
                                  uri.ToCString())).raw();
       break;
     }
     script = Script::New(uri, source, RawScript::kLibraryTag);
     error = Compile(lib, script);
     if (!error.IsNull()) {
       break;
     }
     // If a patch exists, load and patch the script.
     if (bootstrap_libraries[i].patch_paths_ != NULL) {
       patch_uri = Symbols::New(bootstrap_libraries[i].patch_uri_);
       error = LoadPatchFiles(isolate,
                              lib,
                              patch_uri,
                              bootstrap_libraries[i].patch_paths_);
       if (!error.IsNull()) {
         break;
       }
     }
-    i = i + 1;
   }
   if (error.IsNull()) {
     SetupNativeResolver();
   }
 
   // Exit the Dart scope.
   Dart_ExitScope();
 
   // Restore the library tag handler for the isolate.
   isolate->set_library_tag_handler(saved_tag_handler);
 
   return error.raw();
 }
 
 }  // namespace dart