From 55c26d2fe5a08f63ced250e88766f92b7875429f Mon Sep 17 00:00:00 2001
From: Joao Matos <joao@tritao.eu>
Date: Thu, 9 Feb 2017 14:13:03 +0000
Subject: [PATCH] Setup type and expression printer in C# sources generator.

---
 src/Generator/Generators/CSharp/CSharpGenerator.cs |  4 +---
 src/Generator/Generators/CSharp/CSharpSources.cs   | 11 +++++------
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/src/Generator/Generators/CSharp/CSharpGenerator.cs b/src/Generator/Generators/CSharp/CSharpGenerator.cs
index 8b8851cd..3282c3d6 100644
--- a/src/Generator/Generators/CSharp/CSharpGenerator.cs
+++ b/src/Generator/Generators/CSharp/CSharpGenerator.cs
@@ -7,19 +7,17 @@ namespace CppSharp.Generators.CSharp
     public class CSharpGenerator : Generator
     {
         private readonly CSharpTypePrinter typePrinter;
-        private readonly CSharpExpressionPrinter expressionPrinter;
 
         public CSharpGenerator(BindingContext context) : base(context)
         {
             typePrinter = new CSharpTypePrinter(context);
-            expressionPrinter = new CSharpExpressionPrinter(typePrinter);
         }
 
         public override List<CodeGenerator> Generate(IEnumerable<TranslationUnit> units)
         {
             var outputs = new List<CodeGenerator>();
 
-            var gen = new CSharpSources(Context, units, typePrinter, expressionPrinter);
+            var gen = new CSharpSources(Context, units);
             outputs.Add(gen);
 
             return outputs;
diff --git a/src/Generator/Generators/CSharp/CSharpSources.cs b/src/Generator/Generators/CSharp/CSharpSources.cs
index ae9415b8..700ba75f 100644
--- a/src/Generator/Generators/CSharp/CSharpSources.cs
+++ b/src/Generator/Generators/CSharp/CSharpSources.cs
@@ -124,17 +124,16 @@ namespace CppSharp.Generators.CSharp
 
     public class CSharpSources : CodeGenerator
     {
-        public CSharpTypePrinter TypePrinter { get; private set; }
-        public CSharpExpressionPrinter ExpressionPrinter { get; private set; }
+        public CSharpTypePrinter TypePrinter { get; protected set; }
+        public CSharpExpressionPrinter ExpressionPrinter { get; protected set; }
 
         public override string FileExtension => "cs";
 
-        public CSharpSources(BindingContext context, IEnumerable<TranslationUnit> units,
-            CSharpTypePrinter typePrinter, CSharpExpressionPrinter expressionPrinter)
+        public CSharpSources(BindingContext context, IEnumerable<TranslationUnit> units)
             : base(context, units)
         {
-            TypePrinter = typePrinter;
-            ExpressionPrinter = expressionPrinter;
+            TypePrinter = new CSharpTypePrinter(context);
+            ExpressionPrinter = new CSharpExpressionPrinter(TypePrinter);
         }
 
         #region Identifiers