diff --git a/runtime/src/org/jetbrains/jet/rt/signature/JetSignatureAdapter.java b/runtime/src/org/jetbrains/jet/rt/signature/JetSignatureAdapter.java index a2abeab9256..0f5bed09806 100644 --- a/runtime/src/org/jetbrains/jet/rt/signature/JetSignatureAdapter.java +++ b/runtime/src/org/jetbrains/jet/rt/signature/JetSignatureAdapter.java @@ -84,7 +84,7 @@ public class JetSignatureAdapter implements JetSignatureVisitor { } @Override - public void visitInnerClassType(String name, boolean nullable) { + public void visitInnerClassType(String name, boolean nullable, boolean forceReal) { } @Override diff --git a/runtime/src/org/jetbrains/jet/rt/signature/JetSignatureExceptionsAdapter.java b/runtime/src/org/jetbrains/jet/rt/signature/JetSignatureExceptionsAdapter.java index 4874a8c3ff1..a789c096a93 100644 --- a/runtime/src/org/jetbrains/jet/rt/signature/JetSignatureExceptionsAdapter.java +++ b/runtime/src/org/jetbrains/jet/rt/signature/JetSignatureExceptionsAdapter.java @@ -88,7 +88,7 @@ public class JetSignatureExceptionsAdapter implements JetSignatureVisitor { } @Override - public void visitInnerClassType(String name, boolean nullable) { + public void visitInnerClassType(String name, boolean nullable, boolean forceReal) { throw new IllegalStateException(); } diff --git a/runtime/src/org/jetbrains/jet/rt/signature/JetSignatureReader.java b/runtime/src/org/jetbrains/jet/rt/signature/JetSignatureReader.java index 42121685434..c255c4c8aca 100644 --- a/runtime/src/org/jetbrains/jet/rt/signature/JetSignatureReader.java +++ b/runtime/src/org/jetbrains/jet/rt/signature/JetSignatureReader.java @@ -196,7 +196,6 @@ public class JetSignatureReader { v.visitEnd(); return pos; } - start = pos; visited = false; inner = true; break; @@ -226,7 +225,7 @@ public class JetSignatureReader { ) { String name = signature.substring(start, pos - 1); if (inner) { - v.visitInnerClassType(name, nullable); + v.visitInnerClassType(name, nullable, forceReal); } else { v.visitClassType(name, nullable, forceReal); diff --git a/runtime/src/org/jetbrains/jet/rt/signature/JetSignatureVisitor.java b/runtime/src/org/jetbrains/jet/rt/signature/JetSignatureVisitor.java index 5e1a8f85d7d..95d95cdd477 100644 --- a/runtime/src/org/jetbrains/jet/rt/signature/JetSignatureVisitor.java +++ b/runtime/src/org/jetbrains/jet/rt/signature/JetSignatureVisitor.java @@ -136,9 +136,9 @@ public interface JetSignatureVisitor { /** * Visits an inner class. * - * @param name the local name of the inner class in its enclosing class. + * @param name the full name of the inner class. */ - void visitInnerClassType(String name, boolean nullable); + void visitInnerClassType(String name, boolean nullable, boolean forceReal); /** * Visits an unbounded type argument of the last visited class or inner diff --git a/runtime/src/org/jetbrains/jet/rt/signature/JetSignatureWriter.java b/runtime/src/org/jetbrains/jet/rt/signature/JetSignatureWriter.java index b1842d5a574..cdc5f1db008 100644 --- a/runtime/src/org/jetbrains/jet/rt/signature/JetSignatureWriter.java +++ b/runtime/src/org/jetbrains/jet/rt/signature/JetSignatureWriter.java @@ -172,7 +172,7 @@ public class JetSignatureWriter implements JetSignatureVisitor { } @Override - public void visitInnerClassType(final String name, boolean nullable) { + public void visitInnerClassType(final String name, boolean nullable, boolean forceReal) { endArguments(); visitNullabe(nullable); buf.append('.');