Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(377)

Unified Diff: runtime/vm/parser.cc

Issue 8509031: Revert r1380 that is breaking frog. (Closed) Base URL: http://dart.googlecode.com/svn/branches/bleeding_edge/dart/
Patch Set: Created 9 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « runtime/vm/object_test.cc ('k') | runtime/vm/parser_test.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/vm/parser.cc
===================================================================
--- runtime/vm/parser.cc (revision 1381)
+++ runtime/vm/parser.cc (working copy)
@@ -174,8 +174,6 @@
current_class_(Class::Handle()),
library_(library),
try_blocks_list_(NULL) {
- ASSERT(!tokens_.IsNull());
- ASSERT(!library.IsNull());
SetPosition(0);
}
@@ -194,8 +192,6 @@
current_class_(Class::Handle(current_function_.owner())),
library_(Library::Handle(current_class_.library())),
try_blocks_list_(NULL) {
- ASSERT(!tokens_.IsNull());
- ASSERT(!function.IsNull());
SetPosition(token_index);
}
@@ -2616,8 +2612,7 @@
// Allocate an interface to hold the type parameters and their 'extends'
// constraints. Make it the owner of the function type descriptor.
const Class& alias_owner = Class::Handle(
- Class::New(String::Handle(String::NewSymbol(":alias_owner")),
- Script::Handle()));
+ Class::New(String::Handle(String::NewSymbol("")), Script::Handle()));
alias_owner.set_is_interface();
set_current_class(alias_owner);
ParseTypeParameters(alias_owner);
@@ -3212,14 +3207,9 @@
is_top_level_ = true;
TopLevel top_level;
Class& toplevel_class = Class::ZoneHandle(
- Class::New(String::ZoneHandle(String::NewSymbol("::")), script_));
+ Class::New(String::ZoneHandle(String::NewSymbol("")), script_));
toplevel_class.set_library(library_);
- // We notify the class finalizer to expect classes to finalize.
- // This allows signature classes generated at runtime to be properly
- // finalized, without finalizing them prematurely at compile time.
- ClassFinalizer::ExpectClassesToFinalize();
-
if (is_library_source()) {
ParseLibraryDefinition();
}
@@ -3255,7 +3245,7 @@
library_.AddAnonymousClass(toplevel_class);
classes.Add(&toplevel_class);
}
- ClassFinalizer::AddClassesToFinalize(classes);
+ ClassFinalizer::AddPendingClasses(classes);
}
@@ -3689,8 +3679,8 @@
if (!errmsg.IsNull()) {
ErrorMsg(errmsg.ToCString());
}
- // The call to ClassFinalizer::FinalizeAndCanonicalizeType may have
- // extended the vector of type arguments.
+ // The call to ClassFinalizer::FinalizeTypeWhileParsing may have extended
+ // the vector of type arguments.
ASSERT(signature_type_arguments.IsNull() ||
(signature_type_arguments.Length() ==
signature_class.NumTypeArguments()));
« no previous file with comments | « runtime/vm/object_test.cc ('k') | runtime/vm/parser_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698