Fixed a memory leak when generating the wrappers.

ddobrev · ddobrev · commit 58521522fce4 · 2015-12-11T02:07:17.000+02:00
Signed-off-by: Dimitar Dobrev &lt;dpldobrev@protonmail.com&gt;
diff --git a/QtSharp.CLI/Program.cs b/QtSharp.CLI/Program.cs
@@ -120,16 +120,13 @@ public static int Main(string[] args)
             }
             libFiles = libFiles.TopologicalSort(l => dependencies.ContainsKey(l) ? dependencies[l] : Enumerable.Empty<string>());
             var wrappedModules = new List<KeyValuePair<string, string>>(modules.Count);
-            var astContexts = new List<ASTContext>(libFiles.Count);
             foreach (var libFile in libFiles.Where(l => modules.Any(m => m == Path.GetFileNameWithoutExtension(l))))
             {
                 logredirect.SetLogFile(libFile.Replace(".dll", "") + "Log.txt");
                 logredirect.Start();
 
-                var qtSharp = new QtSharp(new QtModuleInfo(qmake, make, headers, libs, libFile, target, systemIncludeDirs, docs),
-                                          astContexts);
+                var qtSharp = new QtSharp(new QtModuleInfo(qmake, make, headers, libs, libFile, target, systemIncludeDirs, docs));
                 ConsoleDriver.Run(qtSharp);
-                astContexts.Add(qtSharp.AST);
                 if (File.Exists(qtSharp.LibraryName) && File.Exists(Path.Combine("release", qtSharp.InlinesLibraryName)))
                 {
                     wrappedModules.Add(new KeyValuePair<string, string>(qtSharp.LibraryName, qtSharp.InlinesLibraryName));
diff --git a/QtSharp.CLI/QtSharp.CLI.csproj b/QtSharp.CLI/QtSharp.CLI.csproj
@@ -10,7 +10,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>QtSharp.CLI</RootNamespace>
     <AssemblyName>QtSharp.CLI</AssemblyName>
-    <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
     <TargetFrameworkProfile>
     </TargetFrameworkProfile>
     <FileAlignment>512</FileAlignment>
diff --git a/QtSharp.CLI/app.config b/QtSharp.CLI/app.config
@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.1"/></startup></configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2"/></startup></configuration>
diff --git a/QtSharp/Documentation.cs b/QtSharp/Documentation.cs
@@ -309,11 +309,14 @@ public void DocumentProperty(Property property)
                         {
                             comment.BriefText = ((Class) property.Namespace).GetBaseProperty(property).Comment.BriefText;
                         }
-                        if (!string.IsNullOrEmpty(comment.BriefText))
+                        if (string.IsNullOrEmpty(comment.BriefText))
                         {
-                            comment.BriefText += Environment.NewLine;
+                            comment.BriefText += setter.Comment.BriefText;
+                        }
+                        else
+                        {
+                            comment.BriefText += Environment.NewLine + setter.Comment.BriefText;
                         }
-                        comment.BriefText += setter.Comment.BriefText;
                     }
                 }
                 if (!string.IsNullOrEmpty(comment.BriefText))
@@ -661,6 +664,5 @@ private static void AddObsoleteAttribute(Declaration function)
         private readonly List<XElement> classNodes;
         private readonly List<XElement> enumNodes;
         private readonly List<XElement> variableNodes;
-
     }
 }
diff --git a/QtSharp/GetCommentsFromQtDocsPass.cs b/QtSharp/GetCommentsFromQtDocsPass.cs
@@ -7,9 +7,8 @@ namespace QtSharp
 {
     public class GetCommentsFromQtDocsPass : TranslationUnitPass
     {
-        public GetCommentsFromQtDocsPass(string docsPath, string module, List<ASTContext> dependencies)
+        public GetCommentsFromQtDocsPass(string docsPath, string module)
         {
-            this.dependencies = dependencies;
             this.documentation = new Documentation(docsPath, module);
             this.Options.VisitFunctionReturnType = false;
             this.Options.VisitFunctionParameters = false;
@@ -86,11 +85,10 @@ public override bool VisitFunctionDecl(Function function)
                 var @class = function.OriginalNamespace as Class;
                 if (@class != null && @class.IsInterface && @class.GenerationKind == GenerationKind.Link)
                 {
-                    function.Comment = (from dependency in this.dependencies
-                                        from found in dependency.FindClass(@class.Name)
-                                        from method in found.Methods
-                                        where method.USR == function.USR
-                                        select method.Comment).FirstOrDefault();
+                    if (functionsComments.ContainsKey(function.Mangled))
+                    {
+                        function.Comment = new RawComment { BriefText = functionsComments[function.Mangled] };
+                    }
                 }
                 else
                 {
@@ -115,17 +113,36 @@ public override bool VisitProperty(Property property)
                                        where @class != null && @class.IsInterface && @class.GenerationKind == GenerationKind.Link
                                        select @class)
                 {
-                    property.Comment = (from dependency in this.dependencies
-                                        from found in dependency.FindClass(@class.Name)
-                                        from prop in found.Properties
-                                        where prop.OriginalName == property.OriginalName
-                                        select prop.Comment).FirstOrDefault();
+                    RawComment comment = null;
+                    if (property.GetMethod != null && functionsComments.ContainsKey(property.GetMethod.Mangled))
+                    {
+                        comment = new RawComment { BriefText = functionsComments[property.GetMethod.Mangled] };
+                    }
+                    if (comment == null && property.SetMethod != null && functionsComments.ContainsKey(property.SetMethod.Mangled))
+                    {
+                        comment = new RawComment { BriefText = functionsComments[property.SetMethod.Mangled] };
+                    }
+                    property.Comment = comment;
                     if (property.Comment != null)
                     {
                         return true;
                     }
                 }
                 this.documentation.DocumentProperty(property);
+                if (property.Comment != null)
+                {
+                    if (property.GetMethod != null)
+                    {
+                        functionsComments[property.GetMethod.Mangled] = property.Comment.BriefText;
+                    }
+                    else
+                    {
+                        if (property.SetMethod != null)
+                        {
+                            functionsComments[property.SetMethod.Mangled] = property.Comment.BriefText;
+                        }
+                    }
+                }
                 return true;
             }
             return false;
@@ -177,10 +194,15 @@ private void DocumentFunction(Function function)
                 {
                     this.documentation.DocumentFunction(function);
                 }
+                if (function.Comment != null)
+                {
+                    functionsComments[function.Mangled] = function.Comment.BriefText;
+                }
             }
         }
 
+        private static readonly Dictionary<string, string> functionsComments = new Dictionary<string, string>();
+
         private readonly Documentation documentation;
-        private readonly List<ASTContext> dependencies;
     }
 }
diff --git a/QtSharp/QtSharp.cs b/QtSharp/QtSharp.cs
@@ -14,9 +14,8 @@ namespace QtSharp
 {
     public class QtSharp : ILibrary
     {
-        public QtSharp(QtModuleInfo qtModuleInfo, List<ASTContext> dependencies)
+        public QtSharp(QtModuleInfo qtModuleInfo)
         {
-            this.dependencies = dependencies;
             this.qmake = qtModuleInfo.Qmake;
             this.includePath = qtModuleInfo.IncludePath.Replace('/', Path.DirectorySeparatorChar);
             this.module = Regex.Match(qtModuleInfo.Library, @"Qt\d?(?<module>\w+?)d?\.\w+$").Groups["module"].Value;
@@ -30,7 +29,6 @@ public QtSharp(QtModuleInfo qtModuleInfo, List<ASTContext> dependencies)
 
         public string LibraryName { get; set; }
         public string InlinesLibraryName { get; set; }
-        public ASTContext AST { get; set; }
 
         public void Preprocess(Driver driver, ASTContext lib)
         {
@@ -129,7 +127,7 @@ private static void IgnorePrivateDeclaration(Declaration declaration)
         public void Postprocess(Driver driver, ASTContext lib)
         {
             new ClearCommentsPass().VisitLibrary(driver.ASTContext);
-            new GetCommentsFromQtDocsPass(this.docs, this.module, this.dependencies).VisitLibrary(driver.ASTContext);
+            new GetCommentsFromQtDocsPass(this.docs, this.module).VisitLibrary(driver.ASTContext);
             new CaseRenamePass(
                 RenameTargets.Function | RenameTargets.Method | RenameTargets.Property | RenameTargets.Delegate |
                 RenameTargets.Field | RenameTargets.Variable,
@@ -146,7 +144,6 @@ public void Postprocess(Driver driver, ASTContext lib)
                         .ExplicitlyIgnore();
                     break;
             }
-            this.AST = lib;
         }
 
         public void Setup(Driver driver)
@@ -214,6 +211,5 @@ public void SetupPasses(Driver driver)
         private readonly IEnumerable<string> systemIncludeDirs;
         private readonly string target;
         private readonly string docs;
-        private readonly List<ASTContext> dependencies;
     }
 }
diff --git a/QtSharp/QtSharp.csproj b/QtSharp/QtSharp.csproj
@@ -10,7 +10,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>QtSharp</RootNamespace>
     <AssemblyName>QtSharp</AssemblyName>
-    <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
   </PropertyGroup>
@@ -23,6 +23,7 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <Prefer32Bit>false</Prefer32Bit>
+    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>

Original file line number	Diff line number	Diff line change
`@@ -120,16 +120,13 @@ public static int Main(string[] args)`
`120`	`120`	`}`
`121`	`121`	`libFiles = libFiles.TopologicalSort(l => dependencies.ContainsKey(l) ? dependencies[l] : Enumerable.Empty<string>());`
`122`	`122`	`var wrappedModules = new List<KeyValuePair<string, string>>(modules.Count);`
`123`		`- var astContexts = new List<ASTContext>(libFiles.Count);`
`124`	`123`	`foreach (var libFile in libFiles.Where(l => modules.Any(m => m == Path.GetFileNameWithoutExtension(l))))`
`125`	`124`	`{`
`126`	`125`	`logredirect.SetLogFile(libFile.Replace(".dll", "") + "Log.txt");`
`127`	`126`	`logredirect.Start();`
`128`	`127`
`129`		`- var qtSharp = new QtSharp(new QtModuleInfo(qmake, make, headers, libs, libFile, target, systemIncludeDirs, docs),`
`130`		`- astContexts);`
	`128`	`+ var qtSharp = new QtSharp(new QtModuleInfo(qmake, make, headers, libs, libFile, target, systemIncludeDirs, docs));`
`131`	`129`	`ConsoleDriver.Run(qtSharp);`
`132`		`- astContexts.Add(qtSharp.AST);`
`133`	`130`	`if (File.Exists(qtSharp.LibraryName) && File.Exists(Path.Combine("release", qtSharp.InlinesLibraryName)))`
`134`	`131`	`{`
`135`	`132`	`wrappedModules.Add(new KeyValuePair<string, string>(qtSharp.LibraryName, qtSharp.InlinesLibraryName));`
Original file line number	Diff line number	Diff line change
`@@ -309,11 +309,14 @@ public void DocumentProperty(Property property)`
`309`	`309`	`{`
`310`	`310`	`comment.BriefText = ((Class) property.Namespace).GetBaseProperty(property).Comment.BriefText;`
`311`	`311`	`}`
`312`		`- if (!string.IsNullOrEmpty(comment.BriefText))`
	`312`	`+ if (string.IsNullOrEmpty(comment.BriefText))`
`313`	`313`	`{`
`314`		`- comment.BriefText += Environment.NewLine;`
	`314`	`+ comment.BriefText += setter.Comment.BriefText;`
	`315`	`+ }`
	`316`	`+ else`
	`317`	`+ {`
	`318`	`+ comment.BriefText += Environment.NewLine + setter.Comment.BriefText;`
`315`	`319`	`}`
`316`		`- comment.BriefText += setter.Comment.BriefText;`
`317`	`320`	`}`
`318`	`321`	`}`
`319`	`322`	`if (!string.IsNullOrEmpty(comment.BriefText))`
`@@ -661,6 +664,5 @@ private static void AddObsoleteAttribute(Declaration function)`
`661`	`664`	`private readonly List<XElement> classNodes;`
`662`	`665`	`private readonly List<XElement> enumNodes;`
`663`	`666`	`private readonly List<XElement> variableNodes;`
`664`		`-`
`665`	`667`	`}`
`666`	`668`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,9 +7,8 @@ namespace QtSharp`
`7`	`7`	`{`
`8`	`8`	`public class GetCommentsFromQtDocsPass : TranslationUnitPass`
`9`	`9`	`{`
`10`		`- public GetCommentsFromQtDocsPass(string docsPath, string module, List<ASTContext> dependencies)`
	`10`	`+ public GetCommentsFromQtDocsPass(string docsPath, string module)`
`11`	`11`	`{`
`12`		`- this.dependencies = dependencies;`
`13`	`12`	`this.documentation = new Documentation(docsPath, module);`
`14`	`13`	`this.Options.VisitFunctionReturnType = false;`
`15`	`14`	`this.Options.VisitFunctionParameters = false;`
`@@ -86,11 +85,10 @@ public override bool VisitFunctionDecl(Function function)`
`86`	`85`	`var @class = function.OriginalNamespace as Class;`
`87`	`86`	`if (@class != null && @class.IsInterface && @class.GenerationKind == GenerationKind.Link)`
`88`	`87`	`{`
`89`		`- function.Comment = (from dependency in this.dependencies`
`90`		`- from found in dependency.FindClass(@class.Name)`
`91`		`- from method in found.Methods`
`92`		`- where method.USR == function.USR`
`93`		`- select method.Comment).FirstOrDefault();`
	`88`	`+ if (functionsComments.ContainsKey(function.Mangled))`
	`89`	`+ {`
	`90`	`+ function.Comment = new RawComment { BriefText = functionsComments[function.Mangled] };`
	`91`	`+ }`
`94`	`92`	`}`
`95`	`93`	`else`
`96`	`94`	`{`
`@@ -115,17 +113,36 @@ public override bool VisitProperty(Property property)`
`115`	`113`	`where @class != null && @class.IsInterface && @class.GenerationKind == GenerationKind.Link`
`116`	`114`	`select @class)`
`117`	`115`	`{`
`118`		`- property.Comment = (from dependency in this.dependencies`
`119`		`- from found in dependency.FindClass(@class.Name)`
`120`		`- from prop in found.Properties`
`121`		`- where prop.OriginalName == property.OriginalName`
`122`		`- select prop.Comment).FirstOrDefault();`
	`116`	`+ RawComment comment = null;`
	`117`	`+ if (property.GetMethod != null && functionsComments.ContainsKey(property.GetMethod.Mangled))`
	`118`	`+ {`
	`119`	`+ comment = new RawComment { BriefText = functionsComments[property.GetMethod.Mangled] };`
	`120`	`+ }`
	`121`	`+ if (comment == null && property.SetMethod != null && functionsComments.ContainsKey(property.SetMethod.Mangled))`
	`122`	`+ {`
	`123`	`+ comment = new RawComment { BriefText = functionsComments[property.SetMethod.Mangled] };`
	`124`	`+ }`
	`125`	`+ property.Comment = comment;`
`123`	`126`	`if (property.Comment != null)`
`124`	`127`	`{`
`125`	`128`	`return true;`
`126`	`129`	`}`
`127`	`130`	`}`
`128`	`131`	`this.documentation.DocumentProperty(property);`
	`132`	`+ if (property.Comment != null)`
	`133`	`+ {`
	`134`	`+ if (property.GetMethod != null)`
	`135`	`+ {`
	`136`	`+ functionsComments[property.GetMethod.Mangled] = property.Comment.BriefText;`
	`137`	`+ }`
	`138`	`+ else`
	`139`	`+ {`
	`140`	`+ if (property.SetMethod != null)`
	`141`	`+ {`
	`142`	`+ functionsComments[property.SetMethod.Mangled] = property.Comment.BriefText;`
	`143`	`+ }`
	`144`	`+ }`
	`145`	`+ }`
`129`	`146`	`return true;`
`130`	`147`	`}`
`131`	`148`	`return false;`
`@@ -177,10 +194,15 @@ private void DocumentFunction(Function function)`
`177`	`194`	`{`
`178`	`195`	`this.documentation.DocumentFunction(function);`
`179`	`196`	`}`
	`197`	`+ if (function.Comment != null)`
	`198`	`+ {`
	`199`	`+ functionsComments[function.Mangled] = function.Comment.BriefText;`
	`200`	`+ }`
`180`	`201`	`}`
`181`	`202`	`}`
`182`	`203`
	`204`	`+ private static readonly Dictionary<string, string> functionsComments = new Dictionary<string, string>();`
	`205`	`+`
`183`	`206`	`private readonly Documentation documentation;`
`184`		`- private readonly List<ASTContext> dependencies;`
`185`	`207`	`}`
`186`	`208`	`}`
Original file line number	Diff line number	Diff line change
`@@ -14,9 +14,8 @@ namespace QtSharp`
`14`	`14`	`{`
`15`	`15`	`public class QtSharp : ILibrary`
`16`	`16`	`{`
`17`		`- public QtSharp(QtModuleInfo qtModuleInfo, List<ASTContext> dependencies)`
	`17`	`+ public QtSharp(QtModuleInfo qtModuleInfo)`
`18`	`18`	`{`
`19`		`- this.dependencies = dependencies;`
`20`	`19`	`this.qmake = qtModuleInfo.Qmake;`
`21`	`20`	`this.includePath = qtModuleInfo.IncludePath.Replace('/', Path.DirectorySeparatorChar);`
`22`	`21`	`this.module = Regex.Match(qtModuleInfo.Library, @"Qt\d?(?<module>\w+?)d?\.\w+$").Groups["module"].Value;`
`@@ -30,7 +29,6 @@ public QtSharp(QtModuleInfo qtModuleInfo, List<ASTContext> dependencies)`
`30`	`29`
`31`	`30`	`public string LibraryName { get; set; }`
`32`	`31`	`public string InlinesLibraryName { get; set; }`
`33`		`- public ASTContext AST { get; set; }`
`34`	`32`
`35`	`33`	`public void Preprocess(Driver driver, ASTContext lib)`
`36`	`34`	`{`
`@@ -129,7 +127,7 @@ private static void IgnorePrivateDeclaration(Declaration declaration)`
`129`	`127`	`public void Postprocess(Driver driver, ASTContext lib)`
`130`	`128`	`{`
`131`	`129`	`new ClearCommentsPass().VisitLibrary(driver.ASTContext);`
`132`		`- new GetCommentsFromQtDocsPass(this.docs, this.module, this.dependencies).VisitLibrary(driver.ASTContext);`
	`130`	`+ new GetCommentsFromQtDocsPass(this.docs, this.module).VisitLibrary(driver.ASTContext);`
`133`	`131`	`new CaseRenamePass(`
`134`	`132`	`RenameTargets.Function \| RenameTargets.Method \| RenameTargets.Property \| RenameTargets.Delegate \|`
`135`	`133`	`RenameTargets.Field \| RenameTargets.Variable,`
`@@ -146,7 +144,6 @@ public void Postprocess(Driver driver, ASTContext lib)`
`146`	`144`	`.ExplicitlyIgnore();`
`147`	`145`	`break;`
`148`	`146`	`}`
`149`		`- this.AST = lib;`
`150`	`147`	`}`
`151`	`148`
`152`	`149`	`public void Setup(Driver driver)`
`@@ -214,6 +211,5 @@ public void SetupPasses(Driver driver)`
`214`	`211`	`private readonly IEnumerable<string> systemIncludeDirs;`
`215`	`212`	`private readonly string target;`
`216`	`213`	`private readonly string docs;`
`217`		`- private readonly List<ASTContext> dependencies;`
`218`	`214`	`}`
`219`	`215`	`}`