| 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 Selectors; | 8 import '../common/names.dart' show Selectors; |
| 9 import '../common/resolution.dart' show Feature, Resolution; | 9 import '../common/resolution.dart' show Feature, Resolution; |
| 10 import '../compile_time_constants.dart'; | 10 import '../compile_time_constants.dart'; |
| (...skipping 3731 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3742 nodes = nodes.tail) { | 3742 nodes = nodes.tail) { |
| 3743 if (modifier == nodes.head.asIdentifier().source) { | 3743 if (modifier == nodes.head.asIdentifier().source) { |
| 3744 modifierNode = nodes.head; | 3744 modifierNode = nodes.head; |
| 3745 break; | 3745 break; |
| 3746 } | 3746 } |
| 3747 } | 3747 } |
| 3748 assert(modifierNode != null); | 3748 assert(modifierNode != null); |
| 3749 reporter.reportErrorMessage(modifierNode, MessageKind.EXTRANEOUS_MODIFIER, | 3749 reporter.reportErrorMessage(modifierNode, MessageKind.EXTRANEOUS_MODIFIER, |
| 3750 {'modifier': modifier}); | 3750 {'modifier': modifier}); |
| 3751 } | 3751 } |
| 3752 |
| 3752 if (modifiers.isFinal && (modifiers.isConst || modifiers.isVar)) { | 3753 if (modifiers.isFinal && (modifiers.isConst || modifiers.isVar)) { |
| 3753 reportExtraModifier('final'); | 3754 reportExtraModifier('final'); |
| 3754 } | 3755 } |
| 3755 if (modifiers.isVar && (modifiers.isConst || node.type != null)) { | 3756 if (modifiers.isVar && (modifiers.isConst || node.type != null)) { |
| 3756 reportExtraModifier('var'); | 3757 reportExtraModifier('var'); |
| 3757 } | 3758 } |
| 3758 if (enclosingElement.isFunction || enclosingElement.isConstructor) { | 3759 if (enclosingElement.isFunction || enclosingElement.isConstructor) { |
| 3759 if (modifiers.isAbstract) { | 3760 if (modifiers.isAbstract) { |
| 3760 reportExtraModifier('abstract'); | 3761 reportExtraModifier('abstract'); |
| 3761 } | 3762 } |
| (...skipping 955 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4717 } | 4718 } |
| 4718 return const NoneResult(); | 4719 return const NoneResult(); |
| 4719 } | 4720 } |
| 4720 } | 4721 } |
| 4721 | 4722 |
| 4722 /// Looks up [name] in [scope] and unwraps the result. | 4723 /// Looks up [name] in [scope] and unwraps the result. |
| 4723 Element lookupInScope( | 4724 Element lookupInScope( |
| 4724 DiagnosticReporter reporter, Node node, Scope scope, String name) { | 4725 DiagnosticReporter reporter, Node node, Scope scope, String name) { |
| 4725 return Elements.unwrap(scope.lookup(name), reporter, node); | 4726 return Elements.unwrap(scope.lookup(name), reporter, node); |
| 4726 } | 4727 } |
| OLD | NEW |