Marshaling correctness fix for enum and primitive types in NAPI.

tritao · tritao · commit 11cc603ee107 · 2020-12-15T02:51:42.000Z
diff --git a/src/Generator/Generators/NAPI/NAPIMarshal.cs b/src/Generator/Generators/NAPI/NAPIMarshal.cs
@@ -128,7 +128,7 @@ public static (string type, string func) GetNAPIPrimitiveType(PrimitiveType type
 
         public bool VisitPrimitiveType(PrimitiveType primitive)
         {
-            var result = $"__result";
+            var result = Generator.GeneratedIdentifier(Context.ReturnVarName);
             var (_, func) = GetNAPIPrimitiveType(primitive);
 
             switch (primitive)
@@ -755,7 +755,7 @@ public override bool VisitTypedefDecl(TypedefDecl typedef)
 
         public override bool VisitEnumDecl(Enumeration @enum)
         {
-            VisitPrimitiveType(PrimitiveType.Int);
+            VisitPrimitiveType(@enum.BuiltinType.Type);
 
             Context.Return.StringBuilder.Clear();
             Context.Return.Write($"(::{@enum.QualifiedOriginalName}){Context.Parameter.Name}");

Original file line number	Diff line number	Diff line change
`@@ -128,7 +128,7 @@ public static (string type, string func) GetNAPIPrimitiveType(PrimitiveType type`
`128`	`128`
`129`	`129`	`public bool VisitPrimitiveType(PrimitiveType primitive)`
`130`	`130`	`{`
`131`		`- var result = $"__result";`
	`131`	`+ var result = Generator.GeneratedIdentifier(Context.ReturnVarName);`
`132`	`132`	`var (_, func) = GetNAPIPrimitiveType(primitive);`
`133`	`133`
`134`	`134`	`switch (primitive)`
`@@ -755,7 +755,7 @@ public override bool VisitTypedefDecl(TypedefDecl typedef)`
`755`	`755`
`756`	`756`	`public override bool VisitEnumDecl(Enumeration @enum)`
`757`	`757`	`{`
`758`		`- VisitPrimitiveType(PrimitiveType.Int);`
	`758`	`+ VisitPrimitiveType(@enum.BuiltinType.Type);`
`759`	`759`
`760`	`760`	`Context.Return.StringBuilder.Clear();`
`761`	`761`	`Context.Return.Write($"(::{@enum.QualifiedOriginalName}){Context.Parameter.Name}");`