Properly detect name collisions at library level

runtime/vm/parser.cc

 // Copyright (c) 2011, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #include "vm/parser.h"
 
 #include "vm/bigint_operations.h"
 #include "vm/class_finalizer.h"
 #include "vm/compiler.h"
 #include "vm/compiler_stats.h"
@@ skipping 2922 matching lines @@
   const Type& type = Type::ZoneHandle(
       ParseFinalVarOrType(kIsMandatory, kCanResolve));
 
   while (true) {
     const intptr_t name_pos = token_index_;
     String& var_name = *ExpectIdentifier("variable name expected");
 
     if (library_.LookupObject(var_name) != Object::null()) {
       ErrorMsg(name_pos, "'%s' is already defined", var_name.ToCString());
     }
+    String& accessor_name = String::Handle(Field::GetterName(var_name));
+    if (library_.LookupObject(accessor_name) != Object::null()) {
+      ErrorMsg(name_pos, "getter for '%s' is already defined",
+               var_name.ToCString());
+    }
+    accessor_name = Field::SetterName(var_name);
+    if (library_.LookupObject(accessor_name) != Object::null()) {
+      ErrorMsg(name_pos, "setter for '%s' is already defined",
+               var_name.ToCString());
+    }
+
     Field& field = Field::ZoneHandle(
         Field::New(var_name, is_static, is_final, name_pos));
     field.set_type(type);
     field.set_value(Instance::Handle(Instance::null()));
     top_level->fields.Add(&field);
     library_.AddObject(field, var_name);
     if (CurrentToken() == Token::kASSIGN) {
       ConsumeToken();
       SkipExpr();
       field.set_value(Instance::Handle(Object::sentinel()));
@@ skipping 32 matching lines @@
         (LookaheadToken(1) != Token::kLPAREN)) {
       result_type = ParseType(kCanResolve);
     }
   }
   const intptr_t name_pos = token_index_;
   const String& func_name = *ExpectIdentifier("function name expected");
 
   if (library_.LookupObject(func_name) != Object::null()) {
     ErrorMsg(name_pos, "'%s' is already defined", func_name.ToCString());
   }
+  String& accessor_name = String::Handle(Field::GetterName(func_name));
+  if (library_.LookupObject(accessor_name) != Object::null()) {
+    ErrorMsg(name_pos, "'%s' is already defined as getter",
+             func_name.ToCString());
+  }
+  accessor_name = Field::SetterName(func_name);
+  if (library_.LookupObject(accessor_name) != Object::null()) {
+    ErrorMsg(name_pos, "'%s' is already defined as setter",
+             func_name.ToCString());
+  }
 
   if (CurrentToken() != Token::kLPAREN) {
     ErrorMsg("'(' expected");
   }
   const intptr_t function_pos = token_index_;
   ParamList params;
   const bool allow_explicit_default_values = true;
   ParseFormalParameterList(allow_explicit_default_values, &params);
 
   if (CurrentToken() == Token::kLBRACE) {
@@ skipping 57 matching lines @@
   } else {
     expected_num_parameters = 1;
     accessor_name = Field::SetterName(*field_name);
   }
   if ((params.num_fixed_parameters != expected_num_parameters) ||
       (params.num_optional_parameters != 0)) {
     ErrorMsg(name_pos, "illegal %s parameters",
              is_getter ? "getter" : "setter");
   }
 
+  if (library_.LookupObject(*field_name) != Object::null()) {
+    ErrorMsg(name_pos, "'%s' is already defined in this library",
+             field_name->ToCString());
+  }
+  if (library_.LookupObject(accessor_name) != Object::null()) {
+    ErrorMsg(name_pos, "%s for '%s' is already defined",
+             is_getter ? "getter" : "setter",
+             field_name->ToCString());
+  }
+
   if (CurrentToken() == Token::kLBRACE) {
     SkipBlock();
   } else if (CurrentToken() == Token::kARROW) {
     ConsumeToken();
     SkipExpr();
     ExpectSemicolon();
   } else if (IsLiteral("native")) {
     ParseNativeDeclaration();
   } else {
     ErrorMsg("function block expected");
@@ skipping 4469 matching lines @@
 }
 
 
 void Parser::SkipNestedExpr() {
   const bool saved_mode = SetAllowFunctionLiterals(true);
   SkipExpr();
   SetAllowFunctionLiterals(saved_mode);
 }
 
 }  // namespace dart