Generate C++ deconflicted with system functions (#1626)

If a type shares a name with a system function, such as, well, "system()", declaring the type by name alone is taken as the function. So we need to prefix the type with "class" or "struct" as appropriate.

Signed-off-by: Dimitar Dobrev <[email protected]>

Author: ddobrev

src/CppParser/Bindings/CSharp/i686-apple-darwin12.4.0/CppSharp.CppParser-symbols.cpp

@@ -21,6 +21,7 @@ public class CppTypePrinter : TypePrinter
         public bool PrintLogicalNames { get; set; }
         public bool PrintTypeQualifiers { get; set; }
         public bool PrintTypeModifiers { get; set; }
+        public bool PrintTags { get; set; }
         public bool PrintVariableArrayAsPointers { get; set; }
 
         public TypePrintScopeKind MethodScopeKind = TypePrintScopeKind.Qualified;
@@ -499,7 +500,11 @@ public virtual TypePrinterResult GetDeclName(Declaration declaration,
                 if (declaration.Namespace is Class)
                 {
                     var declName = GetDeclName(declaration, TypePrintScopeKind.Local);
-                    return $"{declaration.Namespace.Visit(this)}{NamespaceSeparator}{declName}";
+                    bool printTags = PrintTags;
+                    PrintTags = false;
+                    TypePrinterResult declContext = declaration.Namespace.Visit(this);
+                    PrintTags = printTags;
+                    return $"{declContext}{NamespaceSeparator}{declName}";
                 }
 
                 return PrintLogicalNames ? declaration.QualifiedLogicalOriginalName
@@ -547,7 +552,8 @@ public override TypePrinterResult VisitClassDecl(Class @class)
             if (@class.CompleteDeclaration != null)
                 return VisitClassDecl(@class.CompleteDeclaration as Class);
 
-            return VisitDeclaration(@class);
+            string printed = VisitDeclaration(@class);
+            return PrintTags ? PrintTag(@class) + printed : printed;
         }
 
         public override TypePrinterResult VisitClassTemplateSpecializationDecl(

src/CppParser/Bindings/CSharp/i686-pc-win32-msvc/CppSharp.CppParser-symbols.cpp

@@ -225,8 +225,10 @@ private void TakeFunctionAddress(Function function, string wrapper)
                 Write($"class {wrapper}{function.Namespace.Name} : public {@namespace} {{ public: ");
                 Write("static constexpr ");
             }
+            cppTypePrinter.PrintTags = true;
             TypePrinterResult returnType = function.OriginalReturnType.Visit(cppTypePrinter);
             string signature = GetSignature(function);
+            cppTypePrinter.PrintTags = false;
 
             string functionName = GetFunctionName(function, @namespace);
             if (function.FriendKind != FriendKind.None)