Merge branch 'master' of gitlab.science.ru.nl:clean-and-itasks/clean-platform

src/libraries/OS-Independent/Data/Tuple.dcl

@@ -6,8 +6,8 @@ from Data.Foldable import class Foldable
 from Data.Traversable import class Traversable
 from Data.Bifunctor import class Bifunctor
 
-tuple  :: a b -> (a,b)
-tuple3 :: a b c -> (a,b,c)
+tuple  :: .a .b -> .(.a,.b)
+tuple3 :: .a .b .c -> .(.a,.b,.c)
 
 appFst :: (.a -> .c) !(.a,.b) -> (.c,.b)
 appSnd :: (.b -> .c) !(.a,.b) -> (.a,.c)
@@ -16,7 +16,7 @@ appFst3 :: (.a -> .d) !(.a,.b,.c) -> (.d,.b,.c)
 appSnd3 :: (.b -> .d) !(.a,.b,.c) -> (.a,.d,.c)
 appThd3 :: (.c -> .d) !(.a,.b,.c) -> (.a,.b,.d)
 
-swap :: !(a, b) -> (b, a)
+swap :: !.(.a, .b) -> .(.b, .a)
 
 instance Functor ((,) a)
 

src/libraries/OS-Independent/Data/Tuple.icl

@@ -10,10 +10,10 @@ import Data.Foldable
 import Data.Traversable
 import Control.Applicative
 
-tuple :: a b -> (a,b)
+tuple  :: .a .b -> .(.a,.b)
 tuple a b = (a,b)
 
-tuple3 :: a b c -> (a,b,c)
+tuple3 :: .a .b .c -> .(.a,.b,.c)
 tuple3 a b c = (a,b,c)
 
 appFst:: (.a -> .c) !(.a,.b) -> (.c,.b)
@@ -31,7 +31,7 @@ appSnd3 f (a,b,c) = (a,f b,c)
 appThd3 :: (.c -> .d) !(.a,.b,.c) -> (.a,.b,.d)
 appThd3 f (a,b,c) = (a,b,f c)
 
-swap :: !(a, b) -> (b, a)
+swap :: !.(.a, .b) -> .(.b, .a)
 swap (a,b) = (b,a)
 
 instance Functor ((,) a)