From 1e61a875ed301dd23d8ce58f154eea5dc2ddba2d Mon Sep 17 00:00:00 2001
From: "Yukihiro \"Matz\" Matsumoto" <matz@ruby.or.jp>
Date: Sun, 5 May 2024 18:56:20 +0900
Subject: [PATCH] mruby-data: adjust local variable declarations

---
 mrbgems/mruby-data/src/data.c | 63 +++++++++++++++--------------------
 1 file changed, 26 insertions(+), 37 deletions(-)

diff --git a/mrbgems/mruby-data/src/data.c b/mrbgems/mruby-data/src/data.c
index 46f3c0255f..cb32e0ded2 100644
--- a/mrbgems/mruby-data/src/data.c
+++ b/mrbgems/mruby-data/src/data.c
@@ -36,10 +36,10 @@ static mrb_value
 data_s_members(mrb_state *mrb, struct RClass *c)
 {
   struct RClass* sclass = data_class(mrb);
-  mrb_value mem;
 
   for (;;) {
-    mem = mrb_iv_get(mrb, mrb_obj_value(c), MRB_SYM(__members__));
+    mrb_value mem = mrb_iv_get(mrb, mrb_obj_value(c), MRB_SYM(__members__));
+
     if (!mrb_nil_p(mem)) {
       if (!mrb_array_p(mem)) {
         data_corrupted(mrb);
@@ -59,6 +59,7 @@ data_members(mrb_state *mrb, mrb_value obj)
   if (!data_p(obj) || RDATA_LEN(obj) == 0) {
     data_corrupted(mrb);
   }
+
   mrb_value members = data_s_members(mrb, mrb_obj_class(mrb, obj));
   if (RDATA_LEN(obj) != RARRAY_LEN(members)) {
     mrb_raisef(mrb, E_TYPE_ERROR,
@@ -229,14 +230,15 @@ make_data_class(mrb_state *mrb, mrb_value members, struct RClass *klass)
   struct RClass *c = mrb_class_new(mrb, klass);
   MRB_SET_INSTANCE_TT(c, MRB_TT_STRUCT);
   MRB_DEFINE_ALLOCATOR(c);
-  mrb_value data = mrb_obj_value(c);
-  mrb_iv_set(mrb, data, MRB_SYM(__members__), members);
 
   mrb_undef_class_method(mrb, c, "define");
   mrb_define_class_method_id(mrb, c, MRB_SYM(new), mrb_data_new, MRB_ARGS_ANY());
   mrb_define_class_method_id(mrb, c, MRB_SYM(members), mrb_data_s_members, MRB_ARGS_NONE());
   /* RSTRUCT(data)->basic.c->super = c->c; */
   make_data_define_accessors(mrb, members, c);
+
+  mrb_value data = mrb_obj_value(c);
+  mrb_iv_set(mrb, data, MRB_SYM(__members__), members);
   return data;
 }
 
@@ -261,16 +263,14 @@ make_data_class(mrb_state *mrb, mrb_value members, struct RClass *klass)
 static mrb_value
 mrb_data_s_def(mrb_state *mrb, mrb_value klass)
 {
-  mrb_value rest;
-  mrb_value b, data;
-  mrb_sym id;
   const mrb_value *argv;
   mrb_int argc;
+  mrb_value b;
 
   mrb_get_args(mrb, "*&", &argv, &argc, &b);
-  rest = mrb_ary_new_from_values(mrb, argc, argv);
+  mrb_value rest = mrb_ary_new_from_values(mrb, argc, argv);
   for (mrb_int i=0; i<argc; i++) {
-    id = mrb_obj_to_sym(mrb, RARRAY_PTR(rest)[i]);
+    mrb_sym id = mrb_obj_to_sym(mrb, RARRAY_PTR(rest)[i]);
     mrb_ary_set(mrb, rest, i, mrb_symbol_value(id));
   }
   /* check member duplication */
@@ -284,7 +284,7 @@ mrb_data_s_def(mrb_state *mrb, mrb_value klass)
       }
     }
   }
-  data = make_data_class(mrb, rest, mrb_class_ptr(klass));
+  mrb_value data = make_data_class(mrb, rest, mrb_class_ptr(klass));
   if (!mrb_nil_p(b)) {
     mrb_yield_with_class(mrb, b, 1, &data, data, mrb_class_ptr(data));
   }
@@ -353,8 +353,6 @@ static mrb_value
 mrb_data_equal(mrb_state *mrb, mrb_value s)
 {
   mrb_value s2 = mrb_get_arg1(mrb);
-  mrb_value *ptr, *ptr2;
-  mrb_int len;
 
   if (mrb_obj_equal(mrb, s, s2)) {
     return mrb_true_value();
@@ -365,9 +363,9 @@ mrb_data_equal(mrb_state *mrb, mrb_value s)
   if (RDATA_LEN(s) != RDATA_LEN(s2)) {
     return mrb_false_value();
   }
-  ptr = RDATA_PTR(s);
-  ptr2 = RDATA_PTR(s2);
-  len = RDATA_LEN(s);
+  mrb_value *ptr = RDATA_PTR(s);
+  mrb_value *ptr2 = RDATA_PTR(s2);
+  mrb_int len = RDATA_LEN(s);
   for (mrb_int i=0; i<len; i++) {
     if (!mrb_equal(mrb, ptr[i], ptr2[i])) {
       return mrb_false_value();
@@ -388,8 +386,6 @@ static mrb_value
 mrb_data_eql(mrb_state *mrb, mrb_value s)
 {
   mrb_value s2 = mrb_get_arg1(mrb);
-  mrb_value *ptr, *ptr2;
-  mrb_int len;
 
   if (mrb_obj_equal(mrb, s, s2)) {
     return mrb_true_value();
@@ -400,9 +396,9 @@ mrb_data_eql(mrb_state *mrb, mrb_value s)
   if (RDATA_LEN(s) != RDATA_LEN(s2)) {
     return mrb_false_value();
   }
-  ptr = RDATA_PTR(s);
-  ptr2 = RDATA_PTR(s2);
-  len = RDATA_LEN(s);
+  mrb_value *ptr = RDATA_PTR(s);
+  mrb_value *ptr2 = RDATA_PTR(s2);
+  mrb_int len = RDATA_LEN(s);
   for (mrb_int i=0; i<len; i++) {
     if (!mrb_eql(mrb, ptr[i], ptr2[i])) {
       return mrb_false_value();
@@ -421,13 +417,10 @@ mrb_data_eql(mrb_state *mrb, mrb_value s)
 static mrb_value
 mrb_data_to_h(mrb_state *mrb, mrb_value self)
 {
-  mrb_value members, ret;
-  mrb_value *mems;
-
-  members = data_members(mrb, self);
-  mems = RARRAY_PTR(members);
+  mrb_value members = data_members(mrb, self);
+  mrb_value *mems = RARRAY_PTR(members);
 
-  ret = mrb_hash_new_capa(mrb, RARRAY_LEN(members));
+  mrb_value ret = mrb_hash_new_capa(mrb, RARRAY_LEN(members));
   mrb_int len = RARRAY_LEN(members);
   for (mrb_int i=0; i<len; i++) {
     mrb_hash_set(mrb, ret, mems[i], RARRAY_PTR(self)[i]);
@@ -446,16 +439,13 @@ mrb_data_to_h(mrb_state *mrb, mrb_value self)
 static mrb_value
 mrb_data_to_s(mrb_state *mrb, mrb_value self)
 {
-  mrb_value members, ret, cname;
-  mrb_value *mems;
-  mrb_int mlen;
-
-  members = data_members(mrb, self);
-  mlen = RARRAY_LEN(members);
-  mems = RARRAY_PTR(members);
-  ret = mrb_str_new_lit(mrb, "#<data ");
+  mrb_value members = data_members(mrb, self);
+  mrb_int mlen = RARRAY_LEN(members);
+  mrb_value *mems = RARRAY_PTR(members);
+  mrb_value ret = mrb_str_new_lit(mrb, "#<data ");
   int ai = mrb_gc_arena_save(mrb);
-  cname = mrb_class_path(mrb, mrb_class_real(mrb_class(mrb, self)));
+  mrb_value cname = mrb_class_path(mrb, mrb_class_real(mrb_class(mrb, self)));
+
   if (!mrb_nil_p(cname)) {
     mrb_str_cat_str(mrb, ret, cname);
     mrb_str_cat_lit(mrb, ret, " ");
@@ -491,8 +481,7 @@ mrb_data_to_s(mrb_state *mrb, mrb_value self)
 void
 mrb_mruby_data_gem_init(mrb_state* mrb)
 {
-  struct RClass *d;
-  d = mrb_define_class(mrb, "Data",  mrb->object_class);
+  struct RClass *d = mrb_define_class(mrb, "Data",  mrb->object_class);
   MRB_SET_INSTANCE_TT(d, MRB_TT_STRUCT);
   MRB_UNDEF_ALLOCATOR(d);