Browse Source

Improved diagnostic output in CheckIgnoredDecls.

pull/696/head
Joao Matos 9 years ago
parent
commit
7b1abc79bc
  1. 68
      src/Generator/Passes/CheckIgnoredDecls.cs

68
src/Generator/Passes/CheckIgnoredDecls.cs

@ -56,8 +56,8 @@ namespace CppSharp.Passes
if (!CheckDeclarationAccess(decl)) if (!CheckDeclarationAccess(decl))
{ {
Diagnostics.Debug("Decl '{0}' was ignored due to invalid access", Diagnostics.Debug("'{0}' was ignored due to invalid access",
decl.Name); decl.QualifiedName);
decl.GenerationKind = decl is Field ? GenerationKind.Internal : GenerationKind.None; decl.GenerationKind = decl is Field ? GenerationKind.Internal : GenerationKind.None;
return true; return true;
} }
@ -65,8 +65,8 @@ namespace CppSharp.Passes
if (decl.IsDependent) if (decl.IsDependent)
{ {
decl.GenerationKind = decl is Field ? GenerationKind.Internal : GenerationKind.None; decl.GenerationKind = decl is Field ? GenerationKind.Internal : GenerationKind.None;
Diagnostics.Debug("Decl '{0}' was ignored due to dependent context", Diagnostics.Debug("'{0}' was ignored due to dependent context",
decl.Name); decl.QualifiedName);
return true; return true;
} }
@ -94,8 +94,8 @@ namespace CppSharp.Passes
var cppTypePrinter = new CppTypePrinter(); var cppTypePrinter = new CppTypePrinter();
var typeName = field.Type.Visit(cppTypePrinter); var typeName = field.Type.Visit(cppTypePrinter);
Diagnostics.Debug("Field '{0}::{1}' was ignored due to {2} type '{3}'", Diagnostics.Debug("'{0}' was ignored due to {1} type '{2}'",
@class.Name, field.Name, msg, typeName); field.QualifiedName, msg, typeName);
return true; return true;
} }
@ -111,8 +111,8 @@ namespace CppSharp.Passes
if (HasInvalidType(ret.Type, out msg)) if (HasInvalidType(ret.Type, out msg))
{ {
function.ExplicitlyIgnore(); function.ExplicitlyIgnore();
Diagnostics.Debug("Function '{0}' was ignored due to {1} return decl", Diagnostics.Debug("'{0}' was ignored due to {1} return decl",
function.Name, msg); function.QualifiedName, msg);
return false; return false;
} }
@ -121,16 +121,16 @@ namespace CppSharp.Passes
if (HasInvalidDecl(param, out msg)) if (HasInvalidDecl(param, out msg))
{ {
function.ExplicitlyIgnore(); function.ExplicitlyIgnore();
Diagnostics.Debug("Function '{0}' was ignored due to {1} param", Diagnostics.Debug("'{0}' was ignored due to {1} param",
function.Name, msg); function.QualifiedName, msg);
return false; return false;
} }
if (HasInvalidType(param.Type, out msg)) if (HasInvalidType(param.Type, out msg))
{ {
function.ExplicitlyIgnore(); function.ExplicitlyIgnore();
Diagnostics.Debug("Function '{0}' was ignored due to {1} param", Diagnostics.Debug("'{0}' was ignored due to {1} param",
function.Name, msg); function.QualifiedName, msg);
return false; return false;
} }
@ -138,8 +138,8 @@ namespace CppSharp.Passes
if (decayedType != null) if (decayedType != null)
{ {
function.ExplicitlyIgnore(); function.ExplicitlyIgnore();
Diagnostics.Debug("Function '{0}' was ignored due to unsupported decayed type param", Diagnostics.Debug("'{0}' was ignored due to unsupported decayed type param",
function.Name); function.QualifiedName);
return false; return false;
} }
@ -151,8 +151,8 @@ namespace CppSharp.Passes
{ {
function.ExplicitlyIgnore(); function.ExplicitlyIgnore();
Diagnostics.Debug( Diagnostics.Debug(
"Function '{0}' was ignored due to an indirect return param not of a tag type", "'{0}' was ignored due to an indirect return param not of a tag type",
function.Name); function.QualifiedName);
return false; return false;
} }
} }
@ -179,8 +179,8 @@ namespace CppSharp.Passes
if (HasIgnoredBaseClass(method, @class, out ignoredBase)) if (HasIgnoredBaseClass(method, @class, out ignoredBase))
{ {
Diagnostics.Debug( Diagnostics.Debug(
"Virtual method '{0}' was ignored due to ignored base '{1}'", "'{0}' was ignored due to ignored base '{1}'",
method.QualifiedOriginalName, ignoredBase.Name); method.QualifiedName, ignoredBase.Name);
method.ExplicitlyIgnore(); method.ExplicitlyIgnore();
return false; return false;
@ -225,8 +225,8 @@ namespace CppSharp.Passes
if (HasInvalidType(typedef.Type, out msg)) if (HasInvalidType(typedef.Type, out msg))
{ {
typedef.ExplicitlyIgnore(); typedef.ExplicitlyIgnore();
Diagnostics.Debug("Typedef '{0}' was ignored due to {1} type", Diagnostics.Debug("'{0}' was ignored due to {1} type",
typedef.Name, msg); typedef.QualifiedName, msg);
return false; return false;
} }
@ -242,16 +242,16 @@ namespace CppSharp.Passes
if (HasInvalidDecl(property, out msg)) if (HasInvalidDecl(property, out msg))
{ {
property.ExplicitlyIgnore(); property.ExplicitlyIgnore();
Diagnostics.Debug("Property '{0}' was ignored due to {1} decl", Diagnostics.Debug("'{0}' was ignored due to {1} decl",
property.Name, msg); property.QualifiedName, msg);
return false; return false;
} }
if (HasInvalidType(property.Type, out msg)) if (HasInvalidType(property.Type, out msg))
{ {
property.ExplicitlyIgnore(); property.ExplicitlyIgnore();
Diagnostics.Debug("Property '{0}' was ignored due to {1} type", Diagnostics.Debug("'{0}' was ignored due to {1} type",
property.Name, msg); property.QualifiedName, msg);
return false; return false;
} }
@ -267,16 +267,16 @@ namespace CppSharp.Passes
if (HasInvalidDecl(variable, out msg)) if (HasInvalidDecl(variable, out msg))
{ {
variable.ExplicitlyIgnore(); variable.ExplicitlyIgnore();
Diagnostics.Debug("Variable '{0}' was ignored due to {1} decl", Diagnostics.Debug("'{0}' was ignored due to {1} decl",
variable.Name, msg); variable.QualifiedName, msg);
return false; return false;
} }
if (HasInvalidType(variable.Type, out msg)) if (HasInvalidType(variable.Type, out msg))
{ {
variable.ExplicitlyIgnore(); variable.ExplicitlyIgnore();
Diagnostics.Debug("Variable '{0}' was ignored due to {1} type", Diagnostics.Debug("'{0}' was ignored due to {1} type",
variable.Name, msg); variable.QualifiedName, msg);
return false; return false;
} }
@ -292,8 +292,8 @@ namespace CppSharp.Passes
if (HasInvalidDecl(@event, out msg)) if (HasInvalidDecl(@event, out msg))
{ {
@event.ExplicitlyIgnore(); @event.ExplicitlyIgnore();
Diagnostics.Debug("Event '{0}' was ignored due to {1} decl", Diagnostics.Debug("'{0}' was ignored due to {1} decl",
@event.Name, msg); @event.QualifiedName, msg);
return false; return false;
} }
@ -302,16 +302,16 @@ namespace CppSharp.Passes
if (HasInvalidDecl(param, out msg)) if (HasInvalidDecl(param, out msg))
{ {
@event.ExplicitlyIgnore(); @event.ExplicitlyIgnore();
Diagnostics.Debug("Event '{0}' was ignored due to {1} param", Diagnostics.Debug("'{0}' was ignored due to {1} param",
@event.Name, msg); @event.QualifiedName, msg);
return false; return false;
} }
if (HasInvalidType(param.Type, out msg)) if (HasInvalidType(param.Type, out msg))
{ {
@event.ExplicitlyIgnore(); @event.ExplicitlyIgnore();
Diagnostics.Debug("Event '{0}' was ignored due to {1} param", Diagnostics.Debug("'{0}' was ignored due to {1} param",
@event.Name, msg); @event.QualifiedName, msg);
return false; return false;
} }
} }

Loading…
Cancel
Save