Gentle start with removing explicit interfaces

runtime/vm/class_finalizer.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/class_finalizer.h"
 
 #include "vm/flags.h"
 #include "vm/heap.h"
 #include "vm/isolate.h"
 #include "vm/longjump.h"
@@ skipping 317 matching lines @@
                 "both classes or both interfaces",
                 class_name.ToCString(),
                 super_class_name.ToCString());
   }
   // If cls belongs to core lib or to core lib's implementation, restrictions
   // about allowed interfaces are lifted.
   if ((cls.library() != Library::CoreLibrary()) &&
       (cls.library() != Library::CoreImplLibrary())) {
     // Prevent extending core implementation classes.
     switch (super_class.id()) {
+      case kNumberCid:
       case kIntegerCid:
       case kSmiCid:
       case kMintCid:
       case kBigintCid:
       case kDoubleCid:
       case kOneByteStringCid:
       case kTwoByteStringCid:
       case kFourByteStringCid:
       case kExternalOneByteStringCid:
       case kExternalTwoByteStringCid:
@@ skipping 15 matching lines @@
       case kUint32ArrayCid:
       case kExternalUint32ArrayCid:
       case kInt64ArrayCid:
       case kExternalInt64ArrayCid:
       case kUint64ArrayCid:
       case kExternalUint64ArrayCid:
       case kFloat32ArrayCid:
       case kExternalFloat32ArrayCid:
       case kFloat64ArrayCid:
       case kExternalFloat64ArrayCid:
+      case kDartFunctionCid:
       case kWeakPropertyCid: {
         const Script& script = Script::Handle(cls.script());
         ReportError(script, cls.token_pos(),
                     "'%s' is not allowed to extend '%s'",
                     String::Handle(cls.Name()).ToCString(),
                     String::Handle(super_class.Name()).ToCString());
         break;
       }
       default: break;
     }
@@ skipping 954 matching lines @@
       ReportError(script, cls.token_pos(),
                   "'%s' is used where an interface or class name is expected",
                   String::Handle(interface_class.Name()).ToCString());
     }
     // Verify that unless cls belongs to core lib, it cannot extend or implement
     // any of bool, num, int, double, String, Function, Dynamic.
     // The exception is signature classes, which are compiler generated and
     // represent a function type, therefore implementing the Function interface.
     if (!cls_belongs_to_core_lib) {
       if (interface.IsBoolInterface() ||
-          interface.IsNumberInterface() ||
+          interface.IsNumberType() ||
           interface.IsIntInterface() ||
           interface.IsDoubleInterface() ||
           interface.IsStringInterface() ||
-          (interface.IsFunctionInterface() && !cls.IsSignatureClass()) ||
+          (interface.IsFunctionType() && !cls.IsSignatureClass()) ||
           interface.IsDynamicType()) {
         const Script& script = Script::Handle(cls.script());
         ReportError(script, cls.token_pos(),
                     "'%s' is not allowed to extend or implement '%s'",
                     String::Handle(cls.Name()).ToCString(),
                     String::Handle(interface_class.Name()).ToCString());
       }
     }
     // Now resolve the super interfaces.
     ResolveInterfaces(interface_class, visited);
@@ skipping 147 matching lines @@
 void ClassFinalizer::ReportError(const char* format, ...) {
   va_list args;
   va_start(args, format);
   const Error& error = Error::Handle(
       Parser::FormatError(Script::Handle(), -1, "Error", format, args));
   va_end(args);
   ReportError(error);
 }
 
 }  // namespace dart