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

working field read; non-working field write

Browse Source
This commit is contained in:
Dmitry Jemerov
2011-04-15 13:22:08 +02:00
parent f61fda2be2
commit 2f437d3714
2 changed files with 35 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/codegen/ExpressionCodegen.java
+17 -12
View File
@@ -276,15 +276,16 @@ public class ExpressionCodegen extends JetVisitor {
PsiElement declaration = bindingContext.getDeclarationPsiElement(descriptor);
if (declaration instanceof PsiField) {
PsiField psiField = (PsiField) declaration;
final String owner = JetTypeMapper.jvmName(psiField.getContainingClass());
final Type fieldType = psiTypeToAsm(psiField.getType());
if (psiField.hasModifierProperty(PsiModifier.STATIC)) {
v.visitFieldInsn(Opcodes.GETSTATIC,
JetTypeMapper.jvmName(psiField.getContainingClass()),
psiField.getName(),
psiTypeToAsm(psiField.getType()).getDescriptor());
v.visitFieldInsn(Opcodes.GETSTATIC, owner, psiField.getName(), fieldType.getDescriptor());
}
else {
throw new UnsupportedOperationException("don't know how to generate field reference " + descriptor);
ensureReceiverOnStack(expression);
v.visitFieldInsn(Opcodes.GETFIELD, owner, psiField.getName(), fieldType.getDescriptor());
}
myStack.push(StackValue.onStack(fieldType));
}
else {
int index = myMap.getIndex(descriptor);
@@ -342,13 +343,7 @@ public class ExpressionCodegen extends JetVisitor {
}
}
if (expression.getParent() instanceof JetDotQualifiedExpression) {
final JetDotQualifiedExpression parent = (JetDotQualifiedExpression) expression.getParent();
if (!resolvesToClassOrPackage(parent.getReceiverExpression())) {
// we have a receiver on stack
myStack.pop().put(Type.getObjectType(CLASS_OBJECT), v);
}
}
ensureReceiverOnStack(expression);
PsiElement declarationPsiElement = bindingContext.getDeclarationPsiElement(funDescriptor);
Method methodDescriptor;
@@ -387,6 +382,16 @@ public class ExpressionCodegen extends JetVisitor {
}
}
private void ensureReceiverOnStack(JetElement expression) {
if (expression.getParent() instanceof JetDotQualifiedExpression) {
final JetDotQualifiedExpression parent = (JetDotQualifiedExpression) expression.getParent();
if (!resolvesToClassOrPackage(parent.getReceiverExpression())) {
// we have a receiver on stack
myStack.pop().put(Type.getObjectType(CLASS_OBJECT), v);
}
}
}
private void pushMethodArguments(JetCall expression, Method method) {
final Type[] argTypes = method.getArgumentTypes();
List<JetArgument> args = expression.getValueArguments();
idea/tests/org/jetbrains/jet/codegen/NamespaceGenTest.java
+18
View File
@@ -2,6 +2,7 @@ package org.jetbrains.jet.codegen;
import org.jetbrains.jet.parsing.JetParsingTest;
import java.awt.*;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.util.ArrayList;
@@ -272,4 +273,21 @@ public class NamespaceGenTest extends CodegenTestCase {
final Method main = generateFunction();
ArrayList arrayList = (ArrayList) main.invoke(null);
}
public void testFieldRead() throws Exception {
loadText("import java.awt.*; fun foo(c: GridBagConstraints) = c.gridx");
System.out.println(generateToText());
final Method main = generateFunction();
GridBagConstraints c = new GridBagConstraints();
c.gridx = 239;
assertEquals(239, main.invoke(null, c));
}
public void testFieldWrite() throws Exception {
loadText("import java.awt.*; fun foo(c: GridBagConstraints) { c.gridx = 239 }");
final Method main = generateFunction();
GridBagConstraints c = new GridBagConstraints();
main.invoke(null, c);
assertEquals(239, c.gridx);
}
}