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

NO_RECEIVER_PARAMETER is now simply null

Browse Source
This commit is contained in:
Andrey Breslav
2012-11-01 16:34:44 +04:00
parent a325d86e20
commit ec255e8342
62 changed files with 194 additions and 264 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests/org/jetbrains/jet/test/util/NamespaceComparator.java
+4 -4
View File
@@ -31,7 +31,6 @@ import org.jetbrains.jet.lang.resolve.constants.CompileTimeConstant;
import org.jetbrains.jet.lang.resolve.name.FqNameUnsafe;
import org.jetbrains.jet.lang.resolve.name.Name;
import org.jetbrains.jet.lang.resolve.scopes.JetScope;
import org.jetbrains.jet.lang.resolve.scopes.receivers.ExtensionReceiver;
import org.jetbrains.jet.lang.types.ErrorUtils;
import org.jetbrains.jet.lang.types.JetType;
import org.jetbrains.jet.lang.types.TypeProjection;
@@ -431,7 +430,7 @@ public class NamespaceComparator {
}
private void serializeReceiver(CallableDescriptor fun) {
if (fun.getReceiverParameter().exists()) {
if (fun.getReceiverParameter() != null) {
new TypeSerializer(sb).serialize(fun.getReceiverParameter());
sb.append(".");
}
@@ -492,8 +491,9 @@ public class NamespaceComparator {
sb.append("> ");
}
sb.append("!");
if (prop.getReceiverParameter().exists()) {
new TypeSerializer(sb).serialize(prop.getReceiverParameter().getType());
ReceiverParameterDescriptor receiverParameter = prop.getReceiverParameter();
if (receiverParameter != null) {
new TypeSerializer(sb).serialize(receiverParameter.getType());
sb.append(".");
}
sb.append(prop.getName());