Merge branch 'swflib' of git@github.com:mzp/scheme-abc into swflib

Conflicts:
	swflib/OMakefile
	swflib/bytesIn.ml
	swflib/bytesIn.mli

diff --cc swflib/OMakefile
index 979af9e,7004d4f..b159dc3
--- 1/swflib/OMakefile
--- 2/swflib/OMakefile
+++ b/swflib/OMakefile
@@@ -6,8 -6,8 +6,9 @@@ OCAMLPACKS[] 
        str
  
  FILES[] =
+       bytesIn
        bytesOut
 +      bytesIn
        label
        abcType
        abcOut

diff --cc swflib/bytesIn.ml
index 52661cd,73fbf87..c9e8f48
--- 1/swflib/bytesIn.ml
--- 2/swflib/bytesIn.ml
+++ b/swflib/bytesIn.ml
@@@ -10,12 -10,12 +10,11 @@@ let rec repeat n f stream 
        | [<>] ->
          raise (Stream.Error "invalid format")
  
 -
  let of_channel ch =
-   Stream.from (fun _ ->
-                try
-                  Some (input_byte ch)
-                with End_of_file ->
-                  None)
+   Stream.from (fun _ -> try
+                Some (input_byte ch)
+              with End_of_file ->
+                None)
  
  let (++) x y =
    (x lsl 8) + y
@@@ -75,5 -75,4 +74,3 @@@ let d64 
        [<d = repeat 8 byte>] ->
          Int64.float_of_bits @@ List.fold_right shift_or d 0L
  
- let sample () =
-   Stream.of_list @@ range 0 10
 -