Remove / change redundant code

Author: gusty

src/ZMidi/ExtraTypes.fs

@@ -1,5 +1,5 @@
 module ZMidi.Internal.ExtraTypes
-open ZMidi.DataTypes
+open FSharpPlus.Math.Generic
 
 
 
@@ -31,8 +31,8 @@ let fromVarlen =
 let inline encodeVarlen (myValue) =
     let inline initMask nBits =
         [|0 .. nBits - 1|]
-        |> Array.map (fun shift -> LanguagePrimitives.GenericOne <<< shift)
-        |> Array.fold ((|||)) LanguagePrimitives.GenericZero
+        |> Array.map (fun shift -> 1G <<< shift)
+        |> Array.fold ((|||)) 0G
     let nBits = 7
     let maxBits =
         let nMaxBytes = System.Runtime.InteropServices.Marshal.SizeOf(myValue.GetType())
@@ -50,7 +50,7 @@ let inline encodeVarlen (myValue) =
 
     shiftAnd7Bits
     |> Array.rev
-    |> Array.skipWhile ((=) LanguagePrimitives.GenericZero)
-    |> function | [||] -> [|LanguagePrimitives.GenericZero|]
+    |> Array.skipWhile ((=) 0G)
+    |> function | [||] -> [|0G|]
                 | bytes -> bytes 
 

src/ZMidi/Internal/ParserMonad.fs

@@ -6,7 +6,6 @@ module ParserMonad =
     open System.IO
     open FSharpPlus
     open FSharpPlus.Data
-    open ZMidi.Internal.Utils
 
     /// Status is either OFF or the previous VoiceEvent * Channel.
     type VoiceEvent = 
@@ -130,15 +129,7 @@ module ParserMonad =
                                 )
                   )
 
-    let inline mreturn (x:'a) : ParserMonad<'a> = 
-        StateT <| fun st -> Ok (x, st)
-
-    let inline private bindM (parser : ParserMonad<'a>) 
-                      (next : 'a -> ParserMonad<'b>) : ParserMonad<'b> = 
-        StateT <| fun state -> 
-            match apply1 parser state with
-            | Error msg -> Error msg
-            | Ok (ans, st1) -> apply1 (next ans) st1
+    let inline mreturn (x:'a) : ParserMonad<'a> = result x
 
     let mzero () : ParserMonad<'a> = 
         StateT <| fun state -> Error (mkParseError state (EOF "mzero"))
@@ -149,14 +140,7 @@ module ParserMonad =
             | Error _ -> apply1 parser2 state
             | Ok res -> Ok res
 
-    let inline private delayM (fn:unit -> ParserMonad<'a>) : ParserMonad<'a> = 
-        bindM (mreturn ()) fn 
-
     let inline mfor (items: #seq<'a>) (fn: 'a -> ParserMonad<'b>) : ParserMonad<seq<'b>> = failwithf ""
-
-
-    let (>>=) (m: ParserMonad<'a>) (k: 'a -> ParserMonad<'b>) : ParserMonad<'b> =
-      bindM m k
 
     let parseMidi = monad
 
@@ -193,17 +177,8 @@ module ParserMonad =
                 Error(mkOtherParseError st genMessage)
 
     ///
-    let fmap (f: 'a -> 'b) (p: ParserMonad<'a>) : ParserMonad<'b> =
-      parseMidi {
-        let! a = p
-        return (f a)
-      }
+    let fmap (f: 'a -> 'b) (p: ParserMonad<'a>) : ParserMonad<'b> = map f p
     let inline ( <~> (* <$> *) ) (a) b = fmap a b
-    let ( *> ) (a: ParserMonad<'a>) (b: 'a -> ParserMonad<'b>) : ParserMonad<'b> = 
-      parseMidi {
-        let! a = a
-        return! (b a)
-      }
 
     // http://hackage.haskell.org/package/base-4.12.0.0/docs/src/GHC.Base.html#%3C%24
     /// Replace all locations in the input with the same value.

src/ZMidi/Internal/Utils.fs

@@ -1,8 +1,7 @@
 namespace ZMidi.Internal
 open ZMidi.DataTypes
+open FSharpPlus
 
-module Evil =
-    let inline uncurry4 f = fun (a,b,c,d) -> f a b c d
 module DataTypes =
     module FromBytes =
 
@@ -39,21 +38,21 @@ module DataTypes =
         module Iso =
             let reverse iso = snd iso, fst iso
 
-        let word32be : Iso<_,_> = (ToBytes.word32be), (Evil.uncurry4 FromBytes.word32be)
+        let word32be : Iso<_,_> = (ToBytes.word32be), (uncurryN FromBytes.word32be)
 
 module Utils = 
-    open System.IO
+    open FSharpPlus.Math.Generic
 
     let inline (|TestBit|_|) (bit: int) (i: ^T) =
-      let mask = LanguagePrimitives.GenericOne <<< bit
+      let mask = 1G <<< bit
       if mask &&& i = mask then Some () else None
 
     let inline clearBit (bit: int) (i: ^T) =
-      let mask = ~~~ (LanguagePrimitives.GenericOne <<< bit)
+      let mask = ~~~ (1G <<< bit)
       i &&& mask
 
     let inline setBit (bit: int) (i: ^T) =
-      let mask = (LanguagePrimitives.GenericOne <<< bit)
+      let mask = (1G <<< bit)
       i ||| mask
     let inline msbHigh i =
       match i with
@@ -86,8 +85,8 @@ module Utils =
             [|0 .. (maxSize - 1)|]
             |> Array.rev
             |> Array.map (fun shift ->
-                let mask = LanguagePrimitives.GenericOne <<< shift
-                if (number &&& mask <> LanguagePrimitives.GenericZero) then "■" else " "
+                let mask = 1G <<< shift
+                if (number &&& mask <> 0G) then "■" else " "
                 )
             |> String.concat ""
             |> sprintf "[%s]"

src/ZMidi/Read.fs

@@ -157,7 +157,6 @@ module ReadFile =
       }
 
     let metaEvent i =
-      let konst k _ = k
       parseMidi {
         match i with
         | 0x00uy -> return! metaEventSequenceNumber    <??> (konst "sequence number")

src/ZMidi/Write.fs

@@ -3,19 +3,17 @@ open ZMidi.DataTypes
 open ZMidi.Internal.Utils
 open ZMidi.Internal.WriterMonad
 open System.Text
+open FSharpPlus
+
 module WriteFile =
     module PutOps =
 
-        let putAscii (text: string) = text |> Encoding.ASCII.GetBytes |> PutBytes
+        let putAscii (text: string) = String.getBytes Encoding.ASCII text |> PutBytes
 
-        let putWord32be (value: uint32) = PutBytes [| byte (value >>> 24)
-                                                      byte (value >>> 16)
-                                                      byte (value >>> 8)
-                                                      byte (value >>> 0) |]
+        let putWord32be (value: uint32) = PutBytes (toBytesBE value)
 
 
-        let putWord16be (value: uint16) = PutBytes [| byte (value >>> 8)
-                                                      byte (value >>> 0) |]
+        let putWord16be (value: uint16) = PutBytes (toBytesBE value)
 
         let putFormat = putWord16be << function | MidiFormat0 -> 0us
                                                 | MidiFormat1 -> 1us