Browse Source

Fix a few warnings

ast-source-generator
Siegfried Pammer 2 months ago
parent
commit
1f8c0ff289
  1. 4
      ICSharpCode.Decompiler/IL/Instructions.cs
  2. 5
      ICSharpCode.Decompiler/IL/Instructions.tt
  3. 2
      ICSharpCode.Decompiler/IL/Transforms/TransformDisplayClassUsage.cs
  4. 2
      ICSharpCode.Decompiler/TypeSystem/Implementation/MetadataTypeDefinition.cs

4
ICSharpCode.Decompiler/IL/Instructions.cs

@ -3788,7 +3788,7 @@ namespace ICSharpCode.Decompiler.IL
public bool DelayExceptions; // NullReferenceException/IndexOutOfBoundsException only occurs when the reference is dereferenced public bool DelayExceptions; // NullReferenceException/IndexOutOfBoundsException only occurs when the reference is dereferenced
readonly IField field; readonly IField field;
/// <summary>Returns the field operand.</summary> /// <summary>Returns the field operand.</summary>
public IField Field { get { return field; } } public IField Field { get { return this.field; } }
public override StackType ResultType { get { return target.ResultType.IsIntegerType() ? StackType.I : StackType.Ref; } } public override StackType ResultType { get { return target.ResultType.IsIntegerType() ? StackType.I : StackType.Ref; } }
protected override InstructionFlags ComputeFlags() protected override InstructionFlags ComputeFlags()
{ {
@ -3842,7 +3842,7 @@ namespace ICSharpCode.Decompiler.IL
public override StackType ResultType { get { return StackType.Ref; } } public override StackType ResultType { get { return StackType.Ref; } }
readonly IField field; readonly IField field;
/// <summary>Returns the field operand.</summary> /// <summary>Returns the field operand.</summary>
public IField Field { get { return field; } } public IField Field { get { return this.field; } }
public override void WriteTo(ITextOutput output, ILAstWritingOptions options) public override void WriteTo(ITextOutput output, ILAstWritingOptions options)
{ {
WriteILRange(output, options); WriteILRange(output, options);

5
ICSharpCode.Decompiler/IL/Instructions.tt

@ -859,7 +859,8 @@ namespace ICSharpCode.Decompiler.IL
opCode.PerformMatchConditions.Add("Patterns.ListMatch.DoMatch(this." + argProp + ", o." + argProp + ", ref match)"); opCode.PerformMatchConditions.Add("Patterns.ListMatch.DoMatch(this." + argProp + ", o." + argProp + ", ref match)");
if (i == 0) if (i == 0)
opCode.WriteArguments.Add("bool first = true;"); opCode.WriteArguments.Add("bool first = true;");
opCode.WriteArguments.Add("foreach (var " + arg + " in " + argProp + ") {"); opCode.WriteArguments.Add("foreach (var " + arg + " in " + argProp + ")");
opCode.WriteArguments.Add("{");
if (i > 0) if (i > 0)
opCode.WriteArguments.Add("\toutput.Write(\", \");"); opCode.WriteArguments.Add("\toutput.Write(\", \");");
else else
@ -1084,7 +1085,7 @@ protected override void Disconnected()
opCode.MatchParameters.Add(new MatchParamInfo { TypeName = "IField", Name = "field", FieldName = "Field" }); opCode.MatchParameters.Add(new MatchParamInfo { TypeName = "IField", Name = "field", FieldName = "Field" });
opCode.PerformMatchConditions.Add("field.Equals(o.field)"); opCode.PerformMatchConditions.Add("field.Equals(o.field)");
opCode.Members.Add("/// <summary>Returns the field operand.</summary>" + Environment.NewLine opCode.Members.Add("/// <summary>Returns the field operand.</summary>" + Environment.NewLine
+ "public IField Field { get { return field; } }"); + "public IField Field { get { return this.field; } }");
opCode.GenerateWriteTo = true; opCode.GenerateWriteTo = true;
opCode.WriteOperand.Add("output.Write(' ');"); opCode.WriteOperand.Add("output.Write(' ');");
opCode.WriteOperand.Add("field.WriteTo(output);"); opCode.WriteOperand.Add("field.WriteTo(output);");

2
ICSharpCode.Decompiler/IL/Transforms/TransformDisplayClassUsage.cs

@ -53,7 +53,7 @@ namespace ICSharpCode.Decompiler.IL.Transforms
private readonly IField field; private readonly IField field;
private ILVariable declaredVariable; private ILVariable declaredVariable;
public string Name => field.Name; public string Name => @field.Name;
public bool CanPropagate { get; private set; } public bool CanPropagate { get; private set; }
public bool UsesInitialValue { get; set; } public bool UsesInitialValue { get; set; }

2
ICSharpCode.Decompiler/TypeSystem/Implementation/MetadataTypeDefinition.cs

@ -187,7 +187,7 @@ namespace ICSharpCode.Decompiler.TypeSystem.Implementation
foreach (FieldDefinitionHandle h in fieldCollection) foreach (FieldDefinitionHandle h in fieldCollection)
{ {
var field = metadata.GetFieldDefinition(h); var field = metadata.GetFieldDefinition(h);
var attr = field.Attributes; var attr = @field.Attributes;
if (module.IsVisible(attr)) if (module.IsVisible(attr))
{ {
fieldList.Add(module.GetDefinition(h)); fieldList.Add(module.GetDefinition(h));

Loading…
Cancel
Save