Min diff by bringing back parseMidi

Author: gusty

src/ZMidi/Internal/ParserMonad.fs

@@ -158,6 +158,8 @@ module ParserMonad =
     let (>>=) (m: ParserMonad<'a>) (k: 'a -> ParserMonad<'b>) : ParserMonad<'b> =
       bindM m k
 
+    let parseMidi = monad
+
     let runParser (ma:ParserMonad<'a>) input initialState =
       apply1 ma { initialState with Input = input}
       |> Result.map fst
@@ -182,13 +184,13 @@ module ParserMonad =
 
     ///
     let fmap (f: 'a -> 'b) (p: ParserMonad<'a>) : ParserMonad<'b> =
-      monad {
+      parseMidi {
         let! a = p
         return (f a)
       }
     let inline ( <~> (* <$> *) ) (a) b = fmap a b
     let ( *> ) (a: ParserMonad<'a>) (b: 'a -> ParserMonad<'b>) : ParserMonad<'b> = 
-      monad {
+      parseMidi {
         let! a = a
         return! (b a)
       }
@@ -332,7 +334,7 @@ module ParserMonad =
     /// Apply the parser for /count/ times, derive the final answer
     /// from the intermediate list with the supplied function.
     let inline gencount (plen: ParserMonad<'T>) (p: ParserMonad<'a>) (constr: ^T -> 'a array -> 'answer) : ParserMonad<'answer> =
-        monad {
+        parseMidi {
           let! l = plen
           logf "gen count: l: %i" l
           let! items = boundRepeat l p
@@ -353,22 +355,22 @@ module ParserMonad =
 
     /// Parse a single byte char.
     let readChar : ParserMonad<char> = 
-        monad { 
+        parseMidi { 
             let! a = readByte
             return (char a)
         }
 
     /// Parse a string of the given length.
     let readString (length : int) : ParserMonad<string> = 
-        monad { 
+        parseMidi { 
             let! arr = count length readChar
             return (System.String arr)
         }
         <??> sprintf "readString failed at %i"
     open ZMidi.Internal.DataTypes.FromBytes
     /// Parse a uint16 (big endian).
     let readUInt16be : ParserMonad<uint16>= 
-        monad { 
+        parseMidi { 
             let! a = readByte
             let! b = readByte
             return word16be a b
@@ -377,7 +379,7 @@ module ParserMonad =
 
     /// Parse a word14 (big endian) from 2 consecutive bytes.
     let readWord14be = 
-        monad {
+        parseMidi {
             let! a = readByte
             let! b = readByte
             return (word14be a b)
@@ -386,7 +388,7 @@ module ParserMonad =
 
     /// Parse a word32 (big endian).
     let readUInt32be =
-      monad {
+      parseMidi {
         let! a = readByte
         let! b = readByte
         let! c = readByte
@@ -396,7 +398,7 @@ module ParserMonad =
 
     /// Parse a word24 (big endian).
     let readWord24be =
-        monad {
+        parseMidi {
             let! a = readByte
             let! b = readByte
             let! c = readByte

src/ZMidi/Read.fs

@@ -11,7 +11,7 @@ module ReadFile =
     /// Apply parse then apply the check, if the check fails report
     /// the error message. 
     let postCheck parser isOutputValid errorMessage =
-      monad {
+      parseMidi {
         let! answer = parser
         if isOutputValid answer then 
           return answer 
@@ -29,43 +29,43 @@ module ReadFile =
 
     let getVarlen : ParserMonad<word32> =
       let rec loop acc =
-        monad {
+        parseMidi {
           let! b = readByte
           let acc = acc <<< 7
           if msbHigh b then
             let result = uint64 (b &&& 0b01111111uy)
             return! loop (acc + result)
           else
             return (acc + (uint64 b)) }  
-      monad {
+      parseMidi {
         let! result = loop 0UL
         return (uint32 result) }
 
     let getVarlenText = gencount getVarlen readChar (fun _ b -> System.String b)
     let getVarlenBytes = gencount getVarlen readByte (fun _ b -> b)
 
     let deltaTime = 
-      monad {
+      parseMidi {
           let! v = getVarlen
           return DeltaTime(v)
       } <??> (fun p -> "delta time")
 
     let fileFormat =
-        monad {
+        parseMidi {
             match! readUInt16be with
             | 0us -> return MidiFormat0
             | 1us -> return MidiFormat1
             | 2us -> return MidiFormat2
             | x   -> return! (fatalError (Other (sprintf "fileFormat: Unrecognized file format %i" x)))
             }
     let timeDivision =
-        monad {
+        parseMidi {
           match! readUInt16be with
           | TestBit 15 as x -> return FramePerSecond (clearBit 15 x)
           | x               -> return TicksPerBeat x
           }
     let header = 
-        monad {
+        parseMidi {
             let! _ = assertString "MThd"
             let! _ = assertWord32 6u 
             let! format = fileFormat
@@ -76,59 +76,59 @@ module ReadFile =
                      format = format }
             }
     let trackHeader =
-        monad {
+        parseMidi {
           let! _ = assertString "MTrk"
           return! readUInt32be
         }
 
     let textEvent textType =
-      monad {
+      parseMidi {
         let! text = getVarlenText
         return TextEvent(textType, text)
       }
 
     let scale =
-      monad {
+      parseMidi {
         match! readByte with
         | 0uy -> return MidiScaleType.Major
         | 1uy -> return MidiScaleType.Minor
         | other -> return MidiScaleType.OtherScale other
       }
 
     let metaEventSequenceNumber =
-      monad {
+      parseMidi {
         let! a = assertWord8 2uy
         let! b = peek
         return SequenceNumber(word16be a b)
       }
 
     let metaEventChannelPrefix =
-      monad {
+      parseMidi {
         let! _ = assertWord8 0x01uy
         let! b = readByte
         return ChannelPrefix b        
       }
 
     let metaEventMidiPort =
-      monad {
+      parseMidi {
         let! _ = assertWord8 0x01uy
         let! b = readByte
         return MidiPort b   
       }
     let metaEventEndOfTrack =
-      monad {
+      parseMidi {
         let! _ = assertWord8 0uy
         return EndOfTrack
       }
     let metaEventSetTempo =
-      monad {
+      parseMidi {
         let! _ = assertWord8 3uy
         let! a = readWord24be
         return SetTempo a
       }
 
     let metaEventSmpteOffset =
-      monad {
+      parseMidi {
         let! _ = assertWord8 5uy
         let! a = readByte
         let! b = readByte
@@ -138,7 +138,7 @@ module ReadFile =
         return SMPTEOffset(a,b,c,d,e)
       }
     let metaEventTimeSignature =
-      monad {
+      parseMidi {
         let! _ = assertWord8 4uy
         let! a = readByte
         let! b = readByte
@@ -148,7 +148,7 @@ module ReadFile =
       }
 
     let metaEventKeySignature =
-      monad {
+      parseMidi {
         let! _ = assertWord8 2uy
         let! a = readByte
         let a = int8 a
@@ -158,7 +158,7 @@ module ReadFile =
 
     let metaEvent i =
       let konst k _ = k
-      monad {
+      parseMidi {
         match i with
         | 0x00uy -> return! metaEventSequenceNumber    <??> (konst "sequence number")
         | 0x01uy -> return! textEvent GenericText      <??> (konst "generic text")
@@ -188,7 +188,7 @@ module ReadFile =
                   | None -> false
 
     let rec sysExContPackets =
-      monad {
+      parseMidi {
         let! d = deltaTime
         let! b = getVarlenBytes
         let answer = MidiSysExContPacket (d, b)
@@ -198,7 +198,7 @@ module ReadFile =
                             return (answer :: answer2)
       }
     let sysExEvent =
-      monad {
+      parseMidi {
         let! b = getVarlenBytes
         if isTerminated b then
           return SysExSingle b
@@ -207,7 +207,7 @@ module ReadFile =
           return SysExCont(b, cont)
       } <??> (fun _ -> "sysExEvent")
     let sysExEscape = 
-      monad {
+      parseMidi {
         let! bytes = getVarlenBytes
         return SysExEscape bytes
       } <??> (fun _ -> "sysExEscape")
@@ -218,7 +218,7 @@ module ReadFile =
       match n with
       | 0xf1uy -> readByte >>= (QuarterFrame >> mreturn) <??> (fun p -> "quarter frame")
       | 0xf2uy -> 
-        monad {
+        parseMidi {
           let! a = readByte
           let! b = readByte
           return SongPosPointer(a,b)
@@ -246,53 +246,53 @@ module ReadFile =
       b &&& 0xf0uy, b &&& 0x0fuy
 
     let noteOff ch =
-      monad {
+      parseMidi {
         let! a = readByte
         let! b = readByte
         return MidiVoiceEvent.NoteOff(ch, a, b)
       } <??> (fun p -> "note-off")
 
     let noteOn ch =
-      monad {
+      parseMidi {
         let! a = readByte
         let! b = readByte
         return MidiVoiceEvent.NoteOn(ch, a, b)
       } <??> (fun p -> "note-on")
 
     let noteAftertouch ch =
-      monad {
+      parseMidi {
         let! a = readByte
         let! b = readByte
         return MidiVoiceEvent.NoteAfterTouch(ch, a, b)
       } <??> (fun p -> "noteAftertouch")
 
     let controller ch =
-      monad {
+      parseMidi {
         let! a = readByte
         let! b = readByte
         return MidiVoiceEvent.Controller(ch, a, b)
       } <??> (fun p -> "controller")
 
     let programChange ch =
-      monad {
+      parseMidi {
         let! a = readByte
         return MidiVoiceEvent.ProgramChange(ch, a)
       } <??> (fun p -> "controller")
 
     let channelAftertouch ch =
-      monad {
+      parseMidi {
         let! a = readByte
         return MidiVoiceEvent.ChannelAftertouch(ch, a)
       } <??> (fun p -> "channelAftertouch")
     let pitchBend ch =
-      monad {
+      parseMidi {
         let! a = readWord14be
         return MidiVoiceEvent.PitchBend(ch, a)
       } <??> (fun p -> "pitchBend")
 
 
     let voiceEvent n =
-      monad {
+      parseMidi {
         match n with
         | SB(0x80uy, ch) -> do! setRunningEvent (NoteOff ch); 
                             return! noteOff ch
@@ -331,7 +331,7 @@ module ReadFile =
     /// can cause fatal parse errors.
     
     let event : ParserMonad<MidiEvent> = 
-      monad {
+      parseMidi {
         match! peek with
         | 0xffuy -> 
           do! dropByte
@@ -362,26 +362,26 @@ module ReadFile =
       }
 
     let message = 
-        monad {
+        parseMidi {
           let! deltaTime = deltaTime
           let! event = event
           return { timestamp = deltaTime; event = event }
         }
     let messages i = 
-      monad {
+      parseMidi {
 
           let! lastPos = getPos
           let maxPos = lastPos + int i
           return! repeatTillPosition maxPos message
       }
     let track : ParserMonad<MidiTrack> =
-        monad {
+        parseMidi {
             let! length = trackHeader
             return! messages length
         }
 
     let midiFile =
-      monad {
+      parseMidi {
         let! header = header
         let! tracks = count (header.trackCount) track
         return { header = header; tracks = tracks }