ruby-changes:38632
From: ko1 <ko1@a...>
Date: Mon, 1 Jun 2015 15:48:41 +0900 (JST)
Subject: [ruby-changes:38632] ko1:r50713 (trunk): * internal.h: move class related definitions.
ko1 2015-06-01 15:48:07 +0900 (Mon, 01 Jun 2015) New Revision: 50713 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=50713 Log: * internal.h: move class related definitions. Modified files: trunk/ChangeLog trunk/internal.h Index: ChangeLog =================================================================== --- ChangeLog (revision 50712) +++ ChangeLog (revision 50713) @@ -1,3 +1,7 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1 +Mon Jun 1 15:47:16 2015 Koichi Sasada <ko1@a...> + + * internal.h: move class related definitions. + Mon Jun 1 15:43:03 2015 Koichi Sasada <ko1@a...> * class.c: remove needless include pragmra for method.h. Index: internal.h =================================================================== --- internal.h (revision 50712) +++ internal.h (revision 50713) @@ -275,47 +275,6 @@ nlz_int128(uint128_t x) https://github.com/ruby/ruby/blob/trunk/internal.h#L275 SIZEOF_LONG * CHAR_BIT - nlz_long((unsigned long)(x))) #endif -struct rb_deprecated_classext_struct { - char conflict[sizeof(VALUE) * 3]; -}; - -struct rb_subclass_entry; -typedef struct rb_subclass_entry rb_subclass_entry_t; - -struct rb_subclass_entry { - VALUE klass; - rb_subclass_entry_t *next; -}; - -#if defined(HAVE_LONG_LONG) -typedef unsigned LONG_LONG rb_serial_t; -#define SERIALT2NUM ULL2NUM -#elif defined(HAVE_UINT64_T) -typedef uint64_t rb_serial_t; -#define SERIALT2NUM SIZET2NUM -#else -typedef unsigned long rb_serial_t; -#define SERIALT2NUM ULONG2NUM -#endif - -struct rb_classext_struct { - struct st_table *iv_index_tbl; - struct st_table *iv_tbl; - struct st_table *const_tbl; - rb_subclass_entry_t *subclasses; - rb_subclass_entry_t **parent_subclasses; - /** - * In the case that this is an `ICLASS`, `module_subclasses` points to the link - * in the module's `subclasses` list that indicates that the klass has been - * included. Hopefully that makes sense. - */ - rb_subclass_entry_t **module_subclasses; - rb_serial_t class_serial; - const VALUE origin_; - VALUE refined_class; - rb_alloc_func_t allocator; -}; - #ifndef BDIGIT # if SIZEOF_INT*2 <= SIZEOF_LONG_LONG # define BDIGIT unsigned int @@ -469,6 +428,48 @@ extern void ruby_init_setproctitle(int a https://github.com/ruby/ruby/blob/trunk/internal.h#L428 #endif /* class.c */ + +struct rb_deprecated_classext_struct { + char conflict[sizeof(VALUE) * 3]; +}; + +struct rb_subclass_entry; +typedef struct rb_subclass_entry rb_subclass_entry_t; + +struct rb_subclass_entry { + VALUE klass; + rb_subclass_entry_t *next; +}; + +#if defined(HAVE_LONG_LONG) +typedef unsigned LONG_LONG rb_serial_t; +#define SERIALT2NUM ULL2NUM +#elif defined(HAVE_UINT64_T) +typedef uint64_t rb_serial_t; +#define SERIALT2NUM SIZET2NUM +#else +typedef unsigned long rb_serial_t; +#define SERIALT2NUM ULONG2NUM +#endif + +struct rb_classext_struct { + struct st_table *iv_index_tbl; + struct st_table *iv_tbl; + struct st_table *const_tbl; + rb_subclass_entry_t *subclasses; + rb_subclass_entry_t **parent_subclasses; + /** + * In the case that this is an `ICLASS`, `module_subclasses` points to the link + * in the module's `subclasses` list that indicates that the klass has been + * included. Hopefully that makes sense. + */ + rb_subclass_entry_t **module_subclasses; + rb_serial_t class_serial; + const VALUE origin_; + VALUE refined_class; + rb_alloc_func_t allocator; +}; + void rb_class_subclass_add(VALUE super, VALUE klass); void rb_class_remove_from_super_subclasses(VALUE); -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/