- First step in refactoring ports with the goal of moving

runtime/vm/dart_api_impl.h

 // Copyright (c) 2011, 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.
 
 #ifndef VM_DART_API_IMPL_H_
 #define VM_DART_API_IMPL_H_
 
 #include "vm/allocation.h"
 #include "vm/native_arguments.h"
 #include "vm/object.h"
@@ skipping 65 matching lines @@
 
 #define RETURN_TYPE_ERROR(isolate, dart_handle, type)                          \
   do {                                                                         \
     const Object& tmp =                                                        \
         Object::Handle(isolate, Api::UnwrapHandle((dart_handle)));             \
     if (tmp.IsNull()) {                                                        \
       return Api::NewError("%s expects argument '%s' to be non-null.",         \
                            CURRENT_FUNC, #dart_handle);                        \
     } else if (tmp.IsError()) {                                                \
       return dart_handle;                                                      \
-    } else {                                                                   \
-      return Api::NewError("%s expects argument '%s' to be of type %s.",       \
-                           CURRENT_FUNC, #dart_handle, #type);                 \
     }                                                                          \
+    return Api::NewError("%s expects argument '%s' to be of type %s.",         \
+                         CURRENT_FUNC, #dart_handle, #type);                   \
   } while (0)
 
 
 #define RETURN_NULL_ERROR(parameter)                                           \
   return Api::NewError("%s expects argument '%s' to be non-null.",             \
                        CURRENT_FUNC, #parameter);
 
 
 #define CHECK_LENGTH(length, max_elements)                                     \
   do {                                                                         \
@@ skipping 180 matching lines @@
   if (isolate->no_callback_scope_depth() != 0) {                               \
     return reinterpret_cast<Dart_Handle>(Api::AcquiredError(isolate));         \
   }                                                                            \
 
 #define ASSERT_CALLBACK_STATE(isolate)                                         \
   ASSERT(isolate->no_callback_scope_depth() == 0)
 
 }  // namespace dart.
 
 #endif  // VM_DART_API_IMPL_H_