| 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 package com.google.dart.compiler.resolver; | 5 package com.google.dart.compiler.resolver; |
| 6 | 6 |
| 7 import com.google.common.annotations.VisibleForTesting; | 7 import com.google.common.annotations.VisibleForTesting; |
| 8 import com.google.common.collect.Lists; | 8 import com.google.common.collect.Lists; |
| 9 import com.google.common.collect.Maps; | 9 import com.google.common.collect.Maps; |
| 10 import com.google.dart.compiler.DartCompilationError; | 10 import com.google.dart.compiler.DartCompilationError; |
| (...skipping 209 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 220 reportDuplicateDeclaration(listener, oldElement, newElement); | 220 reportDuplicateDeclaration(listener, oldElement, newElement); |
| 221 reportDuplicateDeclaration(listener, newElement, oldElement); | 221 reportDuplicateDeclaration(listener, newElement, oldElement); |
| 222 } | 222 } |
| 223 scope.declareElement(name, newElement); | 223 scope.declareElement(name, newElement); |
| 224 } | 224 } |
| 225 | 225 |
| 226 private static boolean shouldReportDuplicateDeclaration(Element oldElement, El
ement newElement) { | 226 private static boolean shouldReportDuplicateDeclaration(Element oldElement, El
ement newElement) { |
| 227 if (oldElement == null) { | 227 if (oldElement == null) { |
| 228 return false; | 228 return false; |
| 229 } | 229 } |
| 230 // ignore "assert" | |
| 231 if (Elements.isArtificialAssertMethod(oldElement)) { | |
| 232 return false; | |
| 233 } | |
| 234 // Getter/setter can shared same name, but not setter/setter and getter/gett
er. | 230 // Getter/setter can shared same name, but not setter/setter and getter/gett
er. |
| 235 if (newElement.getModifiers().isAbstractField() | 231 if (newElement.getModifiers().isAbstractField() |
| 236 && oldElement.getModifiers().isAbstractField()) { | 232 && oldElement.getModifiers().isAbstractField()) { |
| 237 if (newElement.getModifiers().isGetter() && !oldElement.getModifiers().isG
etter()) { | 233 if (newElement.getModifiers().isGetter() && !oldElement.getModifiers().isG
etter()) { |
| 238 return false; | 234 return false; |
| 239 } | 235 } |
| 240 if (newElement.getModifiers().isSetter() && !oldElement.getModifiers().isS
etter()) { | 236 if (newElement.getModifiers().isSetter() && !oldElement.getModifiers().isS
etter()) { |
| 241 return false; | 237 return false; |
| 242 } | 238 } |
| 243 } | 239 } |
| (...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 298 } | 294 } |
| 299 | 295 |
| 300 @Override | 296 @Override |
| 301 public Void visitField(DartField node) { | 297 public Void visitField(DartField node) { |
| 302 Modifiers modifiers = node.getModifiers(); | 298 Modifiers modifiers = node.getModifiers(); |
| 303 node.setElement(Elements.fieldFromNode(node, library, node.getObsoleteMeta
data(), modifiers)); | 299 node.setElement(Elements.fieldFromNode(node, library, node.getObsoleteMeta
data(), modifiers)); |
| 304 return null; | 300 return null; |
| 305 } | 301 } |
| 306 } | 302 } |
| 307 } | 303 } |
| OLD | NEW |