Rework EvaluationResultImpl class hierarchy.

editor/tools/plugins/com.google.dart.engine/src/com/google/dart/engine/constant/ConstantEvaluator.java

Index: editor/tools/plugins/com.google.dart.engine/src/com/google/dart/engine/constant/ConstantEvaluator.java
diff --git a/editor/tools/plugins/com.google.dart.engine/src/com/google/dart/engine/constant/ConstantEvaluator.java b/editor/tools/plugins/com.google.dart.engine/src/com/google/dart/engine/constant/ConstantEvaluator.java
index ad5a0abc6372a671bebe41aa753c3230d5aebc62..7cf5c4882c53a1462c6d3921ba471c9c435a8161 100644
--- a/editor/tools/plugins/com.google.dart.engine/src/com/google/dart/engine/constant/ConstantEvaluator.java
+++ b/editor/tools/plugins/com.google.dart.engine/src/com/google/dart/engine/constant/ConstantEvaluator.java
@@ -13,18 +13,14 @@
  */
 package com.google.dart.engine.constant;
 
-import com.google.dart.engine.ast.AstNode;
 import com.google.dart.engine.ast.Expression;
-import com.google.dart.engine.error.AnalysisError;
 import com.google.dart.engine.internal.constant.ConstantVisitor;
-import com.google.dart.engine.internal.constant.ErrorResult;
-import com.google.dart.engine.internal.constant.EvaluationResultImpl;
-import com.google.dart.engine.internal.constant.ValidResult;
+import com.google.dart.engine.internal.context.RecordingErrorListener;
+import com.google.dart.engine.internal.error.ErrorReporter;
+import com.google.dart.engine.internal.object.DartObjectImpl;
 import com.google.dart.engine.internal.resolver.TypeProvider;
 import com.google.dart.engine.source.Source;
 
-import java.util.ArrayList;
-
 /**
  * Instances of the class {@code ConstantEvaluator} evaluate constant expressions to produce their
  * compile-time value. According to the Dart Language Specification: <blockquote> A constant
@@ -93,15 +89,12 @@ public class ConstantEvaluator {
   }
 
   public EvaluationResult evaluate(Expression expression) {
-    EvaluationResultImpl result = expression.accept(new ConstantVisitor(typeProvider));
-    if (result instanceof ValidResult) {
-      return EvaluationResult.forValue(((ValidResult) result).getValue());
-    }
-    ArrayList<AnalysisError> errors = new ArrayList<AnalysisError>();
-    for (ErrorResult.ErrorData data : ((ErrorResult) result).getErrorData()) {
-      AstNode node = data.getNode();
-      errors.add(new AnalysisError(source, node.getOffset(), node.getLength(), data.getErrorCode()));
+    RecordingErrorListener errorListener = new RecordingErrorListener();
+    ErrorReporter errorReporter = new ErrorReporter(errorListener, source);
+    DartObjectImpl result = expression.accept(new ConstantVisitor(typeProvider, errorReporter));
+    if (result != null) {
+      return EvaluationResult.forValue(result);
     }
-    return EvaluationResult.forErrors(errors.toArray(new AnalysisError[errors.size()]));
+    return EvaluationResult.forErrors(errorListener.getErrors());
   }
 }