| Index: pkg/analyzer_experimental/lib/src/generated/constant.dart
|
| diff --git a/pkg/analyzer_experimental/lib/src/generated/constant.dart b/pkg/analyzer_experimental/lib/src/generated/constant.dart
|
| index 233a09702ab8d044d759e8f6ae83d25b42b1ffa0..bb5a29207da56a35133dfec6c7bffb0f3dc65008 100644
|
| --- a/pkg/analyzer_experimental/lib/src/generated/constant.dart
|
| +++ b/pkg/analyzer_experimental/lib/src/generated/constant.dart
|
| @@ -1101,12 +1101,12 @@ class ValidResult extends EvaluationResultImpl {
|
| }
|
| EvaluationResultImpl addToError(BinaryExpression node, ErrorResult leftOperand) => leftOperand;
|
| EvaluationResultImpl addToValid(BinaryExpression node, ValidResult leftOperand2) {
|
| - if (isSomeNum || leftOperand2.isSomeNum) {
|
| - if (isAnyNum && leftOperand2.isAnyNum) {
|
| - return RESULT_NUM;
|
| - }
|
| + if (!isAnyNum || !leftOperand2.isAnyNum) {
|
| return error2(node, CompileTimeErrorCode.CONST_EVAL_TYPE_NUM);
|
| }
|
| + if (isSomeNum || leftOperand2.isSomeNum) {
|
| + return RESULT_NUM;
|
| + }
|
| Object leftValue = leftOperand2.value;
|
| if (leftValue == null) {
|
| return error(node.leftOperand);
|
| @@ -1133,12 +1133,12 @@ class ValidResult extends EvaluationResultImpl {
|
| }
|
| EvaluationResultImpl bitAndError(BinaryExpression node, ErrorResult leftOperand) => leftOperand;
|
| EvaluationResultImpl bitAndValid(BinaryExpression node, ValidResult leftOperand2) {
|
| - if (isSomeInt || leftOperand2.isSomeInt) {
|
| - if (isAnyInt && leftOperand2.isAnyInt) {
|
| - return RESULT_INT;
|
| - }
|
| + if (!isAnyInt || !leftOperand2.isAnyInt) {
|
| return error2(node, CompileTimeErrorCode.CONST_EVAL_TYPE_INT);
|
| }
|
| + if (isSomeInt || leftOperand2.isSomeInt) {
|
| + return RESULT_INT;
|
| + }
|
| Object leftValue = leftOperand2.value;
|
| if (leftValue == null) {
|
| return error(node.leftOperand);
|
| @@ -1157,12 +1157,12 @@ class ValidResult extends EvaluationResultImpl {
|
| }
|
| EvaluationResultImpl bitOrError(BinaryExpression node, ErrorResult leftOperand) => leftOperand;
|
| EvaluationResultImpl bitOrValid(BinaryExpression node, ValidResult leftOperand2) {
|
| - if (isSomeInt || leftOperand2.isSomeInt) {
|
| - if (isAnyInt && leftOperand2.isAnyInt) {
|
| - return RESULT_INT;
|
| - }
|
| + if (!isAnyInt || !leftOperand2.isAnyInt) {
|
| return error2(node, CompileTimeErrorCode.CONST_EVAL_TYPE_INT);
|
| }
|
| + if (isSomeInt || leftOperand2.isSomeInt) {
|
| + return RESULT_INT;
|
| + }
|
| Object leftValue = leftOperand2.value;
|
| if (leftValue == null) {
|
| return error(node.leftOperand);
|
| @@ -1181,12 +1181,12 @@ class ValidResult extends EvaluationResultImpl {
|
| }
|
| EvaluationResultImpl bitXorError(BinaryExpression node, ErrorResult leftOperand) => leftOperand;
|
| EvaluationResultImpl bitXorValid(BinaryExpression node, ValidResult leftOperand2) {
|
| - if (isSomeInt || leftOperand2.isSomeInt) {
|
| - if (isAnyInt && leftOperand2.isAnyInt) {
|
| - return RESULT_INT;
|
| - }
|
| + if (!isAnyInt || !leftOperand2.isAnyInt) {
|
| return error2(node, CompileTimeErrorCode.CONST_EVAL_TYPE_INT);
|
| }
|
| + if (isSomeInt || leftOperand2.isSomeInt) {
|
| + return RESULT_INT;
|
| + }
|
| Object leftValue = leftOperand2.value;
|
| if (leftValue == null) {
|
| return error(node.leftOperand);
|
| @@ -1213,12 +1213,12 @@ class ValidResult extends EvaluationResultImpl {
|
| }
|
| EvaluationResultImpl divideError(BinaryExpression node, ErrorResult leftOperand) => leftOperand;
|
| EvaluationResultImpl divideValid(BinaryExpression node, ValidResult leftOperand2) {
|
| - if (isSomeNum || leftOperand2.isSomeNum) {
|
| - if (isAnyNum && leftOperand2.isAnyNum) {
|
| - return RESULT_NUM;
|
| - }
|
| + if (!isAnyNum || !leftOperand2.isAnyNum) {
|
| return error2(node, CompileTimeErrorCode.CONST_EVAL_TYPE_NUM);
|
| }
|
| + if (isSomeNum || leftOperand2.isSomeNum) {
|
| + return RESULT_NUM;
|
| + }
|
| Object leftValue = leftOperand2.value;
|
| if (leftValue == null) {
|
| return error(node.leftOperand);
|
| @@ -1282,12 +1282,12 @@ class ValidResult extends EvaluationResultImpl {
|
| EvaluationResultImpl greaterThanError(BinaryExpression node, ErrorResult leftOperand) => leftOperand;
|
| EvaluationResultImpl greaterThanOrEqualError(BinaryExpression node, ErrorResult leftOperand) => leftOperand;
|
| EvaluationResultImpl greaterThanOrEqualValid(BinaryExpression node, ValidResult leftOperand2) {
|
| - if (isSomeNum || leftOperand2.isSomeNum) {
|
| - if (isAnyNum && leftOperand2.isAnyNum) {
|
| - return RESULT_BOOL;
|
| - }
|
| + if (!isAnyNum || !leftOperand2.isAnyNum) {
|
| return error2(node, CompileTimeErrorCode.CONST_EVAL_TYPE_NUM);
|
| }
|
| + if (isSomeNum || leftOperand2.isSomeNum) {
|
| + return RESULT_BOOL;
|
| + }
|
| Object leftValue = leftOperand2.value;
|
| if (leftValue == null) {
|
| return error(node.leftOperand);
|
| @@ -1309,12 +1309,12 @@ class ValidResult extends EvaluationResultImpl {
|
| return error(node);
|
| }
|
| EvaluationResultImpl greaterThanValid(BinaryExpression node, ValidResult leftOperand2) {
|
| - if (isSomeNum || leftOperand2.isSomeNum) {
|
| - if (isAnyNum && leftOperand2.isAnyNum) {
|
| - return RESULT_BOOL;
|
| - }
|
| + if (!isAnyNum || !leftOperand2.isAnyNum) {
|
| return error2(node, CompileTimeErrorCode.CONST_EVAL_TYPE_NUM);
|
| }
|
| + if (isSomeNum || leftOperand2.isSomeNum) {
|
| + return RESULT_BOOL;
|
| + }
|
| Object leftValue = leftOperand2.value;
|
| if (leftValue == null) {
|
| return error(node.leftOperand);
|
| @@ -1337,12 +1337,12 @@ class ValidResult extends EvaluationResultImpl {
|
| }
|
| EvaluationResultImpl integerDivideError(BinaryExpression node, ErrorResult leftOperand) => leftOperand;
|
| EvaluationResultImpl integerDivideValid(BinaryExpression node, ValidResult leftOperand2) {
|
| - if (isSomeNum || leftOperand2.isSomeNum) {
|
| - if (isAnyNum && leftOperand2.isAnyNum) {
|
| - return RESULT_INT;
|
| - }
|
| + if (!isAnyNum || !leftOperand2.isAnyNum) {
|
| return error2(node, CompileTimeErrorCode.CONST_EVAL_TYPE_NUM);
|
| }
|
| + if (isSomeNum || leftOperand2.isSomeNum) {
|
| + return RESULT_INT;
|
| + }
|
| Object leftValue = leftOperand2.value;
|
| if (leftValue == null) {
|
| return error(node.leftOperand);
|
| @@ -1372,12 +1372,12 @@ class ValidResult extends EvaluationResultImpl {
|
| EvaluationResultImpl lessThanError(BinaryExpression node, ErrorResult leftOperand) => leftOperand;
|
| EvaluationResultImpl lessThanOrEqualError(BinaryExpression node, ErrorResult leftOperand) => leftOperand;
|
| EvaluationResultImpl lessThanOrEqualValid(BinaryExpression node, ValidResult leftOperand2) {
|
| - if (isSomeNum || leftOperand2.isSomeNum) {
|
| - if (isAnyNum && leftOperand2.isAnyNum) {
|
| - return RESULT_BOOL;
|
| - }
|
| + if (!isAnyNum || !leftOperand2.isAnyNum) {
|
| return error2(node, CompileTimeErrorCode.CONST_EVAL_TYPE_NUM);
|
| }
|
| + if (isSomeNum || leftOperand2.isSomeNum) {
|
| + return RESULT_BOOL;
|
| + }
|
| Object leftValue = leftOperand2.value;
|
| if (leftValue == null) {
|
| return error(node.leftOperand);
|
| @@ -1399,12 +1399,12 @@ class ValidResult extends EvaluationResultImpl {
|
| return error(node);
|
| }
|
| EvaluationResultImpl lessThanValid(BinaryExpression node, ValidResult leftOperand2) {
|
| - if (isSomeNum || leftOperand2.isSomeNum) {
|
| - if (isAnyNum && leftOperand2.isAnyNum) {
|
| - return RESULT_BOOL;
|
| - }
|
| + if (!isAnyNum || !leftOperand2.isAnyNum) {
|
| return error2(node, CompileTimeErrorCode.CONST_EVAL_TYPE_NUM);
|
| }
|
| + if (isSomeNum || leftOperand2.isSomeNum) {
|
| + return RESULT_BOOL;
|
| + }
|
| Object leftValue = leftOperand2.value;
|
| if (leftValue == null) {
|
| return error(node.leftOperand);
|
| @@ -1427,12 +1427,12 @@ class ValidResult extends EvaluationResultImpl {
|
| }
|
| EvaluationResultImpl logicalAndError(BinaryExpression node, ErrorResult leftOperand) => leftOperand;
|
| EvaluationResultImpl logicalAndValid(BinaryExpression node, ValidResult leftOperand) {
|
| - if (isSomeBool || leftOperand.isSomeBool) {
|
| - if (isAnyBool && leftOperand.isAnyBool) {
|
| - return RESULT_BOOL;
|
| - }
|
| + if (!isAnyBool || !leftOperand.isAnyBool) {
|
| return error2(node, CompileTimeErrorCode.CONST_EVAL_TYPE_BOOL);
|
| }
|
| + if (isSomeBool || leftOperand.isSomeBool) {
|
| + return RESULT_BOOL;
|
| + }
|
| Object leftValue = leftOperand.value;
|
| if (leftValue is bool) {
|
| if (((leftValue as bool))) {
|
| @@ -1458,12 +1458,12 @@ class ValidResult extends EvaluationResultImpl {
|
| }
|
| EvaluationResultImpl minusError(BinaryExpression node, ErrorResult leftOperand) => leftOperand;
|
| EvaluationResultImpl minusValid(BinaryExpression node, ValidResult leftOperand2) {
|
| - if (isSomeNum || leftOperand2.isSomeNum) {
|
| - if (isAnyNum && leftOperand2.isAnyNum) {
|
| - return RESULT_NUM;
|
| - }
|
| + if (!isAnyNum || !leftOperand2.isAnyNum) {
|
| return error2(node, CompileTimeErrorCode.CONST_EVAL_TYPE_NUM);
|
| }
|
| + if (isSomeNum || leftOperand2.isSomeNum) {
|
| + return RESULT_NUM;
|
| + }
|
| Object leftValue = leftOperand2.value;
|
| if (leftValue == null) {
|
| return error(node.leftOperand);
|
| @@ -1521,12 +1521,12 @@ class ValidResult extends EvaluationResultImpl {
|
| }
|
| EvaluationResultImpl remainderError(BinaryExpression node, ErrorResult leftOperand) => leftOperand;
|
| EvaluationResultImpl remainderValid(BinaryExpression node, ValidResult leftOperand2) {
|
| - if (isSomeNum || leftOperand2.isSomeNum) {
|
| - if (isAnyNum && leftOperand2.isAnyNum) {
|
| - return RESULT_NUM;
|
| - }
|
| + if (!isAnyNum || !leftOperand2.isAnyNum) {
|
| return error2(node, CompileTimeErrorCode.CONST_EVAL_TYPE_NUM);
|
| }
|
| + if (isSomeNum || leftOperand2.isSomeNum) {
|
| + return RESULT_NUM;
|
| + }
|
| Object leftValue = leftOperand2.value;
|
| if (leftValue == null) {
|
| return error(node.leftOperand);
|
| @@ -1552,12 +1552,12 @@ class ValidResult extends EvaluationResultImpl {
|
| }
|
| EvaluationResultImpl shiftLeftError(BinaryExpression node, ErrorResult leftOperand) => leftOperand;
|
| EvaluationResultImpl shiftLeftValid(BinaryExpression node, ValidResult leftOperand2) {
|
| - if (isSomeInt || leftOperand2.isSomeInt) {
|
| - if (isAnyInt && leftOperand2.isAnyInt) {
|
| - return RESULT_INT;
|
| - }
|
| + if (!isAnyInt || !leftOperand2.isAnyInt) {
|
| return error2(node, CompileTimeErrorCode.CONST_EVAL_TYPE_INT);
|
| }
|
| + if (isSomeInt || leftOperand2.isSomeInt) {
|
| + return RESULT_INT;
|
| + }
|
| Object leftValue = leftOperand2.value;
|
| if (leftValue == null) {
|
| return error(node.leftOperand);
|
| @@ -1576,12 +1576,12 @@ class ValidResult extends EvaluationResultImpl {
|
| }
|
| EvaluationResultImpl shiftRightError(BinaryExpression node, ErrorResult leftOperand) => leftOperand;
|
| EvaluationResultImpl shiftRightValid(BinaryExpression node, ValidResult leftOperand2) {
|
| - if (isSomeInt || leftOperand2.isSomeInt) {
|
| - if (isAnyInt && leftOperand2.isAnyInt) {
|
| - return RESULT_INT;
|
| - }
|
| + if (!isAnyInt || !leftOperand2.isAnyInt) {
|
| return error2(node, CompileTimeErrorCode.CONST_EVAL_TYPE_INT);
|
| }
|
| + if (isSomeInt || leftOperand2.isSomeInt) {
|
| + return RESULT_INT;
|
| + }
|
| Object leftValue = leftOperand2.value;
|
| if (leftValue == null) {
|
| return error(node.leftOperand);
|
| @@ -1600,12 +1600,12 @@ class ValidResult extends EvaluationResultImpl {
|
| }
|
| EvaluationResultImpl timesError(BinaryExpression node, ErrorResult leftOperand) => leftOperand;
|
| EvaluationResultImpl timesValid(BinaryExpression node, ValidResult leftOperand2) {
|
| - if (isSomeNum || leftOperand2.isSomeNum) {
|
| - if (isAnyNum && leftOperand2.isAnyNum) {
|
| - return RESULT_NUM;
|
| - }
|
| + if (!isAnyNum || !leftOperand2.isAnyNum) {
|
| return error2(node, CompileTimeErrorCode.CONST_EVAL_TYPE_NUM);
|
| }
|
| + if (isSomeNum || leftOperand2.isSomeNum) {
|
| + return RESULT_NUM;
|
| + }
|
| Object leftValue = leftOperand2.value;
|
| if (leftValue == null) {
|
| return error(node.leftOperand);
|
|
|