Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,10 @@ static void Main(string[] args)
PrintResult((ref dynamic x) => x = x / 2.0, 5);
PrintResult((ref dynamic x) => x = x / 2, 5.0);
PrintResult((ref dynamic x) => x = x / 2, 5);
PrintResult((ref dynamic x) => x = ~x, 5);
PrintResult((ref dynamic x) => x = -x, 5);
PrintResult((ref dynamic x) => x = +x, 5);
PrintResult((ref dynamic x) => x = !x, true);
}

private static void PrintResult(RefAction<dynamic> p, dynamic arg)
Expand Down
24 changes: 24 additions & 0 deletions ICSharpCode.Decompiler.Tests/TestCases/Pretty/DynamicTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -310,6 +310,23 @@ private static void UncheckedArithmeticBinaryOperators(dynamic a, dynamic b)
}
}

private static void BitwiseAndShiftBinaryOperators(dynamic a, dynamic b)
{
DynamicTests.MemberAccess(a & b);
DynamicTests.MemberAccess(a & 1);
DynamicTests.MemberAccess(a & null);
DynamicTests.MemberAccess(a | b);
DynamicTests.MemberAccess(a | 1);
DynamicTests.MemberAccess(a | null);
DynamicTests.MemberAccess(a ^ b);
DynamicTests.MemberAccess(a ^ 1);
DynamicTests.MemberAccess(a ^ null);
DynamicTests.MemberAccess(a << b);
DynamicTests.MemberAccess(a << 1);
DynamicTests.MemberAccess(a >> b);
DynamicTests.MemberAccess(a >> 1);
}

private static void RelationalOperators(dynamic a, dynamic b)
{
DynamicTests.MemberAccess(a == b);
Expand Down Expand Up @@ -369,6 +386,12 @@ private static void CompoundAssignment(dynamic a, dynamic b)
a.Setter2 -= b;
a.Setter2 *= b;
a.Setter2 /= b;
a.Setter2 %= b;
a.Setter2 &= b;
a.Setter2 |= b;
a.Setter2 ^= b;
a.Setter2 <<= b;
a.Setter2 >>= b;
field.Setter += 5;
field.Setter -= 5;
}
Expand All @@ -394,6 +417,7 @@ private static void UnaryOperators(dynamic a)
//++a;
DynamicTests.Casts(-a);
DynamicTests.Casts(+a);
DynamicTests.Casts(~a);
}

private static void Loops(dynamic list)
Expand Down
2 changes: 2 additions & 0 deletions ICSharpCode.Decompiler/CSharp/ExpressionBuilder.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4540,6 +4540,8 @@ protected internal override TranslatedExpression VisitDynamicUnaryOperatorInstru
return CreateUnaryOperator(UnaryOperatorType.Minus, isChecked: true);
case ExpressionType.UnaryPlus:
return CreateUnaryOperator(UnaryOperatorType.Plus, isChecked: inst.BinderFlags.HasFlag(CSharpBinderFlags.CheckedContext));
case ExpressionType.OnesComplement:
return CreateUnaryOperator(UnaryOperatorType.BitNot);
case ExpressionType.IsTrue:
var operand = TranslateDynamicArgument(inst.Operand, inst.OperandArgumentInfo);
Expression expr;
Expand Down
Loading