TypeMap: refactor C++ backend into common methods

deadlocklogic · deadlocklogic · commit 8271415e8a31 · 2023-12-03T04:00:13.000+02:00
diff --git a/src/Generator/Generators/C/CppMarshal.cs b/src/Generator/Generators/C/CppMarshal.cs
@@ -25,7 +25,7 @@ public override bool VisitType(Type type, TypeQualifiers quals)
             TypeMap typeMap;
             if (Context.Context.TypeMaps.FindTypeMap(type, out typeMap) && typeMap.DoesMarshalling)
             {
-                typeMap.CppMarshalToManaged(Context);
+                typeMap.MarshalToManaged(Context);
                 return false;
             }
 
@@ -173,7 +173,7 @@ public override bool VisitTypedefType(TypedefType typedef, TypeQualifiers quals)
                 typeMap.DoesMarshalling)
             {
                 typeMap.Type = typedef;
-                typeMap.CppMarshalToManaged(Context);
+                typeMap.MarshalToManaged(Context);
                 return typeMap.IsValueType;
             }
 
@@ -193,7 +193,7 @@ public override bool VisitTemplateSpecializationType(TemplateSpecializationType
             if (Context.Context.TypeMaps.FindTypeMap(template, out typeMap) && typeMap.DoesMarshalling)
             {
                 typeMap.Type = template;
-                typeMap.CppMarshalToManaged(Context);
+                typeMap.MarshalToManaged(Context);
                 return true;
             }
 
@@ -341,7 +341,7 @@ public override bool VisitType(Type type, TypeQualifiers quals)
             TypeMap typeMap;
             if (Context.Context.TypeMaps.FindTypeMap(type, out typeMap) && typeMap.DoesMarshalling)
             {
-                typeMap.CppMarshalToNative(Context);
+                typeMap.MarshalToNative(Context);
                 return false;
             }
 
@@ -478,7 +478,7 @@ public override bool VisitTypedefType(TypedefType typedef, TypeQualifiers quals)
             if (Context.Context.TypeMaps.FindTypeMap(decl.Type, out typeMap) &&
                 typeMap.DoesMarshalling)
             {
-                typeMap.CppMarshalToNative(Context);
+                typeMap.MarshalToNative(Context);
                 return typeMap.IsValueType;
             }
 
@@ -516,7 +516,7 @@ public override bool VisitTemplateSpecializationType(TemplateSpecializationType
             if (Context.Context.TypeMaps.FindTypeMap(template, out typeMap) && typeMap.DoesMarshalling)
             {
                 typeMap.Type = template;
-                typeMap.CppMarshalToNative(Context);
+                typeMap.MarshalToNative(Context);
                 return true;
             }
 
@@ -563,7 +563,7 @@ private void MarshalRefClass(Class @class)
             if (Context.Context.TypeMaps.FindTypeMap(type, out typeMap) &&
                 typeMap.DoesMarshalling)
             {
-                typeMap.CppMarshalToNative(Context);
+                typeMap.MarshalToNative(Context);
                 return;
             }
 
diff --git a/src/Generator/Generators/C/CppTypePrinter.cs b/src/Generator/Generators/C/CppTypePrinter.cs
@@ -68,7 +68,7 @@ public virtual bool FindTypeMap(CppSharp.AST.Type type, out TypePrinterResult re
             typePrinter.PushContext(ContextKind);
             typePrinter.PushScope(ScopeKind);
 
-            var typeName = typeMap.CppSignatureType(typePrinterContext).Visit(typePrinter);
+            var typeName = typeMap.SignatureType(typePrinterContext).Visit(typePrinter);
             result = new TypePrinterResult(typeName) { TypeMap = typeMap };
 
             return true;
diff --git a/src/Generator/Generators/NAPI/NAPIMarshal.cs b/src/Generator/Generators/NAPI/NAPIMarshal.cs
@@ -26,7 +26,7 @@ public override bool VisitType(Type type, TypeQualifiers quals)
             TypeMap typeMap;
             if (Context.Context.TypeMaps.FindTypeMap(type, out typeMap) && typeMap.DoesMarshalling)
             {
-                typeMap.CppMarshalToManaged(Context);
+                typeMap.MarshalToManaged(Context);
                 return false;
             }
 
@@ -194,7 +194,7 @@ public override bool VisitTypedefType(TypedefType typedef, TypeQualifiers quals)
                 typeMap.DoesMarshalling)
             {
                 typeMap.Type = typedef;
-                typeMap.CppMarshalToManaged(Context);
+                typeMap.MarshalToManaged(Context);
                 return typeMap.IsValueType;
             }
 
@@ -214,7 +214,7 @@ public override bool VisitTemplateSpecializationType(TemplateSpecializationType
             if (Context.Context.TypeMaps.FindTypeMap(template, out typeMap) && typeMap.DoesMarshalling)
             {
                 typeMap.Type = template;
-                typeMap.CppMarshalToManaged(Context);
+                typeMap.MarshalToManaged(Context);
                 return true;
             }
 
@@ -343,7 +343,7 @@ public override bool VisitType(Type type, TypeQualifiers quals)
             TypeMap typeMap;
             if (Context.Context.TypeMaps.FindTypeMap(type, out typeMap) && typeMap.DoesMarshalling)
             {
-                typeMap.CppMarshalToNative(Context);
+                typeMap.MarshalToNative(Context);
                 return false;
             }
 
@@ -591,7 +591,7 @@ public override bool VisitTypedefType(TypedefType typedef, TypeQualifiers quals)
             if (Context.Context.TypeMaps.FindTypeMap(decl.Type, out typeMap) &&
                 typeMap.DoesMarshalling)
             {
-                typeMap.CppMarshalToNative(Context);
+                typeMap.MarshalToNative(Context);
                 return typeMap.IsValueType;
             }
 
@@ -628,7 +628,7 @@ public override bool VisitTemplateSpecializationType(TemplateSpecializationType
             if (Context.Context.TypeMaps.FindTypeMap(template, out typeMap) && typeMap.DoesMarshalling)
             {
                 typeMap.Type = template;
-                typeMap.CppMarshalToNative(Context);
+                typeMap.MarshalToNative(Context);
                 return true;
             }
 
diff --git a/src/Generator/Types/TypeMap.cs b/src/Generator/Types/TypeMap.cs
@@ -58,7 +58,7 @@ public virtual Type SignatureType(TypePrinterContext ctx, GeneratorKind kind = n
             {
                 case var _ when ReferenceEquals(kind, GeneratorKind.C):
                 case var _ when ReferenceEquals(kind, GeneratorKind.CPlusPlus):
-                    return CppSignatureType(ctx);
+                    return new CILType(typeof(object));
                 case var _ when ReferenceEquals(kind, GeneratorKind.CLI):
                     return CLISignatureType(ctx);
                 case var _ when ReferenceEquals(kind, GeneratorKind.CSharp):
@@ -75,7 +75,7 @@ public virtual void MarshalToNative(MarshalContext ctx, GeneratorKind kind = nul
             {
                 case var _ when ReferenceEquals(kind, GeneratorKind.C):
                 case var _ when ReferenceEquals(kind, GeneratorKind.CPlusPlus):
-                    CppMarshalToNative(ctx);
+                    ctx.Return.Write(ctx.Parameter.Name);
                     return;
                 case var _ when ReferenceEquals(kind, GeneratorKind.CLI):
                     CLIMarshalToNative(ctx);
@@ -95,7 +95,7 @@ public virtual void MarshalToManaged(MarshalContext ctx, GeneratorKind kind = nu
             {
                 case var _ when ReferenceEquals(kind, GeneratorKind.C):
                 case var _ when ReferenceEquals(kind, GeneratorKind.CPlusPlus):
-                    CppMarshalToManaged(ctx);
+                    ctx.Return.Write(ctx.ReturnVarName);
                     return;
                 case var _ when ReferenceEquals(kind, GeneratorKind.CLI):
                     CLIMarshalToManaged(ctx);
@@ -158,30 +158,6 @@ public virtual void CLIMarshalToManaged(MarshalContext ctx)
         }
 
         #endregion
-
-        #region C++ backend
-
-        public virtual Type CppSignatureType(TypePrinterContext ctx)
-        {
-            return new CILType(typeof(object));
-        }
-
-        public virtual void CppTypeReference(CLITypeReference collector, ASTRecord<Declaration> record)
-        {
-            throw new NotImplementedException();
-        }
-
-        public virtual void CppMarshalToNative(MarshalContext ctx)
-        {
-            ctx.Return.Write(ctx.Parameter.Name);
-        }
-
-        public virtual void CppMarshalToManaged(MarshalContext ctx)
-        {
-            ctx.Return.Write(ctx.ReturnVarName);
-        }
-
-        #endregion 
     }
 
     public interface ITypeMapDatabase
diff --git a/tests/dotnet/CLI/CLI.Gen.cs b/tests/dotnet/CLI/CLI.Gen.cs
@@ -29,13 +29,6 @@ public override Type CLISignatureType(TypePrinterContext ctx)
             return new CILType(typeof(string));
         }
 
-        public override Type CppSignatureType(TypePrinterContext ctx)
-        {
-            var tagType = ctx.Type as TagType;
-            var typePrinter = new CppTypePrinter(Context);
-            return new CustomType(tagType.Declaration.Visit(typePrinter));
-        }
-
         public override void CLIMarshalToManaged(MarshalContext ctx)
         {
             ctx.Return.Write("clix::marshalString<clix::E_UTF8>({0}.m_str)", ctx.ReturnVarName);

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ public override bool VisitType(Type type, TypeQualifiers quals)`
`25`	`25`	`TypeMap typeMap;`
`26`	`26`	`if (Context.Context.TypeMaps.FindTypeMap(type, out typeMap) && typeMap.DoesMarshalling)`
`27`	`27`	`{`
`28`		`- typeMap.CppMarshalToManaged(Context);`
	`28`	`+ typeMap.MarshalToManaged(Context);`
`29`	`29`	`return false;`
`30`	`30`	`}`
`31`	`31`
`@@ -173,7 +173,7 @@ public override bool VisitTypedefType(TypedefType typedef, TypeQualifiers quals)`
`173`	`173`	`typeMap.DoesMarshalling)`
`174`	`174`	`{`
`175`	`175`	`typeMap.Type = typedef;`
`176`		`- typeMap.CppMarshalToManaged(Context);`
	`176`	`+ typeMap.MarshalToManaged(Context);`
`177`	`177`	`return typeMap.IsValueType;`
`178`	`178`	`}`
`179`	`179`
`@@ -193,7 +193,7 @@ public override bool VisitTemplateSpecializationType(TemplateSpecializationType`
`193`	`193`	`if (Context.Context.TypeMaps.FindTypeMap(template, out typeMap) && typeMap.DoesMarshalling)`
`194`	`194`	`{`
`195`	`195`	`typeMap.Type = template;`
`196`		`- typeMap.CppMarshalToManaged(Context);`
	`196`	`+ typeMap.MarshalToManaged(Context);`
`197`	`197`	`return true;`
`198`	`198`	`}`
`199`	`199`
`@@ -341,7 +341,7 @@ public override bool VisitType(Type type, TypeQualifiers quals)`
`341`	`341`	`TypeMap typeMap;`
`342`	`342`	`if (Context.Context.TypeMaps.FindTypeMap(type, out typeMap) && typeMap.DoesMarshalling)`
`343`	`343`	`{`
`344`		`- typeMap.CppMarshalToNative(Context);`
	`344`	`+ typeMap.MarshalToNative(Context);`
`345`	`345`	`return false;`
`346`	`346`	`}`
`347`	`347`
`@@ -478,7 +478,7 @@ public override bool VisitTypedefType(TypedefType typedef, TypeQualifiers quals)`
`478`	`478`	`if (Context.Context.TypeMaps.FindTypeMap(decl.Type, out typeMap) &&`
`479`	`479`	`typeMap.DoesMarshalling)`
`480`	`480`	`{`
`481`		`- typeMap.CppMarshalToNative(Context);`
	`481`	`+ typeMap.MarshalToNative(Context);`
`482`	`482`	`return typeMap.IsValueType;`
`483`	`483`	`}`
`484`	`484`
`@@ -516,7 +516,7 @@ public override bool VisitTemplateSpecializationType(TemplateSpecializationType`
`516`	`516`	`if (Context.Context.TypeMaps.FindTypeMap(template, out typeMap) && typeMap.DoesMarshalling)`
`517`	`517`	`{`
`518`	`518`	`typeMap.Type = template;`
`519`		`- typeMap.CppMarshalToNative(Context);`
	`519`	`+ typeMap.MarshalToNative(Context);`
`520`	`520`	`return true;`
`521`	`521`	`}`
`522`	`522`
`@@ -563,7 +563,7 @@ private void MarshalRefClass(Class @class)`
`563`	`563`	`if (Context.Context.TypeMaps.FindTypeMap(type, out typeMap) &&`
`564`	`564`	`typeMap.DoesMarshalling)`
`565`	`565`	`{`
`566`		`- typeMap.CppMarshalToNative(Context);`
	`566`	`+ typeMap.MarshalToNative(Context);`
`567`	`567`	`return;`
`568`	`568`	`}`
`569`	`569`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ public override bool VisitType(Type type, TypeQualifiers quals)`
`26`	`26`	`TypeMap typeMap;`
`27`	`27`	`if (Context.Context.TypeMaps.FindTypeMap(type, out typeMap) && typeMap.DoesMarshalling)`
`28`	`28`	`{`
`29`		`- typeMap.CppMarshalToManaged(Context);`
	`29`	`+ typeMap.MarshalToManaged(Context);`
`30`	`30`	`return false;`
`31`	`31`	`}`
`32`	`32`
`@@ -194,7 +194,7 @@ public override bool VisitTypedefType(TypedefType typedef, TypeQualifiers quals)`
`194`	`194`	`typeMap.DoesMarshalling)`
`195`	`195`	`{`
`196`	`196`	`typeMap.Type = typedef;`
`197`		`- typeMap.CppMarshalToManaged(Context);`
	`197`	`+ typeMap.MarshalToManaged(Context);`
`198`	`198`	`return typeMap.IsValueType;`
`199`	`199`	`}`
`200`	`200`
`@@ -214,7 +214,7 @@ public override bool VisitTemplateSpecializationType(TemplateSpecializationType`
`214`	`214`	`if (Context.Context.TypeMaps.FindTypeMap(template, out typeMap) && typeMap.DoesMarshalling)`
`215`	`215`	`{`
`216`	`216`	`typeMap.Type = template;`
`217`		`- typeMap.CppMarshalToManaged(Context);`
	`217`	`+ typeMap.MarshalToManaged(Context);`
`218`	`218`	`return true;`
`219`	`219`	`}`
`220`	`220`
`@@ -343,7 +343,7 @@ public override bool VisitType(Type type, TypeQualifiers quals)`
`343`	`343`	`TypeMap typeMap;`
`344`	`344`	`if (Context.Context.TypeMaps.FindTypeMap(type, out typeMap) && typeMap.DoesMarshalling)`
`345`	`345`	`{`
`346`		`- typeMap.CppMarshalToNative(Context);`
	`346`	`+ typeMap.MarshalToNative(Context);`
`347`	`347`	`return false;`
`348`	`348`	`}`
`349`	`349`
`@@ -591,7 +591,7 @@ public override bool VisitTypedefType(TypedefType typedef, TypeQualifiers quals)`
`591`	`591`	`if (Context.Context.TypeMaps.FindTypeMap(decl.Type, out typeMap) &&`
`592`	`592`	`typeMap.DoesMarshalling)`
`593`	`593`	`{`
`594`		`- typeMap.CppMarshalToNative(Context);`
	`594`	`+ typeMap.MarshalToNative(Context);`
`595`	`595`	`return typeMap.IsValueType;`
`596`	`596`	`}`
`597`	`597`
`@@ -628,7 +628,7 @@ public override bool VisitTemplateSpecializationType(TemplateSpecializationType`
`628`	`628`	`if (Context.Context.TypeMaps.FindTypeMap(template, out typeMap) && typeMap.DoesMarshalling)`
`629`	`629`	`{`
`630`	`630`	`typeMap.Type = template;`
`631`		`- typeMap.CppMarshalToNative(Context);`
	`631`	`+ typeMap.MarshalToNative(Context);`
`632`	`632`	`return true;`
`633`	`633`	`}`
`634`	`634`
Original file line number	Diff line number	Diff line change
`@@ -29,13 +29,6 @@ public override Type CLISignatureType(TypePrinterContext ctx)`
`29`	`29`	`return new CILType(typeof(string));`
`30`	`30`	`}`
`31`	`31`
`32`		`- public override Type CppSignatureType(TypePrinterContext ctx)`
`33`		`- {`
`34`		`- var tagType = ctx.Type as TagType;`
`35`		`- var typePrinter = new CppTypePrinter(Context);`
`36`		`- return new CustomType(tagType.Declaration.Visit(typePrinter));`
`37`		`- }`
`38`		`-`
`39`	`32`	`public override void CLIMarshalToManaged(MarshalContext ctx)`
`40`	`33`	`{`
`41`	`34`	`ctx.Return.Write("clix::marshalString<clix::E_UTF8>({0}.m_str)", ctx.ReturnVarName);`