Clean up default parameter computation in parser

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"
@@ skipping 70 matching lines @@
 
   LocalVariable* instantiator() const { return instantiator_; }
   void set_instantiator(LocalVariable* instantiator) {
     // May be NULL.
     instantiator_ = instantiator;
   }
 
   void set_default_parameter_values(ZoneGrowableArray<const Instance*>* list) {
     default_parameter_values_ = list;
 #if defined(DEBUG)
+    if (list == NULL) return;
     for (intptr_t i = 0; i < list->length(); i++) {
       ASSERT(list->At(i)->IsZoneHandle() || list->At(i)->InVMHeap());
     }
 #endif
   }
 
 
   const Instance& DefaultParameterValueAt(intptr_t i) const {
     ASSERT(default_parameter_values_ != NULL);
     return *default_parameter_values_->At(i);
   }
 
+  ZoneGrowableArray<const Instance*>* default_parameter_values() const {
+    return default_parameter_values_;
+  }
+
   LocalVariable* current_context_var() const {
     return current_context_var_;
   }
 
   LocalVariable* expression_temp_var() const {
     ASSERT(has_expression_temp_var());
     return expression_temp_var_;
   }
   void set_expression_temp_var(LocalVariable* value) {
     ASSERT(!has_expression_temp_var());
@@ skipping 398 matching lines @@
                                 ArgumentListNode* arguments,
                                 bool resolve_getter,
                                 bool* is_no_such_method);
   AstNode* ParseSuperCall(const String& function_name);
   AstNode* ParseSuperFieldAccess(const String& field_name, intptr_t field_pos);
   AstNode* ParseSuperOperator();
   AstNode* BuildUnarySuperOperator(Token::Kind op, PrimaryNode* super);
 
   static bool ParseFormalParameters(const Function& func, ParamList* params);
 
-  static void SetupDefaultsForOptionalParams(
-      const ParamList& params,
-      ZoneGrowableArray<const Instance*>* default_values);
+  void SetupDefaultsForOptionalParams(const ParamList& params);
   ClosureNode* CreateImplicitClosureNode(const Function& func,
                                          intptr_t token_pos,
                                          AstNode* receiver);
   static void AddFormalParamsToFunction(const ParamList* params,
                                         const Function& func);
   void AddFormalParamsToScope(const ParamList* params, LocalScope* scope);
 
-  SequenceNode* ParseConstructor(
-      const Function& func, ZoneGrowableArray<const Instance*>* default_values);
-  SequenceNode* ParseFunc(
-      const Function& func, ZoneGrowableArray<const Instance*>* default_values);
+  SequenceNode* ParseConstructor(const Function& func);
+  SequenceNode* ParseFunc(const Function& func);
 
   void ParseNativeFunctionBlock(const ParamList* params, const Function& func);
 
   SequenceNode* ParseInstanceGetter(const Function& func);
   SequenceNode* ParseInstanceSetter(const Function& func);
   SequenceNode* ParseStaticFinalGetter(const Function& func);
   SequenceNode* ParseStaticInitializer();
   SequenceNode* ParseMethodExtractor(const Function& func);
-  SequenceNode* ParseNoSuchMethodDispatcher(
-      const Function& func, ZoneGrowableArray<const Instance*>* default_values);
-  SequenceNode* ParseInvokeFieldDispatcher(
-      const Function& func, ZoneGrowableArray<const Instance*>* default_values);
-  SequenceNode* ParseImplicitClosure(
-      const Function& func, ZoneGrowableArray<const Instance*>* default_values);
-  SequenceNode* ParseConstructorClosure(
-      const Function& func, ZoneGrowableArray<const Instance*>* default_values);
+  SequenceNode* ParseNoSuchMethodDispatcher(const Function& func);
+  SequenceNode* ParseInvokeFieldDispatcher(const Function& func);
+  SequenceNode* ParseImplicitClosure(const Function& func);
+  SequenceNode* ParseConstructorClosure(const Function& func);
 
   void BuildDispatcherScope(const Function& func,
-                            const ArgumentsDescriptor& desc,
-                            ZoneGrowableArray<const Instance*>* default_values);
+                            const ArgumentsDescriptor& desc);
 
   void EnsureHasReturnStatement(SequenceNode* seq, intptr_t return_pos);
   void ChainNewBlock(LocalScope* outer_scope);
   void OpenBlock();
   void OpenLoopBlock();
   void OpenFunctionBlock(const Function& func);
   void OpenAsyncClosure();
   RawFunction* OpenAsyncFunction(intptr_t formal_param_pos);
   RawFunction* OpenSyncGeneratorFunction(intptr_t func_pos);
   SequenceNode* CloseSyncGenFunction(const Function& closure,
@@ skipping 325 matching lines @@
 
   // Indentation of parser trace.
   intptr_t trace_indent_;
 
   DISALLOW_COPY_AND_ASSIGN(Parser);
 };
 
 }  // namespace dart
 
 #endif  // VM_PARSER_H_