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

Minor. Renamed methods.

Browse Source
This commit is contained in:
Evgeny Gerashchenko
2014-03-21 17:52:41 +04:00
parent 33e59103ec
commit 5360451022
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/jet/codegen/PackageCodegen.java
+5 -5
View File
@@ -91,7 +91,7 @@ public class PackageCodegen extends GenerationStateAware {
this.packageFragment = getOnlyPackageFragment(); this.packageFragment = getOnlyPackageFragment();
this.compiledPackageFragment = getCompiledPackageFragment(); this.compiledPackageFragment = getCompiledPackageFragment();
final PsiFile sourceFile = packageFiles.size() == 1 && getAlreadyCompiledCallables().isEmpty() final PsiFile sourceFile = packageFiles.size() == 1 && getPreviouslyCompiledCallables().isEmpty()
? packageFiles.iterator().next().getContainingFile() : null; ? packageFiles.iterator().next().getContainingFile() : null;
v.addOptionalDeclaration(new ClassBuilderOnDemand.ClassBuilderCallback() { v.addOptionalDeclaration(new ClassBuilderOnDemand.ClassBuilderCallback() {
@@ -129,7 +129,7 @@ public class PackageCodegen extends GenerationStateAware {
} }
@NotNull @NotNull
private List<DeserializedCallableMemberDescriptor> getAlreadyCompiledCallables() { private List<DeserializedCallableMemberDescriptor> getPreviouslyCompiledCallables() {
List<DeserializedCallableMemberDescriptor> callables = Lists.newArrayList(); List<DeserializedCallableMemberDescriptor> callables = Lists.newArrayList();
if (compiledPackageFragment != null) { if (compiledPackageFragment != null) {
for (DeclarationDescriptor member : compiledPackageFragment.getMemberScope().getAllDescriptors()) { for (DeclarationDescriptor member : compiledPackageFragment.getMemberScope().getAllDescriptors()) {
@@ -141,8 +141,8 @@ public class PackageCodegen extends GenerationStateAware {
return callables; return callables;
} }
private void generateDelegationsToAlreadyCompiled(Map<CallableMemberDescriptor, Runnable> generateCallableMemberTasks) { private void generateDelegationsToPreviouslyCompiled(Map<CallableMemberDescriptor, Runnable> generateCallableMemberTasks) {
for (final DeserializedCallableMemberDescriptor member : getAlreadyCompiledCallables()) { for (final DeserializedCallableMemberDescriptor member : getPreviouslyCompiledCallables()) {
generateCallableMemberTasks.put(member, new Runnable() { generateCallableMemberTasks.put(member, new Runnable() {
@Override @Override
public void run() { public void run() {
@@ -219,7 +219,7 @@ public class PackageCodegen extends GenerationStateAware {
if (shouldGeneratePackageClass) { if (shouldGeneratePackageClass) {
// Shouldn't generate delegations to previously compiled if we compile only "classes" part of a package. // Shouldn't generate delegations to previously compiled if we compile only "classes" part of a package.
generateDelegationsToAlreadyCompiled(generateCallableMemberTasks); generateDelegationsToPreviouslyCompiled(generateCallableMemberTasks);
} }
for (CallableMemberDescriptor member : Ordering.from(MemberComparator.INSTANCE).sortedCopy(generateCallableMemberTasks.keySet())) { for (CallableMemberDescriptor member : Ordering.from(MemberComparator.INSTANCE).sortedCopy(generateCallableMemberTasks.keySet())) {