fix liquid build, replace (.||||.) with (.||.)

Author: michaelborkowski

src/DpsMergeSort4Par.hs

@@ -55,12 +55,10 @@ msortInplace src tmp =
         !(tmp1, tmp2)     = splitMid tmpA
         !(tmp3, tmp4)     = splitMid tmpB
         !(((src1', tmp1'), (src2', tmp2')), ((src3', tmp3'), (src4', tmp4')))
-                         = (.||||.) (msortInplace src1 tmp1) (msortInplace src2 tmp2)
-                                    (msortInplace src3 tmp3) (msortInplace src4 tmp4) 
---                         = (msortInplace src1 tmp1 .||. msortInplace src2 tmp2) .||.
---                           (msortInplace src3 tmp3 .||. msortInplace src4 tmp4) 
---                         = tuple4 (msortInplace src1) tmp1 (msortInplace src2) tmp2
---                                  (msortInplace src3) tmp3 (msortInplace src4) tmp4
+                         = (msortInplace src1 tmp1 .||. msortInplace src2 tmp2) .||.
+                           (msortInplace src3 tmp3 .||. msortInplace src4 tmp4) 
+--                         = (.||||.) (msortInplace src1 tmp1) (msortInplace src2 tmp2)
+--                                    (msortInplace src3 tmp3) (msortInplace src4 tmp4) 
         tmpA'            = A.append tmp1' tmp2'
         tmpB'            = A.append tmp3' tmp4'
         !((srcA'', tmpA''), (srcB'', tmpB''))

src/Par.hs

@@ -123,6 +123,6 @@ a .||. b = (a,b)
 {-@ (.||||.) :: x:a -> y:a -> z:a -> w:a 
                     -> { tup:_ | x == fst (fst tup) && y == snd (fst tup) &&
                                  z == fst (snd tup) && w == snd (snd tup) } @-}
-(.||||.) :: (NFData a) => a -. a -. a -. a -. ((a,a),(a,a))  
+(.||||.) :: a -. a -. a -. a -. ((a,a),(a,a))  
 (.||||.) a b c d = ((a, b), (c, d)) 
 #endif