Issue 22279. Tweak constants evaluation error messages.

pkg/analyzer/lib/src/generated/error.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.error;
 
 import 'dart:collection';
 
 import 'ast.dart' show AstNode;
 import 'element.dart';
@@ skipping 686 matching lines @@
   static const CompileTimeErrorCode CONST_NOT_INITIALIZED =
       const CompileTimeErrorCode('CONST_NOT_INITIALIZED',
           "The const variable '{0}' must be initialized");
 
   /**
    * 12.11.2 Const: An expression of one of the forms !e, e1 && e2 or e1 || e2,
    * where e, e1 and e2 are constant expressions that evaluate to a boolean
    * value.
    */
   static const CompileTimeErrorCode CONST_EVAL_TYPE_BOOL =
-      const CompileTimeErrorCode(
-          'CONST_EVAL_TYPE_BOOL', "An expression of type 'bool' was expected");
+      const CompileTimeErrorCode('CONST_EVAL_TYPE_BOOL',
+          "In constant expressions operand(s) of this operator must be of type 'bool'");

[Brian Wilkerson, 2015/03/28 02:35:33]

I'd change "expressions" --> "expressions," but otherwise looks good.

[scheglov, 2015/03/28 03:09:15]

Done.

 
   /**
    * 12.11.2 Const: An expression of one of the forms e1 == e2 or e1 != e2 where
    * e1 and e2 are constant expressions that evaluate to a numeric, string or
    * boolean value or to null.
    */
   static const CompileTimeErrorCode CONST_EVAL_TYPE_BOOL_NUM_STRING =
       const CompileTimeErrorCode('CONST_EVAL_TYPE_BOOL_NUM_STRING',
-          "An expression of type 'bool', 'num', 'String' or 'null' was expected");
+          "In constant expressions operands of this operator must be of type 'bool', 'num', 'String' or 'null'");
 
   /**
    * 12.11.2 Const: An expression of one of the forms ~e, e1 ^ e2, e1 & e2,
    * e1 | e2, e1 >> e2 or e1 << e2, where e, e1 and e2 are constant expressions
    * that evaluate to an integer value or to null.
    */
   static const CompileTimeErrorCode CONST_EVAL_TYPE_INT =
-      const CompileTimeErrorCode(
-          'CONST_EVAL_TYPE_INT', "An expression of type 'int' was expected");
+      const CompileTimeErrorCode('CONST_EVAL_TYPE_INT',
+          "In constant expressions operand(s) of this operator must be of type 'int'");
 
   /**
    * 12.11.2 Const: An expression of one of the forms e, e1 + e2, e1 - e2, e1 *
    * e2, e1 / e2, e1 ~/ e2, e1 > e2, e1 < e2, e1 >= e2, e1 <= e2 or e1 % e2,
    * where e, e1 and e2 are constant expressions that evaluate to a numeric
    * value or to null.
    */
   static const CompileTimeErrorCode CONST_EVAL_TYPE_NUM =
-      const CompileTimeErrorCode(
-          'CONST_EVAL_TYPE_NUM', "An expression of type 'num' was expected");
+      const CompileTimeErrorCode('CONST_EVAL_TYPE_NUM',
+          "In constant expressions operand(s) of this operator must be of type 'num'");
 
   /**
    * 12.11.2 Const: It is a compile-time error if evaluation of a constant
    * object results in an uncaught exception being thrown.
    */
   static const CompileTimeErrorCode CONST_EVAL_THROWS_EXCEPTION =
       const CompileTimeErrorCode('CONST_EVAL_THROWS_EXCEPTION',
           "Evaluation of this constant expression causes exception");
 
   /**
@@ skipping 4135 matching lines @@
    * Initialize a newly created error code to have the given [name].
    */
   const TodoCode(String name) : super(name, "{0}");
 
   @override
   ErrorSeverity get errorSeverity => ErrorSeverity.INFO;
 
   @override
   ErrorType get type => ErrorType.TODO;
 }