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

Unified Diff: lib/src/checker/checker.dart

Issue 1396993002: housecleaning: remove nonnullableTypes (Closed) Base URL: git@github.com:dart-lang/dev_compiler.git@master
Patch Set: Created 5 years, 2 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 | lib/src/checker/rules.dart » ('j') | lib/src/checker/rules.dart » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: lib/src/checker/checker.dart
diff --git a/lib/src/checker/checker.dart b/lib/src/checker/checker.dart
index 2be58f417ce7d41873ac6b1dec3a9685162c27bb..0db811189860684d3a9f1f1dcde1d3ce5f9afe85 100644
--- a/lib/src/checker/checker.dart
+++ b/lib/src/checker/checker.dart
@@ -9,7 +9,6 @@ import 'package:analyzer/src/generated/ast.dart';
import 'package:analyzer/src/generated/element.dart';
import 'package:analyzer/src/generated/scanner.dart' show Token, TokenType;
-import '../../strong_mode.dart' show StrongModeOptions;
import '../info.dart';
import '../utils.dart' show getMemberType;
import 'rules.dart';
@@ -627,13 +626,7 @@ class CodeChecker extends RecursiveAstVisitor {
var parameterType = rules.elementType(parameter.element);
assert(parameterType != null);
var defaultValue = node.defaultValue;
- if (defaultValue == null) {
- if (rules.maybeNonNullableType(parameterType)) {
- var staticInfo = new InvalidVariableDeclaration(
- rules, node.identifier, parameterType);
- _recordMessage(staticInfo);
- }
- } else {
+ if (defaultValue != null) {
checkAssignment(defaultValue, parameterType);
}
@@ -684,19 +677,6 @@ class CodeChecker extends RecursiveAstVisitor {
var initializer = variable.initializer;
if (initializer != null) {
checkAssignment(initializer, dartType);
- } else if (rules.maybeNonNullableType(dartType)) {
- var element = variable.element;
- if (element is FieldElement && !element.isStatic) {
- // Initialized - possibly implicitly - during construction.
- // Handle this via a runtime check during code generation.
-
- // TODO(vsm): Detect statically whether this can fail and
- // report a static error (must fail) or warning (can fail).
- } else {
- var staticInfo =
- new InvalidVariableDeclaration(rules, variable, dartType);
- _recordMessage(staticInfo);
- }
}
}
}
@@ -857,11 +837,14 @@ class CodeChecker extends RecursiveAstVisitor {
case TokenType.STAR_EQ:
case TokenType.TILDE_SLASH_EQ:
case TokenType.PERCENT_EQ:
- if (t1 == rules.provider.intType && t2 == rules.provider.intType) return t1;
- if (t1 == rules.provider.doubleType && t2 == rules.provider.doubleType) return t1;
+ if (t1 == rules.provider.intType &&
+ t2 == rules.provider.intType) return t1;
+ if (t1 == rules.provider.doubleType &&
+ t2 == rules.provider.doubleType) return t1;
// This particular combo is not spelled out in the spec, but all
// implementations and analyzer seem to follow this.
- if (t1 == rules.provider.doubleType && t2 == rules.provider.intType) return t1;
+ if (t1 == rules.provider.doubleType &&
+ t2 == rules.provider.intType) return t1;
}
return normalReturnType;
}
« no previous file with comments | « no previous file | lib/src/checker/rules.dart » ('j') | lib/src/checker/rules.dart » ('J')

Powered by Google App Engine
This is Rietveld 408576698