diff --git a/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/AbstractDescriptorFinder.java b/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/AbstractDescriptorFinder.java index b02e325c551..55d6cbf800d 100644 --- a/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/AbstractDescriptorFinder.java +++ b/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/AbstractDescriptorFinder.java @@ -58,7 +58,7 @@ public abstract class AbstractDescriptorFinder implements DescriptorFinder { @Nullable @Override public ClassDescriptor findClass(@NotNull ClassId classId) { - return findClass.fun(classId); + return findClass.invoke(classId); } @Nullable diff --git a/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/TypeDeserializer.java b/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/TypeDeserializer.java index 321b4163cad..e6adcdd8f24 100644 --- a/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/TypeDeserializer.java +++ b/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/TypeDeserializer.java @@ -136,7 +136,7 @@ public class TypeDeserializer { private TypeConstructor typeConstructor(@NotNull ProtoBuf.Type.Constructor proto) { switch (proto.getKind()) { case CLASS: - ClassDescriptor classDescriptor = classDescriptors.fun(proto.getId()); + ClassDescriptor classDescriptor = classDescriptors.invoke(proto.getId()); if (classDescriptor == null) return null; return classDescriptor.getTypeConstructor(); @@ -227,7 +227,7 @@ public class TypeDeserializer { @NotNull @Override public TypeConstructor getConstructor() { - return constructor.compute(); + return constructor.invoke(); } @NotNull @@ -254,7 +254,7 @@ public class TypeDeserializer { @NotNull @Override public JetScope getMemberScope() { - return memberScope.compute(); + return memberScope.invoke(); } @Override diff --git a/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/DeserializedClassDescriptor.java b/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/DeserializedClassDescriptor.java index a62754a5154..1ada386a2ab 100644 --- a/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/DeserializedClassDescriptor.java +++ b/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/DeserializedClassDescriptor.java @@ -151,7 +151,7 @@ public class DeserializedClassDescriptor extends AbstractClassDescriptor impleme @NotNull @Override public DeclarationDescriptor getContainingDeclaration() { - return containingDeclaration.compute(); + return containingDeclaration.invoke(); } @NotNull @@ -201,7 +201,7 @@ public class DeserializedClassDescriptor extends AbstractClassDescriptor impleme @Override public List getAnnotations() { - return annotations.compute(); + return annotations.invoke(); } @Override @@ -226,7 +226,7 @@ public class DeserializedClassDescriptor extends AbstractClassDescriptor impleme @Nullable @Override public ConstructorDescriptor getUnsubstitutedPrimaryConstructor() { - return primaryConstructor.compute(); + return primaryConstructor.invoke(); } @NotNull @@ -306,7 +306,7 @@ public class DeserializedClassDescriptor extends AbstractClassDescriptor impleme @Nullable @Override public ClassDescriptor getClassObjectDescriptor() { - return classObjectDescriptor.compute(); + return classObjectDescriptor.invoke(); } @NotNull @@ -463,7 +463,7 @@ public class DeserializedClassDescriptor extends AbstractClassDescriptor impleme @Nullable @Override protected ClassifierDescriptor getClassDescriptor(@NotNull Name name) { - return classDescriptor.nestedClasses.findClass.fun(name); + return classDescriptor.nestedClasses.findClass.invoke(name); } @Override @@ -474,7 +474,7 @@ public class DeserializedClassDescriptor extends AbstractClassDescriptor impleme @Nullable @Override public ClassDescriptor getObjectDescriptor(@NotNull Name name) { - return classDescriptor.nestedObjects.findClass.fun(name); + return classDescriptor.nestedObjects.findClass.invoke(name); } @NotNull @@ -504,7 +504,7 @@ public class DeserializedClassDescriptor extends AbstractClassDescriptor impleme public Collection getAllDescriptors() { Collection result = new ArrayList(declaredNames.size()); for (Name name : declaredNames) { - ClassDescriptor descriptor = findClass.fun(name); + ClassDescriptor descriptor = findClass.invoke(name); if (descriptor != null) { result.add(descriptor); } diff --git a/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/DeserializedMemberScope.java b/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/DeserializedMemberScope.java index 021beae07bd..5d783237b0d 100644 --- a/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/DeserializedMemberScope.java +++ b/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/DeserializedMemberScope.java @@ -143,7 +143,7 @@ public abstract class DeserializedMemberScope implements JetScope { @NotNull @Override public final Collection getFunctions(@NotNull Name name) { - return functions.fun(name); + return functions.invoke(name); } @NotNull @@ -160,7 +160,7 @@ public abstract class DeserializedMemberScope implements JetScope { @NotNull @Override public Collection getProperties(@NotNull Name name) { - return properties.fun(name); + return properties.invoke(name); } @Nullable @@ -184,7 +184,7 @@ public abstract class DeserializedMemberScope implements JetScope { @NotNull @Override public Collection getObjectDescriptors() { - return objectDescriptors.compute(); + return objectDescriptors.invoke(); } @Nullable @@ -231,7 +231,7 @@ public abstract class DeserializedMemberScope implements JetScope { @NotNull @Override public final Collection getAllDescriptors() { - return allDescriptors.compute(); + return allDescriptors.invoke(); } @NotNull diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/ImportsProvider.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/ImportsProvider.java index af635742dd1..1eb3ff79f84 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/ImportsProvider.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/ImportsProvider.java @@ -45,7 +45,7 @@ class ImportsProvider { @NotNull public List getImports(@NotNull Name name) { - return importsCacheValue.compute().getImports(name); + return importsCacheValue.invoke().getImports(name); } @NotNull diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/LazyImportScope.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/LazyImportScope.java index 9bde1f89d81..4d5ed124611 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/LazyImportScope.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/LazyImportScope.java @@ -234,7 +234,7 @@ public class LazyImportScope implements JetScope { @NotNull private JetScope getImportScope(JetImportDirective directive, LookupMode lookupMode) { - return importedScopesProvider.fun(directive).scopeForMode(lookupMode); + return importedScopesProvider.invoke(directive).scopeForMode(lookupMode); } @Nullable diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/ScopeProvider.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/ScopeProvider.java index a1bd543c17b..53a1194ee2d 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/ScopeProvider.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/ScopeProvider.java @@ -65,7 +65,7 @@ public class ScopeProvider { @NotNull public JetScope getFileScope(JetFile file) { - return fileScopes.fun(file); + return fileScopes.invoke(file); } private JetScope createFileScope(JetFile file) { @@ -88,7 +88,7 @@ public class ScopeProvider { packageDescriptor.getMemberScope(), rootPackageDescriptor.getMemberScope(), importsScope, - defaultImportsScope.compute()); + defaultImportsScope.invoke()); } private JetScope createScopeWithDefaultImports() { diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/data/FilteringClassLikeInfo.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/data/FilteringClassLikeInfo.java index 0247ba6ce7b..7989e7ce473 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/data/FilteringClassLikeInfo.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/data/FilteringClassLikeInfo.java @@ -106,7 +106,7 @@ public class FilteringClassLikeInfo implements JetClassLikeInfo { @Override @NotNull public List getDeclarations() { - return filteredDeclarations.compute(); + return filteredDeclarations.invoke(); } @Override diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/declarations/AbstractPsiBasedDeclarationProvider.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/declarations/AbstractPsiBasedDeclarationProvider.java index c71db02249f..c984b2026f7 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/declarations/AbstractPsiBasedDeclarationProvider.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/declarations/AbstractPsiBasedDeclarationProvider.java @@ -84,24 +84,24 @@ public abstract class AbstractPsiBasedDeclarationProvider implements Declaration @Override public List getAllDeclarations() { - return index.compute().allDeclarations; + return index.invoke().allDeclarations; } @NotNull @Override public List getFunctionDeclarations(@NotNull Name name) { - return Lists.newArrayList(index.compute().functions.get(name)); + return Lists.newArrayList(index.invoke().functions.get(name)); } @NotNull @Override public List getPropertyDeclarations(@NotNull Name name) { - return Lists.newArrayList(index.compute().properties.get(name)); + return Lists.newArrayList(index.invoke().properties.get(name)); } @NotNull @Override public Collection getClassOrObjectDeclarations(@NotNull Name name) { - return index.compute().classesAndObjects.get(name); + return index.invoke().classesAndObjects.get(name); } } diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/declarations/FileBasedDeclarationProviderFactory.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/declarations/FileBasedDeclarationProviderFactory.java index 89dbed40fdc..b3daa6478a1 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/declarations/FileBasedDeclarationProviderFactory.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/declarations/FileBasedDeclarationProviderFactory.java @@ -102,7 +102,7 @@ public class FileBasedDeclarationProviderFactory implements DeclarationProviderF } /*package*/ boolean isPackageDeclaredExplicitly(@NotNull FqName packageFqName) { - return index.compute().declaredPackages.contains(packageFqName); + return index.invoke().declaredPackages.contains(packageFqName); } /*package*/ boolean isPackageDeclared(@NotNull FqName packageFqName) { @@ -110,7 +110,7 @@ public class FileBasedDeclarationProviderFactory implements DeclarationProviderF } /*package*/ Collection getAllDeclaredSubPackagesOf(@NotNull final FqName parent) { - return Collections2.filter(index.compute().declaredPackages, new Predicate() { + return Collections2.filter(index.invoke().declaredPackages, new Predicate() { @Override public boolean apply(FqName fqName) { return !fqName.isRoot() && fqName.parent().equals(parent); @@ -124,9 +124,9 @@ public class FileBasedDeclarationProviderFactory implements DeclarationProviderF } Collection resultElements = Lists.newArrayList(); - for (FqName declaredPackage : index.compute().filesByPackage.keys()) { + for (FqName declaredPackage : index.invoke().filesByPackage.keys()) { if (QualifiedNamesUtil.isSubpackageOf(declaredPackage, fqName)) { - Collection files = index.compute().filesByPackage.get(declaredPackage); + Collection files = index.invoke().filesByPackage.get(declaredPackage); resultElements.addAll(ContainerUtil.map(files, new Function() { @Override public NavigatablePsiElement fun(JetFile file) { @@ -141,7 +141,7 @@ public class FileBasedDeclarationProviderFactory implements DeclarationProviderF @Override public PackageMemberDeclarationProvider getPackageMemberDeclarationProvider(@NotNull FqName packageFqName) { - return packageDeclarationProviders.fun(packageFqName); + return packageDeclarationProviders.invoke(packageFqName); } @Nullable @@ -153,13 +153,13 @@ public class FileBasedDeclarationProviderFactory implements DeclarationProviderF return null; } - return new FileBasedPackageMemberDeclarationProvider(storageManager, packageFqName, this, index.compute().filesByPackage.get(packageFqName)); + return new FileBasedPackageMemberDeclarationProvider(storageManager, packageFqName, this, index.invoke().filesByPackage.get(packageFqName)); } @NotNull @Override public ClassMemberDeclarationProvider getClassMemberDeclarationProvider(@NotNull JetClassLikeInfo classLikeInfo) { - if (!index.compute().filesByPackage.containsKey(classLikeInfo.getContainingPackageFqName())) { + if (!index.invoke().filesByPackage.containsKey(classLikeInfo.getContainingPackageFqName())) { throw new IllegalStateException("This factory doesn't know about this class: " + classLikeInfo); } diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/declarations/FileBasedPackageMemberDeclarationProvider.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/declarations/FileBasedPackageMemberDeclarationProvider.java index 5d6fb29ca76..042b88a0237 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/declarations/FileBasedPackageMemberDeclarationProvider.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/declarations/FileBasedPackageMemberDeclarationProvider.java @@ -71,7 +71,7 @@ public class FileBasedPackageMemberDeclarationProvider extends AbstractPsiBasedD @Override public Collection getAllDeclaredPackages() { - return allDeclaredPackages.compute(); + return allDeclaredPackages.invoke(); } @NotNull diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/AbstractLazyMemberScope.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/AbstractLazyMemberScope.java index 2fd9e480cfc..d11fea9580c 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/AbstractLazyMemberScope.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/AbstractLazyMemberScope.java @@ -126,12 +126,12 @@ public abstract class AbstractLazyMemberScope T first(@NotNull List list) { @@ -142,7 +142,7 @@ public abstract class AbstractLazyMemberScope getFunctions(@NotNull Name name) { - return functionDescriptors.fun(name); + return functionDescriptors.invoke(name); } @NotNull @@ -175,7 +175,7 @@ public abstract class AbstractLazyMemberScope getProperties(@NotNull Name name) { - return propertyDescriptors.fun(name); + return propertyDescriptors.invoke(name); } @NotNull @@ -224,7 +224,7 @@ public abstract class AbstractLazyMemberScope getObjectDescriptors() { - return allDescriptors.compute().objects; + return allDescriptors.invoke().objects; } @Override @@ -248,7 +248,7 @@ public abstract class AbstractLazyMemberScope getAllDescriptors() { - return allDescriptors.compute().all; + return allDescriptors.invoke().all; } @NotNull @@ -275,7 +275,7 @@ public abstract class AbstractLazyMemberScope getAnnotations() { - return annotations.compute(); + return annotations.invoke(); } @NotNull @@ -427,13 +427,13 @@ public class LazyClassDescriptor extends ClassDescriptorBase implements LazyDesc @NotNull @Override public List getParameters() { - return parameters.compute(); + return parameters.invoke(); } @NotNull @Override public Collection getSupertypes() { - return supertypes.compute(); + return supertypes.invoke(); } private void findAndDisconnectLoopsInTypeHierarchy(Collection supertypes) { diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/LazyClassMemberScope.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/LazyClassMemberScope.java index 2923182f5a3..575c9304222 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/LazyClassMemberScope.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/LazyClassMemberScope.java @@ -348,7 +348,7 @@ public class LazyClassMemberScope extends AbstractLazyMemberScope void doTestComputesOnce(Computable v, T expected, Counter counter) throws Exception { + public static void doTestComputesOnce(Function0 v, T expected, Counter counter) throws Exception { assert 0 == counter.getCount(); - T result1 = v.compute(); - T result2 = v.compute(); + T result1 = v.invoke(); + T result2 = v.invoke(); assertEquals(1, counter.getCount()); assertEquals(expected, result1); assertEquals(result1, result2); } - public static void doTestExceptionPreserved(Computable v, Class expected, Counter counter) + public static void doTestExceptionPreserved(Function0 v, Class expected, Counter counter) throws Exception { assert 0 == counter.getCount(); Throwable caught1 = null; try { - v.compute(); + v.invoke(); fail(); } catch (Throwable e) { @@ -46,7 +48,7 @@ public class StorageManagerTest extends TestCase { } Throwable caught2 = null; try { - v.compute(); + v.invoke(); fail(); } catch (Throwable e) { @@ -64,14 +66,14 @@ public class StorageManagerTest extends TestCase { public void testIsComputed() throws Exception { NotNullLazyValue value = m.createLazyValue(new CounterValue()); assertFalse(value.isComputed()); - value.compute(); + value.invoke(); assertTrue(value.isComputed()); } public void testIsNullableComputed() throws Exception { NullableLazyValue value = m.createNullableLazyValue(new CounterValueNull()); assertFalse(value.isComputed()); - value.compute(); + value.invoke(); assertTrue(value.isComputed()); } @@ -80,7 +82,7 @@ public class StorageManagerTest extends TestCase { assertFalse(value.isComputed()); try { - value.compute(); + value.invoke(); } catch (Exception ignored) { } @@ -93,7 +95,7 @@ public class StorageManagerTest extends TestCase { assertFalse(value.isComputed()); try { - value.compute(); + value.invoke(); } catch (Exception ignored) { } @@ -168,13 +170,13 @@ public class StorageManagerTest extends TestCase { NotNullLazyValue rec = m.createLazyValue(new Computable() { @Override public String compute() { - return rec.compute(); + return rec.invoke(); } }); } try { - new C().rec.compute(); + new C().rec.invoke(); fail(); } catch (IllegalStateException e) { @@ -187,13 +189,13 @@ public class StorageManagerTest extends TestCase { NullableLazyValue rec = m.createNullableLazyValue(new Computable() { @Override public String compute() { - return rec.compute(); + return rec.invoke(); } }); } try { - new C().rec.compute(); + new C().rec.invoke(); fail(); } catch (IllegalStateException e) { @@ -206,13 +208,13 @@ public class StorageManagerTest extends TestCase { NotNullLazyValue rec = m.createRecursionTolerantLazyValue(new Computable() { @Override public String compute() { - assertEquals("rec", rec.compute()); + assertEquals("rec", rec.invoke()); return "tolerant!"; } }, "rec"); } - assertEquals("tolerant!", new C().rec.compute()); + assertEquals("tolerant!", new C().rec.invoke()); } public void testNullableRecursionTolerance() throws Exception { @@ -220,13 +222,13 @@ public class StorageManagerTest extends TestCase { NullableLazyValue rec = m.createRecursionTolerantNullableLazyValue(new Computable() { @Override public String compute() { - assertEquals(null, rec.compute()); + assertEquals(null, rec.invoke()); return "tolerant!"; } }, null); } - assertEquals("tolerant!", new C().rec.compute()); + assertEquals("tolerant!", new C().rec.invoke()); } public void testRecursionIntoleranceWithPostCompute() throws Exception { @@ -236,7 +238,7 @@ public class StorageManagerTest extends TestCase { new Computable() { @Override public String compute() { - return rec.compute(); + return rec.invoke(); } }, null, @@ -245,7 +247,7 @@ public class StorageManagerTest extends TestCase { } try { - new C().rec.compute(); + new C().rec.invoke(); fail(); } catch (IllegalStateException e) { @@ -260,7 +262,7 @@ public class StorageManagerTest extends TestCase { new Computable() { @Override public String compute() { - return rec.compute(); + return rec.invoke(); } }, new Function() { @@ -280,8 +282,8 @@ public class StorageManagerTest extends TestCase { } C c = new C(); - assertEquals("tolerant", c.rec.compute()); - c.rec.compute(); + assertEquals("tolerant", c.rec.invoke()); + c.rec.invoke(); assertEquals("postCompute() called more than once", 1, counter.getCount()); } @@ -306,8 +308,8 @@ public class StorageManagerTest extends TestCase { } ); - assertEquals(Arrays.asList("first", "postComputed"), v.compute()); - v.compute(); + assertEquals(Arrays.asList("first", "postComputed"), v.invoke()); + v.invoke(); assertEquals(1, counter.getCount()); } @@ -331,8 +333,8 @@ public class StorageManagerTest extends TestCase { } ); - assertEquals(Arrays.asList("first", "postComputed"), v.compute()); - v.compute(); + assertEquals(Arrays.asList("first", "postComputed"), v.invoke()); + v.invoke(); assertEquals(1, counter.getCount()); } @@ -343,7 +345,7 @@ public class StorageManagerTest extends TestCase { new Computable() { @Override public String compute() { - return rec.compute(); + return rec.invoke(); } }, new Function() { @@ -366,23 +368,23 @@ public class StorageManagerTest extends TestCase { C c = new C(); try { - c.rec.compute(); + c.rec.invoke(); fail(); } catch (ReenteringLazyValueComputationException e) { // OK } - assertEquals("second", c.rec.compute()); + assertEquals("second", c.rec.invoke()); } // Utilities - private static Computable apply(final Function f, final K x) { - return new Computable() { + private static Function0 apply(final Function1 f, final K x) { + return new Function0() { @Override - public V compute() { - return f.fun(x); + public V invoke() { + return f.invoke(x); } }; } diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/AnnotationDescriptorDeserializer.java b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/AnnotationDescriptorDeserializer.java index 9ae4f89cdbd..a1dc0fefefc 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/AnnotationDescriptorDeserializer.java +++ b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/AnnotationDescriptorDeserializer.java @@ -237,7 +237,7 @@ public class AnnotationDescriptorDeserializer implements AnnotationDeserializer errorReporter.reportAnnotationLoadingError("Kotlin class for loading member annotations is not found: " + container, null); } - List annotations = memberAnnotations.fun(kotlinClass).get(signature); + List annotations = memberAnnotations.invoke(kotlinClass).get(signature); return annotations == null ? Collections.emptyList() : annotations; } diff --git a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/AbstractLazyTypeParameterDescriptor.java b/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/AbstractLazyTypeParameterDescriptor.java index b4fdb6d0c44..e389fabe629 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/AbstractLazyTypeParameterDescriptor.java +++ b/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/AbstractLazyTypeParameterDescriptor.java @@ -105,7 +105,7 @@ public abstract class AbstractLazyTypeParameterDescriptor implements TypeParamet @NotNull @Override public Set getUpperBounds() { - return upperBounds.compute(); + return upperBounds.invoke(); } @NotNull @@ -114,7 +114,7 @@ public abstract class AbstractLazyTypeParameterDescriptor implements TypeParamet @NotNull @Override public JetType getUpperBoundsAsType() { - return upperBoundsAsType.compute(); + return upperBoundsAsType.invoke(); } @NotNull @@ -144,7 +144,7 @@ public abstract class AbstractLazyTypeParameterDescriptor implements TypeParamet @NotNull @Override public TypeConstructor getTypeConstructor() { - return typeConstructor.compute(); + return typeConstructor.invoke(); } @NotNull @@ -192,7 +192,7 @@ public abstract class AbstractLazyTypeParameterDescriptor implements TypeParamet @NotNull @Override public JetType getDefaultType() { - return defaultType.compute(); + return defaultType.invoke(); } @NotNull diff --git a/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/LazyScopeAdapter.java b/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/LazyScopeAdapter.java index 5d8fe4a168a..3971ade2ee2 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/LazyScopeAdapter.java +++ b/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/LazyScopeAdapter.java @@ -30,6 +30,6 @@ public class LazyScopeAdapter extends AbstractScopeAdapter { @NotNull @Override protected JetScope getWorkerScope() { - return scope.compute(); + return scope.invoke(); } } diff --git a/core/descriptors/src/org/jetbrains/jet/lang/types/lang/BuiltinsNamespaceDescriptorImpl.java b/core/descriptors/src/org/jetbrains/jet/lang/types/lang/BuiltinsNamespaceDescriptorImpl.java index 40885838ad4..2fa1d75075d 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/types/lang/BuiltinsNamespaceDescriptorImpl.java +++ b/core/descriptors/src/org/jetbrains/jet/lang/types/lang/BuiltinsNamespaceDescriptorImpl.java @@ -143,7 +143,7 @@ class BuiltinsNamespaceDescriptorImpl extends AbstractNamespaceDescriptorImpl { @NotNull @Override public Collection getClassNames(@NotNull FqName packageName) { - return packageName.equals(KotlinBuiltIns.BUILT_INS_PACKAGE_FQ_NAME) ? classNames.compute() : Collections.emptyList(); + return packageName.equals(KotlinBuiltIns.BUILT_INS_PACKAGE_FQ_NAME) ? classNames.invoke() : Collections.emptyList(); } } } diff --git a/core/util.runtime/src/org/jetbrains/jet/storage/LockBasedStorageManager.java b/core/util.runtime/src/org/jetbrains/jet/storage/LockBasedStorageManager.java index 69a35dc6410..3591689691b 100644 --- a/core/util.runtime/src/org/jetbrains/jet/storage/LockBasedStorageManager.java +++ b/core/util.runtime/src/org/jetbrains/jet/storage/LockBasedStorageManager.java @@ -181,11 +181,6 @@ public class LockBasedStorageManager implements StorageManager { @Override public T invoke() { - return compute(); - } - - @Override - public T compute() { Object _value = value; if (!(value instanceof NotValue)) return WrappedValues.unescapeThrowable(_value); @@ -245,8 +240,8 @@ public class LockBasedStorageManager implements StorageManager { @Override @NotNull - public T compute() { - T result = super.compute(); + public T invoke() { + T result = super.invoke(); assert result != null : "compute() returned null"; return result; } @@ -263,14 +258,9 @@ public class LockBasedStorageManager implements StorageManager { this.compute = compute; } - @Override - public V invoke(K k) { - return fun(k); - } - @Override @Nullable - public V fun(@NotNull K input) { + public V invoke(@NotNull K input) { Object value = cache.get(input); if (value != null) return WrappedValues.unescapeExceptionOrNull(value); @@ -311,8 +301,8 @@ public class LockBasedStorageManager implements StorageManager { @NotNull @Override - public V fun(@NotNull K input) { - V result = super.fun(input); + public V invoke(@NotNull K input) { + V result = super.invoke(input); assert result != null : "compute() returned null"; return result; } diff --git a/core/util.runtime/src/org/jetbrains/jet/storage/MemoizedFunctionToNotNull.java b/core/util.runtime/src/org/jetbrains/jet/storage/MemoizedFunctionToNotNull.java index 31f63ea4a82..55e853f5640 100644 --- a/core/util.runtime/src/org/jetbrains/jet/storage/MemoizedFunctionToNotNull.java +++ b/core/util.runtime/src/org/jetbrains/jet/storage/MemoizedFunctionToNotNull.java @@ -16,15 +16,10 @@ package org.jetbrains.jet.storage; -import com.intellij.util.Function; import jet.Function1; import org.jetbrains.annotations.NotNull; -public interface MemoizedFunctionToNotNull extends Function, Function1 { - @Override - @NotNull - R fun(P p); - +public interface MemoizedFunctionToNotNull extends Function1 { @Override @NotNull R invoke(P p); diff --git a/core/util.runtime/src/org/jetbrains/jet/storage/MemoizedFunctionToNullable.java b/core/util.runtime/src/org/jetbrains/jet/storage/MemoizedFunctionToNullable.java index cba43b7fd0e..5521c143933 100644 --- a/core/util.runtime/src/org/jetbrains/jet/storage/MemoizedFunctionToNullable.java +++ b/core/util.runtime/src/org/jetbrains/jet/storage/MemoizedFunctionToNullable.java @@ -16,15 +16,10 @@ package org.jetbrains.jet.storage; -import com.intellij.util.Function; import jet.Function1; import org.jetbrains.annotations.Nullable; -public interface MemoizedFunctionToNullable extends Function, Function1 { - @Override - @Nullable - R fun(P p); - +public interface MemoizedFunctionToNullable extends Function1 { @Override @Nullable R invoke(P p); diff --git a/core/util.runtime/src/org/jetbrains/jet/storage/NotNullLazyValue.java b/core/util.runtime/src/org/jetbrains/jet/storage/NotNullLazyValue.java index 02b29df856f..ff0c0ef95d2 100644 --- a/core/util.runtime/src/org/jetbrains/jet/storage/NotNullLazyValue.java +++ b/core/util.runtime/src/org/jetbrains/jet/storage/NotNullLazyValue.java @@ -16,15 +16,10 @@ package org.jetbrains.jet.storage; -import com.intellij.openapi.util.Computable; import jet.Function0; import org.jetbrains.annotations.NotNull; -public interface NotNullLazyValue extends Computable, Function0 { - @Override - @NotNull - T compute(); - +public interface NotNullLazyValue extends Function0 { @Override @NotNull T invoke(); diff --git a/core/util.runtime/src/org/jetbrains/jet/storage/NullableLazyValue.java b/core/util.runtime/src/org/jetbrains/jet/storage/NullableLazyValue.java index 84701f4d87f..63d3984c51a 100644 --- a/core/util.runtime/src/org/jetbrains/jet/storage/NullableLazyValue.java +++ b/core/util.runtime/src/org/jetbrains/jet/storage/NullableLazyValue.java @@ -16,15 +16,10 @@ package org.jetbrains.jet.storage; -import com.intellij.openapi.util.Computable; import jet.Function0; import org.jetbrains.annotations.Nullable; -public interface NullableLazyValue extends Computable, Function0 { - @Override - @Nullable - T compute(); - +public interface NullableLazyValue extends Function0 { @Override @Nullable T invoke(); diff --git a/idea/src/org/jetbrains/jet/plugin/project/ResolveElementCache.java b/idea/src/org/jetbrains/jet/plugin/project/ResolveElementCache.java index 0c94555c550..a6757ef7d90 100644 --- a/idea/src/org/jetbrains/jet/plugin/project/ResolveElementCache.java +++ b/idea/src/org/jetbrains/jet/plugin/project/ResolveElementCache.java @@ -99,7 +99,7 @@ public class ResolveElementCache { elementOfAdditionalResolve = jetElement; } - return additionalResolveCache.getValue().fun(elementOfAdditionalResolve); + return additionalResolveCache.getValue().invoke(elementOfAdditionalResolve); } JetParameter parameter = PsiTreeUtil.getTopmostParentOfType(jetElement, JetParameter.class);