* 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: http://svn.ruby-lang.org/repos/ruby/trunk@14000 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 35 insertions, 0 deletions

diff --git a/struct.c b/struct.c
index e87a082c2..ad5f4619a 100644
--- a/struct.c
+++ b/struct.c
@@ -218,6 +218,41 @@ make_struct(VALUE name, VALUE members, VALUE klass)
 }
 
 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, ...)
 {
     va_list ar;