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

Simplified.

Browse Source
This commit is contained in:
Evgeny Gerashchenko
2013-09-25 19:59:56 +04:00
parent 3200997bca
commit f23ba19258
1 changed files with 22 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/jet/codegen/ImplementationBodyCodegen.java
+22 -37
View File
@@ -465,63 +465,60 @@ public class ImplementationBodyCodegen extends ClassBodyCodegen {
genClosureFields(context.closure, v, state.getTypeMapper()); genClosureFields(context.closure, v, state.getTypeMapper());
} }
private void addStubSignature( private void generateMethodStub(
@NotNull List<String> result, @NotNull String name,
@NotNull String signature, @NotNull String desc,
@NotNull ClassifierDescriptor returnedClassifier, @NotNull ClassifierDescriptor returnedClassifier,
@NotNull ClassifierDescriptor... valueParameterClassifiers @NotNull ClassifierDescriptor... valueParameterClassifiers
) { ) {
String name = signature.substring(0, signature.indexOf('('));
if (CodegenUtil.getDeclaredFunctionByRawSignature( if (CodegenUtil.getDeclaredFunctionByRawSignature(
descriptor, Name.identifier(name), returnedClassifier, valueParameterClassifiers) == null) { descriptor, Name.identifier(name), returnedClassifier, valueParameterClassifiers) == null) {
result.add(signature); MethodVisitor mv = v.getVisitor().visitMethod(ACC_PUBLIC, name, desc, null, null);
AsmUtil.genMethodThrow(mv, "java/lang/UnsupportedOperationException", "Mutating immutable collection");
} }
} }
private List<String> getBuiltinMethodStubSignatures() { private void generateBuiltinMethodStubs() {
List<String> result = Lists.newArrayList();
KotlinBuiltIns builtIns = KotlinBuiltIns.getInstance(); KotlinBuiltIns builtIns = KotlinBuiltIns.getInstance();
if (isSubclass(descriptor, builtIns.getCollection())) { if (isSubclass(descriptor, builtIns.getCollection())) {
ClassifierDescriptor classifier = getSubstituteForTypeParameterOf(builtIns.getCollection(), 0); ClassifierDescriptor classifier = getSubstituteForTypeParameterOf(builtIns.getCollection(), 0);
addStubSignature(result, "add(Ljava/lang/Object;)Z", builtIns.getBoolean(), classifier); generateMethodStub("add", "(Ljava/lang/Object;)Z", builtIns.getBoolean(), classifier);
addStubSignature(result, "remove(Ljava/lang/Object;)Z", builtIns.getBoolean(), builtIns.getAny()); generateMethodStub("remove", "(Ljava/lang/Object;)Z", builtIns.getBoolean(), builtIns.getAny());
addStubSignature(result, "addAll(Ljava/util/Collection;)Z", builtIns.getBoolean(), builtIns.getCollection()); generateMethodStub("addAll", "(Ljava/util/Collection;)Z", builtIns.getBoolean(), builtIns.getCollection());
addStubSignature(result, "removeAll(Ljava/util/Collection;)Z", builtIns.getBoolean(), builtIns.getCollection()); generateMethodStub("removeAll", "(Ljava/util/Collection;)Z", builtIns.getBoolean(), builtIns.getCollection());
addStubSignature(result, "retainAll(Ljava/util/Collection;)Z", builtIns.getBoolean(), builtIns.getCollection()); generateMethodStub("retainAll", "(Ljava/util/Collection;)Z", builtIns.getBoolean(), builtIns.getCollection());
addStubSignature(result, "clear()V", builtIns.getUnit()); generateMethodStub("clear", "()V", builtIns.getUnit());
} }
if (isSubclass(descriptor, builtIns.getList())) { if (isSubclass(descriptor, builtIns.getList())) {
ClassifierDescriptor classifier = getSubstituteForTypeParameterOf(builtIns.getList(), 0); ClassifierDescriptor classifier = getSubstituteForTypeParameterOf(builtIns.getList(), 0);
addStubSignature(result, "set(ILjava/lang/Object;)Ljava/lang/Object;", classifier, builtIns.getInt(), classifier); generateMethodStub("set", "(ILjava/lang/Object;)Ljava/lang/Object;", classifier, builtIns.getInt(), classifier);
addStubSignature(result, "add(ILjava/lang/Object;)V", builtIns.getUnit(), builtIns.getInt(), classifier); generateMethodStub("add", "(ILjava/lang/Object;)V", builtIns.getUnit(), builtIns.getInt(), classifier);
addStubSignature(result, "remove(I)Ljava/lang/Object;", classifier, builtIns.getInt()); generateMethodStub("remove", "(I)Ljava/lang/Object;", classifier, builtIns.getInt());
} }
if (isSubclass(descriptor, builtIns.getMap())) { if (isSubclass(descriptor, builtIns.getMap())) {
ClassifierDescriptor keyClassifier = getSubstituteForTypeParameterOf(builtIns.getMap(), 0); ClassifierDescriptor keyClassifier = getSubstituteForTypeParameterOf(builtIns.getMap(), 0);
ClassifierDescriptor valueClassifier = getSubstituteForTypeParameterOf(builtIns.getMap(), 1); ClassifierDescriptor valueClassifier = getSubstituteForTypeParameterOf(builtIns.getMap(), 1);
addStubSignature(result, "put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;", valueClassifier, keyClassifier, valueClassifier); generateMethodStub("put", "(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;", valueClassifier, keyClassifier,
addStubSignature(result, "remove(Ljava/lang/Object;)Ljava/lang/Object;", valueClassifier, builtIns.getAny()); valueClassifier);
addStubSignature(result, "putAll(Ljava/util/Map;)V", builtIns.getUnit(), builtIns.getMap()); generateMethodStub("remove", "(Ljava/lang/Object;)Ljava/lang/Object;", valueClassifier, builtIns.getAny());
addStubSignature(result, "clear()V", builtIns.getUnit()); generateMethodStub("putAll", "(Ljava/util/Map;)V", builtIns.getUnit(), builtIns.getMap());
generateMethodStub("clear", "()V", builtIns.getUnit());
} }
if (isSubclass(descriptor, builtIns.getMapEntry())) { if (isSubclass(descriptor, builtIns.getMapEntry())) {
ClassifierDescriptor valueClassifier = getSubstituteForTypeParameterOf(builtIns.getMapEntry(), 1); ClassifierDescriptor valueClassifier = getSubstituteForTypeParameterOf(builtIns.getMapEntry(), 1);
addStubSignature(result, "setValue(Ljava/lang/Object;)Ljava/lang/Object;", valueClassifier, valueClassifier); generateMethodStub("setValue", "(Ljava/lang/Object;)Ljava/lang/Object;", valueClassifier, valueClassifier);
} }
if (isSubclass(descriptor, builtIns.getIterator())) { if (isSubclass(descriptor, builtIns.getIterator())) {
addStubSignature(result, "remove()V", builtIns.getUnit()); generateMethodStub("remove", "()V", builtIns.getUnit());
} }
return result;
} }
@NotNull @NotNull
@@ -535,18 +532,6 @@ public class ImplementationBodyCodegen extends ClassBodyCodegen {
return classifier; return classifier;
} }
private void generateBuiltinMethodStubs() {
for (String signature : getBuiltinMethodStubSignatures()) {
int parenthOpen = signature.indexOf('(');
String name = signature.substring(0, parenthOpen);
String desc = signature.substring(parenthOpen);
MethodVisitor mv = v.getVisitor().visitMethod(ACC_PUBLIC, name, desc, null, null);
AsmUtil.genMethodThrow(mv, "java/lang/UnsupportedOperationException", "Mutating immutable collection");
}
}
private List<PropertyDescriptor> getDataProperties() { private List<PropertyDescriptor> getDataProperties() {
ArrayList<PropertyDescriptor> result = Lists.newArrayList(); ArrayList<PropertyDescriptor> result = Lists.newArrayList();
for (JetParameter parameter : getPrimaryConstructorParameters()) { for (JetParameter parameter : getPrimaryConstructorParameters()) {