Delay Class parsing until the class is actually used.

runtime/vm/parser.cc

Index: runtime/vm/parser.cc
===================================================================
--- runtime/vm/parser.cc	(revision 22914)
+++ runtime/vm/parser.cc	(working copy)
@@ -261,9 +261,9 @@
 
 
 // For parsing a compilation unit.
-Parser::Parser(const Script& script, const Library& library)
+Parser::Parser(const Script& script, const Library& library, intptr_t token_pos)
     : script_(Script::Handle(script.raw())),
-      tokens_iterator_(TokenStream::Handle(script.tokens()), 0),
+      tokens_iterator_(TokenStream::Handle(script.tokens()), token_pos),
       token_kind_(Token::kILLEGAL),
       current_block_(NULL),
       is_top_level_(false),
@@ -352,7 +352,7 @@
                                   const Script& script) {
   ASSERT(Isolate::Current()->long_jump_base()->IsSafeToJump());
   TimerScope timer(FLAG_compiler_stats, &CompilerStats::parser_timer);
-  Parser parser(script, library);
+  Parser parser(script, library, 0);
   parser.ParseTopLevel();
 }
 
@@ -737,6 +737,19 @@
 }
 
 
+void Parser::ParseClass(const Class& cls) {
+  if (!cls.is_synthesized_class()) {
+    TimerScope timer(FLAG_compiler_stats, &CompilerStats::parser_timer);
+    Isolate* isolate = Isolate::Current();
+    ASSERT(isolate->long_jump_base()->IsSafeToJump());
+    const Script& script = Script::Handle(isolate, cls.script());
+    const Library& lib = Library::Handle(isolate, cls.library());
+    Parser parser(script, lib, cls.token_pos());
+    parser.ParseClassDefinition(cls);
+  }
+}
+
+
 void Parser::ParseFunction(ParsedFunction* parsed_function) {
   TimerScope timer(FLAG_compiler_stats, &CompilerStats::parser_timer);
   Isolate* isolate = Isolate::Current();
@@ -2481,6 +2494,21 @@
 }
 
 
+// Skips tokens up to matching closing braces.
+void Parser::SkipToMatchingBraces() {

[hausner, 2013/05/21 20:07:30]

Parser::SkipBlock() does the same thing and additionally makes sure that all
braces, parens and brackets are properly nested.

[siva, 2013/05/23 00:54:31]

Thanks for pointing that out, used SkipBlock).

On 2013/05/21 20:07:30, hausner wrote:

+  ASSERT(CurrentToken() == Token::kLBRACE);
+  int level = 0;
+  do {
+    if (CurrentToken() == Token::kLBRACE) {
+      level++;
+    } else if (CurrentToken() == Token::kRBRACE) {
+      level--;
+    }
+    ConsumeToken();
+  } while ((level > 0) && (CurrentToken() != Token::kEOS));
+}
+
+
 void Parser::SkipInitializers() {
   ASSERT(CurrentToken() == Token::kCOLON);
   do {
@@ -3201,8 +3229,8 @@
 }
 
 
-void Parser::ParseClassDefinition(const GrowableObjectArray& pending_classes) {
-  TRACE_PARSER("ParseClassDefinition");
+void Parser::ParseClassDeclaration(const GrowableObjectArray& pending_classes) {
+  TRACE_PARSER("ParseClassDeclaration");
   bool is_patch = false;
   bool is_abstract = false;
   if (is_patch_source() &&
@@ -3214,7 +3242,6 @@
     is_abstract = true;
     ConsumeToken();
   }
-  const intptr_t class_pos = TokenPos();
   ExpectToken(Token::kCLASS);
   const intptr_t classname_pos = TokenPos();
   String& class_name = *ExpectUserDefinedTypeIdentifier("class name expected");
@@ -3257,6 +3284,7 @@
       }
       // Pre-registered classes need their scripts connected at this time.
       cls.set_script(script_);
+      cls.set_token_pos(classname_pos);
     }
   }
   ASSERT(!cls.IsNull());
@@ -3328,24 +3356,50 @@
     ParseInterfaceList(cls);
   }
 
+  if (is_abstract) {
+    cls.set_is_abstract();
+  }
+  if (is_patch) {
+    // Apply the changes to the patched class looked up above.
+    ASSERT(obj.raw() == library_.LookupLocalObject(class_name));
+    // The patched class must not be finalized yet.
+    const Class& orig_class = Class::Cast(obj);
+    ASSERT(!orig_class.is_finalized());
+    orig_class.add_patch_class(cls);
+    cls.set_is_patch();
+  }
+  pending_classes.Add(cls, Heap::kOld);
+
+  if (CurrentToken() != Token::kLBRACE) {
+    ErrorMsg("'%s' expected", Token::Str(Token::kLBRACE));

[hausner, 2013/05/21 20:07:30]

Is it Rube Goldberg's birthday? ;-)
I think it's good enough to say ErrorMsg("'{' expected");
No need to use Token::Str() when we know what the token is.

[siva, 2013/05/23 00:54:31]

Done. 
(was just guarding for the time when we decide to use '@' to terminate blocks
;-) )

+  }
+  SkipToMatchingBraces();

[hausner, 2013/05/21 20:07:30]

Use SkipBlock instead (and maybe rename the function)?

[siva, 2013/05/23 00:54:31]

Done.

+}
+
+
+void Parser::ParseClassDefinition(const Class& cls) {
+  TRACE_PARSER("ParseClassDefinition");
+  set_current_class(cls);
+  is_top_level_ = true;
+  String& class_name = String::Handle(cls.Name());
+  const intptr_t class_pos = TokenPos();
+  ClassDesc members(cls, class_name, false, class_pos);
+  while (CurrentToken() != Token::kLBRACE) {
+    ConsumeToken();
+  }
   ExpectToken(Token::kLBRACE);
-  ClassDesc members(cls, class_name, false, class_pos);
   while (CurrentToken() != Token::kRBRACE) {
     SkipMetadata();
     ParseClassMemberDefinition(&members);
   }
   ExpectToken(Token::kRBRACE);
 
-  if (is_abstract) {
-    cls.set_is_abstract();
-  }
-
   CheckConstructors(&members);
 
   // Need to compute this here since MakeArray() will clear the
   // functions array in members.
   const bool need_implicit_constructor =
-      !members.has_constructor() && !is_patch;
+      !members.has_constructor() && !cls.is_patch();
 
   Array& array = Array::Handle();
   array = Array::MakeArray(members.fields());
@@ -3361,16 +3415,15 @@
     AddImplicitConstructor(cls);
   }
 
-  if (!is_patch) {
-    pending_classes.Add(cls, Heap::kOld);
-  } else {
+  if (cls.is_patch()) {
     // Apply the changes to the patched class looked up above.
-    ASSERT(obj.raw() == library_.LookupLocalObject(class_name));
+    Object& obj = Object::Handle(library_.LookupLocalObject(class_name));
     // The patched class must not be finalized yet.
-    ASSERT(!Class::Cast(obj).is_finalized());
-    const char* err_msg = Class::Cast(obj).ApplyPatch(cls);
+    const Class& orig_class = Class::Cast(obj);
+    ASSERT(!orig_class.is_finalized());
+    const char* err_msg = orig_class.ApplyPatch(cls);
     if (err_msg != NULL) {
-      ErrorMsg(classname_pos, "applying patch failed with '%s'", err_msg);
+      ErrorMsg(class_pos, "applying patch failed with '%s'", err_msg);
     }
   }
 }
@@ -3495,6 +3548,7 @@
   // TODO(hausner): treat the mixin application as an alias, not as a base
   // class whose super class is the mixin application!
   mixin_application.set_super_type(type);
+  mixin_application.set_is_synthesized_class();
 
   AddImplicitConstructor(mixin_application);
   if (CurrentToken() == Token::kIMPLEMENTS) {
@@ -3903,6 +3957,7 @@
     mixin_application.set_super_type(mixin_super_type);
     mixin_application.set_mixin(Type::Cast(mixin_type));
     mixin_application.set_library(library_);
+    mixin_application.set_is_synthesized_class();
     AddImplicitConstructor(mixin_application);
     // Add the mixin type to the interfaces that the mixin application
     // class implements. This is necessary so that type tests work.
@@ -4487,17 +4542,17 @@
     set_current_class(Class::Handle());  // No current class.
     SkipMetadata();
     if (CurrentToken() == Token::kCLASS) {
-      ParseClassDefinition(pending_classes);
+      ParseClassDeclaration(pending_classes);
     } else if ((CurrentToken() == Token::kTYPEDEF) &&
                (LookaheadToken(1) != Token::kLPAREN)) {
       set_current_class(toplevel_class);
       ParseTypedef(pending_classes);
     } else if ((CurrentToken() == Token::kABSTRACT) &&
         (LookaheadToken(1) == Token::kCLASS)) {
-      ParseClassDefinition(pending_classes);
+      ParseClassDeclaration(pending_classes);
     } else if (is_patch_source() && IsLiteral("patch") &&
                (LookaheadToken(1) == Token::kCLASS)) {
-      ParseClassDefinition(pending_classes);
+      ParseClassDeclaration(pending_classes);
     } else {
       set_current_class(toplevel_class);
       if (IsVariableDeclaration()) {
@@ -4513,6 +4568,7 @@
       }
     }
   }
+  toplevel_class.set_is_parsed();
   if ((top_level.fields.Length() > 0) || (top_level.functions.Length() > 0)) {
     Array& array = Array::Handle();
 
@@ -8023,7 +8079,7 @@
   }
   Type& type = Type::ZoneHandle(
       Type::New(current_class(), type_arguments, type_pos));
-  if (!is_top_level_) {
+  if (!is_top_level_ || current_class().is_type_finalized()) {
     type ^= ClassFinalizer::FinalizeType(
         current_class(), type, ClassFinalizer::kCanonicalizeWellFormed);
   }