dart-lang/sdk
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Move TypeDefinitionVisitor.

Browse Source 
Review URL: https://chromiumcodereview.appspot.com//10832131

git-svn-id: https://dart.googlecode.com/svn/branches/bleeding_edge/dart@10228 260f80e4-7a28-3924-810f-c04153c831b5
This commit is contained in:
johnniwinther@google.com
2012-08-03 12:43:21 +00:00
parent 729194a689
commit c30a4331b8
1 changed files with 52 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/compiler/implementation/resolver.dart
+52 -52
View File
@@ -1657,6 +1657,58 @@ class ResolverVisitor extends CommonResolverVisitor<Element> {
}
}
class TypeDefinitionVisitor extends CommonResolverVisitor<Type> {
Scope scope;
TypeDeclarationElement element;
TypeResolver typeResolver;
TypeDefinitionVisitor(Compiler compiler, TypeDeclarationElement element)
: this.element = element,
scope = element.enclosingElement.buildScope(),
typeResolver = new TypeResolver(compiler),
super(compiler);
void resolveTypeVariableBounds(NodeList node) {
if (node === null) return;
var nameSet = new Set<SourceString>();
// Resolve the bounds of type variables.
Link<Type> typeLink = element.typeVariables;
Link<Node> nodeLink = node.nodes;
while (!nodeLink.isEmpty()) {
TypeVariableType typeVariable = typeLink.head;
SourceString typeName = typeVariable.name;
TypeVariable typeNode = nodeLink.head;
if (nameSet.contains(typeName)) {
error(typeNode, MessageKind.DUPLICATE_TYPE_VARIABLE_NAME, [typeName]);
}
nameSet.add(typeName);
TypeVariableElement variableElement = typeVariable.element;
if (typeNode.bound !== null) {
Type boundType = typeResolver.resolveTypeAnnotation(
typeNode.bound, inScope: scope, onFailure: warning);
if (boundType !== null && boundType.element == variableElement) {
// TODO(johnniwinther): Check for more general cycles, like
// [: <A extends B, B extends C, C extends B> :].
warning(node, MessageKind.CYCLIC_TYPE_VARIABLE,
[variableElement.name]);
} else if (boundType !== null) {
variableElement.bound = boundType;
} else {
// TODO(johnniwinther): Should be an erroneous type.
variableElement.bound = compiler.objectClass.computeType(compiler);
}
} else {
variableElement.bound = compiler.objectClass.computeType(compiler);
}
nodeLink = nodeLink.tail;
typeLink = typeLink.tail;
}
assert(typeLink.isEmpty());
}
}
class ClassResolverVisitor extends TypeDefinitionVisitor {
ClassElement get element() => super.element;
@@ -1854,58 +1906,6 @@ class ClassResolverVisitor extends TypeDefinitionVisitor {
}
}
class TypeDefinitionVisitor extends CommonResolverVisitor<Type> {
Scope scope;
TypeDeclarationElement element;
TypeResolver typeResolver;
TypeDefinitionVisitor(Compiler compiler, TypeDeclarationElement element)
: this.element = element,
scope = element.enclosingElement.buildScope(),
typeResolver = new TypeResolver(compiler),
super(compiler);
void resolveTypeVariableBounds(NodeList node) {
if (node === null) return;
var nameSet = new Set<SourceString>();
// Resolve the bounds of type variables.
Link<Type> typeLink = element.typeVariables;
Link<Node> nodeLink = node.nodes;
while (!nodeLink.isEmpty()) {
TypeVariableType typeVariable = typeLink.head;
SourceString typeName = typeVariable.name;
TypeVariable typeNode = nodeLink.head;
if (nameSet.contains(typeName)) {
error(typeNode, MessageKind.DUPLICATE_TYPE_VARIABLE_NAME, [typeName]);
}
nameSet.add(typeName);
TypeVariableElement variableElement = typeVariable.element;
if (typeNode.bound !== null) {
Type boundType = typeResolver.resolveTypeAnnotation(
typeNode.bound, inScope: scope, onFailure: warning);
if (boundType !== null && boundType.element == variableElement) {
// TODO(johnniwinther): Check for more general cycles, like
// [: <A extends B, B extends C, C extends B> :].
warning(node, MessageKind.CYCLIC_TYPE_VARIABLE,
[variableElement.name]);
} else if (boundType !== null) {
variableElement.bound = boundType;
} else {
// TODO(johnniwinther): Should be an erroneous type.
variableElement.bound = compiler.objectClass.computeType(compiler);
}
} else {
variableElement.bound = compiler.objectClass.computeType(compiler);
}
nodeLink = nodeLink.tail;
typeLink = typeLink.tail;
}
assert(typeLink.isEmpty());
}
}
class VariableDefinitionsVisitor extends CommonResolverVisitor<SourceString> {
VariableDefinitions definitions;
ResolverVisitor resolver;