Accept instance members and locals named "Function" (fixes #28610).

runtime/vm/parser.cc

 // 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.
 
 #include "vm/parser.h"
 #include "vm/flags.h"
 
 #ifndef DART_PRECOMPILED_RUNTIME
 
 #include "lib/invocation_mirror.h"
@@ skipping 5413 matching lines @@
     TokenPosition void_pos = TokenPos();
     ConsumeToken();
     // 'void' is always allowed as result type of a function type.
     if (!allow_void && !IsFunctionTypeSymbol()) {
       ReportError(void_pos, "'void' not allowed here");
     }
   } else if (!IsFunctionTypeSymbol()) {
     // Including 'Function' not followed by '(' or '<'.
     SkipType(false);
   }
-  while (IsSymbol(Symbols::Function())) {
+  while (IsFunctionTypeSymbol()) {
     ConsumeToken();
     SkipTypeArguments();
     if (CurrentToken() == Token::kLPAREN) {
       SkipToMatchingParenthesis();
     } else {
       ReportError("'(' expected");
     }
   }
 }
 
@@ skipping 2780 matching lines @@
   } else if ((CurrentToken() == Token::kIDENT) && !IsFunctionTypeSymbol()) {
     // 'Function' not followed by '(' or '<' means the Function class.
     if (!TryParseQualIdent()) {
       return false;
     }
     if ((CurrentToken() == Token::kLT) && !TryParseTypeParameters()) {
       return false;
     }
     found = true;
   }
-  while (IsSymbol(Symbols::Function())) {
+  while (IsFunctionTypeSymbol()) {
     ConsumeToken();
     if ((CurrentToken() == Token::kLT) && !TryParseTypeParameters()) {
       return false;
     }
     if (CurrentToken() == Token::kLPAREN) {
       SkipToMatchingParenthesis();
     } else {
       return false;
     }
     found = true;
@@ skipping 4735 matching lines @@
     // 'void' is always allowed as result type of a function type.
     if (!allow_void && !IsFunctionTypeSymbol()) {
       ReportError(void_pos, "'void' not allowed here");
     }
   } else if (!IsFunctionTypeSymbol()) {
     // Including 'Function' not followed by '(' or '<'.
     // It is too early to resolve the type here, since it can
     // refer to a not yet declared function type parameter.
     type = ParseType(ClassFinalizer::kDoNotResolve);
   }
-  while (IsSymbol(Symbols::Function())) {
+  while (IsFunctionTypeSymbol()) {
     if (type.IsNull()) {
       type = Type::DynamicType();
     }
     // 'type' is the result type of the function type.
     type = ParseFunctionType(type, ClassFinalizer::kDoNotResolve);
   }
   // At this point, all type parameters have been parsed, resolve the type.
   if (finalization == ClassFinalizer::kIgnore) {
     return Type::DynamicType();
   }
@@ skipping 57 matching lines @@
 
     const bool use_function_type_syntax = true;
     const bool allow_explicit_default_values = false;
     const bool evaluate_metadata = false;
     ParseFormalParameterList(use_function_type_syntax,
                              allow_explicit_default_values, evaluate_metadata,
                              &params);
     AddFormalParamsToFunction(&params, signature_function);
     innermost_function_ = innermost_function_.parent_function();
     type = signature_function.SignatureType();
-  } while (IsSymbol(Symbols::Function()));
+  } while (IsFunctionTypeSymbol());
   // At this point, all type parameters have been parsed, resolve the type.
   if (finalization == ClassFinalizer::kIgnore) {
     return Type::DynamicType();
   }
   if (finalization >= ClassFinalizer::kResolveTypeParameters) {
     ResolveType(finalization, &type);
     if (finalization >= ClassFinalizer::kCanonicalize) {
       type ^= ClassFinalizer::FinalizeType(current_class(), type, finalization);
     }
   }
@@ skipping 1956 matching lines @@
     const ArgumentListNode& function_args,
     const LocalVariable* temp_for_last_arg,
     bool is_super_invocation) {
   UNREACHABLE();
   return NULL;
 }
 
 }  // namespace dart
 
 #endif  // DART_PRECOMPILED_RUNTIME