fixup! Generate tuple instances for NFData1/2

Author: phadej

Control/DeepSeq.hs

@@ -735,55 +735,55 @@ instance NFData2 (,) where
 instance (NFData a1, NFData a2, NFData a3) =>
          NFData (a1, a2, a3) where rnf = rnf2
 instance (NFData a1, NFData a2) =>
-         NFData1 (,,) a1 a2 where liftRnf = liftRnf2 rnf
+         NFData1 ((,,) a1 a2) where liftRnf = liftRnf2 rnf
 instance (NFData a1) =>
-         NFData2 (,,) a1 where
+         NFData2 ((,,) a1) where
   liftRnf2 r r' (x1,x2,x3) = rnf x1 `seq` r x2 `seq` r' x3
 
 instance (NFData a1, NFData a2, NFData a3, NFData a4) =>
          NFData (a1, a2, a3, a4) where rnf = rnf2
 instance (NFData a1, NFData a2, NFData a3) =>
-         NFData1 (,,,) a1 a2 a3 where liftRnf = liftRnf2 rnf
+         NFData1 ((,,,) a1 a2 a3) where liftRnf = liftRnf2 rnf
 instance (NFData a1, NFData a2) =>
-         NFData2 (,,,) a1 a2 where
+         NFData2 ((,,,) a1 a2) where
   liftRnf2 r r' (x1,x2,x3,x4) = rnf x1 `seq` rnf x2 `seq` r x3 `seq` r' x4
 
 instance (NFData a1, NFData a2, NFData a3, NFData a4, NFData a5) =>
          NFData (a1, a2, a3, a4, a5) where rnf = rnf2
 instance (NFData a1, NFData a2, NFData a3, NFData a4) =>
-         NFData1 (,,,,) a1 a2 a3 a4 where liftRnf = liftRnf2 rnf
+         NFData1 ((,,,,) a1 a2 a3 a4) where liftRnf = liftRnf2 rnf
 instance (NFData a1, NFData a2, NFData a3) =>
-         NFData2 (,,,,) a1 a2 a3 where
+         NFData2 ((,,,,) a1 a2 a3) where
   liftRnf2 r r' (x1,x2,x3,x4,x5) = rnf x1 `seq` rnf x2 `seq` rnf x3 `seq` r x4 `seq` r' x5
 
 instance (NFData a1, NFData a2, NFData a3, NFData a4, NFData a5, NFData a6) =>
          NFData (a1, a2, a3, a4, a5, a6) where rnf = rnf2
 instance (NFData a1, NFData a2, NFData a3, NFData a4, NFData a5) =>
-         NFData1 (,,,,,) a1 a2 a3 a4 a5 where liftRnf = liftRnf2 rnf
+         NFData1 ((,,,,,) a1 a2 a3 a4 a5) where liftRnf = liftRnf2 rnf
 instance (NFData a1, NFData a2, NFData a3, NFData a4) =>
-         NFData2 (,,,,,) a1 a2 a3 a4 where
+         NFData2 ((,,,,,) a1 a2 a3 a4) where
   liftRnf2 r r' (x1,x2,x3,x4,x5,x6) = rnf x1 `seq` rnf x2 `seq` rnf x3 `seq` rnf x4 `seq` r x5 `seq` r' x6
 
 instance (NFData a1, NFData a2, NFData a3, NFData a4, NFData a5, NFData a6, NFData a7) =>
          NFData (a1, a2, a3, a4, a5, a6, a7) where rnf = rnf2
 instance (NFData a1, NFData a2, NFData a3, NFData a4, NFData a5, NFData a6) =>
-         NFData1 (,,,,,,) a1 a2 a3 a4 a5 a6 where liftRnf = liftRnf2 rnf
+         NFData1 ((,,,,,,) a1 a2 a3 a4 a5 a6) where liftRnf = liftRnf2 rnf
 instance (NFData a1, NFData a2, NFData a3, NFData a4, NFData a5) =>
-         NFData2 (,,,,,,) a1 a2 a3 a4 a5 where
+         NFData2 ((,,,,,,) a1 a2 a3 a4 a5) where
   liftRnf2 r r' (x1,x2,x3,x4,x5,x6,x7) = rnf x1 `seq` rnf x2 `seq` rnf x3 `seq` rnf x4 `seq` rnf x5 `seq` r x6 `seq` r' x7
 
 instance (NFData a1, NFData a2, NFData a3, NFData a4, NFData a5, NFData a6, NFData a7, NFData a8) =>
          NFData (a1, a2, a3, a4, a5, a6, a7, a8) where rnf = rnf2
 instance (NFData a1, NFData a2, NFData a3, NFData a4, NFData a5, NFData a6, NFData a7) =>
-         NFData1 (,,,,,,,) a1 a2 a3 a4 a5 a6 a7 where liftRnf = liftRnf2 rnf
+         NFData1 ((,,,,,,,) a1 a2 a3 a4 a5 a6 a7) where liftRnf = liftRnf2 rnf
 instance (NFData a1, NFData a2, NFData a3, NFData a4, NFData a5, NFData a6) =>
-         NFData2 (,,,,,,,) a1 a2 a3 a4 a5 a6 where
+         NFData2 ((,,,,,,,) a1 a2 a3 a4 a5 a6) where
   liftRnf2 r r' (x1,x2,x3,x4,x5,x6,x7,x8) = rnf x1 `seq` rnf x2 `seq` rnf x3 `seq` rnf x4 `seq` rnf x5 `seq` rnf x6 `seq` r x7 `seq` r' x8
 
 instance (NFData a1, NFData a2, NFData a3, NFData a4, NFData a5, NFData a6, NFData a7, NFData a8, NFData a9) =>
          NFData (a1, a2, a3, a4, a5, a6, a7, a8, a9) where rnf = rnf2
 instance (NFData a1, NFData a2, NFData a3, NFData a4, NFData a5, NFData a6, NFData a7, NFData a8) =>
-         NFData1 (,,,,,,,,) a1 a2 a3 a4 a5 a6 a7 a8 where liftRnf = liftRnf2 rnf
+         NFData1 ((,,,,,,,,) a1 a2 a3 a4 a5 a6 a7 a8) where liftRnf = liftRnf2 rnf
 instance (NFData a1, NFData a2, NFData a3, NFData a4, NFData a5, NFData a6, NFData a7) =>
-         NFData2 (,,,,,,,,) a1 a2 a3 a4 a5 a6 a7 where
+         NFData2 ((,,,,,,,,) a1 a2 a3 a4 a5 a6 a7) where
   liftRnf2 r r' (x1,x2,x3,x4,x5,x6,x7,x8,x9) = rnf x1 `seq` rnf x2 `seq` rnf x3 `seq` rnf x4 `seq` rnf x5 `seq` rnf x6 `seq` rnf x7 `seq` r x8 `seq` r' x9

generate-nfdata-tuple.hs

@@ -6,9 +6,9 @@ genNFData n =
     , "instance (" ++ ctx0 ++ ") =>"
     , "         NFData (" ++ intercalate ", " as0  ++ ") where rnf = rnf2"
     , "instance (" ++ ctx1 ++ ") =>"
-    , "         NFData1 (" ++ replicate (n - 1) ',' ++ ") " ++ intercalate " " as1  ++ " where liftRnf = liftRnf2 rnf"
+    , "         NFData1 ((" ++ replicate (n - 1) ',' ++ ") " ++ intercalate " " as1  ++ ") where liftRnf = liftRnf2 rnf"
     , "instance (" ++ ctx2 ++ ") =>"
-    , "         NFData2 (" ++ replicate (n - 1) ',' ++ ") " ++ intercalate " " as2  ++ " where"
+    , "         NFData2 ((" ++ replicate (n - 1) ',' ++ ") " ++ intercalate " " as2  ++ ") where"
     , "  liftRnf2 r r' (" ++ intercalate "," xs ++ ") = " ++ implemantation
     ]
   where