Browse Source

Get rid of diagnostic IDs as these never got used in practice.

pull/491/head
triton 10 years ago
parent
commit
2620fda064
  1. 49
      src/Core/Diagnostics.cs
  2. 16
      src/Generator/Driver.cs
  3. 3
      src/Generator/Passes/CheckOperatorsOverloads.cs
  4. 3
      src/Generator/Passes/FindSymbolsPass.cs
  5. 3
      src/Generator/Passes/ResolveIncompleteDeclsPass.cs

49
src/Core/Diagnostics.cs

@ -5,19 +5,6 @@ using System.Linq; @@ -5,19 +5,6 @@ using System.Linq;
namespace CppSharp
{
public enum DiagnosticId
{
None,
UnresolvedDeclaration,
AmbiguousOverload,
InvalidOperatorOverload,
SymbolNotFound,
FileGenerated,
ParseResult,
ParserDiagnostic,
PropertySynthetized
}
/// <summary>
/// Represents the kind of the diagnostic.
/// </summary>
@ -52,12 +39,6 @@ namespace CppSharp @@ -52,12 +39,6 @@ namespace CppSharp
{
public static void Debug(this IDiagnosticConsumer consumer,
string msg, params object[] args)
{
consumer.Debug(DiagnosticId.None, msg, args);
}
public static void Debug(this IDiagnosticConsumer consumer,
DiagnosticId id, string msg, params object[] args)
{
var diagInfo = new DiagnosticInfo
{
@ -69,7 +50,7 @@ namespace CppSharp @@ -69,7 +50,7 @@ namespace CppSharp
}
public static void EmitMessage(this IDiagnosticConsumer consumer,
DiagnosticId id, string msg, params object[] args)
string msg, params object[] args)
{
var diagInfo = new DiagnosticInfo
{
@ -81,7 +62,7 @@ namespace CppSharp @@ -81,7 +62,7 @@ namespace CppSharp
}
public static void EmitWarning(this IDiagnosticConsumer consumer,
DiagnosticId id, string msg, params object[] args)
string msg, params object[] args)
{
var diagInfo = new DiagnosticInfo
{
@ -93,35 +74,11 @@ namespace CppSharp @@ -93,35 +74,11 @@ namespace CppSharp
}
public static void EmitError(this IDiagnosticConsumer consumer,
DiagnosticId id, string msg, params object[] args)
{
var diagInfo = new DiagnosticInfo
{
Kind = DiagnosticKind.Error,
Message = string.Format(msg, args)
};
consumer.Emit(diagInfo);
}
public static void EmitMessage(this IDiagnosticConsumer consumer,
string msg, params object[] args)
{
var diagInfo = new DiagnosticInfo
{
Kind = DiagnosticKind.Message,
Message = string.Format(msg, args)
};
consumer.Emit(diagInfo);
}
public static void EmitWarning(this IDiagnosticConsumer consumer,
string msg, params object[] args)
{
var diagInfo = new DiagnosticInfo
{
Kind = DiagnosticKind.Warning,
Kind = DiagnosticKind.Error,
Message = string.Format(msg, args)
};

16
src/Generator/Driver.cs

@ -90,16 +90,13 @@ namespace CppSharp @@ -90,16 +90,13 @@ namespace CppSharp
switch (result.Kind)
{
case ParserResultKind.Success:
Diagnostics.EmitMessage(DiagnosticId.ParseResult,
"Parsed '{0}'", file);
Diagnostics.EmitMessage("Parsed '{0}'", file);
break;
case ParserResultKind.Error:
Diagnostics.EmitError(DiagnosticId.ParseResult,
"Error parsing '{0}'", file);
Diagnostics.EmitError("Error parsing '{0}'", file);
break;
case ParserResultKind.FileNotFound:
Diagnostics.EmitError(DiagnosticId.ParseResult,
"File '{0}' was not found", file);
Diagnostics.EmitError("File '{0}' was not found", file);
break;
}
@ -114,10 +111,9 @@ namespace CppSharp @@ -114,10 +111,9 @@ namespace CppSharp
if (diag.Level == ParserDiagnosticLevel.Note)
continue;
Diagnostics.EmitMessage(DiagnosticId.ParserDiagnostic,
"{0}({1},{2}): {3}: {4}", diag.FileName, diag.LineNumber,
diag.ColumnNumber, diag.Level.ToString().ToLower(),
diag.Message);
Diagnostics.EmitMessage("{0}({1},{2}): {3}: {4}",
diag.FileName, diag.LineNumber, diag.ColumnNumber,
diag.Level.ToString().ToLower(), diag.Message);
}
}

3
src/Generator/Passes/CheckOperatorsOverloads.cs

@ -51,8 +51,7 @@ namespace CppSharp.Passes @@ -51,8 +51,7 @@ namespace CppSharp.Passes
{
if (!IsValidOperatorOverload(@operator))
{
Driver.Diagnostics.Debug(DiagnosticId.InvalidOperatorOverload,
"Invalid operator overload {0}::{1}",
Driver.Diagnostics.Debug("Invalid operator overload {0}::{1}",
@class.OriginalName, @operator.OperatorKind);
@operator.ExplicitlyIgnore();
continue;

3
src/Generator/Passes/FindSymbolsPass.cs

@ -28,8 +28,7 @@ namespace CppSharp.Passes @@ -28,8 +28,7 @@ namespace CppSharp.Passes
if (!Driver.Symbols.FindSymbol(ref symbol))
{
Driver.Diagnostics.EmitWarning(DiagnosticId.SymbolNotFound,
"Symbol not found: {0}", symbol);
Driver.Diagnostics.EmitWarning("Symbol not found: {0}", symbol);
return false;
}

3
src/Generator/Passes/ResolveIncompleteDeclsPass.cs

@ -52,8 +52,7 @@ namespace CppSharp.Passes @@ -52,8 +52,7 @@ namespace CppSharp.Passes
if (@enum.CompleteDeclaration == null)
{
@enum.GenerationKind = GenerationKind.Internal;
Driver.Diagnostics.EmitWarning(DiagnosticId.UnresolvedDeclaration,
"Unresolved declaration: {0}", @enum.Name);
Driver.Diagnostics.EmitWarning("Unresolved declaration: {0}", @enum.Name);
}
Out:

Loading…
Cancel
Save