Add support for malformed types and postpone some related errors from compile

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 "vm/ast.h"
+#include "vm/class_finalizer.h"
 #include "vm/compiler_stats.h"
 #include "vm/scanner.h"
 
 namespace dart {
 
 // Forward declarations.
 class Function;
 class Script;
 class TokenStream;
 
@@ skipping 153 matching lines @@
   // Format an error or warning message into the message_buffer.
   // A null script means no source and a negative token_index means no position.
   static void FormatMessage(const Script& script,
                             intptr_t token_index,
                             const char* message_header,
                             char* message_buffer,
                             intptr_t message_buffer_size,
                             const char* format,
                             va_list args);
 
-  // Reports error message at location of current token.
+  // Reports error/warning message at location of current token.
   void ErrorMsg(const char* msg, ...);
+  void Warning(const char* msg, ...);
+  void Unimplemented(const char* msg);
+
+  // Reports error message at given location.
   void ErrorMsg(intptr_t token_index, const char* msg, ...);
-  void Warning(const char* msg, ...);
   void Warning(intptr_t token_index, const char* msg, ...);
-  void Unimplemented(const char* msg);
 
   const Instance& EvaluateConstExpr(AstNode* expr);
   void RunStaticFieldInitializer(const Field& field);
   RawObject* EvaluateConstConstructorCall(
       const Class& type_class,
       const AbstractTypeArguments& type_arguments,
       const Function& constructor,
       ArgumentListNode* arguments);
   AstNode* FoldConstExpr(intptr_t expr_pos, AstNode* expr);
 
@@ skipping 10 matching lines @@
   Dart_Handle CallLibraryTagHandler(Dart_LibraryTag tag,
                                     intptr_t token_pos,
                                     const String& url,
                                     const Array& import_map);
   void ParseLibraryDefinition();
   void ParseLibraryName();
   void ParseLibraryImport();
   void ParseLibraryInclude();
   void ParseLibraryResource();
 
-  enum TypeResolution {
-    kIgnore,  // Parsed type is ignored and replaced by Dynamic.
-    kDoNotResolve,  // Type resolution is postponed.
-    kCanResolve,  // Type resolution is optional.
-    kMustResolve  // Type resolution is required.
-  };
   void ResolveTypeFromClass(const Class& cls,
-                            TypeResolution type_resolution,
+                            ClassFinalizer::TypeFinalization finalization,
                             AbstractType* type);
-  RawAbstractType* ParseType(TypeResolution type_resolution);
+  RawAbstractType* ParseType(ClassFinalizer::TypeFinalization finalization);
   void ParseTypeParameters(const Class& cls);
-  RawAbstractTypeArguments* ParseTypeArguments(TypeResolution type_resolution);
+  RawAbstractTypeArguments* ParseTypeArguments(
+      Error* malformed_error,
+      ClassFinalizer::TypeFinalization finalization);
   void ParseQualIdent(QualIdent* qual_ident);
   void ParseMethodOrConstructor(ClassDesc* members, MemberDesc* method);
   void ParseFieldDefinition(ClassDesc* members, MemberDesc* field);
   void ParseClassMemberDefinition(ClassDesc* members);
   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);
@@ skipping 74 matching lines @@
   // 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.
   void AddFinallyBlockToNode(AstNode* node, InlinedFinallyNode* finally_node);
   AstNode* ParseTryStatement(String* label_name);
-  RawAbstractType* ParseFinalVarOrType(TypeResolution type_resolution);
+  RawAbstractType* ParseFinalVarOrType(
+      ClassFinalizer::TypeFinalization finalization);
   AstNode* ParseVariableDeclaration(const AbstractType& type, bool is_const);
   AstNode* ParseVariableDeclarationList();
   AstNode* ParseFunctionStatement(bool is_literal);
   AstNode* ParseStatement();
   SequenceNode* ParseNestedStatement(bool parsing_loop_body,
                                      SourceLabel* label);
   void ParseStatementSequence();
   bool IsIdentifier();
   bool IsFunctionTypeAliasName();
   bool TryParseTypeParameter();
@@ skipping 124 matching lines @@
   // code at all points in the try block where an exit from the block is
   // done using 'return', 'break' or 'continue' statements.
   TryBlocks* try_blocks_list_;
 
   DISALLOW_COPY_AND_ASSIGN(Parser);
 };
 
 }  // namespace dart
 
 #endif  // VM_PARSER_H_