@@ -631,10 +631,12 @@ rb_smjs_ruby_proc_caller2(VALUE args){ return rb_apply(obj, mname, args); } +#ifdef ZERO_ARITY_METHOD_IS_PROPERTY struct { char* keyname; jsval val; }g_last0arity; +#endif static JSBool rbsm_class_no_such_method( JSContext* cx, JSObject* thisobj, uintN argc, jsval* argv, jsval* rval){ @@ -648,11 +650,13 @@ rbsm_class_no_such_method( JSContext* cx, JSObject* thisobj, uintN argc, jsval* JS_ReportErrorNumber(cx, rbsm_GetErrorMessage, NULL, RBSMMSG_NOT_FUNCTION, keyname); return JS_FALSE; } +#ifdef ZERO_ARITY_METHOD_IS_PROPERTY if( strcmp( keyname, g_last0arity.keyname )==0 ){ //printf("!\n"); *rval = g_last0arity.val; return JS_TRUE; } +#endif //printf("!=%s]",g_last0arity.keyname); return JS_FALSE; /* @@ -743,6 +747,7 @@ rbsm_get_ruby_property(JSContext* cx, JSObject* obj, jsval id, jsval* vp, VALUE } }else if (rb_funcall( rbobj, rb_intern("respond_to?"), 1, ID2SYM(rid))) { method = rb_funcall( rbobj, rb_intern("method"), 1, ID2SYM(rid) ); +#ifdef ZERO_ARITY_METHOD_IS_PROPERTY // メソッドの引数の数を調べる iarity = NUM2INT(rb_funcall( method, rb_intern("arity"), 0 )); if( iarity == 0 /*|| iarity==-1*/ ){ @@ -755,6 +760,9 @@ rbsm_get_ruby_property(JSContext* cx, JSObject* obj, jsval id, jsval* vp, VALUE // 引数0以上、あるいは可変引数のメソッドはfunctionオブジェクトにして返す *vp = OBJECT_TO_JSVAL(rbsm_proc_to_function(cx,method)); } +#else + *vp = OBJECT_TO_JSVAL(rbsm_proc_to_function(cx,method)); +#endif } return JS_TRUE; } spidermonkey.c @@ -241,7 +241,7 @@ class SpiderMonkeyTest < Test::Unit::TestCase cx.eval(" try{ x.func1(); }catch(e){} ") } assert_equal "test", cx.eval(" try{ x.func1(); }catch(e){e.toString()} ") - assert_equal TESTException, cx.eval(" y=null; try{ x.func1(); }catch(e){ y=e['class']; } y") + assert_equal TESTException, cx.eval(" y=null; try{ x.func1(); }catch(e){ y=e['class'](); } y") end @@ -262,7 +262,7 @@ class SpiderMonkeyTest < Test::Unit::TestCase hoge = Hoge.new cx = SpiderMonkey::Context.new cx.set_property( "hoge", hoge ); - assert_equal 1, cx.evaluate( %! hoge.para ! ) , "no need arguments method is property" + assert_equal 1, cx.evaluate( %! hoge.para() ! ) , "no need arguments method is property" assert_equal 2, cx.evaluate( %! hoge.add1( 1 ) ! ); cx.set_property( "Time", Time ); @@ -273,12 +273,12 @@ class SpiderMonkeyTest < Test::Unit::TestCase assert_equal Math::PI ,cx.eval("RubyMath.PI") assert_equal "object", cx.evaluate( %! typeof hoge ! ); - begin - assert_equal 1, cx.eval("hoge.para()") - flunk "para is not function" - rescue SpiderMonkey::EvalError => e - assert_match /TypeError/, e.message - end + #begin + # assert_equal 1, cx.eval("hoge.para()") + # flunk "para is not function" + #rescue SpiderMonkey::EvalError => e + # assert_match /TypeError/, e.message + #end end class Hoge2 @@ -291,7 +291,7 @@ class SpiderMonkeyTest < Test::Unit::TestCase hoge = Hoge2.new cx = SpiderMonkey::Context.new cx.set_property( "hoge", hoge ); - assert_equal 1, cx.eval("hoge.para ") + #assert_equal 1, cx.eval("hoge.para ") assert_equal 1, cx.eval("hoge.para();") end @@ -302,7 +302,7 @@ class SpiderMonkeyTest < Test::Unit::TestCase x.name="hoge" assert_equal 'hoge', x.name cx.set_property( "x", x ); - assert_equal "hoge", cx.eval("x.name") + assert_equal "hoge", cx.eval("x.name()") assert_equal 'fuga', cx.eval("x.name='fuga'") assert_equal 'fuga', x.name assert_equal "undefined", cx.evalget("x.name2").typeof test.rb 1a9efaf21d5d2a79d95400306b1148d0b2002158 nazoking nazoking@368abcae-401b-0410-88d4-195e74ebbf5f http://github.com/matthewd/ruby-mozjs/commit/84ef1b2d9da23980df174caf1f8b239b560f8f38 84ef1b2d9da23980df174caf1f8b239b560f8f38 2006-12-10T03:58:54-08:00 2006-12-10T03:58:54-08:00 Rubyオブジェクトの引数なしメソッドをJavaScriptからプロパティーとしては呼べなくした。 git-svn-id: http://ruby-spidermonkey.googlecode.com/svn/trunk@5 368abcae-401b-0410-88d4-195e74ebbf5f bc1d47bac18a78c0fa33ebb8ceb91ebc4924e0fa nazoking nazoking@368abcae-401b-0410-88d4-195e74ebbf5f