fixed source reading

Author: hagane

ngc/Generator.fs

@@ -40,7 +40,7 @@ let private epilogue context typeBuilder (ilGen : ILGenerator) =
     ilGen.Emit OpCodes.Ret
     ilGen.EndScope()
 
-let compile (source : StreamReader) (assemblyName : string) (fileName : string) (asmRefs:string list): unit =
+let compile (source : Stream) (assemblyName : string) (fileName : string) (asmRefs:string list): unit =
     let assemblyName = new AssemblyName(assemblyName)
     let assemblyBuilder = AppDomain.CurrentDomain.DefineDynamicAssembly(assemblyName, AssemblyBuilderAccess.Save)
     let moduleBuilder = assemblyBuilder.DefineDynamicModule(assemblyBuilder.GetName().Name, fileName)
@@ -61,13 +61,12 @@ let compile (source : StreamReader) (assemblyName : string) (fileName : string)
     List.iter context.loadAssembly (List.map Assembly.LoadFrom asmRefs)
 
     prologue ilGenerator
-    while not source.EndOfStream do
-        try
-            let sexp = Reader.parse source
-            let gen = gf.MakeGenerator context sexp
-            gen.Generate ilGenerator
-        with
-        | ex -> printfn "File: %A\nForm: %A\nError: %A" fileName sexp ex.Source
+    try
+        Reader.parse fileName source |> List.iter (fun sexp ->
+                                                   let gen = gf.MakeGenerator context sexp
+                                                   gen.Generate ilGenerator) 
+    with
+    | ex -> printfn "File: %A\nForm: %A\nError: %A" fileName sexp ex.Source
 
     epilogue context typeBuilder ilGenerator
 

ngc/Program.fs

@@ -33,6 +33,7 @@ for arg in (List.tail args) do
     else
         sources <- arg :: sources
 for fileName in sources do
-    let source = new StreamReader(File.Open (fileName,FileMode.Open))
+    let source = File.Open (fileName,FileMode.Open) :> Stream
     let assemblyName = Path.GetFileNameWithoutExtension fileName
     Generator.compile source assemblyName (assemblyName + ".exe") asmRefs
+    source.Close()

ngc/Reader.fs

@@ -78,28 +78,11 @@ let atom =  (pnumber <|> string <|> symbol) |>> Atom
 
 let listElement = choice [atom;list]
 let sexp = ws (pstring "(") >>. many (ws listElement) .>> ws (pstring ")") |>> List
-let parser = choice [atom;sexp]
+let parser = many1 (choice [atom;sexp])
 do listRef := sexp
 
-let rec read_form (stream : TextReader) (acc:string) balance =
-    let line = stream.ReadLine()
-    let delta = balance
-    String.iter (fun (c) ->
-                    match (c) with
-                    |'(' -> delta := !delta + 1
-                    |')' -> delta := !delta - 1
-                    |_ -> delta := !delta)
-                line
-    if !delta = 0 && not(acc.Trim() = "")then
-        String.concat " " [acc;line]
-    else read_form stream (String.concat " " [acc; line]) delta
-
-let read stream =
-    let form = (read_form stream "" (ref 0)).Trim()
-    run parser form
-
-let parse (source : StreamReader) =
-    let form = read source
+let parse (sourceName:string) (source : Stream) =
+    let form = runParserOnStream parser () sourceName source Text.Encoding.UTF8
     match form with
     | Success(result,   _, _) -> result
     | Failure(errorMsg, _, _) -> failwithf "Failure: %s" errorMsg