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

Unified Diff: pkg/analyzer/lib/src/dart/element/element.dart

Issue 1917203002: Remove more type casts (Closed) Base URL: https://github.com/dart-lang/sdk.git@master
Patch Set: Created 4 years, 8 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/dart/constant/value.dart ('k') | pkg/analyzer/lib/src/dart/element/type.dart » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: pkg/analyzer/lib/src/dart/element/element.dart
diff --git a/pkg/analyzer/lib/src/dart/element/element.dart b/pkg/analyzer/lib/src/dart/element/element.dart
index 9d5a80702184c01cd5b60f7590de91993f5ee57a..567c6fed0ea3498eda30cdf405c122c53db98018 100644
--- a/pkg/analyzer/lib/src/dart/element/element.dart
+++ b/pkg/analyzer/lib/src/dart/element/element.dart
@@ -463,29 +463,33 @@ class ClassElementImpl extends ElementImpl implements ClassElement {
// expected types.
//
for (PropertyAccessorElement accessor in _accessors) {
- if ((accessor as PropertyAccessorElementImpl).identifier == identifier) {
- return accessor as PropertyAccessorElementImpl;
+ PropertyAccessorElementImpl accessorImpl = accessor;
scheglov 2016/04/26 16:05:29 Is this implicit cast OK for strong mode?
Brian Wilkerson 2016/04/26 17:09:59 I think so; I had strong mode enabled and there wa
+ if (accessorImpl.identifier == identifier) {
+ return accessorImpl;
}
}
for (ConstructorElement constructor in _constructors) {
- if ((constructor as ConstructorElementImpl).identifier == identifier) {
- return constructor as ConstructorElementImpl;
+ ConstructorElementImpl constructorImpl = constructor;
+ if (constructorImpl.identifier == identifier) {
+ return constructorImpl;
}
}
for (FieldElement field in _fields) {
- if ((field as FieldElementImpl).identifier == identifier) {
- return field as FieldElementImpl;
+ FieldElementImpl fieldImpl = field;
+ if (fieldImpl.identifier == identifier) {
+ return fieldImpl;
}
}
for (MethodElement method in _methods) {
- if ((method as MethodElementImpl).identifier == identifier) {
- return method as MethodElementImpl;
+ MethodElementImpl methodImpl = method;
+ if (methodImpl.identifier == identifier) {
+ return methodImpl;
}
}
for (TypeParameterElement typeParameter in _typeParameters) {
- if ((typeParameter as TypeParameterElementImpl).identifier ==
- identifier) {
- return typeParameter as TypeParameterElementImpl;
+ TypeParameterElementImpl typeParameterImpl = typeParameter;
+ if (typeParameterImpl.identifier == identifier) {
+ return typeParameterImpl;
}
}
return null;
@@ -778,11 +782,12 @@ class ClassElementImpl extends ElementImpl implements ClassElement {
_internalLookUpSetter(setterName, library, includeThisClass);
while (setter != null && setter.isAbstract) {
Element definingClass = setter.enclosingElement;
- if (definingClass is! ClassElementImpl) {
+ if (definingClass is ClassElementImpl) {
+ setter =
+ definingClass._internalLookUpSetter(setterName, library, false);
+ } else {
return null;
}
- setter = (definingClass as ClassElementImpl)
- ._internalLookUpSetter(setterName, library, false);
}
return setter;
}
@@ -1154,34 +1159,39 @@ class CompilationUnitElementImpl extends UriReferencedElementImpl
// expected types.
//
for (PropertyAccessorElement accessor in _accessors) {
- if ((accessor as PropertyAccessorElementImpl).identifier == identifier) {
- return accessor as PropertyAccessorElementImpl;
+ PropertyAccessorElementImpl accessorImpl = accessor;
+ if (accessorImpl.identifier == identifier) {
+ return accessorImpl;
}
}
- for (VariableElement variable in _variables) {
- if ((variable as VariableElementImpl).identifier == identifier) {
- return variable as VariableElementImpl;
+ for (TopLevelVariableElement variable in _variables) {
+ TopLevelVariableElementImpl variableImpl = variable;
+ if (variableImpl.identifier == identifier) {
+ return variableImpl;
}
}
- for (ExecutableElement function in _functions) {
- if ((function as ExecutableElementImpl).identifier == identifier) {
- return function as ExecutableElementImpl;
+ for (FunctionElement function in _functions) {
+ FunctionElementImpl functionImpl = function;
+ if (functionImpl.identifier == identifier) {
+ return functionImpl;
}
}
for (FunctionTypeAliasElement typeAlias in _typeAliases) {
- if ((typeAlias as FunctionTypeAliasElementImpl).identifier ==
- identifier) {
- return typeAlias as FunctionTypeAliasElementImpl;
+ FunctionTypeAliasElementImpl typeAliasImpl = typeAlias;
+ if (typeAliasImpl.identifier == identifier) {
+ return typeAliasImpl;
}
}
for (ClassElement type in _types) {
- if ((type as ClassElementImpl).identifier == identifier) {
- return type as ClassElementImpl;
+ ClassElementImpl typeImpl = type;
+ if (typeImpl.identifier == identifier) {
+ return typeImpl;
}
}
for (ClassElement type in _enums) {
- if ((type as ClassElementImpl).identifier == identifier) {
- return type as ClassElementImpl;
+ ClassElementImpl typeImpl = type;
+ if (typeImpl.identifier == identifier) {
+ return typeImpl;
}
}
return null;
@@ -2334,21 +2344,20 @@ class ElementLocationImpl implements ElementLocation {
if (identical(this, object)) {
return true;
}
- if (object is! ElementLocationImpl) {
- return false;
- }
- ElementLocationImpl location = object as ElementLocationImpl;
- List<String> otherComponents = location._components;
- int length = _components.length;
- if (otherComponents.length != length) {
- return false;
- }
- for (int i = 0; i < length; i++) {
- if (_components[i] != otherComponents[i]) {
+ if (object is ElementLocationImpl) {
+ List<String> otherComponents = object._components;
+ int length = _components.length;
+ if (otherComponents.length != length) {
return false;
}
+ for (int i = 0; i < length; i++) {
+ if (_components[i] != otherComponents[i]) {
+ return false;
+ }
+ }
+ return true;
}
- return true;
+ return false;
}
@override
@@ -2594,7 +2603,7 @@ abstract class ExecutableElementImpl extends ElementImpl
if (i > 0) {
buffer.write(", ");
}
- ParameterElementImpl parameter = _parameters[i] as ParameterElementImpl;
+ ParameterElement parameter = _parameters[i];
ParameterKind parameterKind = parameter.parameterKind;
if (parameterKind != kind) {
if (closing != null) {
@@ -2626,24 +2635,28 @@ abstract class ExecutableElementImpl extends ElementImpl
@override
ElementImpl getChild(String identifier) {
- for (ExecutableElement function in _functions) {
- if ((function as ExecutableElementImpl).identifier == identifier) {
- return function as ExecutableElementImpl;
+ for (FunctionElement function in _functions) {
+ FunctionElementImpl functionImpl = function;
+ if (functionImpl.identifier == identifier) {
+ return functionImpl;
}
}
for (LabelElement label in _labels) {
- if ((label as LabelElementImpl).identifier == identifier) {
- return label as LabelElementImpl;
+ LabelElementImpl labelImpl = label;
+ if (labelImpl.identifier == identifier) {
+ return labelImpl;
}
}
- for (VariableElement variable in _localVariables) {
- if ((variable as VariableElementImpl).identifier == identifier) {
- return variable as VariableElementImpl;
+ for (LocalVariableElement variable in _localVariables) {
+ LocalVariableElementImpl variableImpl = variable;
+ if (variableImpl.identifier == identifier) {
+ return variableImpl;
}
}
for (ParameterElement parameter in _parameters) {
- if ((parameter as ParameterElementImpl).identifier == identifier) {
- return parameter as ParameterElementImpl;
+ ParameterElementImpl parameterImpl = parameter;
+ if (parameterImpl.identifier == identifier) {
+ return parameterImpl;
}
}
return null;
@@ -3024,15 +3037,16 @@ class FunctionTypeAliasElementImpl extends ElementImpl
@override
ElementImpl getChild(String identifier) {
- for (VariableElement parameter in _parameters) {
- if ((parameter as VariableElementImpl).identifier == identifier) {
- return parameter as VariableElementImpl;
+ for (ParameterElement parameter in _parameters) {
+ ParameterElementImpl parameterImpl = parameter;
+ if (parameterImpl.identifier == identifier) {
+ return parameterImpl;
}
}
for (TypeParameterElement typeParameter in _typeParameters) {
- if ((typeParameter as TypeParameterElementImpl).identifier ==
- identifier) {
- return typeParameter as TypeParameterElementImpl;
+ TypeParameterElementImpl typeParameterImpl = typeParameter;
+ if (typeParameterImpl.identifier == identifier) {
+ return typeParameterImpl;
}
}
return null;
@@ -3597,23 +3611,26 @@ class LibraryElementImpl extends ElementImpl implements LibraryElement {
@override
ElementImpl getChild(String identifier) {
- if ((_definingCompilationUnit as CompilationUnitElementImpl).identifier ==
- identifier) {
- return _definingCompilationUnit as CompilationUnitElementImpl;
+ CompilationUnitElementImpl unitImpl = _definingCompilationUnit;
+ if (unitImpl.identifier == identifier) {
+ return unitImpl;
}
for (CompilationUnitElement part in _parts) {
- if ((part as CompilationUnitElementImpl).identifier == identifier) {
- return part as CompilationUnitElementImpl;
+ CompilationUnitElementImpl partImpl = part;
+ if (partImpl.identifier == identifier) {
+ return partImpl;
}
}
for (ImportElement importElement in _imports) {
- if ((importElement as ImportElementImpl).identifier == identifier) {
- return importElement as ImportElementImpl;
+ ImportElementImpl importElementImpl = importElement;
+ if (importElementImpl.identifier == identifier) {
+ return importElementImpl;
}
}
for (ExportElement exportElement in _exports) {
- if ((exportElement as ExportElementImpl).identifier == identifier) {
- return exportElement as ExportElementImpl;
+ ExportElementImpl exportElementImpl = exportElement;
+ if (exportElementImpl.identifier == identifier) {
+ return exportElementImpl;
}
}
return null;
@@ -4482,8 +4499,9 @@ class ParameterElementImpl extends VariableElementImpl
@override
ElementImpl getChild(String identifier) {
for (ParameterElement parameter in _parameters) {
- if ((parameter as ParameterElementImpl).identifier == identifier) {
- return parameter as ParameterElementImpl;
+ ParameterElementImpl parameterImpl = parameter;
+ if (parameterImpl.identifier == identifier) {
+ return parameterImpl;
}
}
return null;
« no previous file with comments | « pkg/analyzer/lib/src/dart/constant/value.dart ('k') | pkg/analyzer/lib/src/dart/element/type.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698