more complete Component instances

2 files changed, 25 insertions, 22 deletions

diff --git a/lc/Builtins.lc b/lc/Builtins.lc
index 1406277d..834b53eb 100644
--- a/lc/Builtins.lc
+++ b/lc/Builtins.lc
@@ -8,12 +8,13 @@ import Internals
 
 id x = x
 
----------------------------------------
-
+-- todo: move to Internals
 data List a = Nil | Cons a (List a)
 
 infixr 5 :
 
+---------------------------------------
+
 class AttributeTuple a
 instance AttributeTuple a -- TODO
 class ValidOutput a
@@ -100,33 +101,34 @@ instance Signed         Float
 class Component a where
   zeroComp :: a
   oneComp :: a
---  PrimZero, PrimOne :: {- (Component a) => -- TODO -} a
 
-instance Component Bool where
-  zeroComp = False
-  oneComp = True
 instance Component Int where
-  zeroComp = 0 :: Int   -- todo
-  oneComp = 1 :: Int    -- todo
-
+  zeroComp = 0
+  oneComp = 1
 instance Component Word where
-  zeroComp = 0 :: Word
-  oneComp = 1 :: Word
-
+  zeroComp = 0
+  oneComp = 1
 instance Component Float where
-  zeroComp = 0.0    -- todo: 0
-  oneComp = 1.0     -- todo: 1
+  zeroComp = 0
+  oneComp = 1
 instance Component (VecS Float 2) where
-  zeroComp = V2 0.0 0.0
-  oneComp = V2 1.0 1.0
+  zeroComp = V2 0 0
+  oneComp = V2 1 1
 instance Component (VecS Float 3) where
-  zeroComp = V3 0.0 0.0 0.0
-  oneComp = V3 1.0 1.0 1.0
+  zeroComp = V3 0 0 0
+  oneComp = V3 1 1 1
 instance Component (VecS Float 4) where
-  zeroComp = V4 0.0 0.0 0.0 0.0
-  oneComp = V4 1.0 1.0 1.0 1.0
-instance Component (VecS Bool 2) {-where-}
-instance Component (VecS Bool 3) {-where-}
+  zeroComp = V4 0 0 0 0
+  oneComp = V4 1 1 1 1
+instance Component Bool where
+  zeroComp = False
+  oneComp = True
+instance Component (VecS Bool 2) where
+  zeroComp = V2 False False
+  oneComp = V2 True True
+instance Component (VecS Bool 3) where
+  zeroComp = V3 False False False
+  oneComp = V3 True True True
 instance Component (VecS Bool 4) where
   zeroComp = V4 False False False False
   oneComp = V4 True True True True
diff --git a/lc/Internals.lc b/lc/Internals.lc
index b7d55b51..780835cc 100644
--- a/lc/Internals.lc
+++ b/lc/Internals.lc
@@ -127,3 +127,4 @@ instance Eq Nat where
     Succ a == Succ b = a == b
     _      == _      = False
 
+