ruby-changes:28635
From: ko1 <ko1@a...>
Date: Mon, 13 May 2013 15:33:59 +0900 (JST)
Subject: [ruby-changes:28635] ko1:r40687 (trunk): * object.c (rb_obj_setup): added.
ko1 2013-05-13 15:33:48 +0900 (Mon, 13 May 2013) New Revision: 40687 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=40687 Log: * object.c (rb_obj_setup): added. * include/ruby/ruby.h (OBJSETUP): ues rb_obj_setup() instead of a macro. Modified files: trunk/ChangeLog trunk/include/ruby/ruby.h trunk/object.c Index: include/ruby/ruby.h =================================================================== --- include/ruby/ruby.h (revision 40686) +++ include/ruby/ruby.h (revision 40687) @@ -667,13 +667,10 @@ VALUE rb_int2big(SIGNED_VALUE); https://github.com/ruby/ruby/blob/trunk/include/ruby/ruby.h#L667 VALUE rb_newobj(void); VALUE rb_newobj_of(VALUE, VALUE); +VALUE rb_obj_setup(VALUE obj, VALUE klass, VALUE type); #define NEWOBJ(obj,type) type *(obj) = (type*)rb_newobj() #define NEWOBJ_OF(obj,type,klass,flags) type *(obj) = (type*)rb_newobj_of(klass, flags) -#define OBJSETUP(obj,c,t) do {\ - RBASIC(obj)->flags = (t);\ - RBASIC(obj)->klass = (c);\ - if (rb_safe_level() >= 3) FL_SET((obj), FL_TAINT | FL_UNTRUSTED);\ -} while (0) +#define OBJSETUP(obj,c,t) rb_obj_setup(obj, c, t) /* use NEWOBJ_OF instead of NEWOBJ()+OBJSTUP() */ #define CLONESETUP(clone,obj) do {\ OBJSETUP((clone),rb_singleton_class_clone((VALUE)(obj)),RBASIC(obj)->flags);\ rb_singleton_class_attached(RBASIC(clone)->klass, (VALUE)(clone));\ Index: ChangeLog =================================================================== --- ChangeLog (revision 40686) +++ ChangeLog (revision 40687) @@ -1,3 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1 +Mon May 13 15:31:10 2013 Koichi Sasada <ko1@a...> + + * object.c (rb_obj_setup): added. + + * include/ruby/ruby.h (OBJSETUP): ues rb_obj_setup() instead of + a macro. + Mon May 13 15:24:16 2013 Koichi Sasada <ko1@a...> * gc.c (rb_data_object_alloc): check klass only if klass is not 0. Index: object.c =================================================================== --- object.c (revision 40686) +++ object.c (revision 40687) @@ -58,6 +58,15 @@ rb_obj_hide(VALUE obj) https://github.com/ruby/ruby/blob/trunk/object.c#L58 return obj; } +VALUE +rb_obj_setup(VALUE obj, VALUE klass, VALUE type) +{ + RBASIC(obj)->flags = type; + RBASIC(obj)->klass = klass; + if (rb_safe_level() >= 3) FL_SET((obj), FL_TAINT | FL_UNTRUSTED); + return obj; +} + /* * call-seq: * obj === other -> true or false -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/