From bf317daa6d3f826eefce1fceefdb4dc5b728bf33 Mon Sep 17 00:00:00 2001 From: marcos henrich Date: Sat, 23 Mar 2013 19:58:20 +0000 Subject: [PATCH] Added missing SupportBefore(s) --- src/Generator/Generators/CLI/CLISourcesTemplate.cs | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/Generator/Generators/CLI/CLISourcesTemplate.cs b/src/Generator/Generators/CLI/CLISourcesTemplate.cs index 8a0c4b08..35e3a2fa 100644 --- a/src/Generator/Generators/CLI/CLISourcesTemplate.cs +++ b/src/Generator/Generators/CLI/CLISourcesTemplate.cs @@ -266,6 +266,7 @@ namespace Cxxi.Generators.CLI var ctx = new MarshalContext(Driver) { + ArgName = field.Name, ReturnVarName = variable, ReturnType = field.Type }; @@ -273,6 +274,9 @@ namespace Cxxi.Generators.CLI var marshal = new CLIMarshalNativeToManagedPrinter(ctx); field.Visit(marshal); + if (!string.IsNullOrWhiteSpace(marshal.Context.SupportBefore)) + Write(marshal.Context.SupportBefore); + WriteLine("return {0};", marshal.Context.Return); WriteCloseBraceIndent(); @@ -666,10 +670,9 @@ namespace Cxxi.Generators.CLI if (needsReturn) { - Write("return "); - var ctx = new MarshalContext(Driver) { + ArgName = "ret", ReturnVarName = "ret", ReturnType = retType }; @@ -677,7 +680,10 @@ namespace Cxxi.Generators.CLI var marshal = new CLIMarshalNativeToManagedPrinter(ctx); function.ReturnType.Visit(marshal); - WriteLine("{0};", marshal.Context.Return); + if (!string.IsNullOrWhiteSpace(marshal.Context.SupportBefore)) + Write(marshal.Context.SupportBefore); + + WriteLine("return {0};", marshal.Context.Return); } }