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

Unified Diff: runtime/vm/parser.cc

Issue 9302025: Fix build breakage. (Closed) Base URL: http://dart.googlecode.com/svn/branches/bleeding_edge/dart/
Patch Set: Created 8 years, 11 months 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 | « no previous file | no next file » | 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 3706)
+++ runtime/vm/parser.cc (working copy)
@@ -1904,6 +1904,7 @@
void Parser::ParseQualIdent(QualIdent* qual_ident) {
ASSERT(IsIdentifier());
+ ASSERT(!current_class().IsNull());
qual_ident->ident_pos = token_index_;
qual_ident->ident = CurrentLiteral();
qual_ident->lib_prefix = NULL;
@@ -3363,19 +3364,19 @@
ParseFunctionTypeAlias(&classes);
} else if (CurrentToken() == Token::kINTERFACE) {
ParseInterfaceDefinition(&classes);
- } else if (IsVariableDeclaration()) {
+ } else {
set_current_class(toplevel_class);
- ParseTopLevelVariable(&top_level);
- } else if (IsTopLevelFunction()) {
- set_current_class(toplevel_class);
- ParseTopLevelFunction(&top_level);
- } else if (IsTopLevelAccessor()) {
- set_current_class(toplevel_class);
- ParseTopLevelAccessor(&top_level);
- } else if (CurrentToken() == Token::kEOS) {
- break;
- } else {
- UnexpectedToken();
+ if (IsVariableDeclaration()) {
+ ParseTopLevelVariable(&top_level);
+ } else if (IsTopLevelFunction()) {
+ ParseTopLevelFunction(&top_level);
+ } else if (IsTopLevelAccessor()) {
+ ParseTopLevelAccessor(&top_level);
+ } else if (CurrentToken() == Token::kEOS) {
+ break;
+ } else {
+ UnexpectedToken();
+ }
}
}
if ((top_level.fields.length() > 0) || (top_level.functions.length() > 0)) {
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698