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

Unified Diff: runtime/vm/parser.cc

Issue 8294005: Rename class AssertError to AssertionError in the VM (fix issue 119). (Closed) Base URL: http://dart.googlecode.com/svn/branches/bleeding_edge/dart/
Patch Set: Created 9 years, 2 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 | « runtime/vm/bootstrap_natives.h ('k') | tests/language/language.status » ('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 457)
+++ runtime/vm/parser.cc (working copy)
@@ -28,7 +28,7 @@
DEFINE_FLAG(bool, silent_warnings, true, "Silence warnings.");
// All references to Dart names are listed here.
-static const char* kAssertErrorName = "AssertError";
+static const char* kAssertionErrorName = "AssertionError";
static const char* kFallThroughErrorName = "FallThroughError";
static const char* kThrowNewName = "throwNew";
static const char* kGrowableObjectArrayFromArrayName =
@@ -4204,7 +4204,7 @@
Integer::ZoneHandle(Integer::New(begin))));
arguments->Add(new LiteralNode(end,
Integer::ZoneHandle(Integer::New(end))));
- return MakeStaticCall(kAssertErrorName, kThrowNewName, arguments);
+ return MakeStaticCall(kAssertionErrorName, kThrowNewName, arguments);
}
@@ -4212,7 +4212,7 @@
ConsumeToken(); // Consume assert keyword.
ExpectToken(Token::kLPAREN);
const intptr_t condition_pos = token_index_;
- if (!FLAG_enable_asserts) { // always enable assert for now...
+ if (!FLAG_enable_asserts && !FLAG_enable_type_checks) {
SkipExpr();
ExpectToken(Token::kRPAREN);
return NULL;
« no previous file with comments | « runtime/vm/bootstrap_natives.h ('k') | tests/language/language.status » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698