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

Fix project source to overcome bootstrap problem

Browse Source
This commit is contained in:
Denis Zharkov
2015-11-25 23:03:50 +03:00
parent c4bc2c9ba6
commit 0fd2484bc9
11 changed files with 29 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/EnumEntrySyntheticClassDescriptor.java
+2 -2
View File
@@ -262,9 +262,9 @@ public class EnumEntrySyntheticClassDescriptor extends ClassDescriptorBase {
@NotNull
@Override
public Collection<DeclarationDescriptor> getContributedDescriptors(
public Collection getContributedDescriptors(
@NotNull DescriptorKindFilter kindFilter,
@NotNull Function1<? super Name, ? extends Boolean> nameFilter
@NotNull Function1 nameFilter
) {
return allDescriptors.invoke();
}
core/descriptors/src/org/jetbrains/kotlin/types/ErrorUtils.java
+6 -6
View File
@@ -77,8 +77,8 @@ public class ErrorUtils {
@NotNull
@Override
public Collection<FqName> getSubPackagesOf(
@NotNull FqName fqName, @NotNull Function1<? super Name, ? extends Boolean> nameFilter
public Collection getSubPackagesOf(
@NotNull FqName fqName, @NotNull Function1 nameFilter
) {
return emptyList();
}
@@ -193,8 +193,8 @@ public class ErrorUtils {
@NotNull
@Override
public Collection<DeclarationDescriptor> getContributedDescriptors(
@NotNull DescriptorKindFilter kindFilter, @NotNull Function1<? super Name, ? extends Boolean> nameFilter
public Collection getContributedDescriptors(
@NotNull DescriptorKindFilter kindFilter, @NotNull Function1 nameFilter
) {
return Collections.emptyList();
}
@@ -244,8 +244,8 @@ public class ErrorUtils {
@NotNull
@Override
public Collection<DeclarationDescriptor> getContributedDescriptors(
@NotNull DescriptorKindFilter kindFilter, @NotNull Function1<? super Name, ? extends Boolean> nameFilter
public Collection getContributedDescriptors(
@NotNull DescriptorKindFilter kindFilter, @NotNull Function1 nameFilter
) {
throw new IllegalStateException();
}
core/util.runtime/src/org/jetbrains/kotlin/storage/LockBasedStorageManager.java
+11 -11
View File
@@ -151,15 +151,15 @@ public class LockBasedStorageManager implements StorageManager {
@NotNull
@Override
public <T> NotNullLazyValue<T> createLazyValueWithPostCompute(
@NotNull Function0<? extends T> computable,
final Function1<? super Boolean, ? extends T> onRecursiveCall,
@NotNull final Function1<? super T, ? extends Unit> postCompute
public NotNullLazyValue createLazyValueWithPostCompute(
@NotNull Function0 computable,
final Function1 onRecursiveCall,
@NotNull final Function1 postCompute
) {
return new LockBasedNotNullLazyValue<T>(computable) {
return new LockBasedNotNullLazyValue(computable) {
@NotNull
@Override
protected RecursionDetectedResult<T> recursionDetected(boolean firstTime) {
protected RecursionDetectedResult recursionDetected(boolean firstTime) {
if (onRecursiveCall == null) {
return super.recursionDetected(firstTime);
}
@@ -167,7 +167,7 @@ public class LockBasedStorageManager implements StorageManager {
}
@Override
protected void postCompute(@NotNull T value) {
protected void postCompute(@NotNull Object value) {
postCompute.invoke(value);
}
};
@@ -193,12 +193,12 @@ public class LockBasedStorageManager implements StorageManager {
@NotNull
@Override
public <T> NullableLazyValue<T> createNullableLazyValueWithPostCompute(
@NotNull Function0<? extends T> computable, @NotNull final Function1<? super T, ? extends Unit> postCompute
public NullableLazyValue createNullableLazyValueWithPostCompute(
@NotNull Function0 computable, @NotNull final Function1 postCompute
) {
return new LockBasedLazyValue<T>(computable) {
return new LockBasedLazyValue(computable) {
@Override
protected void postCompute(@Nullable T value) {
protected void postCompute(@Nullable Object value) {
postCompute.invoke(value);
}
};