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

Fixed accessing namespace private members from inner classes. Added test.

Browse Source
This commit is contained in:
Evgeny Gerashchenko
2012-06-19 22:47:26 +04:00
parent e8f15027e9
commit 9e727623c2
3 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/jet/codegen/ExpressionCodegen.java
+5 -3
View File
@@ -1063,8 +1063,9 @@ public class ExpressionCodegen extends JetVisitor<StackValue, StackValue> {
final boolean directToField = expression.getReferencedNameElementType() == JetTokens.FIELD_IDENTIFIER && contextKind() != OwnerKind.TRAIT_IMPL ; final boolean directToField = expression.getReferencedNameElementType() == JetTokens.FIELD_IDENTIFIER && contextKind() != OwnerKind.TRAIT_IMPL ;
JetExpression r = getReceiverForSelector(expression); JetExpression r = getReceiverForSelector(expression);
final boolean isSuper = r instanceof JetSuperExpression; final boolean isSuper = r instanceof JetSuperExpression;
if (propertyDescriptor.getVisibility() == Visibilities.PRIVATE && !DescriptorUtils if (propertyDescriptor.getVisibility() == Visibilities.PRIVATE
.isClassObject(propertyDescriptor.getContainingDeclaration())) { && !DescriptorUtils.isClassObject(propertyDescriptor.getContainingDeclaration())
&& propertyDescriptor.getContainingDeclaration() instanceof ClassDescriptor) {
if (context.getClassOrNamespaceDescriptor() != propertyDescriptor.getContainingDeclaration()) { if (context.getClassOrNamespaceDescriptor() != propertyDescriptor.getContainingDeclaration()) {
DeclarationDescriptor enclosed = propertyDescriptor.getContainingDeclaration(); DeclarationDescriptor enclosed = propertyDescriptor.getContainingDeclaration();
if (enclosed != null && enclosed != context.getThisDescriptor()) { if (enclosed != null && enclosed != context.getThisDescriptor()) {
@@ -1366,7 +1367,8 @@ public class ExpressionCodegen extends JetVisitor<StackValue, StackValue> {
} }
if (fd.getVisibility() == Visibilities.PRIVATE if (fd.getVisibility() == Visibilities.PRIVATE
&& !DescriptorUtils.isClassObject(fd.getContainingDeclaration())) { && !DescriptorUtils.isClassObject(fd.getContainingDeclaration())
&& fd.getContainingDeclaration() instanceof ClassDescriptor) {
if (context.getClassOrNamespaceDescriptor() != fd.getContainingDeclaration()) { if (context.getClassOrNamespaceDescriptor() != fd.getContainingDeclaration()) {
DeclarationDescriptor enclosed = fd.getContainingDeclaration(); DeclarationDescriptor enclosed = fd.getContainingDeclaration();
if (enclosed != context.getThisDescriptor()) { if (enclosed != context.getThisDescriptor()) {
compiler/testData/codegen/privateTopLevelPropAndVarInInner.kt
+4
View File
@@ -0,0 +1,4 @@
private var x = "O"
private fun f() = "K"
fun box() = { x + f() }()
compiler/tests/org/jetbrains/jet/codegen/NamespaceGenTest.java
+4
View File
@@ -563,4 +563,8 @@ public class NamespaceGenTest extends CodegenTestCase {
//noinspection ImplicitArrayToString //noinspection ImplicitArrayToString
assertEquals("s" + args.toString(), main.invoke(null, "s", args)); assertEquals("s" + args.toString(), main.invoke(null, "s", args));
} }
public void testPrivateTopLevelPropAndVarInInner() {
blackBoxFile("privateTopLevelPropAndVarInInner.kt");
}
} }