Fix memory leaks when using the driver

Signed-off-by: Dimitar Dobrev <dpldobrev@protonmail.com>

src/Generator.Tests/AST/TestAST.cs

@@ -32,7 +32,7 @@ namespace CppSharp.Generator.Tests.AST
         [OneTimeTearDown]
         public void CleanUp()
         {
-            ParserOptions.Dispose();
+            Driver.Dispose();
         }
 
         [Test]

src/Generator.Tests/ASTTestFixture.cs

@@ -10,25 +10,23 @@ namespace CppSharp.Generator.Tests
     public class ASTTestFixture
     {
         protected Driver Driver;
-        protected DriverOptions Options;
-        protected ParserOptions ParserOptions;
         protected ASTContext AstContext;
 
         protected void ParseLibrary(params string[] files)
         {
-            Options = new DriverOptions { GeneratorKind = GeneratorKind.CSharp };
-            ParserOptions = new ParserOptions();
+            var options = new DriverOptions { GeneratorKind = GeneratorKind.CSharp };
+            var parserOptions = new ParserOptions();
 
             var testsPath = GeneratorTest.GetTestsDirectory("Native");
-            ParserOptions.AddIncludeDirs(testsPath);
-            ParserOptions.SkipPrivateDeclarations = true;
+            parserOptions.AddIncludeDirs(testsPath);
+            parserOptions.SkipPrivateDeclarations = true;
 
-            var module = Options.AddModule("Test");
+            var module = options.AddModule("Test");
             module.Headers.AddRange(files);
 
-            Driver = new Driver(Options)
+            Driver = new Driver(options)
             {
-                ParserOptions = this.ParserOptions
+                ParserOptions = parserOptions
             };
 
             Driver.Setup();

src/Generator.Tests/ReadNativeDependenciesTest.cs

@@ -39,14 +39,12 @@ namespace CppSharp.Generator.Tests
             var driverOptions = new DriverOptions();
             var module = driverOptions.AddModule("Test");
             module.Libraries.Add(library);
-            var driver = new Driver(driverOptions)
+            using (var driver = new Driver(driverOptions) { ParserOptions = parserOptions })
             {
-                ParserOptions = parserOptions
-            };
                 driver.Setup();
                 Assert.IsTrue(driver.ParseLibraries());
-            var dependencies = driver.Context.Symbols.Libraries[0].Dependencies;
-            return dependencies;
+                return driver.Context.Symbols.Libraries[0].Dependencies;
+            }
         }
     }
 }

src/Generator.Tests/ReadNativeSymbolsTest.cs

@@ -311,14 +311,12 @@ namespace CppSharp.Generator.Tests
             var driverOptions = new DriverOptions();
             var module = driverOptions.AddModule("Test");
             module.Libraries.Add(library);
-            var driver = new Driver(driverOptions)
+            using (var driver = new Driver(driverOptions) { ParserOptions = parserOptions })
             {
-                ParserOptions = parserOptions
-            };
                 driver.Setup();
                 Assert.IsTrue(driver.ParseLibraries());
-            var symbols = driver.Context.Symbols.Libraries[0].Symbols;
-            return symbols;
+                return driver.Context.Symbols.Libraries[0].Symbols;
+            }
         }
     }
 }

src/Generator/Driver.cs

@@ -17,7 +17,7 @@ using CppSharp.Generators.Cpp;
 
 namespace CppSharp
 {
-    public class Driver
+    public class Driver : IDisposable
     {
         public DriverOptions Options { get; private set; }
         public ParserOptions ParserOptions { get; set; }
@@ -399,6 +399,13 @@ namespace CppSharp
             Context.GeneratorOutputPasses.AddPass(pass);
         }
 
+        public void Dispose()
+        {
+            Generator.Dispose();
+            Context.TargetInfo?.Dispose();
+            ParserOptions.Dispose();
+        }
+
         private bool hasParsingErrors;
     }
 
@@ -407,8 +414,8 @@ namespace CppSharp
         public static void Run(ILibrary library)
         {
             var options = new DriverOptions();
-            var driver = new Driver(options);
-
+            using (var driver = new Driver(options))
+            {
                 library.Setup(driver);
 
                 driver.Setup();
@@ -469,10 +476,7 @@ namespace CppSharp
                                 break;
                         }
                 }
-
-            driver.Generator.Dispose();
-            driver.Context.TargetInfo.Dispose();
-            driver.ParserOptions.Dispose();
+            }
         }
     }
 }