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

Refactoring: rename method addAllMyDataTo -> addOwnDataTo

Browse Source
This commit is contained in:
Nikolay Krasko
2015-06-29 20:35:44 +03:00
parent 09bb050c3f
commit 2dfed03b67
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/resolve/DelegatingBindingTrace.java
+4 -4
View File
@@ -156,16 +156,16 @@ public class DelegatingBindingTrace implements BindingTrace {
record(BindingContext.EXPRESSION_TYPE_INFO, expression, typeInfo); record(BindingContext.EXPRESSION_TYPE_INFO, expression, typeInfo);
} }
public void addAllMyDataTo(@NotNull BindingTrace trace) { public void addOwnDataTo(@NotNull BindingTrace trace) {
addAllMyDataTo(trace, null, true); addOwnDataTo(trace, null, true);
} }
public void moveAllMyDataTo(@NotNull BindingTrace trace) { public void moveAllMyDataTo(@NotNull BindingTrace trace) {
addAllMyDataTo(trace, null, true); addOwnDataTo(trace, null, true);
clear(); clear();
} }
public void addAllMyDataTo(@NotNull BindingTrace trace, @Nullable TraceEntryFilter filter, boolean commitDiagnostics) { public void addOwnDataTo(@NotNull BindingTrace trace, @Nullable TraceEntryFilter filter, boolean commitDiagnostics) {
BindingContextUtils.addOwnDataTo(trace, filter, commitDiagnostics, map, mutableDiagnostics); BindingContextUtils.addOwnDataTo(trace, filter, commitDiagnostics, map, mutableDiagnostics);
} }
compiler/frontend/src/org/jetbrains/kotlin/resolve/TemporaryBindingTrace.java
+2 -2
View File
@@ -39,12 +39,12 @@ public class TemporaryBindingTrace extends DelegatingBindingTrace {
} }
public void commit() { public void commit() {
addAllMyDataTo(trace); addOwnDataTo(trace);
clear(); clear();
} }
public void commit(@NotNull TraceEntryFilter filter, boolean commitDiagnostics) { public void commit(@NotNull TraceEntryFilter filter, boolean commitDiagnostics) {
addAllMyDataTo(trace, filter, commitDiagnostics); addOwnDataTo(trace, filter, commitDiagnostics);
clear(); clear();
} }
} }
compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/CallResolver.java
+3 -3
View File
@@ -439,7 +439,7 @@ public class CallResolver {
ResolutionResultsCache.CachedData data = context.resolutionResultsCache.get(call); ResolutionResultsCache.CachedData data = context.resolutionResultsCache.get(call);
if (data != null) { if (data != null) {
DelegatingBindingTrace deltasTraceForResolve = data.getResolutionTrace(); DelegatingBindingTrace deltasTraceForResolve = data.getResolutionTrace();
deltasTraceForResolve.addAllMyDataTo(traceToResolveCall); deltasTraceForResolve.addOwnDataTo(traceToResolveCall);
//noinspection unchecked //noinspection unchecked
results = (OverloadResolutionResultsImpl<F>) data.getResolutionResults(); results = (OverloadResolutionResultsImpl<F>) data.getResolutionResults();
} }
@@ -450,7 +450,7 @@ public class CallResolver {
results = doResolveCall(newContext, prioritizedTasks, callTransformer, tracing); results = doResolveCall(newContext, prioritizedTasks, callTransformer, tracing);
DelegatingBindingTrace deltasTraceForTypeInference = ((OverloadResolutionResultsImpl) results).getTrace(); DelegatingBindingTrace deltasTraceForTypeInference = ((OverloadResolutionResultsImpl) results).getTrace();
if (deltasTraceForTypeInference != null) { if (deltasTraceForTypeInference != null) {
deltasTraceForTypeInference.addAllMyDataTo(traceToResolveCall); deltasTraceForTypeInference.addOwnDataTo(traceToResolveCall);
} }
completeTypeInferenceDependentOnFunctionLiterals(newContext, results, tracing); completeTypeInferenceDependentOnFunctionLiterals(newContext, results, tracing);
cacheResults(context, results, traceToResolveCall, tracing); cacheResults(context, results, traceToResolveCall, tracing);
@@ -493,7 +493,7 @@ public class CallResolver {
DelegatingBindingTrace deltasTraceToCacheResolve = new DelegatingBindingTrace( DelegatingBindingTrace deltasTraceToCacheResolve = new DelegatingBindingTrace(
BindingContext.EMPTY, "delta trace for caching resolve of", context.call); BindingContext.EMPTY, "delta trace for caching resolve of", context.call);
traceToResolveCall.addAllMyDataTo(deltasTraceToCacheResolve); traceToResolveCall.addOwnDataTo(deltasTraceToCacheResolve);
context.resolutionResultsCache.record(call, results, context, tracing, deltasTraceToCacheResolve); context.resolutionResultsCache.record(call, results, context, tracing, deltasTraceToCacheResolve);
} }