move fromInt to Internals

2 files changed, 19 insertions, 18 deletions

diff --git a/lc/Builtins.lc b/lc/Builtins.lc
index 1d10d532..47dfc4e1 100644
--- a/lc/Builtins.lc
+++ b/lc/Builtins.lc
@@ -109,24 +109,6 @@ class Signed a
 instance Signed         Int
 instance Signed         Float
 
-class Num a where
-  fromInt :: Int -> a
-  compare :: a -> a -> Ordering
-  negate :: a -> a
-
-instance Num Int where
-  fromInt = id
-  compare = primCompareInt
-  negate = primNegateInt
-instance Num Word where
-  fromInt = primIntToWord
-  compare = primCompareWord
-  negate = primNegateWord
-instance Num Float where
-  fromInt = primIntToFloat
-  compare = primCompareFloat
-  negate = primNegateFloat
-
 class Component a where
   vec2 :: a -> a -> Vec 2 a
   vec3 :: a -> a -> a -> Vec 3 a
diff --git a/lc/Internals.lc b/lc/Internals.lc
index d3f6ed84..5d5a38b1 100644
--- a/lc/Internals.lc
+++ b/lc/Internals.lc
@@ -59,4 +59,23 @@ primIfThenElse :: Bool -> a -> a -> a
 primIfThenElse True  a b = a
 primIfThenElse False a b = b
 
+-- fromInt is needed for integer literal
+class Num a where
+  fromInt :: Int -> a
+  compare :: a -> a -> Ordering
+  negate :: a -> a
+
+instance Num Int where
+  fromInt = \x -> x
+  compare = primCompareInt
+  negate  = primNegateInt
+instance Num Word where
+  fromInt = primIntToWord
+  compare = primCompareWord
+  negate  = primNegateWord
+instance Num Float where
+  fromInt = primIntToFloat
+  compare = primCompareFloat
+  negate  = primNegateFloat
+