Commits

Thijs Alkemade committed efd659f

Be a bit more lenient about the version of base, remove the InstanceSigs extension.

Still doesn't compile with 7.4.2 for me, though. GHC panics.

Comments (0)

Files changed (3)

 	showunit :: (Fractional f) => Bool -> Value f a b -> String
 
 instance (Convertable a b, Convertable c d, UnitMerge a c u) => Convertable u (Mul b d) where
-	factor :: (Fractional f) => Value f u (Mul b d) -> f
 	factor u = let left :: (Fractional f) => Value f a b
 	               left = one
 	               right ::(Fractional f) => Value f c d
 	               in if b then "(" ++ rest ++ ")" else rest
 
 instance (Convertable a b, Convertable c d, UnitMerge a c' u, UnitNeg c c') => Convertable u (Div b d) where
-	factor :: (Fractional f) => Value f u (Div b d) -> f
 	factor u = let left :: (Fractional f) => Value f a b
 	               left = one
 	               right ::(Fractional f) => Value f c d
 	pow :: (Fractional f) => Proxy i -> Value f a b -> Value f c d
 
 instance (Pow' () a b i c d) => Pow a b (i :: Number) c d where
-	pow = _pow ()
+	pow = _pow ()

src/UnitTyped/SI/Meta.hs

 	metashow :: (Fractional f) => Value f a (m b) -> String
 
 instance (MetaUnit m a b, Convertable a b) => Convertable a (m b) where
-	factor :: (Fractional f) => Value f a (m b) -> f
 	factor _ = let sub :: (Fractional f) => Value f a b
 	               sub = one
 	               self :: (Fractional f) => Value f a (m b)
 zebi _ = one
 
 yobi :: (Convertable a b, Fractional f) => Value f a b -> Value f a (Yobi b)
-yobi _ = one
+yobi _ = one
 synopsis:       A type-safe open-world library for computations including units.
 
 library
-  build-depends:   base == 4.6.0.0
+  build-depends:   base >= 4.6 && < 4.7
   extensions:      FlexibleInstances,
                    DataKinds,
                    UndecidableInstances,
                    FunctionalDependencies,
                    KindSignatures,
-                   InstanceSigs,
                    ScopedTypeVariables,
                    FlexibleContexts,
                    OverlappingInstances,
 Test-Suite test-si
     type:          exitcode-stdio-1.0
     main-is:       tests/TestSI.hs
-    build-depends: base == 4.6.0.0, unittyped
+    build-depends: base >= 4.6 && < 4.7, unittyped