API clean-up

pkg/analyzer/lib/src/generated/error_verifier.dart

 // Copyright (c) 2014, 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.
 
 library engine.resolver.error_verifier;
 
 import "dart:math" as math;
 import 'dart:collection';
 
 import 'package:analyzer/src/generated/static_type_analyzer.dart';
@@ skipping 1572 matching lines @@
       if (element == null) {
         continue;
       }
       PropertyAccessorElement getter = element.getter;
       PropertyAccessorElement setter = element.setter;
       SimpleIdentifier fieldName = field.name;
       if (getter != null) {
         if (_checkForAllInvalidOverrideErrorCodesForExecutable(
             getter,
             ParameterElementImpl.EMPTY_ARRAY,
-            AstNode.EMPTY_ARRAY,
+            AstNode.EMPTY_LIST,
             fieldName)) {
           hasProblems = true;
         }
       }
       if (setter != null) {
         if (_checkForAllInvalidOverrideErrorCodesForExecutable(
             setter,
             setter.parameters,
             <AstNode>[fieldName],
             fieldName)) {
@@ skipping 2743 matching lines @@
   bool _checkForMixedReturns(BlockFunctionBody node) {
     if (_hasReturnWithoutValue) {
       return false;
     }
     int withCount = _returnsWith.length;
     int withoutCount = _returnsWithout.length;
     if (withCount > 0 && withoutCount > 0) {
       for (int i = 0; i < withCount; i++) {
         _errorReporter.reportErrorForToken(
             StaticWarningCode.MIXED_RETURN_TYPES,
-            _returnsWith[i].keyword);
+            _returnsWith[i].returnKeyword);
       }
       for (int i = 0; i < withoutCount; i++) {
         _errorReporter.reportErrorForToken(
             StaticWarningCode.MIXED_RETURN_TYPES,
-            _returnsWithout[i].keyword);
+            _returnsWithout[i].returnKeyword);
       }
       return true;
     }
     return false;
   }
 
   /**
    * This verifies that the passed mixin does not have an explicitly declared constructor.
    *
    * @param mixinName the node to report problem on
@@ skipping 1596 matching lines @@
    *
    * @param directives the list of directives that have the same prefix
    * @return `true` if an error was generated
    * See [CompileTimeErrorCode.SHARED_DEFERRED_PREFIX].
    */
   bool _hasDeferredPrefixCollision(List<ImportDirective> directives) {
     bool foundError = false;
     int count = directives.length;
     if (count > 1) {
       for (int i = 0; i < count; i++) {
-        sc.Token deferredToken = directives[i].deferredToken;
+        sc.Token deferredToken = directives[i].deferredKeyword;
         if (deferredToken != null) {
           _errorReporter.reportErrorForToken(
               CompileTimeErrorCode.SHARED_DEFERRED_PREFIX,
               deferredToken);
           foundError = true;
         }
       }
     }
     return foundError;
   }
@@ skipping 334 matching lines @@
     toCheck.add(type.element);
     // type arguments
     if (type is InterfaceType) {
       InterfaceType interfaceType = type;
       for (DartType typeArgument in interfaceType.typeArguments) {
         _addTypeToCheck(typeArgument);
       }
     }
   }
 }