From 941b32c8be2a1c668064b0f04955874bc35aec13 Mon Sep 17 00:00:00 2001 From: Skydark Chen Date: Sun, 15 Nov 2015 21:24:25 +0800 Subject: [PATCH] Fix ZenGetter and ZenSetter annotations Before this commit, ZenGetter and ZenSetter in ZenExpansion could not be defined. Since ZenExpansion requires static methods to work, but the getters and setters will be invoked as virtual. --- .../stanhebben/zenscript/type/expand/ZenExpandMember.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ZenScript/src/main/java/stanhebben/zenscript/type/expand/ZenExpandMember.java b/ZenScript/src/main/java/stanhebben/zenscript/type/expand/ZenExpandMember.java index 1fdad05..2f9a468 100644 --- a/ZenScript/src/main/java/stanhebben/zenscript/type/expand/ZenExpandMember.java +++ b/ZenScript/src/main/java/stanhebben/zenscript/type/expand/ZenExpandMember.java @@ -77,12 +77,12 @@ public class ZenExpandMember { @Override public Expression eval(IEnvironmentGlobal environment) { - return new ExpressionCallVirtual(position, environment, getter, value.eval(environment)); + return new ExpressionCallStatic(position, environment, getter, value.eval(environment)); } @Override public Expression assign(ZenPosition position, IEnvironmentGlobal environment, Expression other) { - return new ExpressionCallVirtual(position, environment, setter, value.eval(environment), other); + return new ExpressionCallStatic(position, environment, setter, value.eval(environment), other); } @Override