Add 'operator' keyword

This commit is contained in:
Yan Zhulanow
2015-09-16 19:59:02 +03:00
parent 4a32993cc3
commit bc727a170b
58 changed files with 179 additions and 54 deletions
@@ -170,7 +170,8 @@ public class SingleAbstractMethodUtils {
Arrays.asList(parameter),
returnType,
Modality.FINAL,
samInterface.getVisibility()
samInterface.getVisibility(),
false
);
return result;
@@ -206,7 +207,8 @@ public class SingleAbstractMethodUtils {
valueParameters,
returnType,
Modality.FINAL,
original.getVisibility()
original.getVisibility(),
false
);
}
});
@@ -116,7 +116,8 @@ public class SignaturesPropagationData {
autoValueParameters,
autoReturnType,
Modality.OPEN,
Visibilities.PUBLIC
Visibilities.PUBLIC,
false
);
return autoMethodDescriptor;
}
@@ -128,7 +128,7 @@ class SamAdapterFunctionsScope(storageManager: StorageManager) : JetScope by Jet
val visibility = syntheticExtensionVisibility(sourceFunction)
descriptor.initialize(receiverType, null, typeParameters, valueParameters, returnType, Modality.FINAL, visibility)
descriptor.initialize(receiverType, null, typeParameters, valueParameters, returnType, Modality.FINAL, visibility, false)
return descriptor
}
@@ -148,6 +148,7 @@ class SamAdapterFunctionsScope(storageManager: StorageManager) : JetScope by Jet
newOwner: DeclarationDescriptor,
newModality: Modality,
newVisibility: Visibility,
newIsOperator: Boolean,
original: FunctionDescriptor?,
copyOverrides: Boolean,
kind: CallableMemberDescriptor.Kind,
@@ -156,7 +157,7 @@ class SamAdapterFunctionsScope(storageManager: StorageManager) : JetScope by Jet
newReturnType: JetType
): FunctionDescriptor? {
val descriptor = super<SimpleFunctionDescriptorImpl>.doSubstitute(
originalSubstitutor, newOwner, newModality, newVisibility, original,
originalSubstitutor, newOwner, newModality, newVisibility, newIsOperator, original,
copyOverrides, kind, newValueParameterDescriptors, newExtensionReceiverParameterType, newReturnType)
as MyFunctionDescriptor? ?: return null