Skip to content

Commit f74c7c2

Browse files
michaelnebelmichaelnebel
committed
C#: Auto format test file and update expected test output.
1 parent 0f032c5 commit f74c7c2

File tree

3 files changed

+91
-89
lines changed

3 files changed

+91
-89
lines changed

‎csharp/ql/test/experimental/ir/ir/PrintAst.expected

Lines changed: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -118,59 +118,59 @@ array.cs:
118118
# 20| 0: [IntLiteral] 1
119119
assignop.cs:
120120
# 3| [Class] AssignOp
121-
# 4| 5: [Method] Main
122-
# 4| -1: [TypeMention] Void
123-
# 4| 4: [BlockStmt] {...}
124-
# 5| 0: [LocalVariableDeclStmt] ... ...;
125-
# 5| 0: [LocalVariableDeclAndInitExpr] Int32 a = ...
126-
# 5| -1: [TypeMention] int
127-
# 5| 0: [LocalVariableAccess] access to local variable a
128-
# 5| 1: [IntLiteral] 1
129-
# 6| 1: [LocalVariableDeclStmt] ... ...;
130-
# 6| 0: [LocalVariableDeclAndInitExpr] Int32 c = ...
131-
# 6| -1: [TypeMention] int
132-
# 6| 0: [LocalVariableAccess] access to local variable c
133-
# 6| 1: [IntLiteral] 1
134-
# 8| 2: [ExprStmt] ...;
135-
# 8| 0: [AssignAddExpr] ... += ...
121+
# 5| 5: [Method] Main
122+
# 5| -1: [TypeMention] Void
123+
# 6| 4: [BlockStmt] {...}
124+
# 7| 0: [LocalVariableDeclStmt] ... ...;
125+
# 7| 0: [LocalVariableDeclAndInitExpr] Int32 a = ...
126+
# 7| -1: [TypeMention] int
127+
# 7| 0: [LocalVariableAccess] access to local variable a
128+
# 7| 1: [IntLiteral] 1
129+
# 8| 1: [LocalVariableDeclStmt] ... ...;
130+
# 8| 0: [LocalVariableDeclAndInitExpr] Int32 c = ...
131+
# 8| -1: [TypeMention] int
136132
# 8| 0: [LocalVariableAccess] access to local variable c
137-
# 8| 1: [LocalVariableAccess] access to local variable a
138-
# 9| 3: [ExprStmt] ...;
139-
# 9| 0: [AssignSubExpr] ... -= ...
140-
# 9| 0: [LocalVariableAccess] access to local variable c
141-
# 9| 1: [LocalVariableAccess] access to local variable a
142-
# 10| 4: [ExprStmt] ...;
143-
# 10| 0: [AssignMulExpr] ... *= ...
133+
# 8| 1: [IntLiteral] 1
134+
# 10| 2: [ExprStmt] ...;
135+
# 10| 0: [AssignAddExpr] ... += ...
144136
# 10| 0: [LocalVariableAccess] access to local variable c
145137
# 10| 1: [LocalVariableAccess] access to local variable a
146-
# 11| 5: [ExprStmt] ...;
147-
# 11| 0: [AssignDivExpr] ... /= ...
138+
# 11| 3: [ExprStmt] ...;
139+
# 11| 0: [AssignSubExpr] ... -= ...
148140
# 11| 0: [LocalVariableAccess] access to local variable c
149141
# 11| 1: [LocalVariableAccess] access to local variable a
150-
# 12| 6: [ExprStmt] ...;
151-
# 12| 0: [AssignRemExpr] ... %= ...
142+
# 12| 4: [ExprStmt] ...;
143+
# 12| 0: [AssignMulExpr] ... *= ...
152144
# 12| 0: [LocalVariableAccess] access to local variable c
153145
# 12| 1: [LocalVariableAccess] access to local variable a
154-
# 13| 7: [ExprStmt] ...;
155-
# 13| 0: [AssignLeftShiftExpr] ... <<= ...
146+
# 13| 5: [ExprStmt] ...;
147+
# 13| 0: [AssignDivExpr] ... /= ...
156148
# 13| 0: [LocalVariableAccess] access to local variable c
157-
# 13| 1: [IntLiteral] 2
158-
# 14| 8: [ExprStmt] ...;
159-
# 14| 0: [AssignRightShiftExpr] ... >>= ...
149+
# 13| 1: [LocalVariableAccess] access to local variable a
150+
# 14| 6: [ExprStmt] ...;
151+
# 14| 0: [AssignRemExpr] ... %= ...
160152
# 14| 0: [LocalVariableAccess] access to local variable c
161-
# 14| 1: [IntLiteral] 2
162-
# 15| 9: [ExprStmt] ...;
163-
# 15| 0: [AssignAndExpr] ... &= ...
153+
# 14| 1: [LocalVariableAccess] access to local variable a
154+
# 15| 7: [ExprStmt] ...;
155+
# 15| 0: [AssignLeftShiftExpr] ... <<= ...
164156
# 15| 0: [LocalVariableAccess] access to local variable c
165157
# 15| 1: [IntLiteral] 2
166-
# 16| 10: [ExprStmt] ...;
167-
# 16| 0: [AssignXorExpr] ... ^= ...
158+
# 16| 8: [ExprStmt] ...;
159+
# 16| 0: [AssignRightShiftExpr] ... >>= ...
168160
# 16| 0: [LocalVariableAccess] access to local variable c
169161
# 16| 1: [IntLiteral] 2
170-
# 17| 11: [ExprStmt] ...;
171-
# 17| 0: [AssignOrExpr] ... |= ...
162+
# 17| 9: [ExprStmt] ...;
163+
# 17| 0: [AssignAndExpr] ... &= ...
172164
# 17| 0: [LocalVariableAccess] access to local variable c
173165
# 17| 1: [IntLiteral] 2
166+
# 18| 10: [ExprStmt] ...;
167+
# 18| 0: [AssignXorExpr] ... ^= ...
168+
# 18| 0: [LocalVariableAccess] access to local variable c
169+
# 18| 1: [IntLiteral] 2
170+
# 19| 11: [ExprStmt] ...;
171+
# 19| 0: [AssignOrExpr] ... |= ...
172+
# 19| 0: [LocalVariableAccess] access to local variable c
173+
# 19| 1: [IntLiteral] 2
174174
casts.cs:
175175
# 1| [Class] Casts_A
176176
# 5| [Class] Casts_B

‎csharp/ql/test/experimental/ir/ir/assignop.cs

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,21 @@
11
using System;
22

3-
class AssignOp {
4-
static void Main() {
3+
class AssignOp
4+
{
5+
static void Main()
6+
{
57
int a = 1;
68
int c = 1;
7-
8-
c += a;
9+
10+
c += a;
911
c -= a;
10-
c *= a;
12+
c *= a;
1113
c /= a;
12-
c %= a;
13-
c <<= 2;
14-
c >>= 2;
15-
c &= 2;
16-
c ^= 2;
14+
c %= a;
15+
c <<= 2;
16+
c >>= 2;
17+
c &= 2;
18+
c ^= 2;
1719
c |= 2;
1820
}
1921
}

‎csharp/ql/test/experimental/ir/ir/raw_ir.expected

Lines changed: 41 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -145,74 +145,74 @@ array.cs:
145145
# 13| v13_6(Void) = ExitFunction :
146146

147147
assignop.cs:
148-
# 4| System.Void AssignOp.Main()
149-
# 4| Block 0
150-
# 4| v4_1(Void) = EnterFunction :
151-
# 4| mu4_2(<unknown>) = AliasedDefinition :
152-
# 5| r5_1(glval<Int32>) = VariableAddress[a] :
153-
# 5| r5_2(Int32) = Constant[1] :
154-
# 5| mu5_3(Int32) = Store[a] : &:r5_1, r5_2
155-
# 6| r6_1(glval<Int32>) = VariableAddress[c] :
156-
# 6| r6_2(Int32) = Constant[1] :
157-
# 6| mu6_3(Int32) = Store[c] : &:r6_1, r6_2
158-
# 8| r8_1(glval<Int32>) = VariableAddress[a] :
159-
# 8| r8_2(Int32) = Load[a] : &:r8_1, ~m?
160-
# 8| r8_3(glval<Int32>) = VariableAddress[c] :
161-
# 8| r8_4(Int32) = Load[c] : &:r8_3, ~m?
162-
# 8| r8_5(Int32) = Add : r8_4, r8_2
163-
# 8| mu8_6(Int32) = Store[c] : &:r8_3, r8_5
164-
# 9| r9_1(glval<Int32>) = VariableAddress[a] :
165-
# 9| r9_2(Int32) = Load[a] : &:r9_1, ~m?
166-
# 9| r9_3(glval<Int32>) = VariableAddress[c] :
167-
# 9| r9_4(Int32) = Load[c] : &:r9_3, ~m?
168-
# 9| r9_5(Int32) = Sub : r9_4, r9_2
169-
# 9| mu9_6(Int32) = Store[c] : &:r9_3, r9_5
148+
# 5| System.Void AssignOp.Main()
149+
# 5| Block 0
150+
# 5| v5_1(Void) = EnterFunction :
151+
# 5| mu5_2(<unknown>) = AliasedDefinition :
152+
# 7| r7_1(glval<Int32>) = VariableAddress[a] :
153+
# 7| r7_2(Int32) = Constant[1] :
154+
# 7| mu7_3(Int32) = Store[a] : &:r7_1, r7_2
155+
# 8| r8_1(glval<Int32>) = VariableAddress[c] :
156+
# 8| r8_2(Int32) = Constant[1] :
157+
# 8| mu8_3(Int32) = Store[c] : &:r8_1, r8_2
170158
# 10| r10_1(glval<Int32>) = VariableAddress[a] :
171159
# 10| r10_2(Int32) = Load[a] : &:r10_1, ~m?
172160
# 10| r10_3(glval<Int32>) = VariableAddress[c] :
173161
# 10| r10_4(Int32) = Load[c] : &:r10_3, ~m?
174-
# 10| r10_5(Int32) = Mul : r10_4, r10_2
162+
# 10| r10_5(Int32) = Add : r10_4, r10_2
175163
# 10| mu10_6(Int32) = Store[c] : &:r10_3, r10_5
176164
# 11| r11_1(glval<Int32>) = VariableAddress[a] :
177165
# 11| r11_2(Int32) = Load[a] : &:r11_1, ~m?
178166
# 11| r11_3(glval<Int32>) = VariableAddress[c] :
179167
# 11| r11_4(Int32) = Load[c] : &:r11_3, ~m?
180-
# 11| r11_5(Int32) = Div : r11_4, r11_2
168+
# 11| r11_5(Int32) = Sub : r11_4, r11_2
181169
# 11| mu11_6(Int32) = Store[c] : &:r11_3, r11_5
182170
# 12| r12_1(glval<Int32>) = VariableAddress[a] :
183171
# 12| r12_2(Int32) = Load[a] : &:r12_1, ~m?
184172
# 12| r12_3(glval<Int32>) = VariableAddress[c] :
185173
# 12| r12_4(Int32) = Load[c] : &:r12_3, ~m?
186-
# 12| r12_5(Int32) = Rem : r12_4, r12_2
174+
# 12| r12_5(Int32) = Mul : r12_4, r12_2
187175
# 12| mu12_6(Int32) = Store[c] : &:r12_3, r12_5
188-
# 13| r13_1(Int32) = Constant[2] :
189-
# 13| r13_2(glval<Int32>) = VariableAddress[c] :
190-
# 13| r13_3(Int32) = Load[c] : &:r13_2, ~m?
191-
# 13| r13_4(Int32) = ShiftLeft : r13_3, r13_1
192-
# 13| mu13_5(Int32) = Store[c] : &:r13_2, r13_4
193-
# 14| r14_1(Int32) = Constant[2] :
194-
# 14| r14_2(glval<Int32>) = VariableAddress[c] :
195-
# 14| r14_3(Int32) = Load[c] : &:r14_2, ~m?
196-
# 14| r14_4(Int32) = ShiftRight : r14_3, r14_1
197-
# 14| mu14_5(Int32) = Store[c] : &:r14_2, r14_4
176+
# 13| r13_1(glval<Int32>) = VariableAddress[a] :
177+
# 13| r13_2(Int32) = Load[a] : &:r13_1, ~m?
178+
# 13| r13_3(glval<Int32>) = VariableAddress[c] :
179+
# 13| r13_4(Int32) = Load[c] : &:r13_3, ~m?
180+
# 13| r13_5(Int32) = Div : r13_4, r13_2
181+
# 13| mu13_6(Int32) = Store[c] : &:r13_3, r13_5
182+
# 14| r14_1(glval<Int32>) = VariableAddress[a] :
183+
# 14| r14_2(Int32) = Load[a] : &:r14_1, ~m?
184+
# 14| r14_3(glval<Int32>) = VariableAddress[c] :
185+
# 14| r14_4(Int32) = Load[c] : &:r14_3, ~m?
186+
# 14| r14_5(Int32) = Rem : r14_4, r14_2
187+
# 14| mu14_6(Int32) = Store[c] : &:r14_3, r14_5
198188
# 15| r15_1(Int32) = Constant[2] :
199189
# 15| r15_2(glval<Int32>) = VariableAddress[c] :
200190
# 15| r15_3(Int32) = Load[c] : &:r15_2, ~m?
201-
# 15| r15_4(Int32) = BitAnd : r15_3, r15_1
191+
# 15| r15_4(Int32) = ShiftLeft : r15_3, r15_1
202192
# 15| mu15_5(Int32) = Store[c] : &:r15_2, r15_4
203193
# 16| r16_1(Int32) = Constant[2] :
204194
# 16| r16_2(glval<Int32>) = VariableAddress[c] :
205195
# 16| r16_3(Int32) = Load[c] : &:r16_2, ~m?
206-
# 16| r16_4(Int32) = BitXor : r16_3, r16_1
196+
# 16| r16_4(Int32) = ShiftRight : r16_3, r16_1
207197
# 16| mu16_5(Int32) = Store[c] : &:r16_2, r16_4
208198
# 17| r17_1(Int32) = Constant[2] :
209199
# 17| r17_2(glval<Int32>) = VariableAddress[c] :
210200
# 17| r17_3(Int32) = Load[c] : &:r17_2, ~m?
211-
# 17| r17_4(Int32) = BitOr : r17_3, r17_1
201+
# 17| r17_4(Int32) = BitAnd : r17_3, r17_1
212202
# 17| mu17_5(Int32) = Store[c] : &:r17_2, r17_4
213-
# 4| v4_3(Void) = ReturnVoid :
214-
# 4| v4_4(Void) = AliasedUse : ~m?
215-
# 4| v4_5(Void) = ExitFunction :
203+
# 18| r18_1(Int32) = Constant[2] :
204+
# 18| r18_2(glval<Int32>) = VariableAddress[c] :
205+
# 18| r18_3(Int32) = Load[c] : &:r18_2, ~m?
206+
# 18| r18_4(Int32) = BitXor : r18_3, r18_1
207+
# 18| mu18_5(Int32) = Store[c] : &:r18_2, r18_4
208+
# 19| r19_1(Int32) = Constant[2] :
209+
# 19| r19_2(glval<Int32>) = VariableAddress[c] :
210+
# 19| r19_3(Int32) = Load[c] : &:r19_2, ~m?
211+
# 19| r19_4(Int32) = BitOr : r19_3, r19_1
212+
# 19| mu19_5(Int32) = Store[c] : &:r19_2, r19_4
213+
# 5| v5_3(Void) = ReturnVoid :
214+
# 5| v5_4(Void) = AliasedUse : ~m?
215+
# 5| v5_5(Void) = ExitFunction :
216216

217217
casts.cs:
218218
# 11| System.Void Casts.Main()

0 commit comments

Comments
 (0)