Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -709,6 +709,7 @@ protected Expression validate(Context ctx, TypeConstant typeRequired, ErrorListe
m_mapRegisters = ctxAnon.ensureRegisterMap();
m_fInstanceChild = ctxAnon.isInstanceChild();
m_ctxCapture = null;
plan = m_fInstanceChild ? Plan.Child : Plan.Regular;

// make sure the capture names don't collide
ClassStructure clzAnon = ctxAnon.getThisClass();
Expand Down
43 changes: 22 additions & 21 deletions javatools/src/main/java/org/xvm/runtime/ClassTemplate.java
Original file line number Diff line number Diff line change
Expand Up @@ -748,15 +748,10 @@ public int getPropertyValue(Frame frame, ObjectHandle hTarget, PropertyConstant
return invokeNativeGet(frame, idProp.getName(), hTarget, iReturn);
}

if (chain.isField()) {
if (chain.isField() || clzTarget.isStruct()) {
return clzTarget.getFieldValue(frame, hTarget, idProp, iReturn);
}

if (clzTarget.isStruct()) {
return frame.raiseException("Invalid property \"" + idProp.getName() +
"\" access from " + clzTarget.getType().getValueString());
}

MethodStructure method = chain.getTop();
ObjectHandle[] ahVar = new ObjectHandle[method.getMaxVars()];
FieldInfo field = clzTarget.getFieldInfo(idProp);
Expand Down Expand Up @@ -876,6 +871,12 @@ public int getFieldValue(Frame frame, ObjectHandle hTarget, PropertyConstant idP
if (field.isInflated()) {
RefHandle hRef = (RefHandle) hValue;
if (!(hRef instanceof FutureHandle)) {
if (hThis.isStruct()) {
// TODO: ideally this should return a structure for the inflated property
return frame.raiseException(xException.unsupported(frame,
"structure for ref annotated property \"" + field.getName() + "\""));
}

if (hRef.getComposition().isStruct()) {
Frame.Continuation stepNext = frameCaller -> {
RefHandle hR = (RefHandle) frameCaller.popStack();
Expand Down Expand Up @@ -1119,7 +1120,7 @@ public int invokeNativeSet(Frame frame, ObjectHandle hTarget, String sPropName,
* @return one of the {@link Op#R_NEXT}, {@link Op#R_CALL} or {@link Op#R_EXCEPTION} values
*/
public int invokePreInc(Frame frame, ObjectHandle hTarget, PropertyConstant idProp, int iReturn) {
if (hTarget.isInflated(idProp)) {
if (hTarget.isInflated(idProp) && !hTarget.isStruct()) {
GenericHandle hThis = (GenericHandle) hTarget;
RefHandle hRef = (RefHandle) hThis.getField(frame, idProp);
return hRef.getVarSupport().invokeVarPreInc(frame, hRef, iReturn);
Expand All @@ -1139,7 +1140,7 @@ public int invokePreInc(Frame frame, ObjectHandle hTarget, PropertyConstant idPr
* @return one of the {@link Op#R_NEXT}, {@link Op#R_CALL} or {@link Op#R_EXCEPTION} values
*/
public int invokePostInc(Frame frame, ObjectHandle hTarget, PropertyConstant idProp, int iReturn) {
if (hTarget.isInflated(idProp)) {
if (hTarget.isInflated(idProp) && !hTarget.isStruct()) {
GenericHandle hThis = (GenericHandle) hTarget;
RefHandle hRef = (RefHandle) hThis.getField(frame, idProp);
return hRef.getVarSupport().invokeVarPostInc(frame, hRef, iReturn);
Expand All @@ -1159,7 +1160,7 @@ public int invokePostInc(Frame frame, ObjectHandle hTarget, PropertyConstant idP
* @return one of the {@link Op#R_NEXT}, {@link Op#R_CALL} or {@link Op#R_EXCEPTION} values
*/
public int invokePreDec(Frame frame, ObjectHandle hTarget, PropertyConstant idProp, int iReturn) {
if (hTarget.isInflated(idProp)) {
if (hTarget.isInflated(idProp) && !hTarget.isStruct()) {
GenericHandle hThis = (GenericHandle) hTarget;
RefHandle hRef = (RefHandle) hThis.getField(frame, idProp);
return hRef.getVarSupport().invokeVarPreDec(frame, hRef, iReturn);
Expand All @@ -1179,7 +1180,7 @@ public int invokePreDec(Frame frame, ObjectHandle hTarget, PropertyConstant idPr
* @return one of the {@link Op#R_NEXT}, {@link Op#R_CALL} or {@link Op#R_EXCEPTION} values
*/
public int invokePostDec(Frame frame, ObjectHandle hTarget, PropertyConstant idProp, int iReturn) {
if (hTarget.isInflated(idProp)) {
if (hTarget.isInflated(idProp) && !hTarget.isStruct()) {
GenericHandle hThis = (GenericHandle) hTarget;
RefHandle hRef = (RefHandle) hThis.getField(frame, idProp);
return hRef.getVarSupport().invokeVarPostDec(frame, hRef, iReturn);
Expand All @@ -1199,7 +1200,7 @@ public int invokePostDec(Frame frame, ObjectHandle hTarget, PropertyConstant idP
* @return one of the {@link Op#R_NEXT}, {@link Op#R_CALL} or {@link Op#R_EXCEPTION} values
*/
public int invokePropertyAdd(Frame frame, ObjectHandle hTarget, PropertyConstant idProp, ObjectHandle hArg) {
if (hTarget.isInflated(idProp)) {
if (hTarget.isInflated(idProp) && !hTarget.isStruct()) {
GenericHandle hThis = (GenericHandle) hTarget;
RefHandle hRef = (RefHandle) hThis.getField(frame, idProp);
return hRef.getVarSupport().invokeVarAdd(frame, hRef, hArg);
Expand All @@ -1220,7 +1221,7 @@ public int invokePropertyAdd(Frame frame, ObjectHandle hTarget, PropertyConstant
* @return one of the {@link Op#R_NEXT}, {@link Op#R_CALL} or {@link Op#R_EXCEPTION} values
*/
public int invokePropertySub(Frame frame, ObjectHandle hTarget, PropertyConstant idProp, ObjectHandle hArg) {
if (hTarget.isInflated(idProp)) {
if (hTarget.isInflated(idProp) && !hTarget.isStruct()) {
GenericHandle hThis = (GenericHandle) hTarget;
RefHandle hRef = (RefHandle) hThis.getField(frame, idProp);
return hRef.getVarSupport().invokeVarSub(frame, hRef, hArg);
Expand All @@ -1241,7 +1242,7 @@ public int invokePropertySub(Frame frame, ObjectHandle hTarget, PropertyConstant
* @return one of the {@link Op#R_NEXT}, {@link Op#R_CALL} or {@link Op#R_EXCEPTION} values
*/
public int invokePropertyMul(Frame frame, ObjectHandle hTarget, PropertyConstant idProp, ObjectHandle hArg) {
if (hTarget.isInflated(idProp)) {
if (hTarget.isInflated(idProp) && !hTarget.isStruct()) {
GenericHandle hThis = (GenericHandle) hTarget;
RefHandle hRef = (RefHandle) hThis.getField(frame, idProp);
return hRef.getVarSupport().invokeVarMul(frame, hRef, hArg);
Expand All @@ -1262,7 +1263,7 @@ public int invokePropertyMul(Frame frame, ObjectHandle hTarget, PropertyConstant
* @return one of the {@link Op#R_NEXT}, {@link Op#R_CALL} or {@link Op#R_EXCEPTION} values
*/
public int invokePropertyDiv(Frame frame, ObjectHandle hTarget, PropertyConstant idProp, ObjectHandle hArg) {
if (hTarget.isInflated(idProp)) {
if (hTarget.isInflated(idProp) && !hTarget.isStruct()) {
GenericHandle hThis = (GenericHandle) hTarget;
RefHandle hRef = (RefHandle) hThis.getField(frame, idProp);
return hRef.getVarSupport().invokeVarDiv(frame, hRef, hArg);
Expand All @@ -1283,7 +1284,7 @@ public int invokePropertyDiv(Frame frame, ObjectHandle hTarget, PropertyConstant
* @return one of the {@link Op#R_NEXT}, {@link Op#R_CALL} or {@link Op#R_EXCEPTION} values
*/
public int invokePropertyMod(Frame frame, ObjectHandle hTarget, PropertyConstant idProp, ObjectHandle hArg) {
if (hTarget.isInflated(idProp)) {
if (hTarget.isInflated(idProp) && !hTarget.isStruct()) {
GenericHandle hThis = (GenericHandle) hTarget;
RefHandle hRef = (RefHandle) hThis.getField(frame, idProp);
return hRef.getVarSupport().invokeVarMod(frame, hRef, hArg);
Expand All @@ -1304,7 +1305,7 @@ public int invokePropertyMod(Frame frame, ObjectHandle hTarget, PropertyConstant
* @return one of the {@link Op#R_NEXT}, {@link Op#R_CALL} or {@link Op#R_EXCEPTION} values
*/
public int invokePropertyShl(Frame frame, ObjectHandle hTarget, PropertyConstant idProp, ObjectHandle hArg) {
if (hTarget.isInflated(idProp)) {
if (hTarget.isInflated(idProp) && !hTarget.isStruct()) {
GenericHandle hThis = (GenericHandle) hTarget;
RefHandle hRef = (RefHandle) hThis.getField(frame, idProp);
return hRef.getVarSupport().invokeVarShl(frame, hRef, hArg);
Expand All @@ -1325,7 +1326,7 @@ public int invokePropertyShl(Frame frame, ObjectHandle hTarget, PropertyConstant
* @return one of the {@link Op#R_NEXT}, {@link Op#R_CALL} or {@link Op#R_EXCEPTION} values
*/
public int invokePropertyShr(Frame frame, ObjectHandle hTarget, PropertyConstant idProp, ObjectHandle hArg) {
if (hTarget.isInflated(idProp)) {
if (hTarget.isInflated(idProp) && !hTarget.isStruct()) {
GenericHandle hThis = (GenericHandle) hTarget;
RefHandle hRef = (RefHandle) hThis.getField(frame, idProp);
return hRef.getVarSupport().invokeVarShr(frame, hRef, hArg);
Expand All @@ -1346,7 +1347,7 @@ public int invokePropertyShr(Frame frame, ObjectHandle hTarget, PropertyConstant
* @return one of the {@link Op#R_NEXT}, {@link Op#R_CALL} or {@link Op#R_EXCEPTION} values
*/
public int invokePropertyShrAll(Frame frame, ObjectHandle hTarget, PropertyConstant idProp, ObjectHandle hArg) {
if (hTarget.isInflated(idProp)) {
if (hTarget.isInflated(idProp) && !hTarget.isStruct()) {
GenericHandle hThis = (GenericHandle) hTarget;
RefHandle hRef = (RefHandle) hThis.getField(frame, idProp);
return hRef.getVarSupport().invokeVarShrAll(frame, hRef, hArg);
Expand All @@ -1367,7 +1368,7 @@ public int invokePropertyShrAll(Frame frame, ObjectHandle hTarget, PropertyConst
* @return one of the {@link Op#R_NEXT}, {@link Op#R_CALL} or {@link Op#R_EXCEPTION} values
*/
public int invokePropertyAnd(Frame frame, ObjectHandle hTarget, PropertyConstant idProp, ObjectHandle hArg) {
if (hTarget.isInflated(idProp)) {
if (hTarget.isInflated(idProp) && !hTarget.isStruct()) {
GenericHandle hThis = (GenericHandle) hTarget;
RefHandle hRef = (RefHandle) hThis.getField(frame, idProp);
return hRef.getVarSupport().invokeVarAnd(frame, hRef, hArg);
Expand All @@ -1388,7 +1389,7 @@ public int invokePropertyAnd(Frame frame, ObjectHandle hTarget, PropertyConstant
* @return one of the {@link Op#R_NEXT}, {@link Op#R_CALL} or {@link Op#R_EXCEPTION} values
*/
public int invokePropertyOr(Frame frame, ObjectHandle hTarget, PropertyConstant idProp, ObjectHandle hArg) {
if (hTarget.isInflated(idProp)) {
if (hTarget.isInflated(idProp) && !hTarget.isStruct()) {
GenericHandle hThis = (GenericHandle) hTarget;
RefHandle hRef = (RefHandle) hThis.getField(frame, idProp);
return hRef.getVarSupport().invokeVarOr(frame, hRef, hArg);
Expand All @@ -1409,7 +1410,7 @@ public int invokePropertyOr(Frame frame, ObjectHandle hTarget, PropertyConstant
* @return one of the {@link Op#R_NEXT}, {@link Op#R_CALL} or {@link Op#R_EXCEPTION} values
*/
public int invokePropertyXor(Frame frame, ObjectHandle hTarget, PropertyConstant idProp, ObjectHandle hArg) {
if (hTarget.isInflated(idProp)) {
if (hTarget.isInflated(idProp) && !hTarget.isStruct()) {
GenericHandle hThis = (GenericHandle) hTarget;
RefHandle hRef = (RefHandle) hThis.getField(frame, idProp);
return hRef.getVarSupport().invokeVarXor(frame, hRef, hArg);
Expand Down
38 changes: 30 additions & 8 deletions manualTests/src/main/x/innerouter.x
Original file line number Diff line number Diff line change
Expand Up @@ -85,22 +85,47 @@ module TestInnerOuter {

class Inner {
construct(String s) {}
Int inc() = 0;
}

Int i = 4;

// var o = new Object()
var o = new Inner("hello") {
var inner = new Inner("hello") {
void run() {
console.print($"in run (i={i})");
++i;
// foo();
}
};

o.run();
inner.run();

console.print($"done (i={i})");
console.print($"done ({i=})");

class Outer {
Inner inner;

construct() {
Int count = 0;
var value = new Inner("") {
@Override
Int inc() {
return ++count;
}
};

inner = value;
assert this.toString().size > 0;
}

@Override
String toString() {
assert as "should no be called";
}
}

Outer o = new Outer();
assert o.inner.inc() == 1;
assert o.inner.inc() == 2;
}

interface FunkyOuter<Element extends Orderable> {
Expand Down Expand Up @@ -255,20 +280,17 @@ module TestInnerOuter {
Holder.Inner inner = holder.new Inner();
assert inner.textByOuter == "Held";
assert inner.outer.text == "Held";
// console.print($"inner.textByOuter={inner.textByOuter}");

Shelf.Inner item = new Shelf.Inner(3);
assert item.size == 3;

Shelf shelf = new Shelf("Top");
Shelf.Drawer drawer = shelf.new Drawer();
assert drawer.labelByOuter == "Top";
// console.print($"item={item}, drawer.labelByOuter={drawer.labelByOuter}");

Box box = new Box();
assert box.new Inner().kind() == "box";
Box crate = new Crate();
assert crate.new Inner().kind() == "crate";
// console.print($"box={box.new Inner().kind()}, crate={crate.new Inner().kind()}");
}
}
Loading