Minor cleanup

pkg/analyzer/lib/src/generated/engine.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.
 
 // This code was auto-generated, is not intended to be edited, and is subject to
 // significant change. Please see the README file for more information.
 
 library engine;
 
 import 'dart:collection';
@@ skipping 11885 matching lines @@
   ResolutionState _nextState;
 
   /**
    * The source for the defining compilation unit of the library that contains this unit. If this
    * unit is the defining compilation unit for it's library, then this will be the source for this
    * unit.
    */
   Source _librarySource;
 
   /**
-   * A table mapping data descriptors to the cached results for those
-   * descriptors.
+   * A table mapping descriptors to the cached results for those descriptors.
+   * If there is no entry for a given descriptor then the state is implicitly
+   * [CacheState.INVALID] and the value is implicitly the default value.
    */
   Map<DataDescriptor, CachedResult> resultMap
       = new HashMap<DataDescriptor, CachedResult>();
 
   /**
    * Flush any AST structures being maintained by this state.
    */
   void flushAstStructures() {
     _flush(DartEntry.BUILT_UNIT);
     _flush(DartEntry.RESOLVED_UNIT);
@@ skipping 102 matching lines @@
   }
 
   /**
    * Set the state of the data represented by the given [descriptor] to the
    * given [state].
    */
   void setState(DataDescriptor descriptor, CacheState state) {
     if (state == CacheState.VALID) {
       throw new ArgumentError("use setValue() to set the state to VALID");
     }
-    CachedResult result = resultMap.putIfAbsent(
-        descriptor,
-        () => new CachedResult(descriptor));
-    result.state = state;
-    if (state != CacheState.IN_PROCESS) {
-      //
-      // If the state is in-process, we can leave the current value in the cache
-      // for any 'get' methods to access.
-      //
-      result.value = descriptor.defaultValue;
+    if (state == CacheState.INVALID) {
+      resultMap.remove(descriptor);
+    } else {
+      CachedResult result = resultMap.putIfAbsent(
+          descriptor,
+          () => new CachedResult(descriptor));
+      result.state = state;
+      if (state != CacheState.IN_PROCESS) {
+        //
+        // If the state is in-process, we can leave the current value in the cache
+        // for any 'get' methods to access.
+        //
+        result.value = descriptor.defaultValue;
+      }
     }
   }
 
   /**
    * Set the value of the data represented by the given [descriptor] to the
    * given [value].
    */
   void setValue(DataDescriptor/*<V>*/ descriptor, dynamic /*V*/ value) {
     CachedResult result = resultMap.putIfAbsent(
         descriptor,
@@ skipping 75 matching lines @@
   /**
    * Write a textual representation of the state of the value described by the
    * given [descriptor] to the given bugger, prefixed by the given [label] to
    * the given [buffer].
    */
   void _writeStateOn(StringBuffer buffer, String label, DataDescriptor descriptor) {
     CachedResult result = resultMap[descriptor];
     buffer.write("; ");
     buffer.write(label);
     buffer.write(" = ");
-    buffer.write(result == null ? "INVALID" : result.state);
+    buffer.write(result == null ? CacheState.INVALID : result.state);
   }
 }
 
 /**
  * A `ResolvableCompilationUnit` is a compilation unit that is not referenced by
  * any other objects. It is used by the [LibraryResolver] to resolve a library.
  */
 class ResolvableCompilationUnit {
   /**
    * The source of the compilation unit.
@@ skipping 851 matching lines @@
    * given [state].
    */
   void setState(DataDescriptor descriptor, CacheState state) {
     if (!_isValidDescriptor(descriptor)) {
       throw new ArgumentError("Invalid descriptor: $descriptor");
     }
     if (state == CacheState.VALID) {
       throw new ArgumentError("use setValue() to set the state to VALID");
     }
     _validateStateChange(descriptor, state);
-    CachedResult result = resultMap.putIfAbsent(
-        descriptor,
-        () => new CachedResult(descriptor));
-    result.state = state;
-    if (state != CacheState.IN_PROCESS) {
-      //
-      // If the state is in-process, we can leave the current value in the cache
-      // for any 'get' methods to access.
-      //
-      result.value = descriptor.defaultValue;
+    if (state == CacheState.INVALID) {
+      resultMap.remove(descriptor);
+    } else {
+      CachedResult result = resultMap.putIfAbsent(
+          descriptor,
+          () => new CachedResult(descriptor));
+      result.state = state;
+      if (state != CacheState.IN_PROCESS) {
+        //
+        // If the state is in-process, we can leave the current value in the cache
+        // for any 'get' methods to access.
+        //
+        result.value = descriptor.defaultValue;
+      }
     }
   }
 
   /**
    * Set the value of the data represented by the given [descriptor] to the
    * given [value].
    */
   void setValue(DataDescriptor/*<V>*/ descriptor, dynamic /*V*/ value) {
     if (!_isValidDescriptor(descriptor)) {
       throw new ArgumentError("Invalid descriptor: $descriptor");
@@ skipping 122 matching lines @@
   /**
    * Write a textual representation of the state of the value described by the
    * given [descriptor] to the given bugger, prefixed by the given [label] to
    * the given [buffer].
    */
   void _writeStateOn(StringBuffer buffer, String label, DataDescriptor descriptor) {
     CachedResult result = resultMap[descriptor];
     buffer.write("; ");
     buffer.write(label);
     buffer.write(" = ");
-    buffer.write(result == null ? "INVALID" : result.state);
+    buffer.write(result == null ? CacheState.INVALID : result.state);
   }
 
   /**
    * If the state of the value described by the given [descriptor] is changing
    * from ERROR to anything else, capture the information. This is an attempt to
    * discover the underlying cause of a long-standing bug.
    */
   void _validateStateChange(DataDescriptor descriptor, CacheState newState) {
     if (descriptor != CONTENT) {
       return;
@@ skipping 301 matching lines @@
     _index++;
     if (_index >= _manager._workQueues[_queueIndex].length) {
       _index = 0;
       _queueIndex++;
       while (_queueIndex < _manager._workQueues.length && _manager._workQueues[_queueIndex].isEmpty) {
         _queueIndex++;
       }
     }
   }
 }