Getting rid of Computable and Function in lazy values and memoized functions

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<JetType> 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

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();
     }
 }

core/descriptors/src/org/jetbrains/jet/lang/types/lang/BuiltinsNamespaceDescriptorImpl.java

@@ -143,7 +143,7 @@ class BuiltinsNamespaceDescriptorImpl extends AbstractNamespaceDescriptorImpl {
         @NotNull
         @Override
         public Collection<Name> getClassNames(@NotNull FqName packageName) {
-            return packageName.equals(KotlinBuiltIns.BUILT_INS_PACKAGE_FQ_NAME) ? classNames.compute() : Collections.<Name>emptyList();
+            return packageName.equals(KotlinBuiltIns.BUILT_INS_PACKAGE_FQ_NAME) ? classNames.invoke() : Collections.<Name>emptyList();
         }
     }
 }