Throw CyclicInitializationError instead of string

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 "lib/invocation_mirror.h"
 #include "vm/bigint_operations.h"
 #include "vm/bootstrap.h"
 #include "vm/class_finalizer.h"
@@ skipping 950 matching lines @@
         new LiteralNode(ident_pos, Object::transition_sentinel()));
     // Set field to null prior to throwing exception, so that subsequent
     // accesses to the field do not throw again, since initializers should only
     // be executed once.
     SequenceNode* report_circular = new SequenceNode(ident_pos, NULL);
     report_circular->Add(
         new StoreStaticFieldNode(
             ident_pos,
             field,
             new LiteralNode(ident_pos, Instance::ZoneHandle())));
-    // TODO(regis, 5802): Exception to throw is not specified by spec.
-    const String& circular_error = String::ZoneHandle(
-        Symbols::New("circular dependency in field initialization"));
+    // call CyclicInitializationError._throwNew(field_name).

[srdjan, 2013/10/28 21:32:02]

s/call/Call/

[hausner, 2013/10/28 21:35:39]

Done.

+    ArgumentListNode* error_arguments = new ArgumentListNode(ident_pos);
+    error_arguments->Add(new LiteralNode(ident_pos, field_name));
     report_circular->Add(
-        new ThrowNode(ident_pos,
-                      new LiteralNode(ident_pos, circular_error),
-                      NULL));
+        MakeStaticCall(Symbols::CyclicInitializationError(),
+                       Library::PrivateCoreLibName(Symbols::ThrowNew()),
+                       error_arguments));
     AstNode* circular_check =
         new IfNode(ident_pos, compare_circular, report_circular, NULL);
     current_block_->statements->Add(circular_check);
 
     // Generate code checking for uninitialized field.
     AstNode* compare_uninitialized = new ComparisonNode(
         ident_pos,
         Token::kEQ_STRICT,
         new LoadStaticFieldNode(ident_pos, field),
         new LiteralNode(ident_pos, Object::sentinel()));
@@ skipping 9600 matching lines @@
 void Parser::SkipQualIdent() {
   ASSERT(IsIdentifier());
   ConsumeToken();
   if (CurrentToken() == Token::kPERIOD) {
     ConsumeToken();  // Consume the kPERIOD token.
     ExpectIdentifier("identifier expected after '.'");
   }
 }
 
 }  // namespace dart