Generator: compiler now could accept path for saving the resulting assembly (useful for tests).

Author: ForNeVeR

Naggum.Test/CompilerTest.fs

@@ -1,8 +1,8 @@
 namespace Naggum.Test
 
+open System
 open System.Diagnostics
 open System.IO
-open System.Reflection
 
 open Xunit
 
@@ -20,7 +20,8 @@ type CompilerTest() =
         let basePath = Path.Combine(directory, testName)
         let testPath = Path.ChangeExtension(basePath, testExtension)
         let resultPath = Path.ChangeExtension(basePath, resultExtension)
-        let executablePath = Path.ChangeExtension(testName, executableExtension)
+        let executableName = Path.ChangeExtension (testName, executableExtension)
+        let executablePath = Path.Combine (Environment.CurrentDirectory, executableName)
 
         use stream = File.Open(testPath, FileMode.Open)
         Generator.compile stream testName executablePath []

ngc/Generator.fs

@@ -28,9 +28,14 @@ let compileMethod context (generatorFactory : IGeneratorFactory) body (methodBui
 
     epilogue context ilGenerator
 
-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 compile (source : Stream) (assemblyName : string) (filePath : string) (asmRefs:string list): unit =
+    let assemblyName = AssemblyName assemblyName
+    let path = Path.GetDirectoryName filePath
+    let assemblyPath = if path = "" then null else path
+    let fileName = Path.GetFileName filePath
+    let appDomain = AppDomain.CurrentDomain
+
+    let assemblyBuilder = appDomain.DefineDynamicAssembly (assemblyName, AssemblyBuilderAccess.Save, assemblyPath)
     Globals.ModuleBuilder <- assemblyBuilder.DefineDynamicModule(assemblyBuilder.GetName().Name, fileName)
     let typeBuilder = Globals.ModuleBuilder.DefineType("Program", TypeAttributes.Public ||| TypeAttributes.Class ||| TypeAttributes.BeforeFieldInit)
     let methodBuilder = typeBuilder.DefineMethod ("Main",