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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Side-by-side diff isn't available for this file because of its large size.
Issue 667463004: Code clean-up (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Created 6 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
Download patch
« no previous file with comments | « pkg/analyzer/lib/src/generated/parser.dart ('k') | pkg/analyzer/test/generated/all_the_rest.dart » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: pkg/analyzer/lib/src/generated/resolver.dart
diff --git a/pkg/analyzer/lib/src/generated/resolver.dart b/pkg/analyzer/lib/src/generated/resolver.dart
index 37e5281260aafe9bf9143d23f778e4c108a14dcd..aa23e01902aef2bd230c9f8d2b6094ca773742d2 100644
--- a/pkg/analyzer/lib/src/generated/resolver.dart
+++ b/pkg/analyzer/lib/src/generated/resolver.dart
@@ -978,7 +978,9 @@ class BestPracticesVerifier extends RecursiveAstVisitor<Object> {
}
bool problemReported = false;
for (Expression argument in argumentList.arguments) {
- problemReported = javaBooleanOr(problemReported, _checkForArgumentTypeNotAssignableForArgument(argument));
+ if (_checkForArgumentTypeNotAssignableForArgument(argument)) {
+ problemReported = true;
+ }
}
return problemReported;
}
@@ -8858,10 +8860,22 @@ class ErrorVerifier extends RecursiveAstVisitor<Object> {
PropertyAccessorElement setter = element.setter;
SimpleIdentifier fieldName = field.name;
if (getter != null) {
- hasProblems = javaBooleanOr(hasProblems, _checkForAllInvalidOverrideErrorCodesForExecutable(getter, ParameterElementImpl.EMPTY_ARRAY, AstNode.EMPTY_ARRAY, fieldName));
+ if (_checkForAllInvalidOverrideErrorCodesForExecutable(
+ getter,
+ ParameterElementImpl.EMPTY_ARRAY,
+ AstNode.EMPTY_ARRAY,
+ fieldName)) {
+ hasProblems = true;
+ }
}
if (setter != null) {
- hasProblems = javaBooleanOr(hasProblems, _checkForAllInvalidOverrideErrorCodesForExecutable(setter, setter.parameters, <AstNode> [fieldName], fieldName));
+ if (_checkForAllInvalidOverrideErrorCodesForExecutable(
+ setter,
+ setter.parameters,
+ <AstNode> [fieldName],
+ fieldName)) {
+ hasProblems = true;
+ }
}
}
return hasProblems;
@@ -8911,14 +8925,26 @@ class ErrorVerifier extends RecursiveAstVisitor<Object> {
if (mixinType is! InterfaceType) {
continue;
}
- if (_checkForExtendsOrImplementsDisallowedClass(mixinName, CompileTimeErrorCode.MIXIN_OF_DISALLOWED_CLASS)) {
+ if (_checkForExtendsOrImplementsDisallowedClass(
+ mixinName,
+ CompileTimeErrorCode.MIXIN_OF_DISALLOWED_CLASS)) {
problemReported = true;
} else {
ClassElement mixinElement = (mixinType as InterfaceType).element;
- problemReported = javaBooleanOr(problemReported, _checkForExtendsOrImplementsDeferredClass(mixinName, CompileTimeErrorCode.MIXIN_DEFERRED_CLASS));
- problemReported = javaBooleanOr(problemReported, _checkForMixinDeclaresConstructor(mixinName, mixinElement));
- problemReported = javaBooleanOr(problemReported, _checkForMixinInheritsNotFromObject(mixinName, mixinElement));
- problemReported = javaBooleanOr(problemReported, _checkForMixinReferencesSuper(mixinName, mixinElement));
+ if (_checkForExtendsOrImplementsDeferredClass(
+ mixinName,
+ CompileTimeErrorCode.MIXIN_DEFERRED_CLASS)) {
+ problemReported = true;
+ }
+ if (_checkForMixinDeclaresConstructor(mixinName, mixinElement)) {
+ problemReported = true;
+ }
+ if (_checkForMixinInheritsNotFromObject(mixinName, mixinElement)) {
+ problemReported = true;
+ }
+ if (_checkForMixinReferencesSuper(mixinName, mixinElement)) {
+ problemReported = true;
+ }
}
}
return problemReported;
@@ -9152,7 +9178,9 @@ class ErrorVerifier extends RecursiveAstVisitor<Object> {
}
bool problemReported = false;
for (Expression argument in argumentList.arguments) {
- problemReported = javaBooleanOr(problemReported, _checkForArgumentTypeNotAssignableForArgument(argument));
+ if (_checkForArgumentTypeNotAssignableForArgument(argument)) {
+ problemReported = true;
+ }
}
return problemReported;
}
@@ -9316,8 +9344,8 @@ class ErrorVerifier extends RecursiveAstVisitor<Object> {
int lastMember = members.length - 1;
for (int i = 0; i < lastMember; i++) {
SwitchMember member = members[i];
- if (member is SwitchCase) {
- foundError = javaBooleanOr(foundError, _checkForCaseBlockNotTerminated(member));
+ if (member is SwitchCase && _checkForCaseBlockNotTerminated(member)) {
+ foundError = true;
}
}
return foundError;
@@ -9567,7 +9595,7 @@ class ErrorVerifier extends RecursiveAstVisitor<Object> {
_enclosingClass.displayName,
name.name,
enclosingElementOfSetter.displayName]);
- foundError = javaBooleanOr(foundError, true);
+ foundError = true;
addThisMemberToTheMap = false;
}
} else if (isSetter) {
@@ -9576,7 +9604,7 @@ class ErrorVerifier extends RecursiveAstVisitor<Object> {
if (conflictingMethod != null && conflictingMethod is MethodDeclaration && !conflictingMethod.isGetter) {
// report problem
_errorReporter.reportErrorForNode(StaticWarningCode.CONFLICTING_INSTANCE_METHOD_SETTER2, name, [_enclosingClass.displayName, name.name]);
- foundError = javaBooleanOr(foundError, true);
+ foundError = true;
addThisMemberToTheMap = false;
}
}
@@ -9920,7 +9948,9 @@ class ErrorVerifier extends RecursiveAstVisitor<Object> {
if (typeArguments != null) {
bool hasError = false;
for (TypeName argument in typeArguments.arguments) {
- hasError = javaBooleanOr(hasError, _checkForConstWithTypeParameters(argument));
+ if (_checkForConstWithTypeParameters(argument)) {
+ hasError = true;
+ }
}
return hasError;
}
@@ -10064,16 +10094,14 @@ class ErrorVerifier extends RecursiveAstVisitor<Object> {
}
bool hasProblem = false;
for (ExecutableElement member in _enclosingClass.methods) {
- if (!member.isStatic) {
- continue;
+ if (member.isStatic && _checkForDuplicateDefinitionOfMember(member)) {
+ hasProblem = true;
}
- hasProblem = javaBooleanOr(hasProblem, _checkForDuplicateDefinitionOfMember(member));
}
for (ExecutableElement member in _enclosingClass.accessors) {
- if (!member.isStatic) {
- continue;
+ if (member.isStatic && _checkForDuplicateDefinitionOfMember(member)) {
+ hasProblem = true;
}
- hasProblem = javaBooleanOr(hasProblem, _checkForDuplicateDefinitionOfMember(member));
}
return hasProblem;
}
@@ -10465,9 +10493,9 @@ class ErrorVerifier extends RecursiveAstVisitor<Object> {
}
bool foundError = false;
for (ClassMember classMember in classMembers) {
- if (classMember is FieldDeclaration) {
- FieldDeclaration field = classMember;
- foundError = javaBooleanOr(foundError, _checkForFinalNotInitialized(field.fields));
+ if (classMember is FieldDeclaration
+ && _checkForFinalNotInitialized(classMember.fields)) {
+ foundError = true;
}
}
return foundError;
@@ -10486,7 +10514,11 @@ class ErrorVerifier extends RecursiveAstVisitor<Object> {
}
bool foundError = false;
for (TypeName type in node.interfaces) {
- foundError = javaBooleanOr(foundError, _checkForExtendsOrImplementsDeferredClass(type, CompileTimeErrorCode.IMPLEMENTS_DEFERRED_CLASS));
+ if (_checkForExtendsOrImplementsDeferredClass(
+ type,
+ CompileTimeErrorCode.IMPLEMENTS_DEFERRED_CLASS)) {
+ foundError = true;
+ }
}
return foundError;
}
@@ -10505,7 +10537,11 @@ class ErrorVerifier extends RecursiveAstVisitor<Object> {
}
bool foundError = false;
for (TypeName type in node.interfaces) {
- foundError = javaBooleanOr(foundError, _checkForExtendsOrImplementsDisallowedClass(type, CompileTimeErrorCode.IMPLEMENTS_DISALLOWED_CLASS));
+ if (_checkForExtendsOrImplementsDisallowedClass(
+ type,
+ CompileTimeErrorCode.IMPLEMENTS_DISALLOWED_CLASS)) {
+ foundError = true;
+ }
}
return foundError;
}
@@ -10944,11 +10980,21 @@ class ErrorVerifier extends RecursiveAstVisitor<Object> {
bool hasProblems = false;
for (Expression element in node.elements) {
if (node.constKeyword != null) {
- // TODO(paulberry): this error should be based on the actual type of the list element, not
- // the static type. See dartbug.com/21119.
- hasProblems = javaBooleanOr(hasProblems, _checkForArgumentTypeNotAssignableWithExpectedTypes(element, listElementType, CheckedModeCompileTimeErrorCode.LIST_ELEMENT_TYPE_NOT_ASSIGNABLE));
+ // TODO(paulberry): this error should be based on the actual type of the
+ // list element, not the static type. See dartbug.com/21119.
+ if (_checkForArgumentTypeNotAssignableWithExpectedTypes(
+ element,
+ listElementType,
+ CheckedModeCompileTimeErrorCode.LIST_ELEMENT_TYPE_NOT_ASSIGNABLE)) {
+ hasProblems = true;
+ }
+ }
+ if (_checkForArgumentTypeNotAssignableWithExpectedTypes(
+ element,
+ listElementType,
+ StaticWarningCode.LIST_ELEMENT_TYPE_NOT_ASSIGNABLE)) {
+ hasProblems = true;
}
- hasProblems = javaBooleanOr(hasProblems, _checkForArgumentTypeNotAssignableWithExpectedTypes(element, listElementType, StaticWarningCode.LIST_ELEMENT_TYPE_NOT_ASSIGNABLE));
}
return hasProblems;
}
@@ -10980,13 +11026,33 @@ class ErrorVerifier extends RecursiveAstVisitor<Object> {
Expression key = entry.key;
Expression value = entry.value;
if (node.constKeyword != null) {
- // TODO(paulberry): this error should be based on the actual type of the list element, not
- // the static type. See dartbug.com/21119.
- hasProblems = javaBooleanOr(hasProblems, _checkForArgumentTypeNotAssignableWithExpectedTypes(key, keyType, CheckedModeCompileTimeErrorCode.MAP_KEY_TYPE_NOT_ASSIGNABLE));
- hasProblems = javaBooleanOr(hasProblems, _checkForArgumentTypeNotAssignableWithExpectedTypes(value, valueType, CheckedModeCompileTimeErrorCode.MAP_VALUE_TYPE_NOT_ASSIGNABLE));
+ // TODO(paulberry): this error should be based on the actual type of the
+ // list element, not the static type. See dartbug.com/21119.
+ if (_checkForArgumentTypeNotAssignableWithExpectedTypes(
+ key,
+ keyType,
+ CheckedModeCompileTimeErrorCode.MAP_KEY_TYPE_NOT_ASSIGNABLE)) {
+ hasProblems = true;
+ }
+ if (_checkForArgumentTypeNotAssignableWithExpectedTypes(
+ value,
+ valueType,
+ CheckedModeCompileTimeErrorCode.MAP_VALUE_TYPE_NOT_ASSIGNABLE)) {
+ hasProblems = true;
+ }
+ }
+ if (_checkForArgumentTypeNotAssignableWithExpectedTypes(
+ key,
+ keyType,
+ StaticWarningCode.MAP_KEY_TYPE_NOT_ASSIGNABLE)) {
+ hasProblems = true;
+ }
+ if (_checkForArgumentTypeNotAssignableWithExpectedTypes(
+ value,
+ valueType,
+ StaticWarningCode.MAP_VALUE_TYPE_NOT_ASSIGNABLE)) {
+ hasProblems = true;
}
- hasProblems = javaBooleanOr(hasProblems, _checkForArgumentTypeNotAssignableWithExpectedTypes(key, keyType, StaticWarningCode.MAP_KEY_TYPE_NOT_ASSIGNABLE));
- hasProblems = javaBooleanOr(hasProblems, _checkForArgumentTypeNotAssignableWithExpectedTypes(value, valueType, StaticWarningCode.MAP_VALUE_TYPE_NOT_ASSIGNABLE));
}
return hasProblems;
}
@@ -13266,9 +13332,9 @@ class FunctionTypeScope extends EnclosedScope {
}
class GeneralizingAstVisitor_StaticTypeAnalyzer_computePropagatedReturnTypeOfFunction extends GeneralizingAstVisitor<Object> {
- List<DartType> result;
+ DartType result = null;
- GeneralizingAstVisitor_StaticTypeAnalyzer_computePropagatedReturnTypeOfFunction(this.result) : super();
+ GeneralizingAstVisitor_StaticTypeAnalyzer_computePropagatedReturnTypeOfFunction();
@override
Object visitExpression(Expression node) => null;
@@ -13284,10 +13350,10 @@ class GeneralizingAstVisitor_StaticTypeAnalyzer_computePropagatedReturnTypeOfFun
type = BottomTypeImpl.instance;
}
// merge types
- if (result[0] == null) {
- result[0] = type;
+ if (result == null) {
+ result = type;
} else {
- result[0] = result[0].getLeastUpperBound(type);
+ result = result.getLeastUpperBound(type);
}
return null;
}
@@ -18453,11 +18519,11 @@ class RecursiveAstVisitor_AngularCompilationUnitBuilder_parseViews extends Recur
}
class RecursiveAstVisitor_ResolverVisitor_isVariableAccessedInClosure extends RecursiveAstVisitor<Object> {
- List<bool> result;
+ final Element variable;
- Element variable;
+ bool result = false;
- RecursiveAstVisitor_ResolverVisitor_isVariableAccessedInClosure(this.result, this.variable) : super();
+ RecursiveAstVisitor_ResolverVisitor_isVariableAccessedInClosure(this.variable);
bool _inClosure = false;
@@ -18474,31 +18540,31 @@ class RecursiveAstVisitor_ResolverVisitor_isVariableAccessedInClosure extends Re
@override
Object visitSimpleIdentifier(SimpleIdentifier node) {
- if (result[0]) {
+ if (result) {
return null;
}
if (_inClosure && identical(node.staticElement, variable)) {
- result[0] = javaBooleanOr(result[0], true);
+ result = true;
}
return null;
}
}
class RecursiveAstVisitor_ResolverVisitor_isVariablePotentiallyMutatedIn extends RecursiveAstVisitor<Object> {
- List<bool> result;
+ final Element variable;
- Element variable;
+ bool result = false;
- RecursiveAstVisitor_ResolverVisitor_isVariablePotentiallyMutatedIn(this.result, this.variable) : super();
+ RecursiveAstVisitor_ResolverVisitor_isVariablePotentiallyMutatedIn(this.variable);
@override
Object visitSimpleIdentifier(SimpleIdentifier node) {
- if (result[0]) {
+ if (result) {
return null;
}
if (identical(node.staticElement, variable)) {
if (node.inSetterContext()) {
- result[0] = javaBooleanOr(result[0], true);
+ result = true;
}
}
return null;
@@ -19981,9 +20047,10 @@ class ResolverVisitor extends ScopedVisitor {
* @return `true` if this variable is potentially mutated somewhere in the given ASTNode
*/
bool _isVariableAccessedInClosure(Element variable, AstNode target) {
- List<bool> result = [false];
- target.accept(new RecursiveAstVisitor_ResolverVisitor_isVariableAccessedInClosure(result, variable));
- return result[0];
+ RecursiveAstVisitor_ResolverVisitor_isVariableAccessedInClosure visitor
+ = new RecursiveAstVisitor_ResolverVisitor_isVariableAccessedInClosure(variable);
+ target.accept(visitor);
+ return visitor.result;
}
/**
@@ -19995,9 +20062,10 @@ class ResolverVisitor extends ScopedVisitor {
* @return `true` if this variable is potentially mutated somewhere in the given ASTNode
*/
bool _isVariablePotentiallyMutatedIn(Element variable, AstNode target) {
- List<bool> result = [false];
- target.accept(new RecursiveAstVisitor_ResolverVisitor_isVariablePotentiallyMutatedIn(result, variable));
- return result[0];
+ RecursiveAstVisitor_ResolverVisitor_isVariablePotentiallyMutatedIn visitor
+ = new RecursiveAstVisitor_ResolverVisitor_isVariablePotentiallyMutatedIn(variable);
+ target.accept(visitor);
+ return visitor.result;
}
/**
@@ -22370,9 +22438,10 @@ class StaticTypeAnalyzer extends SimpleAstVisitor<Object> {
return expressionBody.expression.bestType;
}
if (body is BlockFunctionBody) {
- List<DartType> result = [null];
- body.accept(new GeneralizingAstVisitor_StaticTypeAnalyzer_computePropagatedReturnTypeOfFunction(result));
- return result[0];
+ GeneralizingAstVisitor_StaticTypeAnalyzer_computePropagatedReturnTypeOfFunction visitor
+ = new GeneralizingAstVisitor_StaticTypeAnalyzer_computePropagatedReturnTypeOfFunction();
+ body.accept(visitor);
+ return visitor.result;
}
return null;
}
« no previous file with comments | « pkg/analyzer/lib/src/generated/parser.dart ('k') | pkg/analyzer/test/generated/all_the_rest.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698