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

Generating stub methods for read-only map and entry.

Browse Source
This commit is contained in:
Evgeny Gerashchenko
2013-09-25 00:11:31 +04:00
parent d1cfbbbad5
commit b4bb08c013
6 changed files with 143 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/jet/codegen/ImplementationBodyCodegen.java
+37 -4
View File
@@ -470,7 +470,7 @@ public class ImplementationBodyCodegen extends ClassBodyCodegen {
KotlinBuiltIns builtIns = KotlinBuiltIns.getInstance();
if (isSubclass(descriptor, builtIns.getCollection())) {
ClassifierDescriptor classifier = getSubstituteForTypeParameterOf(builtIns.getCollection());
ClassifierDescriptor classifier = getSubstituteForTypeParameterOf(builtIns.getCollection(), 0);
if (CodegenUtil.getDeclaredFunctionByRawSignature(descriptor, Name.identifier("add"),
builtIns.getBoolean(), classifier) == null) {
@@ -503,7 +503,7 @@ public class ImplementationBodyCodegen extends ClassBodyCodegen {
}
if (isSubclass(descriptor, builtIns.getList())) {
ClassifierDescriptor classifier = getSubstituteForTypeParameterOf(builtIns.getList());
ClassifierDescriptor classifier = getSubstituteForTypeParameterOf(builtIns.getList(), 0);
if (CodegenUtil.getDeclaredFunctionByRawSignature(descriptor, Name.identifier("set"),
classifier, builtIns.getInt(), classifier) == null) {
@@ -521,6 +521,39 @@ public class ImplementationBodyCodegen extends ClassBodyCodegen {
}
}
if (isSubclass(descriptor, builtIns.getMap())) {
ClassifierDescriptor keyClassifier = getSubstituteForTypeParameterOf(builtIns.getMap(), 0);
ClassifierDescriptor valueClassifier = getSubstituteForTypeParameterOf(builtIns.getMap(), 1);
if (CodegenUtil.getDeclaredFunctionByRawSignature(descriptor, Name.identifier("put"),
valueClassifier, keyClassifier, valueClassifier) == null) {
result.add("put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;");
}
if (CodegenUtil.getDeclaredFunctionByRawSignature(descriptor, Name.identifier("remove"),
valueClassifier, builtIns.getAny()) == null) {
result.add("remove(Ljava/lang/Object;)Ljava/lang/Object;");
}
if (CodegenUtil.getDeclaredFunctionByRawSignature(descriptor, Name.identifier("putAll"),
builtIns.getUnit(), builtIns.getMap()) == null) {
result.add("putAll(Ljava/util/Map;)V");
}
if (CodegenUtil.getDeclaredFunctionByRawSignature(descriptor, Name.identifier("clear"), builtIns.getUnit()) == null) {
result.add("clear()V");
}
}
if (isSubclass(descriptor, builtIns.getMapEntry())) {
ClassifierDescriptor valueClassifier = getSubstituteForTypeParameterOf(builtIns.getMapEntry(), 1);
if (CodegenUtil.getDeclaredFunctionByRawSignature(descriptor, Name.identifier("setValue"),
valueClassifier, valueClassifier) == null) {
result.add("setValue(Ljava/lang/Object;)Ljava/lang/Object;");
}
}
if (isSubclass(descriptor, builtIns.getIterator())) {
if (CodegenUtil.getDeclaredFunctionByRawSignature(descriptor, Name.identifier("remove"),
builtIns.getUnit()) == null) {
@@ -532,8 +565,8 @@ public class ImplementationBodyCodegen extends ClassBodyCodegen {
}
@NotNull
private ClassifierDescriptor getSubstituteForTypeParameterOf(@NotNull ClassDescriptor trait) {
TypeParameterDescriptor listTypeParameter = trait.getTypeConstructor().getParameters().get(0);
private ClassifierDescriptor getSubstituteForTypeParameterOf(@NotNull ClassDescriptor trait, int index) {
TypeParameterDescriptor listTypeParameter = trait.getTypeConstructor().getParameters().get(index);
TypeSubstitutor deepSubstitutor = SubstitutionUtils.buildDeepSubstitutor(descriptor.getDefaultType());
TypeProjection substitute = deepSubstitutor.substitute(new TypeProjection(listTypeParameter.getDefaultType()));
assert substitute != null : "Couldn't substitute: " + descriptor;