Implement updated method overriding rules in the vm.

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 "lib/invocation_mirror.h"
@@ skipping 144 matching lines @@
   // A null script means no source and a negative token_pos means no position.
   static RawError* FormatError(const Script& script,
                                intptr_t token_pos,
                                const char* message_header,
                                const char* format,
                                va_list args);
   static RawError* FormatErrorMsg(const Script& script,
                                   intptr_t token_pos,
                                   const char* message_header,
                                   const char* format, ...)
-    PRINTF_ATTRIBUTE(4, 5);
+      PRINTF_ATTRIBUTE(4, 5);
 
   // Same as FormatError, but appends the new error to the 'prev_error'.
   static RawError* FormatErrorWithAppend(const Error& prev_error,
                                          const Script& script,
                                          intptr_t token_pos,
                                          const char* message_header,
                                          const char* format,
                                          va_list args);
 
+  static void AddImplicitConstructor(const Class& cls);
+
  private:
   friend class EffectGraphVisitor;  // For BuildNoSuchMethodArguments.
 
   struct Block;
   class TryBlocks;
 
   Parser(const Script& script, const Library& library, intptr_t token_pos);
   Parser(const Script& script, ParsedFunction* function, intptr_t token_pos);
 
   // The function for which we will generate code.
@@ skipping 106 matching lines @@
     Function& constructor,
     const AbstractTypeArguments& type_arguments);
 
   // A null script means no source and a negative token_pos means no position.
   static RawString* FormatMessage(const Script& script,
                                   intptr_t token_pos,
                                   const char* message_header,
                                   const char* format,
                                   va_list args);
 
-  // Reports error/warning message at location of current token.
+  // Reports error/warning msg at location of current token in current script.
   void ErrorMsg(const char* msg, ...) PRINTF_ATTRIBUTE(2, 3);
   void Warning(const char* msg, ...)  PRINTF_ATTRIBUTE(2, 3);
   void Unimplemented(const char* msg);
 
-  // Reports error message at given location.
+  // Reports error message at given location in current script.
   void ErrorMsg(intptr_t token_pos, const char* msg, ...) const
       PRINTF_ATTRIBUTE(3, 4);
   void Warning(intptr_t token_pos, const char* msg, ...)
       PRINTF_ATTRIBUTE(3, 4);
 
   // Reports an already formatted error message.
-  void ErrorMsg(const Error& error);
+  static void ErrorMsg(const Error& error);
 
   // Concatenates two error messages, the previous and the current one.
   void AppendErrorMsg(
       const Error& prev_error, intptr_t token_pos, const char* format, ...)
       PRINTF_ATTRIBUTE(4, 5);
 
   const Instance& EvaluateConstExpr(AstNode* expr);
   AstNode* RunStaticFieldInitializer(const Field& field);
   RawObject* EvaluateConstConstructorCall(
       const Class& type_class,
@@ skipping 40 matching lines @@
   void ParseFieldDefinition(ClassDesc* members, MemberDesc* field);
   void ParseClassMemberDefinition(ClassDesc* members,
                                   intptr_t metadata_pos);
   void ParseFormalParameter(bool allow_explicit_default_value,
                             ParamList* params);
   void ParseFormalParameters(bool allow_explicit_default_values,
                              ParamList* params);
   void ParseFormalParameterList(bool allow_explicit_default_values,
                                 ParamList* params);
   void CheckConstFieldsInitialized(const Class& cls);
-  void AddImplicitConstructor(const Class& cls);
   void CheckConstructors(ClassDesc* members);
   AstNode* ParseExternalInitializedField(const Field& field);
   void ParseInitializedInstanceFields(
       const Class& cls,
       LocalVariable* receiver,
       GrowableArray<Field*>* initialized_fields);
   void CheckDuplicateFieldInit(intptr_t init_pos,
                                GrowableArray<Field*>* initialized_fields,
                                Field* field);
   void GenerateSuperConstructorCall(const Class& cls,
@@ skipping 30 matching lines @@
   AstNode* ParseSuperCall(const String& function_name);
   AstNode* ParseSuperFieldAccess(const String& field_name);
   AstNode* ParseSuperOperator();
   AstNode* BuildUnarySuperOperator(Token::Kind op, PrimaryNode* super);
 
   static void SetupDefaultsForOptionalParams(const ParamList* params,
                                              Array& default_values);
   AstNode* CreateImplicitClosureNode(const Function& func,
                                      intptr_t token_pos,
                                      AstNode* receiver);
-  void AddFormalParamsToFunction(const ParamList* params, const Function& func);
+  static void AddFormalParamsToFunction(const ParamList* params,
+                                        const Function& func);
   void AddFormalParamsToScope(const ParamList* params, LocalScope* scope);
 
   SequenceNode* ParseConstructor(const Function& func,
                                  Array& default_parameter_values);
   SequenceNode* ParseFunc(const Function& func,
                           Array& default_parameter_values);
 
   void ParseNativeFunctionBlock(const ParamList* params, const Function& func);
 
   SequenceNode* ParseInstanceGetter(const Function& func);
@@ skipping 112 matching lines @@
   AstNode* GenerateStaticFieldLookup(const Field& field,
                                      intptr_t ident_pos);
   AstNode* ParseStaticFieldAccess(const Class& cls,
                                   const String& field_name,
                                   intptr_t ident_pos,
                                   bool consume_cascades);
 
   LocalVariable* LookupLocalScope(const String& ident);
   void CheckInstanceFieldAccess(intptr_t field_pos, const String& field_name);
   bool ParsingStaticMember() const;
-  const Type* ReceiverType() const;
+  static const AbstractType* ReceiverType(const Class& cls);
   bool IsInstantiatorRequired() const;
   bool ResolveIdentInLocalScope(intptr_t ident_pos,
                                 const String &ident,
                                 AstNode** node);
   static const bool kResolveLocally = true;
   static const bool kResolveIncludingImports = false;
 
   // Resolve a primary identifier in the library or prefix scope and
   // generate the corresponding AstNode.
   AstNode* ResolveIdentInCurrentLibraryScope(intptr_t ident_pos,
@@ skipping 120 matching lines @@
   // Each try in this function gets its own try index.
   intptr_t AllocateTryIndex() { return ++last_used_try_index_; }
   intptr_t last_used_try_index_;
 
   DISALLOW_COPY_AND_ASSIGN(Parser);
 };
 
 }  // namespace dart
 
 #endif  // VM_PARSER_H_