Simplified the way generators are created in the driver.

src/Generator/Driver.cs

@@ -17,20 +17,6 @@ namespace CppSharp
 {
     public class Driver
     {
-        public delegate Generator CreateGeneratorDelegate(Driver driver);
-        public static Dictionary<LanguageGeneratorKind, CreateGeneratorDelegate>
-            Generators;
-
-        static Driver()
-        {
-            Generators = new Dictionary<LanguageGeneratorKind,
-                CreateGeneratorDelegate>();
-            Generators[LanguageGeneratorKind.CSharp] = driver =>
-                new CSharpGenerator(driver);
-            Generators[LanguageGeneratorKind.CLI] = driver =>
-                new CLIGenerator(driver);
-        }
-
         public DriverOptions Options { get; private set; }
         public IDiagnosticConsumer Diagnostics { get; private set; }
         public Project Project { get; private set; }
@@ -54,11 +40,21 @@ namespace CppSharp
             GeneratorOutputPasses = new PassBuilder<GeneratorOutputPass>(this);
         }
 
-        static void ValidateOptions(DriverOptions options)
+        Generator CreateGeneratorFromKind(GeneratorKind kind)
         {
-            if (!Generators.ContainsKey(options.GeneratorKind))
+            switch (kind)
-                throw new InvalidOptionException();
+            {
+                case GeneratorKind.CLI:
+                    return new CLIGenerator(this);
+                case GeneratorKind.CSharp:
+                    return new CSharpGenerator(this);
+            }
+
+            return null;
+        }
 
+        static void ValidateOptions(DriverOptions options)
+        {
             if (string.IsNullOrWhiteSpace(options.LibraryName))
                 throw new InvalidOptionException();
 
@@ -75,8 +71,6 @@ namespace CppSharp
         public void Setup()
         {
             ValidateOptions(Options);
-
-            Generator = Generators[Options.GeneratorKind](this);
             TypeDatabase.SetupTypeMaps();
             Generator = CreateGeneratorFromKind(Options.GeneratorKind);
         }