Simplify VM internal representation of a mixin application clause (MixinAppType

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 11575 matching lines @@
   OS::SNPrint(chars, len, format, type_cstr, bound_cstr, cls_cstr);
   return chars;
 }
 
 
 void BoundedType::PrintToJSONStream(JSONStream* stream, bool ref) const {
   JSONObject jsobj(stream);
 }
 
 
+intptr_t MixinAppType::token_pos() const {
+  return Class::Handle(MixinAppAt(0)).token_pos();
+}
+
+
+intptr_t MixinAppType::Depth() const {
+  const Array& mixin_apps = Array::Handle(mixins());
+  return mixin_apps.Length();
+}
+
+
 RawString* MixinAppType::Name() const {
-  return String::New("MixinApplication");
+  return String::New("MixinAppType");
 }
 
 
 const char* MixinAppType::ToCString() const {
-  return "MixinAppType";
+  const char* format = "MixinAppType: super type: %s; first mixin app: %s";
+  const char* super_type_cstr = String::Handle(AbstractType::Handle(
+      SuperType()).Name()).ToCString();
+  const char* first_mixin_app_cstr = String::Handle(Class::Handle(
+      MixinAppAt(0)).Name()).ToCString();
+  intptr_t len = OS::SNPrint(
+      NULL, 0, format, super_type_cstr, first_mixin_app_cstr) + 1;
+  char* chars = Isolate::Current()->current_zone()->Alloc<char>(len);
+  OS::SNPrint(chars, len, format, super_type_cstr, first_mixin_app_cstr);
+  return chars;
 }
 
 
 void MixinAppType::PrintToJSONStream(JSONStream* stream, bool ref) const {
   JSONObject jsobj(stream);
 }
 
 
-void MixinAppType::set_super_type(const AbstractType& value) const {
-  StorePointer(&raw_ptr()->super_type_, value.raw());
+RawAbstractType* MixinAppType::SuperType() const {
+  return Class::Handle(MixinAppAt(0)).super_type();
 }
 
 
-void MixinAppType::set_mixin_types(const Array& value) const {
-  StorePointer(&raw_ptr()->mixin_types_, value.raw());
+RawClass* MixinAppType::MixinAppAt(intptr_t depth) const {
+  Class& mixin_app = Class::Handle();
+  mixin_app ^= Array::Handle(mixins()).At(depth);
+  return mixin_app.raw();
+}
+
+
+void MixinAppType::set_mixins(const Array& value) const {
+  StorePointer(&raw_ptr()->mixins_, value.raw());
 }
 
 
 RawMixinAppType* MixinAppType::New() {
   ASSERT(Isolate::Current()->object_store()->mixin_app_type_class() !=
          Class::null());
   // MixinAppType objects do not survive finalization, so allocate
   // on new heap.
   RawObject* raw = Object::Allocate(MixinAppType::kClassId,
                                     MixinAppType::InstanceSize(),
                                     Heap::kNew);
   return reinterpret_cast<RawMixinAppType*>(raw);
 }
 
 
-RawMixinAppType* MixinAppType::New(const AbstractType& super_type,
-                                   const Array& mixin_types) {
+RawMixinAppType* MixinAppType::New(const Array& mixins) {
   const MixinAppType& result = MixinAppType::Handle(MixinAppType::New());
-  result.set_super_type(super_type);
-  result.set_mixin_types(mixin_types);
+  result.set_mixins(mixins);
   return result.raw();
 }
 
 
 const char* Number::ToCString() const {
   // Number is an interface. No instances of Number should exist.
   UNREACHABLE();
   return "Number";
 }
 
@@ skipping 3202 matching lines @@
   return "_MirrorReference";
 }
 
 
 void MirrorReference::PrintToJSONStream(JSONStream* stream, bool ref) const {
   JSONObject jsobj(stream);
 }
 
 
 }  // namespace dart