| OLD | NEW |
| 1 // Copyright (c) 2015, the Dart project authors. Please see the AUTHORS file | 1 // Copyright (c) 2015, the Dart project authors. Please see the AUTHORS file |
| 2 // for details. All rights reserved. Use of this source code is governed by a | 2 // for details. All rights reserved. Use of this source code is governed by a |
| 3 // BSD-style license that can be found in the LICENSE file. | 3 // BSD-style license that can be found in the LICENSE file. |
| 4 | 4 |
| 5 library dart2js.resolution.class_hierarchy; | 5 library dart2js.resolution.class_hierarchy; |
| 6 | 6 |
| 7 import '../common.dart'; | 7 import '../common.dart'; |
| 8 import '../common/resolution.dart' show Feature; | 8 import '../common/resolution.dart' show Feature; |
| 9 import '../compiler.dart' show Compiler; | 9 import '../compiler.dart' show Compiler; |
| 10 import '../core_types.dart' show CoreClasses, CoreTypes; | 10 import '../core_types.dart' show CoreClasses, CoreTypes; |
| (...skipping 230 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 241 reporter.reportErrorMessage( | 241 reporter.reportErrorMessage( |
| 242 node, MessageKind.EMPTY_ENUM_DECLARATION, {'enumName': element.name}); | 242 node, MessageKind.EMPTY_ENUM_DECLARATION, {'enumName': element.name}); |
| 243 } | 243 } |
| 244 | 244 |
| 245 EnumCreator creator = | 245 EnumCreator creator = |
| 246 new EnumCreator(reporter, compiler.coreTypes, element); | 246 new EnumCreator(reporter, compiler.coreTypes, element); |
| 247 creator.createMembers(); | 247 creator.createMembers(); |
| 248 return enumType; | 248 return enumType; |
| 249 } | 249 } |
| 250 | 250 |
| 251 /// Resolves the mixed type for [mixinNode] and checks that the the mixin type | 251 /// Resolves the mixed type for [mixinNode] and checks that the mixin type |
| 252 /// is a valid, non-blacklisted interface type. The mixin type is returned. | 252 /// is a valid, non-blacklisted interface type. The mixin type is returned. |
| 253 DartType checkMixinType(TypeAnnotation mixinNode) { | 253 DartType checkMixinType(TypeAnnotation mixinNode) { |
| 254 DartType mixinType = resolveType(mixinNode); | 254 DartType mixinType = resolveType(mixinNode); |
| 255 if (isBlackListed(mixinType)) { | 255 if (isBlackListed(mixinType)) { |
| 256 reporter.reportErrorMessage( | 256 reporter.reportErrorMessage( |
| 257 mixinNode, MessageKind.CANNOT_MIXIN, {'type': mixinType}); | 257 mixinNode, MessageKind.CANNOT_MIXIN, {'type': mixinType}); |
| 258 } else if (mixinType.isTypeVariable) { | 258 } else if (mixinType.isTypeVariable) { |
| 259 reporter.reportErrorMessage(mixinNode, MessageKind.CLASS_NAME_EXPECTED); | 259 reporter.reportErrorMessage(mixinNode, MessageKind.CLASS_NAME_EXPECTED); |
| 260 } else if (mixinType.isMalformed) { | 260 } else if (mixinType.isMalformed) { |
| 261 reporter.reportErrorMessage(mixinNode, MessageKind.CANNOT_MIXIN_MALFORMED, | 261 reporter.reportErrorMessage(mixinNode, MessageKind.CANNOT_MIXIN_MALFORMED, |
| (...skipping 386 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 648 Identifier selector = node.selector.asIdentifier(); | 648 Identifier selector = node.selector.asIdentifier(); |
| 649 var e = prefixElement.lookupLocalMember(selector.source); | 649 var e = prefixElement.lookupLocalMember(selector.source); |
| 650 if (e == null || !e.impliesType) { | 650 if (e == null || !e.impliesType) { |
| 651 reporter.reportErrorMessage(node.selector, | 651 reporter.reportErrorMessage(node.selector, |
| 652 MessageKind.CANNOT_RESOLVE_TYPE, {'typeName': node.selector}); | 652 MessageKind.CANNOT_RESOLVE_TYPE, {'typeName': node.selector}); |
| 653 return; | 653 return; |
| 654 } | 654 } |
| 655 loadSupertype(e, node); | 655 loadSupertype(e, node); |
| 656 } | 656 } |
| 657 } | 657 } |
| OLD | NEW |