Simplify the desugaring of catch clauses.

runtime/vm/parser.h

 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #ifndef VM_PARSER_H_
 #define VM_PARSER_H_
 
 #include "include/dart_api.h"
 
+#include "platform/assert.h"
+#include "platform/globals.h"
 #include "lib/invocation_mirror.h"
+#include "vm/allocation.h"
 #include "vm/ast.h"
 #include "vm/class_finalizer.h"
 #include "vm/compiler_stats.h"
-#include "vm/scanner.h"
+#include "vm/object.h"
+#include "vm/raw_object.h"
+#include "vm/token.h"
 
 namespace dart {
 
 // Forward declarations.
 class ArgumentsDescriptor;
-class Function;
 class Isolate;
-class LiteralToken;
-class Script;
-class TokenStream;
+class LocalScope;
+class LocalVariable;
+class SourceLabel;
+template <typename T> class GrowableArray;
 
 struct TopLevel;
 class ClassDesc;
 struct MemberDesc;
 struct ParamList;
 struct QualIdent;
-struct CatchParamDesc;
-struct FieldInitExpression;
 
 // The class ParsedFunction holds the result of parsing a function.
 class ParsedFunction : public ZoneAllocated {
  public:
   explicit ParsedFunction(const Function& function)
       : function_(function),
         node_sequence_(NULL),
         instantiator_(NULL),
         default_parameter_values_(Array::ZoneHandle()),
         saved_current_context_var_(NULL),
@@ skipping 456 matching lines @@
   AstNode* ParseDoWhileStatement(String* label_name);
   AstNode* ParseForStatement(String* label_name);
   AstNode* ParseForInStatement(intptr_t forin_pos, SourceLabel* label);
   RawClass* CheckCaseExpressions(const GrowableArray<LiteralNode*>& values);
   CaseNode* ParseCaseClause(LocalVariable* switch_expr_value,
                             GrowableArray<LiteralNode*>* case_expr_values,
                             SourceLabel* case_label);
   AstNode* ParseSwitchStatement(String* label_name);
 
   // try/catch/finally parsing.
-  void AddCatchParamsToScope(const CatchParamDesc& exception_param,
-                             const CatchParamDesc& stack_trace_param,
-                             LocalScope* scope);
+  // Parse all the catch clause of a try.
+  SequenceNode* ParseCatchClauses(intptr_t handler_pos,
+                                  LocalVariable* exception_var,
+                                  LocalVariable* stack_trace_var,
+                                  const GrowableObjectArray& handler_types,
+                                  bool* needs_stack_trace);
   // Parse finally block and create an AST for it.
   SequenceNode* ParseFinallyBlock();
   // Adds try block to the list of try blocks seen so far.
   void PushTryBlock(Block* try_block);
   // Pops the inner most try block from the list.
   TryBlocks* PopTryBlock();
   // Add specified node to try block list so that it can be patched with
   // inlined finally code if needed.
   void AddNodeForFinallyInlining(AstNode* node);
   // Add the inlined finally block to the specified node.
@@ skipping 199 matching lines @@
   intptr_t last_used_try_index_;
 
   bool unregister_pending_function_;
 
   DISALLOW_COPY_AND_ASSIGN(Parser);
 };
 
 }  // namespace dart
 
 #endif  // VM_PARSER_H_