Merge pull request #2 from pbosetti/master

Catch up with API changes on mrb_intern() -> mrb_intern_cstr()

src/io.c

@@ -282,8 +282,8 @@ retry:
           fd = pw[1];
         }
 
-        mrb_iv_set(mrb, io, mrb_intern(mrb, "@buf"), mrb_str_new_cstr(mrb, ""));
-        mrb_iv_set(mrb, io, mrb_intern(mrb, "@pos"), mrb_fixnum_value(0));
+        mrb_iv_set(mrb, io,  mrb_intern_cstr(mrb, "@buf"), mrb_str_new_cstr(mrb, ""));
+        mrb_iv_set(mrb, io,  mrb_intern_cstr(mrb, "@pos"), mrb_fixnum_value(0));
 
         fptr = mrb_io_alloc(mrb);
         fptr->fd   = fd;
@@ -319,8 +319,8 @@ mrb_io_initialize(mrb_state *mrb, mrb_value io)
     opt = mrb_hash_new(mrb);
   }
 
-  mrb_iv_set(mrb, io, mrb_intern(mrb, "@buf"), mrb_str_new_cstr(mrb, ""));
-  mrb_iv_set(mrb, io, mrb_intern(mrb, "@pos"), mrb_fixnum_value(0));
+  mrb_iv_set(mrb, io,  mrb_intern_cstr(mrb, "@buf"), mrb_str_new_cstr(mrb, ""));
+  mrb_iv_set(mrb, io,  mrb_intern_cstr(mrb, "@pos"), mrb_fixnum_value(0));
 
   fptr = DATA_PTR(io);
   if (fptr == NULL) {
@@ -554,7 +554,7 @@ time2timeval(mrb_state *mrb, mrb_value time)
 static int
 mrb_io_read_data_pending(mrb_state *mrb, mrb_value io)
 {
-  mrb_value buf = mrb_iv_get(mrb, io, mrb_intern(mrb, "@buf"));
+  mrb_value buf = mrb_iv_get(mrb, io,  mrb_intern_cstr(mrb, "@buf"));
   if (mrb_type(buf) == MRB_TT_STRING && RSTRING_LEN(buf) > 0) {
     return 1;
   }
@@ -758,5 +758,5 @@ mrb_init_io(mrb_state *mrb)
   mrb_define_method(mrb, io, "pid",        mrb_io_pid,         MRB_ARGS_NONE());   /* 15.2.20.5.2 */
   mrb_define_method(mrb, io, "fileno",     mrb_io_fileno,      MRB_ARGS_NONE());
 
-  mrb_gv_set(mrb, mrb_intern(mrb, "$/"), mrb_str_new_cstr(mrb, "\n"));
+  mrb_gv_set(mrb,  mrb_intern_cstr(mrb, "$/"), mrb_str_new_cstr(mrb, "\n"));
 }

test/mruby_io_test.c

@@ -35,11 +35,11 @@ mrb_io_test_io_setup(mrb_state *mrb, mrb_value self)
   }
   umask(mask);
 
-  mrb_gv_set(mrb, mrb_intern(mrb, "$mrbtest_io_rfname"), mrb_str_new_cstr(mrb, rfname));
-  mrb_gv_set(mrb, mrb_intern(mrb, "$mrbtest_io_wfname"), mrb_str_new_cstr(mrb, wfname));
-  mrb_gv_set(mrb, mrb_intern(mrb, "$mrbtest_io_symlinkname"), mrb_str_new_cstr(mrb, symlinkname));
-  mrb_gv_set(mrb, mrb_intern(mrb, "$mrbtest_io_socketname"), mrb_str_new_cstr(mrb, socketname));
-  mrb_gv_set(mrb, mrb_intern(mrb, "$mrbtest_io_msg"), mrb_str_new_cstr(mrb, msg));
+  mrb_gv_set(mrb,  mrb_intern_cstr(mrb, "$mrbtest_io_rfname"), mrb_str_new_cstr(mrb, rfname));
+  mrb_gv_set(mrb,  mrb_intern_cstr(mrb, "$mrbtest_io_wfname"), mrb_str_new_cstr(mrb, wfname));
+  mrb_gv_set(mrb,  mrb_intern_cstr(mrb, "$mrbtest_io_symlinkname"), mrb_str_new_cstr(mrb, symlinkname));
+  mrb_gv_set(mrb,  mrb_intern_cstr(mrb, "$mrbtest_io_socketname"), mrb_str_new_cstr(mrb, socketname));
+  mrb_gv_set(mrb,  mrb_intern_cstr(mrb, "$mrbtest_io_msg"), mrb_str_new_cstr(mrb, msg));
 
   fp = fopen(rfname, "w");
   if (fp == NULL) {
@@ -81,10 +81,10 @@ mrb_io_test_io_setup(mrb_state *mrb, mrb_value self)
 static mrb_value
 mrb_io_test_io_cleanup(mrb_state *mrb, mrb_value self)
 {
-  mrb_value rfname = mrb_gv_get(mrb, mrb_intern(mrb, "$mrbtest_io_rfname"));
-  mrb_value wfname = mrb_gv_get(mrb, mrb_intern(mrb, "$mrbtest_io_wfname"));
-  mrb_value symlinkname = mrb_gv_get(mrb, mrb_intern(mrb, "$mrbtest_io_symlinkname"));
-  mrb_value socketname = mrb_gv_get(mrb, mrb_intern(mrb, "$mrbtest_io_socketname"));
+  mrb_value rfname = mrb_gv_get(mrb,  mrb_intern_cstr(mrb, "$mrbtest_io_rfname"));
+  mrb_value wfname = mrb_gv_get(mrb,  mrb_intern_cstr(mrb, "$mrbtest_io_wfname"));
+  mrb_value symlinkname = mrb_gv_get(mrb,  mrb_intern_cstr(mrb, "$mrbtest_io_symlinkname"));
+  mrb_value socketname = mrb_gv_get(mrb,  mrb_intern_cstr(mrb, "$mrbtest_io_socketname"));
 
   if (mrb_type(rfname) == MRB_TT_STRING) {
     remove(RSTRING_PTR(rfname));
@@ -99,11 +99,11 @@ mrb_io_test_io_cleanup(mrb_state *mrb, mrb_value self)
     remove(RSTRING_PTR(socketname));
   }
 
-  mrb_gv_set(mrb, mrb_intern(mrb, "$mrbtest_io_rfname"), mrb_nil_value());
-  mrb_gv_set(mrb, mrb_intern(mrb, "$mrbtest_io_wfname"), mrb_nil_value());
-  mrb_gv_set(mrb, mrb_intern(mrb, "$mrbtest_io_symlinkname"), mrb_nil_value());
-  mrb_gv_set(mrb, mrb_intern(mrb, "$mrbtest_io_socketname"), mrb_nil_value());
-  mrb_gv_set(mrb, mrb_intern(mrb, "$mrbtest_io_msg"), mrb_nil_value());
+  mrb_gv_set(mrb,  mrb_intern_cstr(mrb, "$mrbtest_io_rfname"), mrb_nil_value());
+  mrb_gv_set(mrb,  mrb_intern_cstr(mrb, "$mrbtest_io_wfname"), mrb_nil_value());
+  mrb_gv_set(mrb,  mrb_intern_cstr(mrb, "$mrbtest_io_symlinkname"), mrb_nil_value());
+  mrb_gv_set(mrb,  mrb_intern_cstr(mrb, "$mrbtest_io_socketname"), mrb_nil_value());
+  mrb_gv_set(mrb,  mrb_intern_cstr(mrb, "$mrbtest_io_msg"), mrb_nil_value());
 
   return mrb_nil_value();
 }