Merge branch 'Refactor-numeric.c' of https://github.com/suzukaze/mruby into suzukaze-Refactor-numeric.c

1 files changed, 12 insertions, 30 deletions

diff --git a/src/numeric.c b/src/numeric.c
index f7ee3103d..e5fc59ec8 100644
--- a/src/numeric.c
+++ b/src/numeric.c
@@ -1024,27 +1024,18 @@ fix_shift_get_width(mrb_state *mrb, mrb_int *width)
 static mrb_value
 fix_lshift(mrb_state *mrb, mrb_value x)
 {
-  mrb_int width;
-  mrb_value result;
+  mrb_int width, val;
 
   fix_shift_get_width(mrb, &width);
 
   if (width == 0) {
-    result = x;
+    return(x);
   }
-  else {
-    mrb_int val;
-
-    val = mrb_fixnum(x);
-    if (width < 0) {
-      result = rshift(val, -width);
-    }
-    else {
-      result = lshift(mrb, val, width);
-    }
+  val = mrb_fixnum(x);
+  if (width < 0) {
+    return(rshift(val, -width));
   }
-
-  return result;
+  return(lshift(mrb, val, width));
 }
 
 /* 15.2.8.3.13 */
@@ -1058,27 +1049,18 @@ fix_lshift(mrb_state *mrb, mrb_value x)
 static mrb_value
 fix_rshift(mrb_state *mrb, mrb_value x)
 {
-  mrb_int width;
-  mrb_value result;
+  mrb_int width, val;
 
   fix_shift_get_width(mrb, &width);
 
   if (width == 0) {
-    result = x;
+    return(x);
   }
-  else {
-    mrb_int val;
-
-    val = mrb_fixnum(x);
-    if (width < 0) {
-      result = lshift(mrb, val, -width);
-    }
-    else {
-      result = rshift(val, width);
-    }
+  val = mrb_fixnum(x);
+  if (width < 0) {
+    return(lshift(mrb, val, -width));
   }
-
-  return result;
+  return(rshift(val, width));
 }
 
 /* 15.2.8.3.23 */