| OLD | NEW |
| 1 // Copyright (c) 2012, the Dart project authors. Please see the AUTHORS file | 1 // Copyright (c) 2012, 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.members; | 5 library dart2js.resolution.members; |
| 6 | 6 |
| 7 import '../common.dart'; | 7 import '../common.dart'; |
| 8 import '../common/names.dart' show | 8 import '../common/names.dart' show |
| 9 Selectors; | 9 Selectors; |
| 10 import '../common/resolution.dart' show | 10 import '../common/resolution.dart' show |
| (...skipping 1007 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1018 Element target = currentClass.lookupSuperByName(name); | 1018 Element target = currentClass.lookupSuperByName(name); |
| 1019 // [target] may be null which means invoking noSuchMethod on super. | 1019 // [target] may be null which means invoking noSuchMethod on super. |
| 1020 if (target == null) { | 1020 if (target == null) { |
| 1021 if (alternateName != null) { | 1021 if (alternateName != null) { |
| 1022 target = currentClass.lookupSuperByName(alternateName); | 1022 target = currentClass.lookupSuperByName(alternateName); |
| 1023 } | 1023 } |
| 1024 Element error; | 1024 Element error; |
| 1025 if (selector.isSetter) { | 1025 if (selector.isSetter) { |
| 1026 error = reportAndCreateErroneousElement( | 1026 error = reportAndCreateErroneousElement( |
| 1027 node, name.text, MessageKind.UNDEFINED_SUPER_SETTER, | 1027 node, name.text, MessageKind.UNDEFINED_SUPER_SETTER, |
| 1028 {'className': currentClass.name, 'name': name}); | 1028 {'className': currentClass.name, 'memberName': name}); |
| 1029 } else { | 1029 } else { |
| 1030 error = reportAndCreateErroneousElement( | 1030 error = reportAndCreateErroneousElement( |
| 1031 node, name.text, MessageKind.NO_SUCH_SUPER_MEMBER, | 1031 node, name.text, MessageKind.NO_SUCH_SUPER_MEMBER, |
| 1032 {'className': currentClass.name, 'memberName': name}); | 1032 {'className': currentClass.name, 'memberName': name}); |
| 1033 } | 1033 } |
| 1034 if (target == null) { | 1034 if (target == null) { |
| 1035 // If a setter wasn't resolved, use the [ErroneousElement]. | 1035 // If a setter wasn't resolved, use the [ErroneousElement]. |
| 1036 target = error; | 1036 target = error; |
| 1037 } | 1037 } |
| 1038 // We still need to register the invocation, because we might | 1038 // We still need to register the invocation, because we might |
| (...skipping 3831 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4870 } | 4870 } |
| 4871 return const NoneResult(); | 4871 return const NoneResult(); |
| 4872 } | 4872 } |
| 4873 } | 4873 } |
| 4874 | 4874 |
| 4875 /// Looks up [name] in [scope] and unwraps the result. | 4875 /// Looks up [name] in [scope] and unwraps the result. |
| 4876 Element lookupInScope(DiagnosticReporter reporter, Node node, | 4876 Element lookupInScope(DiagnosticReporter reporter, Node node, |
| 4877 Scope scope, String name) { | 4877 Scope scope, String name) { |
| 4878 return Elements.unwrap(scope.lookup(name), reporter, node); | 4878 return Elements.unwrap(scope.lookup(name), reporter, node); |
| 4879 } | 4879 } |
| OLD | NEW |