Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(435)

Unified Diff: pkg/analyzer/lib/src/generated/type_system.dart

Issue 1957953004: Issue 26427. Refine type of 'T + int' and 'T + double' when 'T extends num'. (Closed) Base URL: git@github.com:dart-lang/sdk.git@master
Patch Set: Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | pkg/analyzer/test/src/task/strong/inferred_type_test.dart » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: pkg/analyzer/lib/src/generated/type_system.dart
diff --git a/pkg/analyzer/lib/src/generated/type_system.dart b/pkg/analyzer/lib/src/generated/type_system.dart
index 954a7ef8428db6be3ef154c9c29e7a71db07198a..877944a9b0552d36feacf99c253d719f8702a243 100644
--- a/pkg/analyzer/lib/src/generated/type_system.dart
+++ b/pkg/analyzer/lib/src/generated/type_system.dart
@@ -355,16 +355,26 @@ class StrongTypeSystemImpl extends TypeSystem {
DartType rightType,
DartType currentType) {
if (leftType is TypeParameterType &&
- leftType.element.bound == typeProvider.numType &&
- leftType == rightType) {
- if (operator == TokenType.PLUS ||
- operator == TokenType.MINUS ||
- operator == TokenType.STAR ||
- operator == TokenType.PLUS_EQ ||
- operator == TokenType.MINUS_EQ ||
- operator == TokenType.STAR_EQ) {
- return leftType;
+ leftType.element.bound == typeProvider.numType) {
+ if (rightType == leftType || rightType == typeProvider.intType) {
+ if (operator == TokenType.PLUS ||
+ operator == TokenType.MINUS ||
+ operator == TokenType.STAR ||
+ operator == TokenType.PLUS_EQ ||
+ operator == TokenType.MINUS_EQ ||
+ operator == TokenType.STAR_EQ) {
+ return leftType;
+ }
+ }
+ if (rightType == typeProvider.doubleType) {
+ if (operator == TokenType.PLUS ||
+ operator == TokenType.MINUS ||
+ operator == TokenType.STAR ||
+ operator == TokenType.SLASH) {
+ return typeProvider.doubleType;
+ }
}
+ return currentType;
}
return super.refineBinaryExpressionType(
typeProvider, leftType, operator, rightType, currentType);
« no previous file with comments | « no previous file | pkg/analyzer/test/src/task/strong/inferred_type_test.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698