Two-phase constructors

runtime/vm/parser.h

 // Copyright (c) 2011, 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 "vm/ast.h"
@@ skipping 203 matching lines @@
                             ParamList* params);
   void ParseFormalParameters(bool allow_explicit_default_values,
                              ParamList* params);
   void ParseFormalParameterList(bool allow_explicit_default_values,
                                 ParamList* params);
   void ParseNamedFormalParameters(bool are_implicitly_const, ParamList* params);
   void CheckConstFieldsInitialized(const Class& cls);
   void CheckConstructors(ClassDesc* members);
   void ParseInitializedInstanceFields(const Class& cls,
            GrowableArray<FieldInitExpression>* initializers);
-  void GenerateSuperInitializerCall(const Class& cls, LocalVariable* receiver);
+  void GenerateSuperConstructorCall(const Class& cls,
+                                    LocalVariable* receiver);
   AstNode* ParseSuperInitializer(const Class& cls, LocalVariable* receiver);
   AstNode* ParseInitializer(const Class& cls, LocalVariable* receiver);
   void ParseConstructorRedirection(const Class& cls, LocalVariable* receiver);
-  void ParseInitializers(const Class& cls);
+  void ParseInitializers(const Class& cls, LocalVariable* receiver);
   String& ParseNativeDeclaration();
   RawArray* ParseInterfaceList();
   void AddInterfaces(intptr_t interfaces_pos,
                      const Class& cls,
                      const Array& interfaces);
   RawFunction* GetSuperFunction(intptr_t token_pos, const String& name);
   AstNode* ParseSuperCall(const String& function_name);
   AstNode* ParseSuperFieldAccess(const String& field_name);
   AstNode* ParseSuperOperator();
 
@@ skipping 13 matching lines @@
   SequenceNode* ParseInstanceGetter(const Function& func);
   SequenceNode* ParseInstanceSetter(const Function& func);
   SequenceNode* ParseStaticConstGetter(const Function& func);
 
   void ChainNewBlock(LocalScope* outer_scope);
   void OpenBlock();
   void OpenLoopBlock();
   void OpenFunctionBlock(const Function& func);
   SequenceNode* CloseBlock();
 
+  LocalVariable* LookupPhaseParameter();
   LocalVariable* LookupReceiver(LocalScope* from_scope, bool test_only);
   void CaptureReceiver();
   AstNode* LoadReceiver(intptr_t token_index);
   AstNode* CallGetter(intptr_t token_index,
                       AstNode* object,
                       const String& name);
 
   AstNode* ParseAssertStatement();
   AstNode* ParseJump(String* label_name);
   AstNode* ParseIfStatement(String* label_name);
@@ skipping 66 matching lines @@
   AstNode* ParseMapLiteral(intptr_t type_pos,
                            bool is_const,
                            const TypeArguments& type_arguments);
   AstNode* ParseNewOperator();
 
   const Array* BuildArgumentsDescriptor(
       int num_args,
       GrowableArray<const String*>& named_argument_names,
       GrowableArray<const Smi*>& named_argument_positions);
   // An implicit argument, if non-null, is prepended to the returned list.
-  ArgumentListNode* ParseActualParameters(AstNode* implicit_argument,
+  ArgumentListNode* ParseActualParameters(ArgumentListNode* implicit_arguments,
                                           bool require_const);
   AstNode* ParseStaticCall(const Class& cls,
                            const String& method_name,
                            intptr_t ident_pos);
   AstNode* ParseInstanceCall(AstNode* receiver, const String& method_name);
   AstNode* ParseClosureCall(AstNode* closure);
   AstNode* ParseInstanceFieldAccess(AstNode* receiver,
                                     const String& field_name);
   AstNode* GenerateStaticFieldLookup(const Field& field,
                                      intptr_t ident_pos);
@@ skipping 81 matching lines @@
   TryBlocks* try_blocks_list_;
 
   char error_msg_[kErrorBuflen];
 
   DISALLOW_COPY_AND_ASSIGN(Parser);
 };
 
 }  // namespace dart
 
 #endif  // VM_PARSER_H_