Mixins with Generics

runtime/vm/class_finalizer.h

 // 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.
 
 #ifndef VM_CLASS_FINALIZER_H_
 #define VM_CLASS_FINALIZER_H_
 
 #include "vm/allocation.h"
 #include "vm/growable_array.h"
 
 namespace dart {
 
 class AbstractType;
+class MixinAppType;
 class AbstractTypeArguments;
 class Class;
 class Error;
 class Function;
 class GrowableObjectArray;
 class RawAbstractType;
 class RawClass;
 class RawType;
 class Script;
 class Type;
@@ skipping 68 matching lines @@
   static bool IsSuperCycleFree(const Class& cls);
   static bool IsAliasCycleFree(const Class& cls,
                                GrowableArray<intptr_t>* visited);
   static void CheckForLegalConstClass(const Class& cls);
   static RawClass* ResolveClass(const Class& cls,
                                 const UnresolvedClass& unresolved_class);
   static void ResolveRedirectingFactoryTarget(
       const Class& cls,
       const Function& factory,
       const GrowableObjectArray& visited_factories);
+

[regis, 2013/03/14 23:40:34]

No blank line elsewhere in this private section.

[hausner, 2013/03/15 00:36:32]

Removed

+  static void CloneTypeParameters(const Class& mixapp_class);
   static void ApplyMixin(const Class& cls);
+

[regis, 2013/03/14 23:40:34]

... except here.

[hausner, 2013/03/15 00:36:32]

Also removed.

[hausner, 2013/03/15 00:36:32]

Also removed.

+  static void CopyArgs(const Class& cls,
+                       const Type& type,
+                       const GrowableObjectArray& args);
+  static RawType* ResolveMixinAppType(const Class& cls,
+                                      const MixinAppType& mixin_app);
   static void ResolveSuperTypeAndInterfaces(const Class& cls,
                                             GrowableArray<intptr_t>* visited);
   static void FinalizeTypeParameters(const Class& cls);
   static void FinalizeTypeArguments(const Class& cls,
                                     const AbstractTypeArguments& arguments,
                                     FinalizationKind finalization,
                                     Error* bound_error);
   static void CheckTypeArgumentBounds(const Class& cls,
                                       const AbstractTypeArguments& arguments,
                                       Error* bound_error);
@@ skipping 16 matching lines @@
   static void ReportError(const Error& error);
   static void ReportError(const Script& script,
                           intptr_t token_index,
                           const char* format, ...) PRINTF_ATTRIBUTE(3, 4);
   static void ReportError(const char* format, ...) PRINTF_ATTRIBUTE(1, 2);
 };
 
 }  // namespace dart
 
 #endif  // VM_CLASS_FINALIZER_H_