pimhwang
/
ILSpy
mirror of https://github.com/icsharpcode/ILSpy.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Add more test cases to CompoundAssignmentTest and InlineAssignmentTest

pull/734/head
Siegfried Pammer 9 years ago
parent
fc45d47615
commit
c0effc817c
5 changed files with 170 additions and 8 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 3
      ICSharpCode.Decompiler/Tests/ICSharpCode.Decompiler.Tests.csproj
  2. 22
      ICSharpCode.Decompiler/Tests/TestCases/Pretty/CompoundAssignmentTest.cs
  3. 87
      ICSharpCode.Decompiler/Tests/TestCases/Pretty/CompoundAssignmentTest.il
  4. 11
      ICSharpCode.Decompiler/Tests/TestCases/Pretty/InlineAssignmentTest.cs
  5. 55
      ICSharpCode.Decompiler/Tests/TestCases/Pretty/InlineAssignmentTest.il

3
ICSharpCode.Decompiler/Tests/ICSharpCode.Decompiler.Tests.csproj
Unescape View File

@ -151,6 +151,9 @@ @@ -151,6 +151,9 @@
<Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
</ItemGroup>
<ItemGroup>
<None Include="TestCases\Pretty\CompoundAssignmentTest.il">
<DependentUpon>CompoundAssignmentTest.cs</DependentUpon>
</None>
<None Include="TestCases\Pretty\HelloWorld.il">
<DependentUpon>HelloWorld.cs</DependentUpon>
</None>

22
ICSharpCode.Decompiler/Tests/TestCases/Pretty/CompoundAssignmentTest.cs
Unescape View File

@ -22,7 +22,15 @@ namespace ICSharpCode.Decompiler.Tests.TestCases.Pretty @@ -22,7 +22,15 @@ namespace ICSharpCode.Decompiler.Tests.TestCases.Pretty
{
public class CompoundAssignmentTest
{
private struct StructContainer
{
public bool HasIndex;
public int Field;
}
private int test1;
private int[] array1;
private StructContainer field1;
public static void Main()
{
@ -53,5 +61,19 @@ namespace ICSharpCode.Decompiler.Tests.TestCases.Pretty @@ -53,5 +61,19 @@ namespace ICSharpCode.Decompiler.Tests.TestCases.Pretty
Console.WriteLine(this.test1 -= i);
Console.WriteLine(this.test1);
}
public void Array(int i)
{
Console.WriteLine(this.array1[i] += i);
Console.WriteLine(this.array1[i * 2] += i * 2);
}
public void NestedField()
{
if (this.field1.HasIndex) {
this.field1.Field++;
}
}
}
}

87
ICSharpCode.Decompiler/Tests/TestCases/Pretty/CompoundAssignmentTest.il
Unescape View File

@ -10,7 +10,7 @@ @@ -10,7 +10,7 @@
.publickeytoken = (B7 7A 5C 56 19 34 E0 89 ) // .z\V.4..
.ver 4:0:0:0
}
.assembly baqif21x
.assembly s32trvk2
{
.custom instance void [mscorlib]System.Runtime.CompilerServices.CompilationRelaxationsAttribute::.ctor(int32) = ( 01 00 08 00 00 00 00 00 )
.custom instance void [mscorlib]System.Runtime.CompilerServices.RuntimeCompatibilityAttribute::.ctor() = ( 01 00 01 00 54 02 16 57 72 61 70 4E 6F 6E 45 78 // ....T..WrapNonEx
@ -20,15 +20,15 @@ @@ -20,15 +20,15 @@
.hash algorithm 0x00008004
.ver 0:0:0:0
}
.module baqif21x.exe
// MVID: {1149F1EE-8A3E-4309-9B0E-D81380AC971E}
.module s32trvk2.exe
// MVID: {09E6012F-15AE-4E0C-B48E-2644E4707595}
.custom instance void [mscorlib]System.Security.UnverifiableCodeAttribute::.ctor() = ( 01 00 00 00 )
.imagebase 0x00400000
.file alignment 0x00000200
.stackreserve 0x00100000
.subsystem 0x0003 // WINDOWS_CUI
.corflags 0x00000001 // ILONLY
// Image base: 0x011D0000
// Image base: 0x01510000
// =============== CLASS MEMBERS DECLARATION ===================
@ -36,7 +36,16 @@ @@ -36,7 +36,16 @@
.class public auto ansi beforefieldinit ICSharpCode.Decompiler.Tests.TestCases.Pretty.CompoundAssignmentTest
extends [mscorlib]System.Object
{
.class sequential ansi sealed nested private beforefieldinit StructContainer
extends [mscorlib]System.ValueType
{
.field public bool HasIndex
.field public int32 Field
} // end of class StructContainer
.field private int32 test1
.field private int32[] array1
.field private valuetype ICSharpCode.Decompiler.Tests.TestCases.Pretty.CompoundAssignmentTest/StructContainer field1
.method public hidebysig static void Main() cil managed
{
.entrypoint
@ -141,6 +150,76 @@ @@ -141,6 +150,76 @@
IL_0047: ret
} // end of method CompoundAssignmentTest::IntegerField
.method public hidebysig instance void
Array(int32 i) cil managed
{
// Code size 74 (0x4a)
.maxstack 4
.locals init (int32 V_0)
IL_0000: nop
IL_0001: ldarg.0
IL_0002: ldfld int32[] ICSharpCode.Decompiler.Tests.TestCases.Pretty.CompoundAssignmentTest::array1
IL_0007: ldarg.1
IL_0008: ldelema [mscorlib]System.Int32
IL_000d: dup
IL_000e: ldobj [mscorlib]System.Int32
IL_0013: ldarg.1
IL_0014: add
IL_0015: dup
IL_0016: stloc.0
IL_0017: stobj [mscorlib]System.Int32
IL_001c: ldloc.0
IL_001d: call void [mscorlib]System.Console::WriteLine(int32)
IL_0022: nop
IL_0023: ldarg.0
IL_0024: ldfld int32[] ICSharpCode.Decompiler.Tests.TestCases.Pretty.CompoundAssignmentTest::array1
IL_0029: ldarg.1
IL_002a: ldc.i4.2
IL_002b: mul
IL_002c: ldelema [mscorlib]System.Int32
IL_0031: dup
IL_0032: ldobj [mscorlib]System.Int32
IL_0037: ldarg.1
IL_0038: ldc.i4.2
IL_0039: mul
IL_003a: add
IL_003b: dup
IL_003c: stloc.0
IL_003d: stobj [mscorlib]System.Int32
IL_0042: ldloc.0
IL_0043: call void [mscorlib]System.Console::WriteLine(int32)
IL_0048: nop
IL_0049: ret
} // end of method CompoundAssignmentTest::Array
.method public hidebysig instance void
NestedField() cil managed
{
// Code size 41 (0x29)
.maxstack 3
.locals init (bool V_0)
IL_0000: nop
IL_0001: ldarg.0
IL_0002: ldflda valuetype ICSharpCode.Decompiler.Tests.TestCases.Pretty.CompoundAssignmentTest/StructContainer ICSharpCode.Decompiler.Tests.TestCases.Pretty.CompoundAssignmentTest::field1
IL_0007: ldfld bool ICSharpCode.Decompiler.Tests.TestCases.Pretty.CompoundAssignmentTest/StructContainer::HasIndex
IL_000c: ldc.i4.0
IL_000d: ceq
IL_000f: stloc.0
IL_0010: ldloc.0
IL_0011: brtrue.s IL_0028
IL_0013: nop
IL_0014: ldarg.0
IL_0015: ldflda valuetype ICSharpCode.Decompiler.Tests.TestCases.Pretty.CompoundAssignmentTest/StructContainer ICSharpCode.Decompiler.Tests.TestCases.Pretty.CompoundAssignmentTest::field1
IL_001a: dup
IL_001b: ldfld int32 ICSharpCode.Decompiler.Tests.TestCases.Pretty.CompoundAssignmentTest/StructContainer::Field
IL_0020: ldc.i4.1
IL_0021: add
IL_0022: stfld int32 ICSharpCode.Decompiler.Tests.TestCases.Pretty.CompoundAssignmentTest/StructContainer::Field
IL_0027: nop
IL_0028: ret
} // end of method CompoundAssignmentTest::NestedField
.method public hidebysig specialname rtspecialname
instance void .ctor() cil managed
{

11
ICSharpCode.Decompiler/Tests/TestCases/Pretty/InlineAssignmentTest.cs
Unescape View File

@ -24,6 +24,7 @@ namespace ICSharpCode.Decompiler.Tests.TestCases.Pretty @@ -24,6 +24,7 @@ namespace ICSharpCode.Decompiler.Tests.TestCases.Pretty
{
private int field1;
private static InlineAssignmentTest field2;
private int[] field3;
public static void Main()
{
@ -74,5 +75,15 @@ namespace ICSharpCode.Decompiler.Tests.TestCases.Pretty @@ -74,5 +75,15 @@ namespace ICSharpCode.Decompiler.Tests.TestCases.Pretty
{
return a = 3;
}
public int Array(int[] a, int i)
{
return a[i] = i;
}
public int Array2(int i)
{
return this.field3[i] = 1;
}
}
}

55
ICSharpCode.Decompiler/Tests/TestCases/Pretty/InlineAssignmentTest.il
Unescape View File

@ -10,7 +10,7 @@ @@ -10,7 +10,7 @@
.publickeytoken = (B7 7A 5C 56 19 34 E0 89 ) // .z\V.4..
.ver 4:0:0:0
}
.assembly xdhcadn4
.assembly siuuofgg
{
.custom instance void [mscorlib]System.Runtime.CompilerServices.CompilationRelaxationsAttribute::.ctor(int32) = ( 01 00 08 00 00 00 00 00 )
.custom instance void [mscorlib]System.Runtime.CompilerServices.RuntimeCompatibilityAttribute::.ctor() = ( 01 00 01 00 54 02 16 57 72 61 70 4E 6F 6E 45 78 // ....T..WrapNonEx
@ -20,15 +20,15 @@ @@ -20,15 +20,15 @@
.hash algorithm 0x00008004
.ver 0:0:0:0
}
.module xdhcadn4.exe
// MVID: {013854B0-173B-4858-BB3C-CA652EACC772}
.module siuuofgg.exe
// MVID: {7C4F4FA4-F91C-4C75-A521-2E31EFBCDAC8}
.custom instance void [mscorlib]System.Security.UnverifiableCodeAttribute::.ctor() = ( 01 00 00 00 )
.imagebase 0x00400000
.file alignment 0x00000200
.stackreserve 0x00100000
.subsystem 0x0003 // WINDOWS_CUI
.corflags 0x00000001 // ILONLY
// Image base: 0x011B0000
// Image base: 0x016A0000
// =============== CLASS MEMBERS DECLARATION ===================
@ -38,6 +38,7 @@ @@ -38,6 +38,7 @@
{
.field private int32 field1
.field private static class ICSharpCode.Decompiler.Tests.TestCases.Pretty.InlineAssignmentTest field2
.field private int32[] field3
.method public hidebysig static void Main() cil managed
{
.entrypoint
@ -175,6 +176,52 @@ @@ -175,6 +176,52 @@
IL_000b: ret
} // end of method InlineAssignmentTest::Return
.method public hidebysig instance int32
Array(int32[] a,
int32 i) cil managed
{
// Code size 13 (0xd)
.maxstack 4
.locals init (int32 V_0,
int32 V_1)
IL_0000: nop
IL_0001: ldarg.1
IL_0002: ldarg.2
IL_0003: ldarg.2
IL_0004: dup
IL_0005: stloc.1
IL_0006: stelem.i4
IL_0007: ldloc.1
IL_0008: stloc.0
IL_0009: br.s IL_000b
IL_000b: ldloc.0
IL_000c: ret
} // end of method InlineAssignmentTest::Array
.method public hidebysig instance int32
Array2(int32 i) cil managed
{
// Code size 18 (0x12)
.maxstack 4
.locals init (int32 V_0,
int32 V_1)
IL_0000: nop
IL_0001: ldarg.0
IL_0002: ldfld int32[] ICSharpCode.Decompiler.Tests.TestCases.Pretty.InlineAssignmentTest::field3
IL_0007: ldarg.1
IL_0008: ldc.i4.1
IL_0009: dup
IL_000a: stloc.1
IL_000b: stelem.i4
IL_000c: ldloc.1
IL_000d: stloc.0
IL_000e: br.s IL_0010
IL_0010: ldloc.0
IL_0011: ret
} // end of method InlineAssignmentTest::Array2
.method public hidebysig specialname rtspecialname
instance void .ctor() cil managed
{

Write Preview
Loading…
Cancel
Save