pimhwang
/
CppSharp
mirror of https://github.com/mono/CppSharp.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Extracted the native printing in C# to separate methods. 

Signed-off-by: Dimitar Dobrev <dpldobrev@protonmail.com>
pull/890/head
Dimitar Dobrev 8 years ago
parent
54434454c9
commit
2af1af6404
4 changed files with 50 additions and 65 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 11
      src/Generator/Generators/CSharp/CSharpMarshal.cs
  2. 72
      src/Generator/Generators/CSharp/CSharpSources.cs
  3. 28
      src/Generator/Generators/CSharp/CSharpTypePrinter.cs
  4. 4
      src/Generator/Types/Std/Stdlib.cs

11
src/Generator/Generators/CSharp/CSharpMarshal.cs
Unescape View File

@ -609,11 +609,8 @@ namespace CppSharp.Generators.CSharp @@ -609,11 +609,8 @@ namespace CppSharp.Generators.CSharp
if (!marshalAsString &&
Context.Context.Options.MarshalCharAsManagedChar &&
primitive == PrimitiveType.Char)
{
typePrinter.PushContext(TypePrinterContextKind.Native);
Context.Return.Write(string.Format("({0}) ", pointer.Visit(typePrinter)));
typePrinter.PopContext();
}
Context.Return.Write($"({typePrinter.PrintNative(pointer)}) ");
if (marshalAsString && (Context.MarshalKind == MarshalKind.NativeField ||
Context.MarshalKind == MarshalKind.VTableReturnValue ||
Context.MarshalKind == MarshalKind.Variable))
@ -784,9 +781,7 @@ namespace CppSharp.Generators.CSharp @@ -784,9 +781,7 @@ namespace CppSharp.Generators.CSharp
}
var realClass = @class.OriginalClass ?? @class;
typePrinter.PushContext(TypePrinterContextKind.Native);
var qualifiedIdentifier = realClass.Visit(typePrinter);
typePrinter.PopContext();
var qualifiedIdentifier = typePrinter.PrintNative(realClass);
Context.Return.Write(
"ReferenceEquals({0}, null) ? new {1}() : *({1}*) {2}",
param, qualifiedIdentifier, paramInstance);

72
src/Generator/Generators/CSharp/CSharpSources.cs
Unescape View File

@ -847,15 +847,13 @@ namespace CppSharp.Generators.CSharp @@ -847,15 +847,13 @@ namespace CppSharp.Generators.CSharp
else
{
var name = @class.Layout.Fields.First(f => f.FieldPtr == field.OriginalPtr).Name;
TypePrinter.PushContext(TypePrinterContextKind.Native);
var printed = TypePrinter.PrintNative(@class);
ctx.ReturnVarName = string.Format("{0}{1}{2}",
@class.IsValueType
? Helpers.InstanceField
: string.Format("(({0}*) {1})", @class.Visit(TypePrinter),
Helpers.InstanceIdentifier),
: $"(({printed}*) {Helpers.InstanceIdentifier})",
@class.IsValueType ? "." : "->",
SafeIdentifier(name));
TypePrinter.PopContext();
}
param.Visit(marshal);
@ -889,15 +887,9 @@ namespace CppSharp.Generators.CSharp @@ -889,15 +887,9 @@ namespace CppSharp.Generators.CSharp
string type;
if (Context.Options.MarshalCharAsManagedChar && isChar)
{
var typePrinter = new CSharpTypePrinter(Context);
typePrinter.PushContext(TypePrinterContextKind.Native);
type = originalType.Visit(typePrinter).Type;
}
type = TypePrinter.PrintNative(originalType).Type;
else
{
type = originalType.ToString();
}
var name = ((Class) field.Namespace).Layout.Fields.First(
f => f.FieldPtr == field.OriginalPtr).Name;
@ -1085,19 +1077,16 @@ namespace CppSharp.Generators.CSharp @@ -1085,19 +1077,16 @@ namespace CppSharp.Generators.CSharp
private void GenerateFieldGetter(Field field, Class @class)
{
var name = @class.Layout.Fields.First(f => f.FieldPtr == field.OriginalPtr).Name;
TypePrinter.PushContext(TypePrinterContextKind.Native);
var ctx = new CSharpMarshalContext(Context)
{
ArgName = field.Name,
Declaration = field,
ReturnVarName = $@"{(@class.IsValueType ? Helpers.InstanceField :
$"(({@class.Visit(TypePrinter)}*) {Helpers.InstanceIdentifier})")}{
$"(({TypePrinter.PrintNative(@class)}*) {Helpers.InstanceIdentifier})")}{
(@class.IsValueType ? "." : "->")}{SafeIdentifier(name)}",
ReturnType = field.QualifiedType
};
ctx.PushMarshalKind(MarshalKind.NativeField);
TypePrinter.PopContext();
var arrayType = field.Type.Desugar() as ArrayType;
@ -1442,7 +1431,6 @@ namespace CppSharp.Generators.CSharp @@ -1442,7 +1431,6 @@ namespace CppSharp.Generators.CSharp
private void SaveOriginalVTablePointers(Class @class)
{
TypePrinter.PushContext(TypePrinterContextKind.Native);
if (Context.ParserOptions.IsMicrosoftAbi)
WriteLine("__OriginalVTables = new void*[] {{ {0} }};",
string.Join(", ",
@ -1452,7 +1440,6 @@ namespace CppSharp.Generators.CSharp @@ -1452,7 +1440,6 @@ namespace CppSharp.Generators.CSharp
WriteLine(
$@"__OriginalVTables = new void*[] {{ *(void**) ({
Helpers.InstanceIdentifier} + {@class.Layout.VTablePointers[0].Offset}) }};");
TypePrinter.PopContext();
}
private void AllocateNewVTablesMS(Class @class, IList<VTableComponent> wrappedEntries,
@ -1630,10 +1617,9 @@ namespace CppSharp.Generators.CSharp @@ -1630,10 +1617,9 @@ namespace CppSharp.Generators.CSharp
if (method.HasIndirectReturnTypeParameter)
{
var retParam = method.Parameters.First(p => p.Kind == ParameterKind.IndirectReturnType);
TypePrinter.PushContext(TypePrinterContextKind.Native);
WriteLine("*({0}*) {1} = {2};",
method.OriginalReturnType.Visit(TypePrinter), retParam.Name, marshal.Context.Return);
TypePrinter.PopContext();
TypePrinter.PrintNative(method.OriginalReturnType),
retParam.Name, marshal.Context.Return);
}
else
{
@ -1924,9 +1910,7 @@ namespace CppSharp.Generators.CSharp @@ -1924,9 +1910,7 @@ namespace CppSharp.Generators.CSharp
WriteLine($"{printedClass}{printedClass.NameSuffix} {Helpers.DummyIdentifier};");
WriteLine("NativeToManagedMap.TryRemove({0}, out {1});",
Helpers.InstanceIdentifier, Helpers.DummyIdentifier);
TypePrinter.PushContext(TypePrinterContextKind.Native);
var classInternal = @class.Visit(TypePrinter);
TypePrinter.PopContext();
var classInternal = TypePrinter.PrintNative(@class);
if (@class.IsDynamic && GetUniqueVTableMethodEntries(@class).Count != 0)
{
if (Context.ParserOptions.IsMicrosoftAbi)
@ -2062,9 +2046,7 @@ namespace CppSharp.Generators.CSharp @@ -2062,9 +2046,7 @@ namespace CppSharp.Generators.CSharp
}
else
{
TypePrinter.PushContext(TypePrinterContextKind.Native);
WriteLine($"{Helpers.InstanceField} = *({@class.Visit(TypePrinter)}*) native;");
TypePrinter.PopContext();
WriteLine($"{Helpers.InstanceField} = *({TypePrinter.PrintNative(@class)}*) native;");
}
WriteCloseBraceIndent();
@ -2073,9 +2055,7 @@ namespace CppSharp.Generators.CSharp @@ -2073,9 +2055,7 @@ namespace CppSharp.Generators.CSharp
public void GenerateNativeConstructorByValue(Class @class, string returnType)
{
TypePrinter.PushContext(TypePrinterContextKind.Native);
var @internal = (@class.IsAbstractImpl ? @class.BaseClass : @class).Visit(TypePrinter);
TypePrinter.PopContext();
var @internal = TypePrinter.PrintNative(@class.IsAbstractImpl ? @class.BaseClass : @class);
if (!@class.IsAbstractImpl)
{
@ -2101,11 +2081,9 @@ namespace CppSharp.Generators.CSharp @@ -2101,11 +2081,9 @@ namespace CppSharp.Generators.CSharp
{
// Allocate memory for a new native object and call the ctor.
WriteLine($"var ret = Marshal.AllocHGlobal(sizeof({@internal}));");
TypePrinter.PushContext(TypePrinterContextKind.Native);
WriteLine($"{@class.Visit(TypePrinter)}.{GetFunctionNativeIdentifier(copyCtorMethod)}(ret, new global::System.IntPtr(&native));",
@class.Visit(TypePrinter),
GetFunctionNativeIdentifier(copyCtorMethod));
TypePrinter.PopContext();
var printed = TypePrinter.PrintNative(@class);
WriteLine($"{printed}.{GetFunctionNativeIdentifier(copyCtorMethod)}(ret, new global::System.IntPtr(&native));",
printed, GetFunctionNativeIdentifier(copyCtorMethod));
WriteLine("return ret.ToPointer();");
}
else
@ -2420,10 +2398,8 @@ namespace CppSharp.Generators.CSharp @@ -2420,10 +2398,8 @@ namespace CppSharp.Generators.CSharp
{
WriteLine("if ({0} == global::System.IntPtr.Zero)", Helpers.InstanceIdentifier);
WriteLineIndent("return global::System.IntPtr.Zero.GetHashCode();");
TypePrinter.PushContext(TypePrinterContextKind.Native);
WriteLine($@"return (*({@class.Visit(TypePrinter)}*) {
WriteLine($@"return (*({TypePrinter.PrintNative(@class)}*) {
Helpers.InstanceIdentifier}).GetHashCode();");
TypePrinter.PopContext();
}
else
{
@ -2544,9 +2520,8 @@ namespace CppSharp.Generators.CSharp @@ -2544,9 +2520,8 @@ namespace CppSharp.Generators.CSharp
private void GenerateClassConstructor(Method method, Class @class)
{
TypePrinter.PushContext(TypePrinterContextKind.Native);
var @internal = (@class.IsAbstractImpl ? @class.BaseClass : @class).Visit(TypePrinter);
TypePrinter.PopContext();
var @internal = TypePrinter.PrintNative(
@class.IsAbstractImpl ? @class.BaseClass : @class);
WriteLine($"{Helpers.InstanceIdentifier} = Marshal.AllocHGlobal(sizeof({@internal}));");
WriteLine($"{Helpers.OwnsNativeInstanceIdentifier} = true;");
WriteLine($"NativeToManagedMap[{Helpers.InstanceIdentifier}] = this;");
@ -2557,9 +2532,7 @@ namespace CppSharp.Generators.CSharp @@ -2557,9 +2532,7 @@ namespace CppSharp.Generators.CSharp
GenerateInternalFunctionCall(method);
else
{
TypePrinter.PushContext(TypePrinterContextKind.Native);
var classInternal = @class.Visit(TypePrinter);
TypePrinter.PopContext();
var classInternal = TypePrinter.PrintNative(@class);
WriteLine($@"*(({classInternal}*) {Helpers.InstanceIdentifier}) = *(({
classInternal}*) {method.Parameters[0].Name}.{Helpers.InstanceIdentifier});");
}
@ -2583,12 +2556,8 @@ namespace CppSharp.Generators.CSharp @@ -2583,12 +2556,8 @@ namespace CppSharp.Generators.CSharp
var @class = function.Namespace as Class;
string @internal = Helpers.InternalStruct;
if (@class != null && @class is ClassTemplateSpecialization)
{
TypePrinter.PushContext(TypePrinterContextKind.Native);
@internal = @class.Visit(TypePrinter).Type;
TypePrinter.PopContext();
}
if (@class is ClassTemplateSpecialization)
@internal = TypePrinter.PrintNative(@class).Type;
var nativeFunction = GetFunctionNativeIdentifier(function);
var functionName = $"{@internal}.{nativeFunction}";
@ -2646,9 +2615,8 @@ namespace CppSharp.Generators.CSharp @@ -2646,9 +2615,8 @@ namespace CppSharp.Generators.CSharp
if (construct == null)
{
var @class = retClass.OriginalClass ?? retClass;
TypePrinter.PushContext(TypePrinterContextKind.Native);
WriteLine($"var {Helpers.ReturnIdentifier} = new {@class.Visit(TypePrinter)}();");
TypePrinter.PopContext();
WriteLine($@"var {Helpers.ReturnIdentifier} = new {
TypePrinter.PrintNative(@class)}();");
}
else
{

28
src/Generator/Generators/CSharp/CSharpTypePrinter.cs
Unescape View File

@ -731,8 +731,6 @@ namespace CppSharp.Generators.CSharp @@ -731,8 +731,6 @@ namespace CppSharp.Generators.CSharp
}
}
private CSharpExpressionPrinter expressionPrinter => new CSharpExpressionPrinter(this);
public override TypePrinterResult VisitFieldDecl(Field field)
{
var cSharpSourcesDummy = new CSharpSources(Context, new List<TranslationUnit>());
@ -755,5 +753,31 @@ namespace CppSharp.Generators.CSharp @@ -755,5 +753,31 @@ namespace CppSharp.Generators.CSharp
return returnTypePrinter;
}
public TypePrinterResult PrintNative(Declaration declaration)
{
PushContext(TypePrinterContextKind.Native);
var typePrinterResult = declaration.Visit(this);
PopContext();
return typePrinterResult;
}
public TypePrinterResult PrintNative(Type type)
{
PushContext(TypePrinterContextKind.Native);
var typePrinterResult = type.Visit(this);
PopContext();
return typePrinterResult;
}
public TypePrinterResult PrintNative(QualifiedType type)
{
PushContext(TypePrinterContextKind.Native);
var typePrinterResult = type.Visit(this);
PopContext();
return typePrinterResult;
}
private CSharpExpressionPrinter expressionPrinter => new CSharpExpressionPrinter(this);
}
}

4
src/Generator/Types/Std/Stdlib.cs
Unescape View File

@ -63,10 +63,8 @@ namespace CppSharp.Types.Std @@ -63,10 +63,8 @@ namespace CppSharp.Types.Std
var type = ctx.Parameter.Type.Desugar();
ClassTemplateSpecialization basicString = GetBasicString(type);
var typePrinter = new CSharpTypePrinter(ctx.Context);
typePrinter.PushContext(TypePrinterContextKind.Native);
if (!ctx.Parameter.Type.Desugar().IsAddress())
ctx.Return.Write($"*({basicString.Visit(typePrinter)}*) ");
typePrinter.PopContext();
ctx.Return.Write($"*({typePrinter.PrintNative(basicString)}*) ");
var allocator = ctx.Context.ASTContext.FindClass("allocator", false, true).First(
a => a.IsDependent && a.TranslationUnit.IsSystemHeader);
var allocatorChar = allocator.Specializations.First(s => !s.Ignore);

Write Preview
Loading…
Cancel
Save