azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Clarifying rename

Browse Source
This commit is contained in:
Andrey Breslav
2012-11-23 19:06:58 +04:00
parent e064a50728
commit c2f2356855
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/lang/resolve/DescriptorResolver.java
+6 -5
View File
@@ -262,7 +262,7 @@ public class DescriptorResolver {
innerScope.addLabeledDeclaration(functionDescriptor); innerScope.addLabeledDeclaration(functionDescriptor);
List<TypeParameterDescriptorImpl> typeParameterDescriptors = List<TypeParameterDescriptorImpl> typeParameterDescriptors =
resolveTypeParameters(functionDescriptor, innerScope, function.getTypeParameters(), trace); resolveTypeParametersForCallableDescriptor(functionDescriptor, innerScope, function.getTypeParameters(), trace);
innerScope.changeLockLevel(WritableScope.LockLevel.BOTH); innerScope.changeLockLevel(WritableScope.LockLevel.BOTH);
resolveGenericBounds(function, innerScope, typeParameterDescriptors, trace); resolveGenericBounds(function, innerScope, typeParameterDescriptors, trace);
@@ -501,7 +501,7 @@ public class DescriptorResolver {
} }
} }
public List<TypeParameterDescriptorImpl> resolveTypeParameters( public List<TypeParameterDescriptorImpl> resolveTypeParametersForCallableDescriptor(
DeclarationDescriptor containingDescriptor, DeclarationDescriptor containingDescriptor,
WritableScope extensibleScope, WritableScope extensibleScope,
List<JetTypeParameter> typeParameters, List<JetTypeParameter> typeParameters,
@@ -510,12 +510,12 @@ public class DescriptorResolver {
List<TypeParameterDescriptorImpl> result = new ArrayList<TypeParameterDescriptorImpl>(); List<TypeParameterDescriptorImpl> result = new ArrayList<TypeParameterDescriptorImpl>();
for (int i = 0, typeParametersSize = typeParameters.size(); i < typeParametersSize; i++) { for (int i = 0, typeParametersSize = typeParameters.size(); i < typeParametersSize; i++) {
JetTypeParameter typeParameter = typeParameters.get(i); JetTypeParameter typeParameter = typeParameters.get(i);
result.add(resolveTypeParameter(containingDescriptor, extensibleScope, typeParameter, i, trace)); result.add(resolveTypeParameterForCallableDescriptor(containingDescriptor, extensibleScope, typeParameter, i, trace));
} }
return result; return result;
} }
private TypeParameterDescriptorImpl resolveTypeParameter( private TypeParameterDescriptorImpl resolveTypeParameterForCallableDescriptor(
DeclarationDescriptor containingDescriptor, DeclarationDescriptor containingDescriptor,
WritableScope extensibleScope, WritableScope extensibleScope,
JetTypeParameter typeParameter, JetTypeParameter typeParameter,
@@ -940,7 +940,8 @@ public class DescriptorResolver {
WritableScope writableScope = new WritableScopeImpl( WritableScope writableScope = new WritableScopeImpl(
scope, containingDeclaration, new TraceBasedRedeclarationHandler(trace), scope, containingDeclaration, new TraceBasedRedeclarationHandler(trace),
"Scope with type parameters of a property"); "Scope with type parameters of a property");
typeParameterDescriptors = resolveTypeParameters(containingDeclaration, writableScope, typeParameters, trace); typeParameterDescriptors = resolveTypeParametersForCallableDescriptor(containingDeclaration, writableScope, typeParameters,
trace);
writableScope.changeLockLevel(WritableScope.LockLevel.READING); writableScope.changeLockLevel(WritableScope.LockLevel.READING);
resolveGenericBounds(property, writableScope, typeParameterDescriptors, trace); resolveGenericBounds(property, writableScope, typeParameterDescriptors, trace);
scopeWithTypeParameters = writableScope; scopeWithTypeParameters = writableScope;