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

more correct signature

Browse Source
This commit is contained in:
Alex Tkachman
2011-12-09 10:51:05 +02:00
parent 4d303b0225
commit 81feca7bfd
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/jet/codegen/SignatureUtil.java
+3 -2
View File
@@ -45,8 +45,9 @@ public class SignatureUtil {
} }
else { else {
sb.append("T"); sb.append("T");
sb.append(descriptor.getContainingDeclaration().getName()); JetType defaultType = ((ClassDescriptor) descriptor.getContainingDeclaration()).getDefaultType();
sb.append(";"); Type type = typeMapper.mapType(defaultType, OwnerKind.IMPLEMENTATION);
sb.append(type.getDescriptor());
sb.append(descriptor.getName()); sb.append(descriptor.getName());
sb.append(";"); sb.append(";");
} }
stdlib/src/jet/typeinfo/TypeInfo.java
+3 -1
View File
@@ -669,7 +669,9 @@ public abstract class TypeInfo<T> implements JetObject {
private TypeInfo parseTypeVar(Signature signature) { private TypeInfo parseTypeVar(Signature signature) {
TypeInfoVariance variance = parseVariance(); TypeInfoVariance variance = parseVariance();
String klazz = parseName(); assert string[cur] == 'L';
cur++;
String klazz = parseName().replace('/','.');
String name = parseName(); String name = parseName();
boolean nullable = false; boolean nullable = false;
if(string[cur] == '?') { if(string[cur] == '?') {