From f8e2f5ee17e82aa125c957d11b84fc3ea134b732 Mon Sep 17 00:00:00 2001 From: Siegfried Pammer Date: Fri, 4 Jan 2019 20:07:45 +0100 Subject: [PATCH] Try to fix unit tests on build server. --- .../CSharp/Syntax/TypeSystemAstBuilder.cs | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/ICSharpCode.Decompiler/CSharp/Syntax/TypeSystemAstBuilder.cs b/ICSharpCode.Decompiler/CSharp/Syntax/TypeSystemAstBuilder.cs index fc0ead8d1..a75c649a6 100644 --- a/ICSharpCode.Decompiler/CSharp/Syntax/TypeSystemAstBuilder.cs +++ b/ICSharpCode.Decompiler/CSharp/Syntax/TypeSystemAstBuilder.cs @@ -1033,16 +1033,17 @@ namespace ICSharpCode.Decompiler.CSharp.Syntax if (d != 1) { expr = new BinaryOperatorExpression(expr, BinaryOperatorType.Divide, MakeConstant(type, d)); } - +#pragma warning disable IDE0004 if (isDouble) { - double approxValue = n / (double)d * (memberName == "PI" ? Math.PI : Math.E); + double approxValue = (double)n / (double)d * (memberName == "PI" ? Math.PI : Math.E); if (approxValue == (double)literalValue) return expr; } else { - float approxValue = n / (float)d * (memberName == "PI" ? MathF_PI : MathF_E); + float approxValue = (float)n / (float)d * (memberName == "PI" ? MathF_PI : MathF_E); if (approxValue == (float)literalValue) return expr; } +#pragma warning restore IDE0004 expr = fieldReference.Detach(); expr = new BinaryOperatorExpression(MakeConstant(type, n), BinaryOperatorType.Divide, expr); @@ -1050,17 +1051,17 @@ namespace ICSharpCode.Decompiler.CSharp.Syntax if (d != 1) { expr = new BinaryOperatorExpression(MakeConstant(type, d), BinaryOperatorType.Multiply, expr); } - +#pragma warning disable IDE0004 if (isDouble) { - double approxValue = n / (d * (memberName == "PI" ? Math.PI : Math.E)); + double approxValue = (double)n / ((double)d * (memberName == "PI" ? Math.PI : Math.E)); if (approxValue == (double)literalValue) return expr; } else { - float approxValue = n / (d * (memberName == "PI" ? MathF_PI : MathF_E)); + float approxValue = (float)n / ((float)d * (memberName == "PI" ? MathF_PI : MathF_E)); if (approxValue == (float)literalValue) return expr; } - +#pragma warning restore IDE0004 return null; }