A collection of context-related refactoring changes.

src/parser.cc

Index: src/parser.cc
diff --git a/src/parser.cc b/src/parser.cc
index 192892602e61b196401e2a89d2d67f4458f0a889..9803b5e05e97ea12ba833cd27b81b12534ea4fb3 100644
--- a/src/parser.cc
+++ b/src/parser.cc
@@ -1930,7 +1930,7 @@ Block* Parser::WithHelper(Expression* obj, ZoneStringList* labels, bool* ok) {
 
     // Create exit block.
     Block* exit = new(zone()) Block(NULL, 1, false);
-    exit->AddStatement(new(zone()) WithExitStatement());
+    exit->AddStatement(new(zone()) ContextExitStatement());
 
     // Return a try-finally statement.
     TryFinallyStatement* wrapper = new(zone()) TryFinallyStatement(body, exit);
@@ -2089,8 +2089,8 @@ TryStatement* Parser::ParseTryStatement(bool* ok) {
     Expect(Token::RPAREN, CHECK_OK);
 
     if (peek() == Token::LBRACE) {
-        // Rewrite the catch body B to a single statement block
-        // { try B finally { PopContext }}.
+      // Rewrite the catch body B to a single statement block
+      // { try B finally { PopContext }}.
       Block* inner_body;
       // We need to collect escapes from the body for both the inner
       // try/finally used to pop the catch context and any possible outer
@@ -2107,7 +2107,7 @@ TryStatement* Parser::ParseTryStatement(bool* ok) {
 
       // Create exit block.
       Block* inner_finally = new(zone()) Block(NULL, 1, false);
-      inner_finally->AddStatement(new(zone()) WithExitStatement());
+      inner_finally->AddStatement(new(zone()) ContextExitStatement());
 
       // Create a try/finally statement.
       TryFinallyStatement* inner_try_finally =