Eliminate interface bool

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 542 matching lines @@
 
   cls = Class::New<Double>();
   object_store->set_double_class(cls);
   name = Symbols::Double();
   RegisterClass(cls, name, core_impl_lib);
   pending_classes.Add(cls, Heap::kOld);
 
   cls = Class::New<Bool>();
   object_store->set_bool_class(cls);
   name = Symbols::Bool();
-  RegisterClass(cls, name, core_impl_lib);
+  RegisterClass(cls, name, core_lib);
   pending_classes.Add(cls, Heap::kOld);
 
   cls = object_store->array_class();  // Was allocated above.
   name = Symbols::ObjectArray();
   RegisterClass(cls, name, core_impl_lib);
   pending_classes.Add(cls, Heap::kOld);
 
   cls = object_store->growable_object_array_class();  // Was allocated above.
   name = Symbols::GrowableObjectArray();
   RegisterClass(cls, name, core_impl_lib);
@@ skipping 206 matching lines @@
   cls = CreateAndRegisterInterface("double", script, core_lib);
   pending_classes.Add(cls, Heap::kOld);
   type = Type::NewNonParameterizedType(cls);
   object_store->set_double_interface(type);
 
   cls = CreateAndRegisterInterface("String", script, core_lib);
   pending_classes.Add(cls, Heap::kOld);
   type = Type::NewNonParameterizedType(cls);
   object_store->set_string_interface(type);
 
-  cls = CreateAndRegisterInterface("bool", script, core_lib);
-  pending_classes.Add(cls, Heap::kOld);
+  cls = object_store->bool_class();
   type = Type::NewNonParameterizedType(cls);
-  object_store->set_bool_interface(type);
+  object_store->set_bool_type(type);
 
   cls = CreateAndRegisterInterface("List", script, core_lib);
   pending_classes.Add(cls, Heap::kOld);
   type = Type::NewNonParameterizedType(cls);
   object_store->set_list_interface(type);
 
   cls = CreateAndRegisterInterface("ByteArray", script, core_lib);
   pending_classes.Add(cls, Heap::kOld);
   type = Type::NewNonParameterizedType(cls);
   object_store->set_byte_array_interface(type);
@@ skipping 355 matching lines @@
     case kDoubleCid:
       return Symbols::New("double");
     case kOneByteStringCid:
     case kTwoByteStringCid:
     case kFourByteStringCid:
     case kExternalOneByteStringCid:
     case kExternalTwoByteStringCid:
     case kExternalFourByteStringCid:
       return Symbols::New("String");
     case kBoolCid:
       return Symbols::New("bool");

[turnidge, 2012/08/24 23:58:31]

Do we still need this special case here?

[hausner, 2012/08/25 00:32:40]

Apparently not. If I remove the case, I still get correct error messages, e.g.

Unhandled exception:
type 'String' is not a subtype of type 'bool' of 'b'.

for this line of code in checked mode.

  bool b = "bla";

     case kArrayCid:
     case kImmutableArrayCid:
     case kGrowableObjectArrayCid:
       return Symbols::New("List");
     case kInt8ArrayCid:
     case kExternalInt8ArrayCid:
       return Symbols::New("Int8List");
     case kUint8ArrayCid:
     case kExternalUint8ArrayCid:
       return Symbols::New("Uint8List");
@@ skipping 1368 matching lines @@
 
 RawString* AbstractType::ClassName() const {
   if (HasResolvedTypeClass()) {
     return Class::Handle(type_class()).Name();
   } else {
     return UnresolvedClass::Handle(unresolved_class()).Name();
   }
 }
 
 
-bool AbstractType::IsBoolInterface() const {
+bool AbstractType::IsBoolType() const {
   return HasResolvedTypeClass() &&
-      (type_class() == Type::Handle(Type::BoolInterface()).type_class());
+      (type_class() == Type::Handle(Type::BoolType()).type_class());
 }
 
 
 bool AbstractType::IsIntInterface() const {
   return HasResolvedTypeClass() &&
       (type_class() == Type::Handle(Type::IntInterface()).type_class());
 }
 
 
 bool AbstractType::IsDoubleInterface() const {
@@ skipping 110 matching lines @@
 RawType* Type::VoidType() {
   return Isolate::Current()->object_store()->void_type();
 }
 
 
 RawType* Type::ObjectType() {
   return Isolate::Current()->object_store()->object_type();
 }
 
 
-RawType* Type::BoolInterface() {
-  return Isolate::Current()->object_store()->bool_interface();
+RawType* Type::BoolType() {
+  return Isolate::Current()->object_store()->bool_type();
 }
 
 
 RawType* Type::IntInterface() {
   return Isolate::Current()->object_store()->int_interface();
 }
 
 
 RawType* Type::SmiType() {
   return Isolate::Current()->object_store()->smi_type();
@@ skipping 8479 matching lines @@
   }
   return result.raw();
 }
 
 
 const char* WeakProperty::ToCString() const {
   return "_WeakProperty";
 }
 
 }  // namespace dart