From 0dbdad759916fb214750882cf73f4d686b3f10aa Mon Sep 17 00:00:00 2001 From: akr Date: Fri, 23 Nov 2007 04:35:53 +0000 Subject: * struct.c (rb_struct_define_without_accessor): new function. * range.c (range_alloc): removed. (Init_Range): use rb_struct_define_without_accessor. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@14000 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- struct.c | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) (limited to 'struct.c') diff --git a/struct.c b/struct.c index e87a082c23..ad5f4619aa 100644 --- a/struct.c +++ b/struct.c @@ -217,6 +217,41 @@ make_struct(VALUE name, VALUE members, VALUE klass) return nstr; } +VALUE +rb_struct_define_without_accessor(char *class_name, VALUE super, ...) +{ + VALUE klass; + va_list ar; + VALUE members; + long i; + char *name; + + members = rb_ary_new2(0); + va_start(ar, super); + i = 0; + while ((name = va_arg(ar, char*)) != NULL) { + rb_ary_push(members, ID2SYM(rb_intern(name))); + } + va_end(ar); + OBJ_FREEZE(members); + + if (class_name) { + klass = rb_define_class(class_name, super); + } + else { + klass = rb_class_new(super); + rb_make_metaclass(klass, RBASIC(super)->klass); + rb_class_inherited(super, klass); + } + + rb_iv_set(klass, "__size__", LONG2NUM(RARRAY_LEN(members))); + rb_iv_set(klass, "__members__", members); + + rb_define_alloc_func(klass, struct_alloc); + + return klass; +} + VALUE rb_struct_define(const char *name, ...) { -- cgit v1.2.3