From e68f9bc041e10041a0978ca5a15b9a9ee2d3b147 Mon Sep 17 00:00:00 2001 From: Dimitar Dobrev Date: Fri, 16 Sep 2016 23:04:01 +0300 Subject: [PATCH] Revert "Improved diagnostic output in CheckIgnoredDecls." This reverts commit 7b1abc79bcf00a70db93a6a6d1fa46effd8b2e69. It breaks the build and it's not trivial to fix it, so given that it's just logging, we'd better disable it for now. Signed-off-by: Dimitar Dobrev --- src/Generator/Passes/CheckIgnoredDecls.cs | 68 +++++++++++------------ 1 file changed, 34 insertions(+), 34 deletions(-) diff --git a/src/Generator/Passes/CheckIgnoredDecls.cs b/src/Generator/Passes/CheckIgnoredDecls.cs index dbedd777..56a67918 100644 --- a/src/Generator/Passes/CheckIgnoredDecls.cs +++ b/src/Generator/Passes/CheckIgnoredDecls.cs @@ -56,8 +56,8 @@ namespace CppSharp.Passes if (!CheckDeclarationAccess(decl)) { - Diagnostics.Debug("'{0}' was ignored due to invalid access", - decl.QualifiedName); + Diagnostics.Debug("Decl '{0}' was ignored due to invalid access", + decl.Name); decl.GenerationKind = decl is Field ? GenerationKind.Internal : GenerationKind.None; return true; } @@ -65,8 +65,8 @@ namespace CppSharp.Passes if (decl.IsDependent) { decl.GenerationKind = decl is Field ? GenerationKind.Internal : GenerationKind.None; - Diagnostics.Debug("'{0}' was ignored due to dependent context", - decl.QualifiedName); + Diagnostics.Debug("Decl '{0}' was ignored due to dependent context", + decl.Name); return true; } @@ -94,8 +94,8 @@ namespace CppSharp.Passes var cppTypePrinter = new CppTypePrinter(); var typeName = field.Type.Visit(cppTypePrinter); - Diagnostics.Debug("'{0}' was ignored due to {1} type '{2}'", - field.QualifiedName, msg, typeName); + Diagnostics.Debug("Field '{0}::{1}' was ignored due to {2} type '{3}'", + @class.Name, field.Name, msg, typeName); return true; } @@ -111,8 +111,8 @@ namespace CppSharp.Passes if (HasInvalidType(ret.Type, out msg)) { function.ExplicitlyIgnore(); - Diagnostics.Debug("'{0}' was ignored due to {1} return decl", - function.QualifiedName, msg); + Diagnostics.Debug("Function '{0}' was ignored due to {1} return decl", + function.Name, msg); return false; } @@ -121,16 +121,16 @@ namespace CppSharp.Passes if (HasInvalidDecl(param, out msg)) { function.ExplicitlyIgnore(); - Diagnostics.Debug("'{0}' was ignored due to {1} param", - function.QualifiedName, msg); + Diagnostics.Debug("Function '{0}' was ignored due to {1} param", + function.Name, msg); return false; } if (HasInvalidType(param.Type, out msg)) { function.ExplicitlyIgnore(); - Diagnostics.Debug("'{0}' was ignored due to {1} param", - function.QualifiedName, msg); + Diagnostics.Debug("Function '{0}' was ignored due to {1} param", + function.Name, msg); return false; } @@ -138,8 +138,8 @@ namespace CppSharp.Passes if (decayedType != null) { function.ExplicitlyIgnore(); - Diagnostics.Debug("'{0}' was ignored due to unsupported decayed type param", - function.QualifiedName); + Diagnostics.Debug("Function '{0}' was ignored due to unsupported decayed type param", + function.Name); return false; } @@ -151,8 +151,8 @@ namespace CppSharp.Passes { function.ExplicitlyIgnore(); Diagnostics.Debug( - "'{0}' was ignored due to an indirect return param not of a tag type", - function.QualifiedName); + "Function '{0}' was ignored due to an indirect return param not of a tag type", + function.Name); return false; } } @@ -179,8 +179,8 @@ namespace CppSharp.Passes if (HasIgnoredBaseClass(method, @class, out ignoredBase)) { Diagnostics.Debug( - "'{0}' was ignored due to ignored base '{1}'", - method.QualifiedName, ignoredBase.Name); + "Virtual method '{0}' was ignored due to ignored base '{1}'", + method.QualifiedOriginalName, ignoredBase.Name); method.ExplicitlyIgnore(); return false; @@ -225,8 +225,8 @@ namespace CppSharp.Passes if (HasInvalidType(typedef.Type, out msg)) { typedef.ExplicitlyIgnore(); - Diagnostics.Debug("'{0}' was ignored due to {1} type", - typedef.QualifiedName, msg); + Diagnostics.Debug("Typedef '{0}' was ignored due to {1} type", + typedef.Name, msg); return false; } @@ -242,16 +242,16 @@ namespace CppSharp.Passes if (HasInvalidDecl(property, out msg)) { property.ExplicitlyIgnore(); - Diagnostics.Debug("'{0}' was ignored due to {1} decl", - property.QualifiedName, msg); + Diagnostics.Debug("Property '{0}' was ignored due to {1} decl", + property.Name, msg); return false; } if (HasInvalidType(property.Type, out msg)) { property.ExplicitlyIgnore(); - Diagnostics.Debug("'{0}' was ignored due to {1} type", - property.QualifiedName, msg); + Diagnostics.Debug("Property '{0}' was ignored due to {1} type", + property.Name, msg); return false; } @@ -267,16 +267,16 @@ namespace CppSharp.Passes if (HasInvalidDecl(variable, out msg)) { variable.ExplicitlyIgnore(); - Diagnostics.Debug("'{0}' was ignored due to {1} decl", - variable.QualifiedName, msg); + Diagnostics.Debug("Variable '{0}' was ignored due to {1} decl", + variable.Name, msg); return false; } if (HasInvalidType(variable.Type, out msg)) { variable.ExplicitlyIgnore(); - Diagnostics.Debug("'{0}' was ignored due to {1} type", - variable.QualifiedName, msg); + Diagnostics.Debug("Variable '{0}' was ignored due to {1} type", + variable.Name, msg); return false; } @@ -292,8 +292,8 @@ namespace CppSharp.Passes if (HasInvalidDecl(@event, out msg)) { @event.ExplicitlyIgnore(); - Diagnostics.Debug("'{0}' was ignored due to {1} decl", - @event.QualifiedName, msg); + Diagnostics.Debug("Event '{0}' was ignored due to {1} decl", + @event.Name, msg); return false; } @@ -302,16 +302,16 @@ namespace CppSharp.Passes if (HasInvalidDecl(param, out msg)) { @event.ExplicitlyIgnore(); - Diagnostics.Debug("'{0}' was ignored due to {1} param", - @event.QualifiedName, msg); + Diagnostics.Debug("Event '{0}' was ignored due to {1} param", + @event.Name, msg); return false; } if (HasInvalidType(param.Type, out msg)) { @event.ExplicitlyIgnore(); - Diagnostics.Debug("'{0}' was ignored due to {1} param", - @event.QualifiedName, msg); + Diagnostics.Debug("Event '{0}' was ignored due to {1} param", + @event.Name, msg); return false; } }