Merge pull request mruby#1348 from carsonmcdonald/shiftwarningfix

matz · matz · commit 5f74721e02c3 · 2013-07-06T10:08:42.000-07:00
Fix signed/unsigned warning in numeric shift
diff --git a/src/numeric.c b/src/numeric.c
@@ -998,7 +998,7 @@ fix_xor(mrb_state *mrb, mrb_value x)
 #define NUMERIC_SHIFT_WIDTH_MAX (sizeof(mrb_int)*CHAR_BIT-1)
 
 static mrb_value
-lshift(mrb_state *mrb, mrb_int val, int width)
+lshift(mrb_state *mrb, mrb_int val, size_t width)
 {
   if (width > NUMERIC_SHIFT_WIDTH_MAX) {
     mrb_raisef(mrb, E_RANGE_ERROR, "width(%S) > (%S:sizeof(mrb_int)*CHAR_BIT-1)",
@@ -1010,7 +1010,7 @@ lshift(mrb_state *mrb, mrb_int val, int width)
 }
 
 static mrb_value
-rshift(mrb_int val, int width)
+rshift(mrb_int val, size_t width)
 {
   if (width >= NUMERIC_SHIFT_WIDTH_MAX) {
     if (val < 0) {
diff --git a/test/t/integer.rb b/test/t/integer.rb
@@ -104,13 +104,32 @@
   #   00010111 (23)
   # = 00101110 (46)
   assert_equal 23 << 1, 46
+
+  # Left Shift by a negative is Right Shift
+  assert_equal 46 << -1, 23
+
+  # Raise when shift is too large
+  assert_raise(RangeError) do
+    2 << 128
+  end
 end
 
 assert('Integer#>>', '15.2.8.3.13') do
   # Right Shift by one
   #   00101110 (46)
   # = 00010111 (23)
   assert_equal 46 >> 1, 23
+
+  # Right Shift by a negative is Left Shift
+  assert_equal 23 >> -1, 46
+
+  # Don't raise on large Right Shift
+  assert_equal 23 >> 128, 0
+
+  # Raise when shift is too large
+  assert_raise(RangeError) do
+    2 >> -128
+  end
 end
 
 assert('Integer#ceil', '15.2.8.3.14') do

Original file line number	Diff line number	Diff line change
`@@ -998,7 +998,7 @@ fix_xor(mrb_state *mrb, mrb_value x)`
`998`	`998`	`#define NUMERIC_SHIFT_WIDTH_MAX (sizeof(mrb_int)*CHAR_BIT-1)`
`999`	`999`
`1000`	`1000`	`static mrb_value`
`1001`		`-lshift(mrb_state *mrb, mrb_int val, int width)`
	`1001`	`+lshift(mrb_state *mrb, mrb_int val, size_t width)`
`1002`	`1002`	`{`
`1003`	`1003`	`if (width > NUMERIC_SHIFT_WIDTH_MAX) {`
`1004`	`1004`	`mrb_raisef(mrb, E_RANGE_ERROR, "width(%S) > (%S:sizeof(mrb_int)*CHAR_BIT-1)",`
`@@ -1010,7 +1010,7 @@ lshift(mrb_state *mrb, mrb_int val, int width)`
`1010`	`1010`	`}`
`1011`	`1011`
`1012`	`1012`	`static mrb_value`
`1013`		`-rshift(mrb_int val, int width)`
	`1013`	`+rshift(mrb_int val, size_t width)`
`1014`	`1014`	`{`
`1015`	`1015`	`if (width >= NUMERIC_SHIFT_WIDTH_MAX) {`
`1016`	`1016`	`if (val < 0) {`