Added support for directly wrapping entire sets of interdependent lib…

…raries.

It's realised by using modules. Users now have to define one module for each library they want wrapped while setting the driver up.

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

examples/SDL/SDL.cs

@@ -13,7 +13,7 @@ public void Setup(Driver driver)
             options.LibraryName = "SDL";
             options.Headers.Add("SDL.h");
             var sdlPath = Path.Combine(GetExamplesDirectory("SDL"), "SDL-2.0/include");
-            options.Module.IncludeDirs.Add(sdlPath);
+            options.addIncludeDirs(sdlPath);
             options.OutputDir = "SDL";
         }
 

src/AST/Declaration.cs

@@ -41,11 +41,7 @@ public enum GenerationKind
         /// <summary>
         /// Declaration is generated to be used internally.
         /// </summary>
-        Internal,
-        /// <summary>
-        /// Declaration was already generated in a linked assembly.
-        /// </summary>
-        Link, 
+        Internal
     }
 
     /// <summary>
@@ -252,8 +248,7 @@ public bool IsDeclared
             {
                 var k = GenerationKind;
                 return k == GenerationKind.Generate
-                    || k == GenerationKind.Internal
-                    || k == GenerationKind.Link;
+                    || k == GenerationKind.Internal;
             }
         }
 

src/AST/Expression.cs

@@ -1,4 +1,6 @@
+using System;
 using System.Collections.Generic;
+using System.Linq;
 
 namespace CppSharp.AST
 {
@@ -7,6 +9,8 @@ public abstract class Expression : Statement
         public string DebugText;
 
         public abstract TV Visit<TV>(IExpressionVisitor<TV> visitor);
+
+        public abstract Expression Clone();
     }
 
     public class BuiltinTypeExpression : Expression
@@ -39,6 +43,19 @@ public override T Visit<T>(IExpressionVisitor<T> visitor)
         {
             return visitor.VisitExpression(this);
         }
+
+        public override Expression Clone()
+        {
+            return new BuiltinTypeExpression
+            {
+                Value = this.Value,
+                Type = this.Type,
+                DebugText = this.DebugText,
+                Class = this.Class,
+                Declaration = this.Declaration,
+                String = this.String
+            };
+        }
     }
 
     public class BinaryOperator : Expression
@@ -59,6 +76,16 @@ public override T Visit<T>(IExpressionVisitor<T> visitor)
         {
             return visitor.VisitExpression(this);
         }
+
+        public override Expression Clone()
+        {
+            return new BinaryOperator(LHS.Clone(), RHS.Clone(), OpcodeStr)
+            {
+                DebugText = this.DebugText,
+                Declaration = this.Declaration,
+                String = this.String
+            };
+        }
     }
 
     public class CallExpr : Expression
@@ -75,6 +102,18 @@ public override T Visit<T>(IExpressionVisitor<T> visitor)
         {
             return visitor.VisitExpression(this);
         }
+
+        public override Expression Clone()
+        {
+            var clone = new CallExpr
+            {
+                DebugText = this.DebugText,
+                Declaration = this.Declaration,
+                String = this.String
+            };
+            clone.Arguments.AddRange(Arguments.Select(a => a.Clone()));
+            return clone;
+        }
     }
 
     public class CXXConstructExpr : Expression
@@ -91,6 +130,18 @@ public override T Visit<T>(IExpressionVisitor<T> visitor)
         {
             return visitor.VisitExpression(this);
         }
+
+        public override Expression Clone()
+        {
+            var clone = new CXXConstructExpr
+            {
+                DebugText = this.DebugText,
+                Declaration = this.Declaration,
+                String = this.String
+            };
+            clone.Arguments.AddRange(Arguments.Select(a => a.Clone()));
+            return clone;
+        }
     }
 
     public interface IExpressionVisitor<out T>

src/Generator/Module.cs → src/AST/Module.cs

@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace CppSharp
+namespace CppSharp.AST
 {
     public class Module
     {
@@ -12,6 +12,8 @@ public Module()
             Libraries = new List<string>();
             Defines = new List<string>();
             Undefines = new List<string>();
+            Units = new List<TranslationUnit>();
+            CodeFiles = new List<string>();
         }
 
         public List<string> IncludeDirs { get; private set; }
@@ -22,6 +24,9 @@ public Module()
         public List<string> Undefines { get; set; }
         public string OutputNamespace { get; set; }
 
+        public List<TranslationUnit> Units { get; private set; }
+        public List<string> CodeFiles { get; private set; }
+
         public string SharedLibraryName
         {
             get

src/AST/SymbolContext.cs

@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 
 namespace CppSharp.AST
 {
@@ -79,8 +80,9 @@ public void IndexSymbols()
             {
                 foreach (var symbol in library.Symbols)
                 {
-                    Symbols[symbol] = library;
-                    if (symbol.StartsWith("__"))
+                    if (!Symbols.ContainsKey(symbol))
+                        Symbols[symbol] = library;
+                    if (symbol.StartsWith("__", StringComparison.Ordinal))
                     {
                         string stripped = symbol.Substring(1);
                         if (!Symbols.ContainsKey(stripped))

src/AST/TranslationUnit.cs

@@ -1,3 +1,4 @@
+using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
@@ -24,6 +25,12 @@ public TranslationUnit(string file) : this()
         /// Contains the macros present in the unit.
         public List<MacroDefinition> Macros;
 
+        public Module Module
+        {
+            get { return (Module) module.Target; }
+            set { module = new WeakReference(value); }
+        }
+
         public bool IsSystemHeader { get; set; }
 
         public bool IsValid { get { return FilePath != "<invalid>"; } }
@@ -75,5 +82,7 @@ public string FileRelativePath
                     (fileRelativePath = Path.Combine(FileRelativeDirectory, FileName));
             }
         }
+
+        private WeakReference module;
     }
 }

src/CppParser/Bindings/ParserGen.cs

@@ -71,8 +71,8 @@ public void Setup(Driver driver)
                 SetupLinuxOptions(options);
 
             var basePath = Path.Combine(GetSourceDirectory("src"), "CppParser");
-            options.Module.IncludeDirs.Add(basePath);
-            options.Module.LibraryDirs.Add(".");
+            options.addIncludeDirs(basePath);
+            options.addLibraryDirs(".");
 
             options.OutputDir = Path.Combine(GetSourceDirectory("src"), "CppParser",
                 "Bindings", Kind.ToString());

src/CppParser/Bootstrap/Bootstrap.cs

@@ -42,16 +42,16 @@ public void Setup(Driver driver)
             options.MicrosoftMode = false;
             options.TargetTriple = "i686-apple-darwin12.4.0";
 
-            options.Module.Defines.Add("__STDC_LIMIT_MACROS");
-            options.Module.Defines.Add("__STDC_CONSTANT_MACROS");
+            options.addDefines ("__STDC_LIMIT_MACROS");
+            options.addDefines ("__STDC_CONSTANT_MACROS");
 
             var llvmPath = Path.Combine (GetSourceDirectory ("deps"), "llvm");
             var clangPath = Path.Combine(llvmPath, "tools", "clang");
 
-            options.Module.IncludeDirs.Add(Path.Combine(llvmPath, "include"));
-            options.Module.IncludeDirs.Add(Path.Combine(llvmPath, "build", "include"));
-            options.Module.IncludeDirs.Add(Path.Combine (llvmPath, "build", "tools", "clang", "include"));
-            options.Module.IncludeDirs.Add(Path.Combine(clangPath, "include"));
+            options.addIncludeDirs(Path.Combine(llvmPath, "include"));
+            options.addIncludeDirs(Path.Combine(llvmPath, "build", "include"));
+            options.addIncludeDirs (Path.Combine (llvmPath, "build", "tools", "clang", "include"));
+            options.addIncludeDirs(Path.Combine(clangPath, "include"));
         }
 
         public void SetupPasses(Driver driver)

src/Generator.Tests/ASTTestFixture.cs

@@ -15,13 +15,11 @@ protected void ParseLibrary(params string[] files)
             Options = new DriverOptions();
 
             var testsPath = GeneratorTest.GetTestsDirectory("Native");
-            Options.Module.IncludeDirs.Add(testsPath);
+            Options.addIncludeDirs(testsPath);
 
             Options.Headers.AddRange(files);
 
             Driver = new Driver(Options, new TextDiagnosticPrinter());
-            foreach (var includeDir in Options.Module.IncludeDirs)
-                Options.addIncludeDirs(includeDir);
             Driver.SetupIncludes();
             Driver.BuildParseOptions();
             if (!Driver.ParseCode())

src/Generator.Tests/GeneratorTest.cs

@@ -46,7 +46,7 @@ public virtual void Setup(Driver driver)
                 options.TargetTriple = Environment.Is64BitProcess ? "x86_64-apple-darwin" : "i686-apple-darwin";
 
             var path = Path.GetFullPath(GetTestsDirectory(name));
-            options.Module.IncludeDirs.Add(path);
+            options.addIncludeDirs(path);
 
             // Remove this hardcoded path once we update our LLVM binary packages to bundle
             // the built-in Clang includes.

src/Generator.Tests/ReadNativeDependenciesTest.cs

@@ -38,11 +38,9 @@ public void TestReadDependenciesOSX()
         private static IList<string> GetDependencies(string library)
         {
             var driverOptions = new DriverOptions();
-            driverOptions.Module.LibraryDirs.Add(GeneratorTest.GetTestsDirectory("Native"));
+            driverOptions.addLibraryDirs(GeneratorTest.GetTestsDirectory("Native"));
             driverOptions.Libraries.Add(library);
             var driver = new Driver(driverOptions, new TextDiagnosticPrinter());
-            foreach (var libraryDir in driverOptions.Module.LibraryDirs)
-                driverOptions.addLibraryDirs(libraryDir);
             Assert.IsTrue(driver.ParseLibraries());
             var dependencies = driver.Symbols.Libraries[0].Dependencies;
             return dependencies;