Updated parser to produce error when trying to reinitialize final variables in class constructors. …

runtime/vm/parser.cc

 // Copyright (c) 2012, 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/flags.h"
 
 #ifndef DART_PRECOMPILED_RUNTIME
 
 #include "lib/invocation_mirror.h"
@@ skipping 3003 matching lines @@
   // have an initializer expression inlined in the class declaration.
   // The remaining fields are those initialized by the constructor's
   // initializing formals and initializer list
   int initializer_idx = 0;
   while (initializer_idx < initialized_fields->length()) {
     Field* initialized_field = (*initialized_fields)[initializer_idx];
     initializer_idx++;
     if (initialized_field == NULL) {
       break;
     }
+
+    const String& initialized_name =
+        String::ZoneHandle(initialized_field->name());
+    const String& field_name = String::ZoneHandle(field->name());

[siva, 2017/06/13 22:20:08]

Why do these have to be zone handles and not just regular handles?

+    if (initialized_name.Equals(field_name) && field->IsFinalAndInitialized()) {
+      ReportError(init_pos, "'%s' is initialized already, and final.",

[zra, 2017/06/13 20:19:41]

How about "final field '%s' is already initialized" ?

[bkonyi, 2017/06/13 22:16:47]

Done.

+                  field_name.ToCString());
+    }
+
     if (initialized_field->raw() == field->raw()) {
       // This final field has been initialized by an inlined
       // initializer expression. This is a runtime error.
       // Throw a NoSuchMethodError for the missing setter.
       ASSERT(field->is_final());
 
       // Build a call to NoSuchMethodError::_throwNew(
       //     Object receiver,
       //     String memberName,
       //     int invocation_type,
@@ skipping 1454 matching lines @@
     MemberDesc* existing_member = &members->members()[i];
     if (name.Equals(*existing_member->DictName())) {
       ReportError(
           member->name_pos, "%s '%s' conflicts with previously declared %s",
           member->ToCString(), name.ToCString(), existing_member->ToCString());
     }
   }
 }
 
 
+void Parser::CheckMemberAlreadyInitializedConflicts(ClassDesc* members,
+                                                    MemberDesc* member) {
+  if (!member->IsConstructor()) {
+    return;
+  }
+  ParamList* params = &member->params;
+  if (!params->has_field_initializer) {
+    return;
+  }
+  const ZoneGrowableArray<ParamDesc>& parameters = *params->parameters;
+  for (int p = 0; p < parameters.length(); p++) {

[zra, 2017/06/13 20:19:41]

intptr_t p

[bkonyi, 2017/06/13 22:16:47]

Done.

+    const ParamDesc& current_param = parameters[p];
+    if (!current_param.is_field_initializer) {
+      continue;
+    }
+    const String& name = *current_param.name;
+    for (int i = 0; i < members->members().length(); i++) {

[zra, 2017/06/13 20:19:42]

intptr_t i

[bkonyi, 2017/06/13 22:16:47]

Done.

+      MemberDesc* existing_member = &members->members()[i];
+      if (existing_member->has_final &&
+          name.Equals(*existing_member->DictName()) &&
+          existing_member->field_ != NULL &&

[zra, 2017/06/13 20:19:42]

parens around != clause

[bkonyi, 2017/06/13 22:16:47]

Done.

+          existing_member->field_->IsFinalAndInitialized()) {
+        ReportError(current_param.name_pos,
+                    "'%s' is initialized already, and final.",

[zra, 2017/06/13 20:19:41]

"final field %s is already initialized"

[bkonyi, 2017/06/13 22:16:47]

Done.

+                    existing_member->DictName()->ToCString());
+      }
+    }
+  }
+}
+
+
 void Parser::ParseClassMemberDefinition(ClassDesc* members,
                                         TokenPosition metadata_pos) {
   TRACE_PARSER("ParseClassMemberDefinition");
   MemberDesc member;
   current_member_ = &member;
   member.metadata_pos = metadata_pos;
   member.decl_begin_pos = TokenPos();
   if ((CurrentToken() == Token::kEXTERNAL) &&
       (LookaheadToken(1) != Token::kLPAREN)) {
     ConsumeToken();
@@ skipping 192 matching lines @@
       AbstractType& type = AbstractType::ZoneHandle(Z, member.type->raw());
       ResolveType(&type);
       member.type = &type;
     }
     ParseFieldDefinition(members, &member);
   } else {
     UnexpectedToken();
   }
   current_member_ = NULL;
   CheckMemberNameConflict(members, &member);
+  CheckMemberAlreadyInitializedConflicts(members, &member);
   members->AddMember(member);
 }
 
 
 void Parser::ParseEnumDeclaration(const GrowableObjectArray& pending_classes,
                                   const Object& tl_owner,
                                   TokenPosition metadata_pos) {
   TRACE_PARSER("ParseEnumDeclaration");
   const TokenPosition declaration_pos =
       (metadata_pos.IsReal()) ? metadata_pos : TokenPos();
@@ skipping 10594 matching lines @@
                                                 TokenPosition* start,
                                                 TokenPosition* end) {
   UNREACHABLE();
   return false;
 }
 
 
 }  // namespace dart
 
 #endif  // DART_PRECOMPILED_RUNTIME