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

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

Issue 888943004: Implement new "yield*" type checking rules in analyzer. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Created 5 years, 11 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 | « pkg/analyzer/lib/src/generated/error.dart ('k') | pkg/analyzer/test/generated/non_error_resolver_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/error_verifier.dart
diff --git a/pkg/analyzer/lib/src/generated/error_verifier.dart b/pkg/analyzer/lib/src/generated/error_verifier.dart
index bb7258d7e7ab07908ac40369e7674da837cdc20b..50bba0373963087749de1ecae23a09e00d4247fe 100644
--- a/pkg/analyzer/lib/src/generated/error_verifier.dart
+++ b/pkg/analyzer/lib/src/generated/error_verifier.dart
@@ -5775,14 +5775,32 @@ class ErrorVerifier extends RecursiveAstVisitor<Object> {
impliedReturnType =
_typeProvider.iterableType.substitute4(<DartType>[staticYieldedType]);
}
- if (impliedReturnType.isAssignableTo(declaredReturnType)) {
- return false;
+ if (!impliedReturnType.isAssignableTo(declaredReturnType)) {
+ _errorReporter.reportTypeErrorForNode(
+ StaticTypeWarningCode.YIELD_OF_INVALID_TYPE,
+ yieldExpression,
+ [impliedReturnType, declaredReturnType]);
+ return true;
}
- _errorReporter.reportTypeErrorForNode(
- StaticTypeWarningCode.YIELD_OF_INVALID_TYPE,
- yieldExpression,
- [declaredReturnType, impliedReturnType]);
- return true;
+ if (isYieldEach) {
+ // Since the declared return type might have been "dynamic", we need to
+ // also check that the implied return type is assignable to generic
+ // Stream/Iterable.
+ DartType requiredReturnType;
+ if (_enclosingFunction.isAsynchronous) {
+ requiredReturnType = _typeProvider.streamDynamicType;
+ } else {
+ requiredReturnType = _typeProvider.iterableDynamicType;
+ }
+ if (!impliedReturnType.isAssignableTo(requiredReturnType)) {
+ _errorReporter.reportTypeErrorForNode(
+ StaticTypeWarningCode.YIELD_OF_INVALID_TYPE,
+ yieldExpression,
+ [impliedReturnType, requiredReturnType]);
+ return true;
+ }
+ }
+ return false;
}
/**
« no previous file with comments | « pkg/analyzer/lib/src/generated/error.dart ('k') | pkg/analyzer/test/generated/non_error_resolver_test.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698