Some fixes to primitives

spec/compiler/codegen/next_spec.cr

@@ -24,7 +24,7 @@ describe "Code gen: next" do
 
       a = 0
       foo do |i|
-        next if i % 2 == 0
+        next if i.unsafe_mod(2) == 0
         a += i
       end
       a
@@ -125,7 +125,7 @@ describe "Code gen: next" do
         b = 0
         while a < 4
           a += 1
-          next if a % 2 == 0
+          next if a.unsafe_mod(2) == 0
           b += a
         end
         if b == i

spec/compiler/codegen/primitives_spec.cr

@@ -42,10 +42,6 @@ describe "Code gen: primitives" do
     run(%(2 * 3)).to_i.should eq(6)
   end
 
-  it "codegens 8 / 3" do
-    run(%(8 / 3)).to_i.should eq(2)
-  end
-
   it "codegens 8.unsafe_div 3" do
     run(%(8.unsafe_div 3)).to_i.should eq(2)
   end

spec/compiler/codegen/while_spec.cr

@@ -75,7 +75,7 @@ describe "Codegen: while" do
 
       while i < 10
         i += 1
-        next if i % 2 == 0
+        next if i.unsafe_mod(2) == 0
         x += i
       end
       x

spec/compiler/type_inference/primitives_spec.cr

@@ -92,4 +92,34 @@ describe "Type inference: primitives" do
              instantiate([string, fun_of(bool)] of TypeVar)
       end
   end
+
+  it "extends from Number and doesn't find + method" do
+    assert_error %(
+      struct Foo < Number
+      end
+
+      Foo.new + 1
+      ),
+      "undefined method"
+  end
+
+  it "extends from Number and doesn't find >= method" do
+    assert_error %(
+      struct Foo < Number
+      end
+
+      Foo.new >= 1
+      ),
+      "undefined method"
+  end
+
+  it "extends from Number and doesn't find to_i method" do
+    assert_error %(
+      struct Foo < Number
+      end
+
+      Foo.new.to_i
+      ),
+      "undefined method"
+  end
 end

spec/std/int_spec.cr

@@ -157,4 +157,9 @@ describe "Int" do
     expect_raises(DivisionByZero) { 1 / 0 }
     (4 / 2).should eq(2)
   end
+
+  it "raises when mods by zero" do
+    expect_raises(DivisionByZero) { 1 % 0 }
+    (4 % 2).should eq(0)
+  end
 end

src/compiler/crystal/primitives.cr

@@ -27,20 +27,34 @@ module Crystal
       floats = [float32, float64]
       nums = ints + floats
 
-      %w(+ - * /).each do |op|
-        nums.each do |another_number|
-          number.add_def Def.new(op, [Arg.new("other", type: another_number)], binary)
+      # The `/` operator is only defined for int vs float combinations.
+      # The `/` operator for int vs int is defined in Crystal on top
+      # of unsafe div.
+      # The same goes with the `%` operator.
+
+      %w(+ - *).each do |op|
+        nums.product(nums) do |num1, num2|
+          num1.add_def Def.new(op, [Arg.new("other", type: num2)], binary)
         end
       end
 
+      floats.product(ints) do |num1, num2|
+        num1.add_def Def.new("/", [Arg.new("other", type: num2)], binary)
+        num2.add_def Def.new("/", [Arg.new("other", type: num1)], binary)
+      end
+
+      floats.product(floats) do |num1, num2|
+        num1.add_def Def.new("/", [Arg.new("other", type: num2)], binary)
+      end
+
       %w(== < <= > >= !=).each do |op|
-        nums.each do |another_number|
-          number.add_def Def.new(op, [Arg.new("other", type: another_number)], binary)
+        nums.product(nums) do |num1, num2|
+          num1.add_def Def.new(op, [Arg.new("other", type: num2)], binary)
         end
         char.add_def Def.new(op, [Arg.new("other", type: char)], binary)
       end
 
-      %w(% << >> | & ^ unsafe_div unsafe_mod).each do |op|
+      %w(<< >> | & ^ unsafe_div unsafe_mod).each do |op|
         ints.each do |another_int|
           int.add_def Def.new(op, [Arg.new("other", type: another_int)], binary)
         end
@@ -53,7 +67,9 @@ module Crystal
       end
 
       %w(to_i to_i8 to_i16 to_i32 to_i64 to_u to_u8 to_u16 to_u32 to_u64 to_f to_f32 to_f64).each do |op|
-        number.add_def Def.new(op, body: cast)
+        nums.each do |num|
+          num.add_def Def.new(op, body: cast)
+        end
       end
 
       int.add_def Def.new("chr", body: cast)

src/float.cr

@@ -3,10 +3,6 @@ struct Float
     cast(0)
   end
 
-  def +
-    self
-  end
-
   def nan?
     !(self == self)
   end

src/int.cr

@@ -3,10 +3,6 @@ struct Int
     cast(0)
   end
 
-  def +
-    self
-  end
-
   def ~
     self ^ -1
   end
@@ -19,14 +15,13 @@ struct Int
     unsafe_div x
   end
 
-  # TODO: uncomment after 0.5.3
-  # def %(x : Int)
-  #   if x == 0
-  #     raise DivisionByZero.new
-  #   end
+  def %(x : Int)
+    if x == 0
+      raise DivisionByZero.new
+    end
 
-  #   unsafe_mod x
-  # end
+    unsafe_mod x
+  end
 
   def abs
     self >= 0 ? self : -self

src/number.cr

 struct Number
+  def +
+    self
+  end
+
   def step(limit = nil, by = 1)
     x = self