Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(600)

Unified Diff: sdk/lib/_internal/compiler/implementation/resolution/members.dart

Issue 23708057: Emit compile-time errors for conflicting modifiers. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Small fix to dart_backend_test. Created 7 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | tests/co19/co19-dart2dart.status » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sdk/lib/_internal/compiler/implementation/resolution/members.dart
diff --git a/sdk/lib/_internal/compiler/implementation/resolution/members.dart b/sdk/lib/_internal/compiler/implementation/resolution/members.dart
index 4135d0cc3585607fda7a57ae98f58db2ebdae025..d69635e889e0642f272536c869eee16bccee7833 100644
--- a/sdk/lib/_internal/compiler/implementation/resolution/members.dart
+++ b/sdk/lib/_internal/compiler/implementation/resolution/members.dart
@@ -2727,6 +2727,27 @@ class ResolverVisitor extends MappingVisitor<Element> {
} else {
visitor.variables.type = compiler.types.dynamicType;
}
+
+ Modifiers modifiers = node.modifiers;
+ void reportExtraModifier(String modifier) {
+ Node modifierNode;
+ for (var nodes = modifiers.nodes; !nodes.isEmpty; nodes = nodes.tail) {
+ if (modifier == nodes.head.asIdentifier().source.stringValue) {
+ modifierNode = nodes.head;
+ break;
+ }
+ }
+ assert(modifierNode != null);
+ compiler.reportError(modifierNode, MessageKind.EXTRANEOUS_MODIFIER,
+ {'modifier': modifier});
+ }
+ if (modifiers.isFinal() && (modifiers.isConst() || modifiers.isVar())) {
+ reportExtraModifier('final');
+ }
+ if (modifiers.isVar() && (modifiers.isConst() || node.type != null)) {
+ reportExtraModifier('var');
+ }
+
visitor.visit(node.definitions);
}
« no previous file with comments | « no previous file | tests/co19/co19-dart2dart.status » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698