From a964df906941a4b1ace00e75ce5a12a537f1b4e0 Mon Sep 17 00:00:00 2001
From: triton <ripzonetriton@gmail.com>
Date: Wed, 21 Aug 2013 03:08:28 +0100
Subject: [PATCH] Renamed HiddenStructureReturn to IndirectReturnType as it is
 a lot more clear.

---
 src/AST/Function.cs                              | 10 +++++-----
 .../Generators/CSharp/CSharpTextTemplate.cs      | 16 ++++++++--------
 .../Generators/CSharp/CSharpTypePrinter.cs       |  2 +-
 src/Generator/Passes/CheckDuplicatedNamesPass.cs |  2 +-
 4 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/AST/Function.cs b/src/AST/Function.cs
index 0a1fe3c7..2a30d8bd 100644
--- a/src/AST/Function.cs
+++ b/src/AST/Function.cs
@@ -24,7 +24,7 @@ namespace CppSharp.AST
     public enum ParameterKind
     {
         Regular,
-        HiddenStructureReturn,
+        IndirectReturnType,
         OperatorParameter
     }
 
@@ -103,12 +103,12 @@ namespace CppSharp.AST
             get { return CallingConvention == CallingConvention.C; }
         }
 
-        public bool HasHiddenStructParameter
+        public bool HasIndirectReturnTypeParameter
         {
             get
             {
                 return Parameters.Any(param =>
-                    param.Kind == ParameterKind.HiddenStructureReturn);
+                    param.Kind == ParameterKind.IndirectReturnType);
             }
         }
 
@@ -116,11 +116,11 @@ namespace CppSharp.AST
         {
             get
             {
-                if (!HasHiddenStructParameter)
+                if (!HasIndirectReturnTypeParameter)
                     return ReturnType;
 
                 var hiddenParam = Parameters.Single(param =>
-                    param.Kind == ParameterKind.HiddenStructureReturn);
+                    param.Kind == ParameterKind.IndirectReturnType);
                 return hiddenParam.QualifiedType;
             }
         }
diff --git a/src/Generator/Generators/CSharp/CSharpTextTemplate.cs b/src/Generator/Generators/CSharp/CSharpTextTemplate.cs
index 2e40d40b..08690e4d 100644
--- a/src/Generator/Generators/CSharp/CSharpTextTemplate.cs
+++ b/src/Generator/Generators/CSharp/CSharpTextTemplate.cs
@@ -1057,7 +1057,7 @@ namespace CppSharp.Generators.CSharp
                 if (param.Ignore)
                     continue;
 
-                if (param.Kind == ParameterKind.HiddenStructureReturn)
+                if (param.Kind == ParameterKind.IndirectReturnType)
                     continue;
 
                 var ctx = new CSharpMarshalContext(Driver)
@@ -1076,7 +1076,7 @@ namespace CppSharp.Generators.CSharp
             }
 
             var hasReturn = !method.ReturnType.Type.IsPrimitiveType(PrimitiveType.Void)
-                && !method.HasHiddenStructParameter;
+                && !method.HasIndirectReturnTypeParameter;
 
             if (hasReturn)
                 Write("var _ret = ");
@@ -1624,10 +1624,10 @@ namespace CppSharp.Generators.CSharp
             var needsFixedThis = needsInstance && isValueType;
             var @params = GenerateFunctionParamsMarshal(parameters, function);
 
-            if (function.HasHiddenStructParameter)
+            if (function.HasIndirectReturnTypeParameter)
             {
                 var hiddenParam = function.Parameters[0];
-                if (hiddenParam.Kind != ParameterKind.HiddenStructureReturn)
+                if (hiddenParam.Kind != ParameterKind.IndirectReturnType)
                     throw new NotSupportedException("Expected hidden structure parameter kind");
 
                 Class retClass = null;
@@ -1647,7 +1647,7 @@ namespace CppSharp.Generators.CSharp
                 names.Add(name);
             }
 
-            if (function.HasHiddenStructParameter)
+            if (function.HasIndirectReturnTypeParameter)
             {
                 var name = string.Format("new IntPtr(&{0})", GeneratedIdentifier("ret"));
                 names.Insert(0, name);
@@ -1667,7 +1667,7 @@ namespace CppSharp.Generators.CSharp
                 WriteLine("var {0} = ToInternal();", Generator.GeneratedIdentifier("instance"));
             }
 
-            if (needsReturn && !function.HasHiddenStructParameter)
+            if (needsReturn && !function.HasIndirectReturnTypeParameter)
                 Write("var {0} = ", GeneratedIdentifier("ret"));
 
             WriteLine("{0}({1});", functionName, string.Join(", ", names));
@@ -1776,7 +1776,7 @@ namespace CppSharp.Generators.CSharp
             var paramIndex = 0;
             foreach (var param in @params)
             {
-                if (param.Kind == ParameterKind.HiddenStructureReturn)
+                if (param.Kind == ParameterKind.IndirectReturnType)
                     continue;
 
                 marshals.Add(GenerateFunctionParamMarshal(param, paramIndex, function));
@@ -1853,7 +1853,7 @@ namespace CppSharp.Generators.CSharp
             {
                 var param = function.Parameters[i];
 
-                if (param.Kind == ParameterKind.HiddenStructureReturn)
+                if (param.Kind == ParameterKind.IndirectReturnType)
                     continue;
 
                 @params.Add(string.Format("{0}{1} {2}", GetParameterUsage(param.Usage),
diff --git a/src/Generator/Generators/CSharp/CSharpTypePrinter.cs b/src/Generator/Generators/CSharp/CSharpTypePrinter.cs
index cd0b3f2f..3fb2d838 100644
--- a/src/Generator/Generators/CSharp/CSharpTypePrinter.cs
+++ b/src/Generator/Generators/CSharp/CSharpTypePrinter.cs
@@ -361,7 +361,7 @@ namespace CppSharp.Generators.CSharp
         {
             var paramType = parameter.Type;
 
-            if (parameter.Kind == ParameterKind.HiddenStructureReturn)
+            if (parameter.Kind == ParameterKind.IndirectReturnType)
                 return "global::System.IntPtr";
 
             return paramType.Visit(this);
diff --git a/src/Generator/Passes/CheckDuplicatedNamesPass.cs b/src/Generator/Passes/CheckDuplicatedNamesPass.cs
index 179479a1..82fc9b09 100644
--- a/src/Generator/Passes/CheckDuplicatedNamesPass.cs
+++ b/src/Generator/Passes/CheckDuplicatedNamesPass.cs
@@ -39,7 +39,7 @@ namespace CppSharp.Passes
 
         private bool UpdateName(Method method)
         {
-            var @params = method.Parameters.Where(p => p.Kind != ParameterKind.HiddenStructureReturn)
+            var @params = method.Parameters.Where(p => p.Kind != ParameterKind.IndirectReturnType)
                                 .Select(p => p.QualifiedType.ToString());
             var signature = string.Format("{0}({1})", Name,string.Join( ", ", @params));