384 - member box call error

src/org/mozilla/javascript/ScriptableObject.java

@@ -253,8 +253,17 @@ ScriptableObject getPropertyDescriptor(Context cx, Scriptable scope) {
             if (getter == null && setter == null) {
                 desc.defineProperty("writable", (attr & READONLY) == 0, EMPTY);
             }
-            if (getter != null) desc.defineProperty("get", getter, EMPTY);
-            if (setter != null) desc.defineProperty("set", setter, EMPTY);
+            if (getter != null)
+			{
+				if( getter instanceof MemberBox ) desc.defineProperty("get", new FunctionObject("f", ((MemberBox)getter).member(),scope), EMPTY);
+				else if( getter instanceof Member ) desc.defineProperty("get", new FunctionObject("f",(Member)getter,scope), EMPTY);
+				else desc.defineProperty("get", getter, EMPTY);
+			}
+			if (setter != null) {
+				if( setter instanceof MemberBox ) desc.defineProperty("set", new FunctionObject("f", ((MemberBox)setter).member(),scope), EMPTY);
+				else if( setter instanceof Member ) desc.defineProperty("set", new FunctionObject("f",(Member)setter,scope), EMPTY);
+				else desc.defineProperty("set", setter, EMPTY);
+			}
             return desc;
         }
 

testsrc/org/mozilla/javascript/tests/MemberBoxCallTest.java

@@ -0,0 +1,108 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+package org.mozilla.javascript.tests;
+
+import org.junit.Test;
+import org.junit.Before;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+
+import org.mozilla.javascript.*;
+import org.mozilla.javascript.annotations.*;
+
+public class MemberBoxCallTest {
+
+    Scriptable scope;
+
+    @Test
+    public void testPrototypeProperty() {
+		Context cx = Context.enter();
+		try {
+			assertEquals(evaluate(cx, 
+				"var hostObj = new AnnotatedHostObject(); " +
+				"var valueProperty = Object.getOwnPropertyDescriptor(Object.getPrototypeOf(hostObj), \"foo\");" +
+				"var result = 'failed';" +
+				"if( valueProperty.get && valueProperty.set ) {" +
+					"valueProperty.set.call(hostObj, 'superVal');" +
+					"result = valueProperty.get.call(hostObj);" +
+				"}"+
+				"result;"), "SUPERVAL");
+        } finally {
+            Context.exit();
+        }
+    }
+
+    private Object evaluate(Context cx, String str) {
+        return cx.evaluateString(scope, str, "<testsrc>", 0, null);
+    }
+
+
+    @Before
+    public void init() throws Exception {
+        Context cx = Context.enter();
+        try {
+            scope = cx.initStandardObjects();
+            ScriptableObject.defineClass(scope, AnnotatedHostObject.class);
+        } finally {
+            Context.exit();
+        }
+    }
+
+    public static class AnnotatedHostObject extends ScriptableObject {
+
+        String foo, bar = "bar";
+
+        public AnnotatedHostObject() {}
+
+        @Override
+        public String getClassName() {
+            return "AnnotatedHostObject";
+        }
+
+        @JSConstructor
+        public void jsConstructorMethod() {
+            put("initialized", this, Boolean.TRUE);
+        }
+
+        @JSFunction
+        public Object instanceFunction() {
+            return "instanceFunction";
+        }
+
+        @JSFunction("namedFunction")
+        public Object someFunctionName() {
+            return "namedFunction";
+        }
+
+        @JSStaticFunction
+        public static Object staticFunction() {
+            return "staticFunction";
+        }
+
+        @JSStaticFunction("namedStaticFunction")
+        public static Object someStaticFunctionName() {
+            return "namedStaticFunction";
+        }
+
+        @JSGetter
+        public String getFoo() {
+            return foo;
+        }
+
+        @JSSetter
+        public void setFoo(String foo) {
+            this.foo = foo.toUpperCase();
+        }
+
+        @JSGetter("bar")
+        public String getMyBar() {
+            return bar;
+        }
+
+        public void setBar(String bar) {
+            this.bar = bar.toUpperCase();
+        }
+    }
+}