Some cleanups

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/cpu.h"
@@ skipping 1857 matching lines @@
     }
   }
   closure = Function::null();
   if (best_fit_index >= 0) {
     closure ^= closures.At(best_fit_index);
   }
   return closure.raw();
 }
 
 intptr_t Class::FindClosureIndex(intptr_t token_pos) const {
-  if (raw_ptr()->closure_functions_ == GrowableObjectArray::null()) {
+  if (closures() == GrowableObjectArray::null()) {
     return -1;
   }
   Isolate* isolate = Isolate::Current();
   ReusableHandleScope reused_handles(isolate);
-  const GrowableObjectArray& closures =
-      GrowableObjectArray::Handle(isolate, raw_ptr()->closure_functions_);
+  const GrowableObjectArray& closures_array =
+      GrowableObjectArray::Handle(isolate, closures());
   Function& closure = reused_handles.FunctionHandle();
-  intptr_t num_closures = closures.Length();
+  intptr_t num_closures = closures_array.Length();
   intptr_t best_fit_token_pos = -1;
   intptr_t best_fit_index = -1;
   for (intptr_t i = 0; i < num_closures; i++) {
-    closure ^= closures.At(i);
+    closure ^= closures_array.At(i);
     ASSERT(!closure.IsNull());
     if ((closure.token_pos() <= token_pos) &&
         (token_pos <= closure.end_token_pos()) &&
         (best_fit_token_pos < closure.token_pos())) {
       best_fit_index = i;
       best_fit_token_pos = closure.token_pos();
     }
   }
   return best_fit_index;
 }
@@ skipping 564 matching lines @@
   String& needle_name = String::Handle(isolate);
   needle_name ^= needle.name();
   const intptr_t len = fields_array.Length();
   for (intptr_t i = 0; i < len; i++) {
     field ^= fields_array.At(i);
     field_name ^= field.name();
     if (field_name.Equals(needle_name)) {
       return i;
     }
   }
-  // No field found found.
+  // No field found.
   return -1;
 }
 
 
 template <class FakeInstance>
 RawClass* Class::New(intptr_t index) {
   ASSERT(Object::class_class() != Class::null());
   Class& result = Class::Handle();
   {
     RawObject* raw = Object::Allocate(Class::kClassId,
@@ skipping 12063 matching lines @@
   return dststr.raw();
 }
 
 
 RawString* String::DecodeURI(const String& str) {
   // URI encoding is only specified for one byte strings.
   ASSERT(str.IsOneByteString() || str.IsExternalOneByteString());
   CodePointIterator cpi(str);
   intptr_t num_escapes = 0;
   intptr_t len = str.Length();
-  bool valid = true;
   {
     CodePointIterator cpi(str);
-    while (valid && cpi.Next()) {
+    while (cpi.Next()) {
       int32_t code_point = cpi.Current();
       if (IsPercent(code_point)) {
         // Verify that the two characters following the % are hex digits.
         if (!cpi.Next()) {
-          valid = false;
-          break;
+          return str.raw();
         }
         int32_t code_point = cpi.Current();
         if (!IsHexCharacter(code_point)) {
-          valid = false;
-          break;
+          return str.raw();
         }
         if (!cpi.Next()) {
-          valid = false;
-          break;
+          return str.raw();
         }
         code_point = cpi.Current();
         if (!IsHexCharacter(code_point)) {
-          valid = false;
-          break;
+          return str.raw();
         }
         num_escapes += 2;
       }
     }
   }
-  if (!valid) {
-    // Invalid, return original string.
-    return str.raw();
-  }
   ASSERT(len - num_escapes > 0);
   const String& dststr = String::Handle(
       OneByteString::New(len - num_escapes, Heap::kNew));
   {
     intptr_t index = 0;
     CodePointIterator cpi(str);
     while (cpi.Next()) {
       int32_t code_point = cpi.Current();
       if (IsPercent(code_point)) {
         cpi.Next();
@@ skipping 2189 matching lines @@
   return "_MirrorReference";
 }
 
 
 void MirrorReference::PrintToJSONStream(JSONStream* stream, bool ref) const {
   Instance::PrintToJSONStream(stream, ref);
 }
 
 
 }  // namespace dart