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

Unified Diff: sdk/lib/_internal/compiler/implementation/typechecker.dart

Issue 177963002: Use List instead of Link in the type system. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Address comments. Created 6 years, 6 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
Index: sdk/lib/_internal/compiler/implementation/typechecker.dart
diff --git a/sdk/lib/_internal/compiler/implementation/typechecker.dart b/sdk/lib/_internal/compiler/implementation/typechecker.dart
index 924f1ba19f34869691a85ac5f220d5f3529a8523..4f56b634884ac6e6636694db7b242281e73313fe 100644
--- a/sdk/lib/_internal/compiler/implementation/typechecker.dart
+++ b/sdk/lib/_internal/compiler/implementation/typechecker.dart
@@ -98,7 +98,7 @@ class AssertAccess implements ElementAccess {
DartType computeType(Compiler compiler) {
return new FunctionType.synthesized(
const VoidType(),
- const Link<DartType>().prepend(const DynamicType()));
+ <DartType>[const DynamicType()]);
}
bool isCallable(Compiler compiler) => true;
@@ -123,7 +123,12 @@ class ResolvedAccess extends ElementAccess {
return functionType.returnType;
} else if (element.isSetter) {
FunctionType functionType = element.computeType(compiler);
- return functionType.parameterTypes.head;
+ if (functionType.parameterTypes.length != 1) {
+ // TODO(johnniwinther,karlklose): this happens for malformed static
+ // setters. Treat them the same as instance members.
+ return const DynamicType();
+ }
+ return functionType.parameterTypes.first;
} else {
return element.computeType(compiler);
}
@@ -824,8 +829,9 @@ class TypeCheckerVisitor extends Visitor<DartType> {
if (identical(unaliasedType.kind, TypeKind.FUNCTION)) {
bool error = false;
FunctionType funType = unaliasedType;
- Link<DartType> parameterTypes = funType.parameterTypes;
- Link<DartType> optionalParameterTypes = funType.optionalParameterTypes;
+ Iterator<DartType> parameterTypes = funType.parameterTypes.iterator;
+ Iterator<DartType> optionalParameterTypes =
+ funType.optionalParameterTypes.iterator;
while (!arguments.isEmpty) {
Node argument = arguments.head;
NamedArgument namedArgument = argument.asNamedArgument();
@@ -851,8 +857,8 @@ class TypeCheckerVisitor extends Visitor<DartType> {
}
}
} else {
- if (parameterTypes.isEmpty) {
- if (optionalParameterTypes.isEmpty) {
+ if (!parameterTypes.moveNext()) {
+ if (!optionalParameterTypes.moveNext()) {
error = true;
// TODO(johnniwinther): Provide better information on the
// called function.
@@ -864,28 +870,28 @@ class TypeCheckerVisitor extends Visitor<DartType> {
DartType argumentType = analyze(argument);
if (argumentTypes != null) argumentTypes.addLast(argumentType);
if (!checkAssignable(argument,
- argumentType, optionalParameterTypes.head)) {
+ argumentType,
+ optionalParameterTypes.current)) {
error = true;
}
- optionalParameterTypes = optionalParameterTypes.tail;
}
} else {
DartType argumentType = analyze(argument);
if (argumentTypes != null) argumentTypes.addLast(argumentType);
- if (!checkAssignable(argument, argumentType, parameterTypes.head)) {
+ if (!checkAssignable(argument, argumentType,
+ parameterTypes.current)) {
error = true;
}
- parameterTypes = parameterTypes.tail;
}
}
arguments = arguments.tail;
}
- if (!parameterTypes.isEmpty) {
+ if (parameterTypes.moveNext()) {
error = true;
// TODO(johnniwinther): Provide better information on the called
// function.
reportTypeWarning(send, MessageKind.MISSING_ARGUMENT,
- {'argumentType': parameterTypes.head});
+ {'argumentType': parameterTypes.current});
}
if (error) {
// TODO(johnniwinther): Improve access to declaring element and handle
@@ -1256,17 +1262,16 @@ class TypeCheckerVisitor extends Visitor<DartType> {
}
/// Returns the first type in the list or [:dynamic:] if the list is empty.
- DartType firstType(Link<DartType> link) {
- return link.isEmpty ? const DynamicType() : link.head;
+ DartType firstType(List<DartType> list) {
+ return list.isEmpty ? const DynamicType() : list.first;
}
/**
* Returns the second type in the list or [:dynamic:] if the list is too
* short.
*/
- DartType secondType(Link<DartType> link) {
- return link.isEmpty || link.tail.isEmpty
- ? const DynamicType() : link.tail.head;
+ DartType secondType(List<DartType> list) {
+ return list.length < 2 ? const DynamicType() : list[1];
}
/**
« no previous file with comments | « sdk/lib/_internal/compiler/implementation/ssa/builder.dart ('k') | sdk/lib/_internal/compiler/implementation/util/link.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698