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

Minor. Replaced TYPE_RESOLUTION_SCOPE to LEXICAL_SCOPE

Browse Source
This commit is contained in:
Stanislav Erokhin
2015-09-18 21:33:40 +03:00
parent 3d6d527d93
commit fd503d0367
6 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/CliLightClassGenerationSupport.kt
+1 -1
View File
@@ -181,7 +181,7 @@ public class CliLightClassGenerationSupport(project: Project) : LightClassGenera
public class NoScopeRecordCliBindingTrace : CliBindingTrace() {
override fun <K, V> record(slice: WritableSlice<K, V>, key: K, value: V) {
if (slice === BindingContext.RESOLUTION_SCOPE || slice === BindingContext.TYPE_RESOLUTION_SCOPE || slice === BindingContext.LEXICAL_SCOPE) {
if (slice === BindingContext.RESOLUTION_SCOPE || slice === BindingContext.LEXICAL_SCOPE) {
// In the compiler there's no need to keep scopes
return
}
compiler/frontend/src/org/jetbrains/kotlin/resolve/BindingContext.java
+1 -5
View File
@@ -137,12 +137,8 @@ public interface BindingContext {
WritableSlice<JetWhenExpression, Boolean> EXHAUSTIVE_WHEN = Slices.createSimpleSlice();
/**
* A scope where type of expression has been resolved
*/
WritableSlice<JetTypeReference, JetScope> TYPE_RESOLUTION_SCOPE = Slices.createSimpleSlice();
@Deprecated WritableSlice<JetExpression, JetScope> RESOLUTION_SCOPE = Slices.createSimpleSlice();
WritableSlice<JetExpression, LexicalScope> LEXICAL_SCOPE = Slices.createSimpleSlice();
WritableSlice<JetElement, LexicalScope> LEXICAL_SCOPE = Slices.createSimpleSlice();
WritableSlice<ScriptDescriptor, JetScope> SCRIPT_SCOPE = Slices.createSimpleSlice();
compiler/frontend/src/org/jetbrains/kotlin/resolve/TypeResolver.kt
+1 -1
View File
@@ -109,7 +109,7 @@ public class TypeResolver(
val typeElement = typeReference.getTypeElement()
val type = resolveTypeElement(c, annotations, typeElement)
c.trace.record(BindingContext.TYPE_RESOLUTION_SCOPE, typeReference, c.scope.asJetScope())
c.trace.record(BindingContext.LEXICAL_SCOPE, typeReference, c.scope)
if (!type.isBare) {
for (argument in type.actualType.arguments) {
compiler/frontend/src/org/jetbrains/kotlin/types/expressions/BasicExpressionTypingVisitor.java
+1 -1
View File
@@ -429,7 +429,7 @@ public class BasicExpressionTypingVisitor extends ExpressionTypingVisitor {
context.trace.record(BindingContext.REFERENCE_TARGET, expression.getInstanceReference(), result.getConstructor().getDeclarationDescriptor());
}
if (superTypeQualifier != null) {
context.trace.record(BindingContext.TYPE_RESOLUTION_SCOPE, superTypeQualifier, asJetScope(context.scope));
context.trace.record(BindingContext.LEXICAL_SCOPE, superTypeQualifier, context.scope);
}
return result;
}