Integrate refactoring of commit f1ed1436240a2d0d3d45a7061ade26cdc25be352

1 files changed, 23 insertions, 26 deletions

diff --git a/src/init.c b/src/init.c
index 98b68006d..eb93fd0a7 100644
--- a/src/init.c
+++ b/src/init.c
@@ -29,47 +29,44 @@ void mrb_init_math(mrb_state*);
 void mrb_init_mrblib(mrb_state*);
 void mrb_init_mrbgems(mrb_state*);
 
-
+#define DONE mrb_gc_arena_restore(mrb, 0);
 void
 mrb_init_core(mrb_state *mrb)
 {
-  mrb_init_symtbl(mrb);
+  mrb_init_symtbl(mrb); DONE;
 
-  mrb_init_class(mrb);
-  mrb_init_object(mrb);
-  mrb_init_kernel(mrb);
-  mrb_init_comparable(mrb);
-  mrb_init_enumerable(mrb);
+  mrb_init_class(mrb); DONE;
+  mrb_init_object(mrb); DONE;
+  mrb_init_kernel(mrb); DONE;
+  mrb_init_comparable(mrb); DONE;
+  mrb_init_enumerable(mrb); DONE;
 
-  mrb_init_symbol(mrb);
-  mrb_init_exception(mrb);
-  mrb_init_proc(mrb);
-  mrb_init_string(mrb);
-  mrb_init_array(mrb);
-  mrb_init_hash(mrb);
-  mrb_init_numeric(mrb);
-  mrb_init_range(mrb);
+  mrb_init_symbol(mrb); DONE;
+  mrb_init_exception(mrb); DONE;
+  mrb_init_proc(mrb); DONE;
+  mrb_init_string(mrb); DONE;
+  mrb_init_array(mrb); DONE;
+  mrb_init_hash(mrb); DONE;
+  mrb_init_numeric(mrb); DONE;
+  mrb_init_range(mrb); DONE;
 #ifdef ENABLE_STRUCT
-  mrb_init_struct(mrb);
+  mrb_init_struct(mrb); DONE;
 #endif
-  mrb_init_gc(mrb);
+  mrb_init_gc(mrb); DONE;
 #ifdef ENABLE_REGEXP
-  mrb_init_regexp(mrb);
+  mrb_init_regexp(mrb); DONE;
 #endif
 #ifdef ENABLE_STDIO
-  mrb_init_print(mrb);
+  mrb_init_print(mrb); DONE;
 #endif
 #ifdef ENABLE_TIME
-  mrb_init_time(mrb);
+  mrb_init_time(mrb); DONE;
 #endif
 #ifdef ENABLE_MATH
-  mrb_init_math(mrb);
+  mrb_init_math(mrb); DONE;
 #endif
-
-  mrb_init_mrblib(mrb);
+  mrb_init_mrblib(mrb); DONE;
 #ifdef ENABLE_GEMS
-  mrb_init_mrbgems(mrb);
+  mrb_init_mrbgems(mrb); DONE;
 #endif
-
-  mrb_gc_arena_restore(mrb, 0);
 }