Skip to content

Commit 57ec094

Browse files
hvitvedhvitved
committed
C#: Update expected test output
1 parent 2971a20 commit 57ec094

File tree

75 files changed

+2593
-2593
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

75 files changed

+2593
-2593
lines changed

‎csharp/ql/integration-tests/all-platforms/diag_recursive_generics/Types.expected‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,35 @@
1-
| test.cs:1:14:1:20 | GenA<> | System.Object |
2-
| test.cs:1:14:1:20 | GenA<GenB<GenB<>>> | System.Object |
31
| test.cs:1:14:1:20 | GenA<GenB<GenB<String>>> | System.Object |
4-
| test.cs:2:14:2:20 | GenB<> | System.Object |
5-
| test.cs:2:14:2:20 | GenB<GenB<>> | System.Object |
2+
| test.cs:1:14:1:20 | GenA<GenB<GenB`1>> | System.Object |
3+
| test.cs:1:14:1:20 | GenA`1 | System.Object |
64
| test.cs:2:14:2:20 | GenB<GenB<String>> | System.Object |
5+
| test.cs:2:14:2:20 | GenB<GenB`1> | System.Object |
76
| test.cs:2:14:2:20 | GenB<String> | System.Object |
8-
| test.cs:4:7:4:10 | P<> | System.Object |
9-
| test.cs:4:7:4:10 | P<C<,>> | System.Object |
7+
| test.cs:2:14:2:20 | GenB`1 | System.Object |
108
| test.cs:4:7:4:10 | P<C<Int32,String>> | System.Object |
119
| test.cs:4:7:4:10 | P<C<String,Int32>> | System.Object |
1210
| test.cs:4:7:4:10 | P<C<V,U>> | System.Object |
1311
| test.cs:4:7:4:10 | P<C<W,X>> | System.Object |
1412
| test.cs:4:7:4:10 | P<C<X,W>> | System.Object |
15-
| test.cs:4:7:4:10 | P<D<,>> | System.Object |
13+
| test.cs:4:7:4:10 | P<C`2> | System.Object |
1614
| test.cs:4:7:4:10 | P<D<Int32,String>> | System.Object |
1715
| test.cs:4:7:4:10 | P<D<String,Int32>> | System.Object |
1816
| test.cs:4:7:4:10 | P<D<U,V>> | System.Object |
1917
| test.cs:4:7:4:10 | P<D<V,U>> | System.Object |
2018
| test.cs:4:7:4:10 | P<D<X,W>> | System.Object |
21-
| test.cs:5:7:5:13 | C<,> | P<D<V,U>> |
19+
| test.cs:4:7:4:10 | P<D`2> | System.Object |
20+
| test.cs:4:7:4:10 | P`1 | System.Object |
2221
| test.cs:5:7:5:13 | C<Int32,String> | P<D<System.String,System.Int32>> |
2322
| test.cs:5:7:5:13 | C<String,Int32> | P<D<System.Int32,System.String>> |
2423
| test.cs:5:7:5:13 | C<V,U> | P<D<U,V>> |
2524
| test.cs:5:7:5:13 | C<W,X> | P<D<X,W>> |
26-
| test.cs:5:7:5:13 | C<X,W> | P<D<,>> |
27-
| test.cs:6:7:6:13 | D<,> | P<C<W,X>> |
25+
| test.cs:5:7:5:13 | C<X,W> | P<D`2> |
26+
| test.cs:5:7:5:13 | C`2 | P<D<V,U>> |
2827
| test.cs:6:7:6:13 | D<Int32,String> | P<C<System.Int32,System.String>> |
2928
| test.cs:6:7:6:13 | D<String,Int32> | P<C<System.String,System.Int32>> |
30-
| test.cs:6:7:6:13 | D<U,V> | P<C<,>> |
29+
| test.cs:6:7:6:13 | D<U,V> | P<C`2> |
3130
| test.cs:6:7:6:13 | D<V,U> | P<C<V,U>> |
3231
| test.cs:6:7:6:13 | D<X,W> | P<C<X,W>> |
33-
| test.cs:8:7:8:10 | A<> | System.Object |
32+
| test.cs:6:7:6:13 | D`2 | P<C<W,X>> |
3433
| test.cs:8:7:8:10 | A<String> | System.Object |
34+
| test.cs:8:7:8:10 | A`1 | System.Object |
3535
| test.cs:13:14:13:18 | Class | System.Object |

‎csharp/ql/test/library-tests/assignables/AssignableDefinitionNode.expected‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,11 @@
2929
| Assignables.cs:34:40:34:44 | access to field Field | Assignables.cs:34:9:34:45 | call to method RefCertainOneOf |
3030
| Assignables.cs:37:22:37:22 | o | Assignables.cs:37:10:37:12 | enter Out |
3131
| Assignables.cs:39:9:39:13 | ... = ... | Assignables.cs:39:9:39:13 | ... = ... |
32-
| Assignables.cs:42:26:42:26 | x | Assignables.cs:42:10:42:22 | enter RefCertain<> |
33-
| Assignables.cs:42:35:42:35 | y | Assignables.cs:42:10:42:22 | enter RefCertain<> |
34-
| Assignables.cs:42:43:42:43 | b | Assignables.cs:42:10:42:22 | enter RefCertain<> |
32+
| Assignables.cs:42:26:42:26 | x | Assignables.cs:42:10:42:22 | enter RefCertain`1 |
33+
| Assignables.cs:42:35:42:35 | y | Assignables.cs:42:10:42:22 | enter RefCertain`1 |
34+
| Assignables.cs:42:43:42:43 | b | Assignables.cs:42:10:42:22 | enter RefCertain`1 |
3535
| Assignables.cs:45:13:45:17 | ... = ... | Assignables.cs:45:13:45:17 | ... = ... |
36-
| Assignables.cs:47:31:47:31 | access to parameter y | Assignables.cs:47:13:47:38 | call to method RefCertain<> |
36+
| Assignables.cs:47:31:47:31 | access to parameter y | Assignables.cs:47:13:47:38 | call to method RefCertain`1 |
3737
| Assignables.cs:50:27:50:27 | x | Assignables.cs:50:10:50:21 | enter RefUncertain |
3838
| Assignables.cs:50:38:50:38 | y | Assignables.cs:50:10:50:21 | enter RefUncertain |
3939
| Assignables.cs:53:13:53:17 | ... = ... | Assignables.cs:53:13:53:17 | ... = ... |

‎csharp/ql/test/library-tests/comments/BindingAfter.expected‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@
5252
| comments2.cs:103:31:104:34 | // ... | comments2.cs:107:20:107:20 | E | D |
5353
| comments2.cs:106:5:106:8 | // ... | comments2.cs:107:20:107:20 | E | E |
5454
| comments2.cs:107:23:108:26 | // ... | comments2.cs:110:10:110:12 | gen | E |
55-
| comments2.cs:118:5:118:21 | // ... | comments2.cs:119:11:119:25 | GenericClass<> | GenericClass<> |
56-
| comments2.cs:124:5:124:16 | // ... | comments2.cs:125:9:125:20 | GenericFn<> | GenericFn |
55+
| comments2.cs:118:5:118:21 | // ... | comments2.cs:119:11:119:25 | GenericClass`1 | GenericClass<> |
56+
| comments2.cs:124:5:124:16 | // ... | comments2.cs:125:9:125:20 | GenericFn`1 | GenericFn |
5757
| comments2.cs:127:20:127:23 | // ... | comments2.cs:128:9:128:17 | return ...; | x |
5858
| trivia.cs:1:1:3:15 | // ... | trivia.cs:14:7:14:9 | Tr1 | |
5959
| trivia.cs:13:89:13:103 | // ... | trivia.cs:14:7:14:9 | Tr1 | New checksum |

‎csharp/ql/test/library-tests/comments/BindingBefore.expected‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
| comments2.cs:107:23:108:26 | // ... | comments2.cs:107:20:107:20 | E | E |
4646
| comments2.cs:118:5:118:21 | // ... | comments2.cs:111:5:116:5 | {...} | GenericClass<> |
4747
| comments2.cs:121:17:121:20 | // ... | comments2.cs:121:13:121:13 | f | f |
48-
| comments2.cs:124:5:124:16 | // ... | comments2.cs:119:11:119:25 | GenericClass<> | GenericFn |
48+
| comments2.cs:124:5:124:16 | // ... | comments2.cs:119:11:119:25 | GenericClass`1 | GenericFn |
4949
| comments2.cs:127:20:127:23 | // ... | comments2.cs:127:9:127:18 | ... ...; | x |
5050
| comments2.cs:132:1:132:21 | // ... | comments2.cs:11:7:11:8 | C2 | End of comment2.cs |
5151
| trivia.cs:25:14:25:38 | // ... | trivia.cs:24:9:24:16 | ... ...; | numbering not affected |

‎csharp/ql/test/library-tests/comments/BindingParent.expected‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
| comments2.cs:106:5:106:8 | // ... | comments2.cs:11:7:11:8 | C2 | E |
4545
| comments2.cs:107:23:108:26 | // ... | comments2.cs:11:7:11:8 | C2 | E |
4646
| comments2.cs:118:5:118:21 | // ... | comments2.cs:11:7:11:8 | C2 | GenericClass<> |
47-
| comments2.cs:121:17:121:20 | // ... | comments2.cs:119:11:119:25 | GenericClass<> | f |
47+
| comments2.cs:121:17:121:20 | // ... | comments2.cs:119:11:119:25 | GenericClass`1 | f |
4848
| comments2.cs:124:5:124:16 | // ... | comments2.cs:11:7:11:8 | C2 | GenericFn |
4949
| comments2.cs:127:20:127:23 | // ... | comments2.cs:126:5:129:5 | {...} | x |
5050
| trivia.cs:25:14:25:38 | // ... | trivia.cs:17:5:29:5 | {...} | numbering not affected |

‎csharp/ql/test/library-tests/comments/Bindings.expected‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,9 @@
4545
| comments2.cs:103:31:104:34 | // ... | comments2.cs:103:26:103:26 | D | D |
4646
| comments2.cs:106:5:106:8 | // ... | comments2.cs:107:20:107:20 | E | E |
4747
| comments2.cs:107:23:108:26 | // ... | comments2.cs:107:20:107:20 | E | E |
48-
| comments2.cs:118:5:118:21 | // ... | comments2.cs:119:11:119:25 | GenericClass<> | GenericClass<> |
48+
| comments2.cs:118:5:118:21 | // ... | comments2.cs:119:11:119:25 | GenericClass`1 | GenericClass<> |
4949
| comments2.cs:121:17:121:20 | // ... | comments2.cs:121:13:121:13 | f | f |
50-
| comments2.cs:124:5:124:16 | // ... | comments2.cs:125:9:125:20 | GenericFn<> | GenericFn |
50+
| comments2.cs:124:5:124:16 | // ... | comments2.cs:125:9:125:20 | GenericFn`1 | GenericFn |
5151
| comments2.cs:127:20:127:23 | // ... | comments2.cs:127:9:127:18 | ... ...; | x |
5252
| trivia.cs:13:89:13:103 | // ... | trivia.cs:14:7:14:9 | Tr1 | New checksum |
5353
| trivia.cs:25:14:25:38 | // ... | trivia.cs:17:5:29:5 | {...} | numbering not affected |

‎csharp/ql/test/library-tests/comments/Generics.expected‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
| comments2.cs:118:5:118:21 | // ... | comments2.cs:119:11:119:25 | GenericClass<> |
2-
| comments2.cs:124:5:124:16 | // ... | comments2.cs:125:9:125:20 | GenericFn<> |
1+
| comments2.cs:118:5:118:21 | // ... | comments2.cs:119:11:119:25 | GenericClass`1 |
2+
| comments2.cs:124:5:124:16 | // ... | comments2.cs:125:9:125:20 | GenericFn`1 |

‎csharp/ql/test/library-tests/comments/PrintAst.expected‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,12 +110,12 @@ comments2.cs:
110110
# 115| -1: [TypeMention] int
111111
# 115| 0: [LocalVariableAccess] access to local variable t4
112112
# 115| 1: [MethodCall] call to method GenericFn<Double>
113-
# 119| 18: [Class] GenericClass<>
113+
# 119| 20: [Class] GenericClass`1
114114
#-----| 1: (Type parameters)
115115
# 119| 0: [TypeParameter] T
116116
# 121| 5: [Field] f
117117
# 121| -1: [TypeMention] int
118-
# 125| 21: [Method] GenericFn<>
118+
# 125| 23: [Method] GenericFn`1
119119
# 125| -1: [TypeMention] int
120120
#-----| 1: (Type parameters)
121121
# 125| 0: [TypeParameter] T

‎csharp/ql/test/library-tests/conversion/operator/Operator.expected‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
| ArraySegment<T> | Memory<> |
2-
| ArraySegment<T> | ReadOnlyMemory<> |
3-
| ArraySegment<T> | ReadOnlySpan<> |
4-
| ArraySegment<T> | Span<> |
1+
| ArraySegment<T> | Memory`1 |
2+
| ArraySegment<T> | ReadOnlyMemory`1 |
3+
| ArraySegment<T> | ReadOnlySpan`1 |
4+
| ArraySegment<T> | Span`1 |
55
| Byte | Decimal |
66
| Byte | Half |
77
| Byte | Int128 |
@@ -28,22 +28,22 @@
2828
| Int64 | NFloat |
2929
| IntPtr | Int128 |
3030
| IntPtr | NFloat |
31-
| Memory<> | ReadOnlyMemory<T> |
31+
| Memory`1 | ReadOnlyMemory<T> |
3232
| MetadataToken | Int32 |
3333
| NFloat | Double |
3434
| SByte | Decimal |
3535
| SByte | Half |
3636
| SByte | Int128 |
3737
| SByte | NFloat |
3838
| Single | NFloat |
39-
| Span<> | ReadOnlySpan<T> |
39+
| Span`1 | ReadOnlySpan<T> |
4040
| String | ReadOnlySpan<Char> |
41-
| T | Nullable<> |
42-
| T[] | ArraySegment<> |
43-
| T[] | Memory<> |
44-
| T[] | ReadOnlyMemory<> |
45-
| T[] | ReadOnlySpan<> |
46-
| T[] | Span<> |
41+
| T | Nullable`1 |
42+
| T[] | ArraySegment`1 |
43+
| T[] | Memory`1 |
44+
| T[] | ReadOnlyMemory`1 |
45+
| T[] | ReadOnlySpan`1 |
46+
| T[] | Span`1 |
4747
| UInt16 | Decimal |
4848
| UInt16 | Int128 |
4949
| UInt16 | NFloat |

‎csharp/ql/test/library-tests/conversion/reftype/RefType.expected‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
| C2[] | Object |
2222
| C2[] | Object[] |
2323
| C2[] | dynamic |
24-
| C3<,> | Object |
25-
| C3<,> | dynamic |
24+
| C3`2 | Object |
25+
| C3`2 | dynamic |
2626
| Func<I1<C1>> | Object |
2727
| Func<I1<C1>> | dynamic |
2828
| Func<T3,T4,Object,T5,T6> | Func<T3,T4,String,T5,T6> |
@@ -39,28 +39,24 @@
3939
| Func<T3> | dynamic |
4040
| Func<T6> | Object |
4141
| Func<T6> | dynamic |
42-
| I1<> | Object |
43-
| I1<> | dynamic |
4442
| I1<C1> | I1<C2> |
4543
| I1<C1> | Object |
4644
| I1<C1> | dynamic |
4745
| I1<C2> | Object |
4846
| I1<C2> | dynamic |
4947
| I1<T1> | Object |
5048
| I1<T1> | dynamic |
51-
| I2<> | Object |
52-
| I2<> | dynamic |
49+
| I1`1 | Object |
50+
| I1`1 | dynamic |
5351
| I2<C1> | Object |
5452
| I2<C1> | dynamic |
5553
| I2<C2> | I2<C1> |
5654
| I2<C2> | Object |
5755
| I2<C2> | dynamic |
5856
| I2<T2> | Object |
5957
| I2<T2> | dynamic |
60-
| I3<,> | I1<T1> |
61-
| I3<,> | I2<T2> |
62-
| I3<,> | Object |
63-
| I3<,> | dynamic |
58+
| I2`1 | Object |
59+
| I2`1 | dynamic |
6460
| I3<C1,C2> | I1<C1> |
6561
| I3<C1,C2> | I1<C2> |
6662
| I3<C1,C2> | I2<C1> |
@@ -72,16 +68,20 @@
7268
| I3<C2,C1> | I2<C1> |
7369
| I3<C2,C1> | Object |
7470
| I3<C2,C1> | dynamic |
75-
| I4<,> | Object |
76-
| I4<,> | dynamic |
77-
| I4<C1,T4> | I4<,> |
71+
| I3`2 | I1<T1> |
72+
| I3`2 | I2<T2> |
73+
| I3`2 | Object |
74+
| I3`2 | dynamic |
75+
| I4<C1,T4> | I4`2 |
7876
| I4<C1,T4> | Object |
7977
| I4<C1,T4> | dynamic |
8078
| I4<C1,T6> | I4<T5,T6> |
8179
| I4<C1,T6> | Object |
8280
| I4<C1,T6> | dynamic |
8381
| I4<T5,T6> | Object |
8482
| I4<T5,T6> | dynamic |
83+
| I4`2 | Object |
84+
| I4`2 | dynamic |
8585
| ICollection<C1> | IEnumerable<C1> |
8686
| ICollection<C1> | Object |
8787
| ICollection<C1> | dynamic |
@@ -235,29 +235,29 @@
235235
| null | C1[] |
236236
| null | C2 |
237237
| null | C2[] |
238-
| null | C3<,> |
238+
| null | C3`2 |
239239
| null | Func<I1<C1>> |
240240
| null | Func<T3,T4,Object,T5,T6> |
241241
| null | Func<T3,T4,String,T5,T6> |
242242
| null | Func<T3,T4,T5,T6,Object> |
243243
| null | Func<T3,T4,T5,T6,String> |
244244
| null | Func<T3> |
245245
| null | Func<T6> |
246-
| null | I1<> |
247246
| null | I1<C1> |
248247
| null | I1<C2> |
249248
| null | I1<T1> |
250-
| null | I2<> |
249+
| null | I1`1 |
251250
| null | I2<C1> |
252251
| null | I2<C2> |
253252
| null | I2<T2> |
254-
| null | I3<,> |
253+
| null | I2`1 |
255254
| null | I3<C1,C2> |
256255
| null | I3<C2,C1> |
257-
| null | I4<,> |
256+
| null | I3`2 |
258257
| null | I4<C1,T4> |
259258
| null | I4<C1,T6> |
260259
| null | I4<T5,T6> |
260+
| null | I4`2 |
261261
| null | ICollection<C1> |
262262
| null | ICollection<C2> |
263263
| null | ICollection<T3> |

0 commit comments

Comments
 (0)