one step closer to actually parse stuff

Author: smoothdeveloper

demo/scratch.fsx

@@ -1,12 +1,15 @@
-#load "../src/zmidi/datatypes.fs"
-#load "../src/zmidi/extratypes.fs"
-#load "../src/zmidi/internal/utils.fs"
-#load "../src/zmidi/internal/parsermonad.fs"
-#load "../src/zmidi/read.fs"
-//#r "../build/Debug/AnyCPU/net45/zmidi-fs-core.dll"
+//#load "../src/zmidi/datatypes.fs"
+//#load "../src/zmidi/extratypes.fs"
+//#load "../src/zmidi/internal/utils.fs"
+//#load "../src/zmidi/internal/parsermonad.fs"
+//#load "../src/zmidi/read.fs"
+#r "../build/Debug/AnyCPU/net45/zmidi-fs-core.dll"
+
+
 open System.IO
 open ZMidi.Internal.ParserMonad
-(*
+open ZMidi
+
 let folder = 
   Path.Combine(__SOURCE_DIRECTORY__ , ".." , "data", "midifiles")
   |> DirectoryInfo
@@ -33,7 +36,7 @@ for file in folder.EnumerateFiles() do
     ()
   | Error something -> printfn "ERR: %s %A" file.FullName something
 
-  *)
+
 let cases = 
   [|
     {| expected = 0x00000000u; input = [|0x00uy|] |}
@@ -55,18 +58,50 @@ for case in cases do
   let result = runParser ZMidi.ReadFile.getVarlen case.input state
   printfn "%A" result
 
+do 
+  printfn "hello"; 
+  let a = 1; 
+  printfn "world %i" a;
 
+//do printfn "hello"; let a = 1; printfn "world %i" a;
 
-let inline (|TestBit|_|) (bit: int) (i: ^T) =
-  let mask = LanguagePrimitives.GenericOne <<< bit
-  if mask &&& i = mask then Some () else None
+open ZMidi.ReadFile
+open ZMidi.DataTypes
+let p = parseMidi {
+  let! _ = assertString "MThd"
+  let! _ = assertWord32 6u
+  let! format = fileFormat
+  let! trackCount = readUInt16be
+  let! timeDiv = timeDivision
+  let header =
+         { trackCount = trackCount
+           timeDivision = timeDiv
+           format = format }
+         
+  let! _ = assertString "MTrk"
+  let! l = readUInt32be
+  let! t = deltaTime
+  let! e = event
+  return (l,t,e)
+  //let! track1 = track
+  //return track1
+}
+  
+  
 
-let inline clearBit (bit: int) (i: ^T) =
-  let mask = ~~~ (LanguagePrimitives.GenericOne <<< bit)
-  i &&& mask
-let inline msbHigh i =
-  match i with
-  | TestBit 7 -> true
-  | _ -> false
+for file in folder.EnumerateFiles() do
+  let buffer = File.ReadAllBytes file.FullName
 
-msbHigh 0x80uy &&& 0x7fuy
+  let parseResult = 
+    ZMidi.Internal.ParserMonad.runParser
+      p
+      buffer
+      State.initial
+
+
+  printfn "%s" file.FullName 
+
+  match parseResult with 
+  | Ok result -> 
+    printfn "%A" result
+  | Error something -> printfn "ERR: %s %A" file.FullName something

src/ZMidi/DataTypes.fs

@@ -3,6 +3,7 @@
 type midiportnumber = byte
 type word8 = byte
 type word16 = uint16
+type word24 = uint32
 type word32 = uint32
 type bits7 = byte
 type midichannel = byte