Undo change 29900

runtime/vm/parser.h

Index: runtime/vm/parser.h
===================================================================
--- runtime/vm/parser.h	(revision 29949)
+++ runtime/vm/parser.h	(working copy)
@@ -8,41 +8,28 @@
 #include "include/dart_api.h"
 
 #include "lib/invocation_mirror.h"
-#include "platform/assert.h"
-#include "platform/globals.h"
-#include "vm/allocation.h"
+#include "vm/ast.h"
 #include "vm/class_finalizer.h"
 #include "vm/compiler_stats.h"
-#include "vm/object.h"
-#include "vm/raw_object.h"
-#include "vm/token.h"
+#include "vm/scanner.h"
 
 namespace dart {
 
 // Forward declarations.
-class ArgumentListNode;
 class ArgumentsDescriptor;
-class AstNode;
-class CaseNode;
-class ClassDesc;
-class ConstructorCallNode;
-template <typename T> class GrowableArray;
-class InlinedFinallyNode;
+class Function;
 class Isolate;
-class LetNode;
-class LiteralNode;
-class LocalScope;
-class LocalVariable;
-class PrimaryNode;
-class SequenceNode;
-class SourceLabel;
-class StaticCallNode;
+class LiteralToken;
+class Script;
+class TokenStream;
 
-struct CatchParameter;
+struct TopLevel;
+class ClassDesc;
 struct MemberDesc;
 struct ParamList;
 struct QualIdent;
-struct TopLevel;
+struct CatchParamDesc;
+struct FieldInitExpression;
 
 // The class ParsedFunction holds the result of parsing a function.
 class ParsedFunction : public ZoneAllocated {
@@ -518,9 +505,9 @@
   AstNode* ParseSwitchStatement(String* label_name);
 
   // try/catch/finally parsing.
-  void AddCatchParametersToScope(CatchParameter* exception_param,
-                                 CatchParameter* stack_trace_param,
-                                 LocalScope* scope);
+  void AddCatchParamsToScope(const CatchParamDesc& exception_param,
+                             const CatchParamDesc& stack_trace_param,
+                             LocalScope* scope);
   // Parse finally block and create an AST for it.
   SequenceNode* ParseFinallyBlock();
   // Adds try block to the list of try blocks seen so far.
@@ -643,8 +630,6 @@
   LetNode* PrepareCompoundAssignmentNodes(AstNode** expr);
   LocalVariable* CreateTempConstVariable(intptr_t token_pos, const char* s);
 
-  LocalVariable* EnsureLocalVariable(const String& name);
-
   static SequenceNode* NodeAsSequenceNode(intptr_t sequence_pos,
                                           AstNode* node,
                                           LocalScope* scope);