Merge remote-tracking branch 'upstream/master' into mrbgems

src/kernel.c

@@ -1111,7 +1111,6 @@ mrb_init_kernel(mrb_state *mrb)
   mrb_define_method(mrb, krn, "remove_instance_variable",   mrb_obj_remove_instance_variable,ARGS_REQ(1));    /* 15.3.1.3.41 */
   mrb_define_method(mrb, krn, "respond_to?",                obj_respond_to,                  ARGS_ANY());     /* 15.3.1.3.43 */
   mrb_define_method(mrb, krn, "send",                       mrb_f_send,                      ARGS_ANY());     /* 15.3.1.3.44 */
-  mrb_define_method(mrb, krn, "__send__",                   mrb_f_send,                      ARGS_ANY());     /* 15.3.1.3.4 */
   mrb_define_method(mrb, krn, "singleton_methods",          mrb_obj_singleton_methods_m,     ARGS_ANY());     /* 15.3.1.3.45 */
   mrb_define_method(mrb, krn, "to_s",                       mrb_any_to_s,                    ARGS_NONE());    /* 15.3.1.3.46 */
 

src/numeric.c

@@ -948,7 +948,7 @@ fix_xor(mrb_state *mrb, mrb_value x)
 }
 
 static mrb_value
-lshift(mrb_state *mrb, mrb_int val, unsigned long width)
+lshift(mrb_state *mrb, mrb_int val, int width)
 {
   if (width > (sizeof(mrb_int)*CHAR_BIT-1)) {
       mrb_raisef(mrb, E_RANGE_ERROR, "width(%d) > (%d:sizeof(mrb_int)*CHAR_BIT-1)", width,
@@ -959,7 +959,7 @@ lshift(mrb_state *mrb, mrb_int val, unsigned long width)
 }
 
 static mrb_value
-rshift(mrb_int val, unsigned long i)
+rshift(mrb_int val, int i)
 {
     if (i >= sizeof(mrb_int)*CHAR_BIT-1) {
         if (val < 0) return mrb_fixnum_value(-1);
@@ -988,7 +988,7 @@ fix_lshift(mrb_state *mrb, mrb_value x)
   y = bit_coerce(mrb, y);
   width = mrb_fixnum(y);
   if (width < 0)
-      return rshift(val, (unsigned long)-width);
+      return rshift(val, -width);
   return lshift(mrb, val, width);
 }
 
@@ -1012,7 +1012,7 @@ fix_rshift(mrb_state *mrb, mrb_value x)
   i = mrb_fixnum(y);
     if (i == 0) return x;
     if (i < 0)
-        return lshift(mrb, val, (unsigned long)-i);
+        return lshift(mrb, val, -i);
     return rshift(val, i);
 }