C#: Update expected test output

github · Nov 10, 2023 · 57ec094 · 57ec094
1 parent 2971a20
commit 57ec094
Show file tree

Hide file tree

Showing 75 changed files with 2,593 additions and 2,593 deletions.
diff --git a/csharp/ql/integration-tests/all-platforms/diag_recursive_generics/Types.expected b/csharp/ql/integration-tests/all-platforms/diag_recursive_generics/Types.expected
@@ -1,35 +1,35 @@
-| test.cs:1:14:1:20 | GenA<> | System.Object |
-| test.cs:1:14:1:20 | GenA<GenB<GenB<>>> | System.Object |
 | test.cs:1:14:1:20 | GenA<GenB<GenB<String>>> | System.Object |
-| test.cs:2:14:2:20 | GenB<> | System.Object |
-| test.cs:2:14:2:20 | GenB<GenB<>> | System.Object |
+| test.cs:1:14:1:20 | GenA<GenB<GenB`1>> | System.Object |
+| test.cs:1:14:1:20 | GenA`1 | System.Object |
 | test.cs:2:14:2:20 | GenB<GenB<String>> | System.Object |
+| test.cs:2:14:2:20 | GenB<GenB`1> | System.Object |
 | test.cs:2:14:2:20 | GenB<String> | System.Object |
-| test.cs:4:7:4:10 | P<> | System.Object |
-| test.cs:4:7:4:10 | P<C<,>> | System.Object |
+| test.cs:2:14:2:20 | GenB`1 | System.Object |
 | test.cs:4:7:4:10 | P<C<Int32,String>> | System.Object |
 | test.cs:4:7:4:10 | P<C<String,Int32>> | System.Object |
 | test.cs:4:7:4:10 | P<C<V,U>> | System.Object |
 | test.cs:4:7:4:10 | P<C<W,X>> | System.Object |
 | test.cs:4:7:4:10 | P<C<X,W>> | System.Object |
-| test.cs:4:7:4:10 | P<D<,>> | System.Object |
+| test.cs:4:7:4:10 | P<C`2> | System.Object |
 | test.cs:4:7:4:10 | P<D<Int32,String>> | System.Object |
 | test.cs:4:7:4:10 | P<D<String,Int32>> | System.Object |
 | test.cs:4:7:4:10 | P<D<U,V>> | System.Object |
 | test.cs:4:7:4:10 | P<D<V,U>> | System.Object |
 | test.cs:4:7:4:10 | P<D<X,W>> | System.Object |
-| test.cs:5:7:5:13 | C<,> | P<D<V,U>> |
+| test.cs:4:7:4:10 | P<D`2> | System.Object |
+| test.cs:4:7:4:10 | P`1 | System.Object |
 | test.cs:5:7:5:13 | C<Int32,String> | P<D<System.String,System.Int32>> |
 | test.cs:5:7:5:13 | C<String,Int32> | P<D<System.Int32,System.String>> |
 | test.cs:5:7:5:13 | C<V,U> | P<D<U,V>> |
 | test.cs:5:7:5:13 | C<W,X> | P<D<X,W>> |
-| test.cs:5:7:5:13 | C<X,W> | P<D<,>> |
-| test.cs:6:7:6:13 | D<,> | P<C<W,X>> |
+| test.cs:5:7:5:13 | C<X,W> | P<D`2> |
+| test.cs:5:7:5:13 | C`2 | P<D<V,U>> |
 | test.cs:6:7:6:13 | D<Int32,String> | P<C<System.Int32,System.String>> |
 | test.cs:6:7:6:13 | D<String,Int32> | P<C<System.String,System.Int32>> |
-| test.cs:6:7:6:13 | D<U,V> | P<C<,>> |
+| test.cs:6:7:6:13 | D<U,V> | P<C`2> |
 | test.cs:6:7:6:13 | D<V,U> | P<C<V,U>> |
 | test.cs:6:7:6:13 | D<X,W> | P<C<X,W>> |
-| test.cs:8:7:8:10 | A<> | System.Object |
+| test.cs:6:7:6:13 | D`2 | P<C<W,X>> |
 | test.cs:8:7:8:10 | A<String> | System.Object |
+| test.cs:8:7:8:10 | A`1 | System.Object |
 | test.cs:13:14:13:18 | Class | System.Object |
diff --git a/csharp/ql/test/library-tests/assignables/AssignableDefinitionNode.expected b/csharp/ql/test/library-tests/assignables/AssignableDefinitionNode.expected
@@ -29,11 +29,11 @@
 | Assignables.cs:34:40:34:44 | access to field Field | Assignables.cs:34:9:34:45 | call to method RefCertainOneOf |
 | Assignables.cs:37:22:37:22 | o | Assignables.cs:37:10:37:12 | enter Out |
 | Assignables.cs:39:9:39:13 | ... = ... | Assignables.cs:39:9:39:13 | ... = ... |
-| Assignables.cs:42:26:42:26 | x | Assignables.cs:42:10:42:22 | enter RefCertain<> |
-| Assignables.cs:42:35:42:35 | y | Assignables.cs:42:10:42:22 | enter RefCertain<> |
-| Assignables.cs:42:43:42:43 | b | Assignables.cs:42:10:42:22 | enter RefCertain<> |
+| Assignables.cs:42:26:42:26 | x | Assignables.cs:42:10:42:22 | enter RefCertain`1 |
+| Assignables.cs:42:35:42:35 | y | Assignables.cs:42:10:42:22 | enter RefCertain`1 |
+| Assignables.cs:42:43:42:43 | b | Assignables.cs:42:10:42:22 | enter RefCertain`1 |
 | Assignables.cs:45:13:45:17 | ... = ... | Assignables.cs:45:13:45:17 | ... = ... |
-| Assignables.cs:47:31:47:31 | access to parameter y | Assignables.cs:47:13:47:38 | call to method RefCertain<> |
+| Assignables.cs:47:31:47:31 | access to parameter y | Assignables.cs:47:13:47:38 | call to method RefCertain`1 |
 | Assignables.cs:50:27:50:27 | x | Assignables.cs:50:10:50:21 | enter RefUncertain |
 | Assignables.cs:50:38:50:38 | y | Assignables.cs:50:10:50:21 | enter RefUncertain |
 | Assignables.cs:53:13:53:17 | ... = ... | Assignables.cs:53:13:53:17 | ... = ... |

diff --git a/csharp/ql/test/library-tests/comments/BindingAfter.expected b/csharp/ql/test/library-tests/comments/BindingAfter.expected
@@ -52,8 +52,8 @@
 | comments2.cs:103:31:104:34 | // ... | comments2.cs:107:20:107:20 | E | D |
 | comments2.cs:106:5:106:8 | // ... | comments2.cs:107:20:107:20 | E | E |
 | comments2.cs:107:23:108:26 | // ... | comments2.cs:110:10:110:12 | gen | E |
-| comments2.cs:118:5:118:21 | // ... | comments2.cs:119:11:119:25 | GenericClass<> | GenericClass<> |
-| comments2.cs:124:5:124:16 | // ... | comments2.cs:125:9:125:20 | GenericFn<> | GenericFn |
+| comments2.cs:118:5:118:21 | // ... | comments2.cs:119:11:119:25 | GenericClass`1 | GenericClass<> |
+| comments2.cs:124:5:124:16 | // ... | comments2.cs:125:9:125:20 | GenericFn`1 | GenericFn |
 | comments2.cs:127:20:127:23 | // ... | comments2.cs:128:9:128:17 | return ...; | x |
 | trivia.cs:1:1:3:15 | // ... | trivia.cs:14:7:14:9 | Tr1 |  |
 | trivia.cs:13:89:13:103 | // ... | trivia.cs:14:7:14:9 | Tr1 | New checksum |

diff --git a/csharp/ql/test/library-tests/comments/BindingBefore.expected b/csharp/ql/test/library-tests/comments/BindingBefore.expected
@@ -45,7 +45,7 @@
 | comments2.cs:107:23:108:26 | // ... | comments2.cs:107:20:107:20 | E | E |
 | comments2.cs:118:5:118:21 | // ... | comments2.cs:111:5:116:5 | {...} | GenericClass<> |
 | comments2.cs:121:17:121:20 | // ... | comments2.cs:121:13:121:13 | f | f |
-| comments2.cs:124:5:124:16 | // ... | comments2.cs:119:11:119:25 | GenericClass<> | GenericFn |
+| comments2.cs:124:5:124:16 | // ... | comments2.cs:119:11:119:25 | GenericClass`1 | GenericFn |
 | comments2.cs:127:20:127:23 | // ... | comments2.cs:127:9:127:18 | ... ...; | x |
 | comments2.cs:132:1:132:21 | // ... | comments2.cs:11:7:11:8 | C2 | End of comment2.cs |
 | trivia.cs:25:14:25:38 | // ... | trivia.cs:24:9:24:16 | ... ...; | numbering not affected |
diff --git a/csharp/ql/test/library-tests/comments/BindingParent.expected b/csharp/ql/test/library-tests/comments/BindingParent.expected
@@ -44,7 +44,7 @@
 | comments2.cs:106:5:106:8 | // ... | comments2.cs:11:7:11:8 | C2 | E |
 | comments2.cs:107:23:108:26 | // ... | comments2.cs:11:7:11:8 | C2 | E |
 | comments2.cs:118:5:118:21 | // ... | comments2.cs:11:7:11:8 | C2 | GenericClass<> |
-| comments2.cs:121:17:121:20 | // ... | comments2.cs:119:11:119:25 | GenericClass<> | f |
+| comments2.cs:121:17:121:20 | // ... | comments2.cs:119:11:119:25 | GenericClass`1 | f |
 | comments2.cs:124:5:124:16 | // ... | comments2.cs:11:7:11:8 | C2 | GenericFn |
 | comments2.cs:127:20:127:23 | // ... | comments2.cs:126:5:129:5 | {...} | x |
 | trivia.cs:25:14:25:38 | // ... | trivia.cs:17:5:29:5 | {...} | numbering not affected |

diff --git a/csharp/ql/test/library-tests/comments/Bindings.expected b/csharp/ql/test/library-tests/comments/Bindings.expected
@@ -45,9 +45,9 @@
 | comments2.cs:103:31:104:34 | // ... | comments2.cs:103:26:103:26 | D | D |
 | comments2.cs:106:5:106:8 | // ... | comments2.cs:107:20:107:20 | E | E |
 | comments2.cs:107:23:108:26 | // ... | comments2.cs:107:20:107:20 | E | E |
-| comments2.cs:118:5:118:21 | // ... | comments2.cs:119:11:119:25 | GenericClass<> | GenericClass<> |
+| comments2.cs:118:5:118:21 | // ... | comments2.cs:119:11:119:25 | GenericClass`1 | GenericClass<> |
 | comments2.cs:121:17:121:20 | // ... | comments2.cs:121:13:121:13 | f | f |
-| comments2.cs:124:5:124:16 | // ... | comments2.cs:125:9:125:20 | GenericFn<> | GenericFn |
+| comments2.cs:124:5:124:16 | // ... | comments2.cs:125:9:125:20 | GenericFn`1 | GenericFn |
 | comments2.cs:127:20:127:23 | // ... | comments2.cs:127:9:127:18 | ... ...; | x |
 | trivia.cs:13:89:13:103 | // ... | trivia.cs:14:7:14:9 | Tr1 | New checksum |
 | trivia.cs:25:14:25:38 | // ... | trivia.cs:17:5:29:5 | {...} | numbering not affected |

diff --git a/csharp/ql/test/library-tests/comments/Generics.expected b/csharp/ql/test/library-tests/comments/Generics.expected
@@ -1,2 +1,2 @@
-| comments2.cs:118:5:118:21 | // ... | comments2.cs:119:11:119:25 | GenericClass<> |
-| comments2.cs:124:5:124:16 | // ... | comments2.cs:125:9:125:20 | GenericFn<> |
+| comments2.cs:118:5:118:21 | // ... | comments2.cs:119:11:119:25 | GenericClass`1 |
+| comments2.cs:124:5:124:16 | // ... | comments2.cs:125:9:125:20 | GenericFn`1 |
diff --git a/csharp/ql/test/library-tests/comments/PrintAst.expected b/csharp/ql/test/library-tests/comments/PrintAst.expected
@@ -110,12 +110,12 @@ comments2.cs:
 #  115|           -1: [TypeMention] int
 #  115|           0: [LocalVariableAccess] access to local variable t4
 #  115|           1: [MethodCall] call to method GenericFn<Double>
-#  119|   18: [Class] GenericClass<>
+#  119|   20: [Class] GenericClass`1
 #-----|     1: (Type parameters)
 #  119|       0: [TypeParameter] T
 #  121|     5: [Field] f
 #  121|       -1: [TypeMention] int
-#  125|   21: [Method] GenericFn<>
+#  125|   23: [Method] GenericFn`1
 #  125|     -1: [TypeMention] int
 #-----|     1: (Type parameters)
 #  125|       0: [TypeParameter] T

diff --git a/csharp/ql/test/library-tests/conversion/operator/Operator.expected b/csharp/ql/test/library-tests/conversion/operator/Operator.expected
@@ -1,7 +1,7 @@
-| ArraySegment<T> | Memory<> |
-| ArraySegment<T> | ReadOnlyMemory<> |
-| ArraySegment<T> | ReadOnlySpan<> |
-| ArraySegment<T> | Span<> |
+| ArraySegment<T> | Memory`1 |
+| ArraySegment<T> | ReadOnlyMemory`1 |
+| ArraySegment<T> | ReadOnlySpan`1 |
+| ArraySegment<T> | Span`1 |
 | Byte | Decimal |
 | Byte | Half |
 | Byte | Int128 |
@@ -28,22 +28,22 @@
 | Int64 | NFloat |
 | IntPtr | Int128 |
 | IntPtr | NFloat |
-| Memory<> | ReadOnlyMemory<T> |
+| Memory`1 | ReadOnlyMemory<T> |
 | MetadataToken | Int32 |
 | NFloat | Double |
 | SByte | Decimal |
 | SByte | Half |
 | SByte | Int128 |
 | SByte | NFloat |
 | Single | NFloat |
-| Span<> | ReadOnlySpan<T> |
+| Span`1 | ReadOnlySpan<T> |
 | String | ReadOnlySpan<Char> |
-| T | Nullable<> |
-| T[] | ArraySegment<> |
-| T[] | Memory<> |
-| T[] | ReadOnlyMemory<> |
-| T[] | ReadOnlySpan<> |
-| T[] | Span<> |
+| T | Nullable`1 |
+| T[] | ArraySegment`1 |
+| T[] | Memory`1 |
+| T[] | ReadOnlyMemory`1 |
+| T[] | ReadOnlySpan`1 |
+| T[] | Span`1 |
 | UInt16 | Decimal |
 | UInt16 | Int128 |
 | UInt16 | NFloat |

diff --git a/csharp/ql/test/library-tests/conversion/reftype/RefType.expected b/csharp/ql/test/library-tests/conversion/reftype/RefType.expected
@@ -21,8 +21,8 @@
 | C2[] | Object |
 | C2[] | Object[] |
 | C2[] | dynamic |
-| C3<,> | Object |
-| C3<,> | dynamic |
+| C3`2 | Object |
+| C3`2 | dynamic |
 | Func<I1<C1>> | Object |
 | Func<I1<C1>> | dynamic |
 | Func<T3,T4,Object,T5,T6> | Func<T3,T4,String,T5,T6> |
@@ -39,28 +39,24 @@
 | Func<T3> | dynamic |
 | Func<T6> | Object |
 | Func<T6> | dynamic |
-| I1<> | Object |
-| I1<> | dynamic |
 | I1<C1> | I1<C2> |
 | I1<C1> | Object |
 | I1<C1> | dynamic |
 | I1<C2> | Object |
 | I1<C2> | dynamic |
 | I1<T1> | Object |
 | I1<T1> | dynamic |
-| I2<> | Object |
-| I2<> | dynamic |
+| I1`1 | Object |
+| I1`1 | dynamic |
 | I2<C1> | Object |
 | I2<C1> | dynamic |
 | I2<C2> | I2<C1> |
 | I2<C2> | Object |
 | I2<C2> | dynamic |
 | I2<T2> | Object |
 | I2<T2> | dynamic |
-| I3<,> | I1<T1> |
-| I3<,> | I2<T2> |
-| I3<,> | Object |
-| I3<,> | dynamic |
+| I2`1 | Object |
+| I2`1 | dynamic |
 | I3<C1,C2> | I1<C1> |
 | I3<C1,C2> | I1<C2> |
 | I3<C1,C2> | I2<C1> |
@@ -72,16 +68,20 @@
 | I3<C2,C1> | I2<C1> |
 | I3<C2,C1> | Object |
 | I3<C2,C1> | dynamic |
-| I4<,> | Object |
-| I4<,> | dynamic |
-| I4<C1,T4> | I4<,> |
+| I3`2 | I1<T1> |
+| I3`2 | I2<T2> |
+| I3`2 | Object |
+| I3`2 | dynamic |
+| I4<C1,T4> | I4`2 |
 | I4<C1,T4> | Object |
 | I4<C1,T4> | dynamic |
 | I4<C1,T6> | I4<T5,T6> |
 | I4<C1,T6> | Object |
 | I4<C1,T6> | dynamic |
 | I4<T5,T6> | Object |
 | I4<T5,T6> | dynamic |
+| I4`2 | Object |
+| I4`2 | dynamic |
 | ICollection<C1> | IEnumerable<C1> |
 | ICollection<C1> | Object |
 | ICollection<C1> | dynamic |
@@ -235,29 +235,29 @@
 | null | C1[] |
 | null | C2 |
 | null | C2[] |
-| null | C3<,> |
+| null | C3`2 |
 | null | Func<I1<C1>> |
 | null | Func<T3,T4,Object,T5,T6> |
 | null | Func<T3,T4,String,T5,T6> |
 | null | Func<T3,T4,T5,T6,Object> |
 | null | Func<T3,T4,T5,T6,String> |
 | null | Func<T3> |
 | null | Func<T6> |
-| null | I1<> |
 | null | I1<C1> |
 | null | I1<C2> |
 | null | I1<T1> |
-| null | I2<> |
+| null | I1`1 |
 | null | I2<C1> |
 | null | I2<C2> |
 | null | I2<T2> |
-| null | I3<,> |
+| null | I2`1 |
 | null | I3<C1,C2> |
 | null | I3<C2,C1> |
-| null | I4<,> |
+| null | I3`2 |
 | null | I4<C1,T4> |
 | null | I4<C1,T6> |
 | null | I4<T5,T6> |
+| null | I4`2 |
 | null | ICollection<C1> |
 | null | ICollection<C2> |
 | null | ICollection<T3> |

diff --git a/csharp/ql/test/library-tests/csharp11/PrintAst.expected b/csharp/ql/test/library-tests/csharp11/PrintAst.expected
@@ -227,10 +227,10 @@ FileScoped1.cs:
 #-----|   3: (Base types)
 #    9|     1: [TypeMention] I2
 #   11| [Interface] IC
-#   13| [Class] C4<>
+#   13| [Class] C4`1
 #-----|   1: (Type parameters)
 #   13|     0: [TypeParameter] T
-#   15| [Class] C5<>
+#   15| [Class] C5`1
 #-----|   1: (Type parameters)
 #   15|     0: [TypeParameter] S
 #-----|   3: (Base types)
@@ -267,10 +267,10 @@ FileScoped2.cs:
 #-----|   3: (Base types)
 #    7|     1: [TypeMention] I2
 #    9| [Class] IC
-#   11| [Class] C4<>
+#   11| [Class] C4`1
 #-----|   1: (Type parameters)
 #   11|     0: [TypeParameter] T
-#   13| [Class] C5<>
+#   13| [Class] C5`1
 #-----|   1: (Type parameters)
 #   13|     0: [TypeParameter] S
 #-----|   3: (Base types)
@@ -321,12 +321,12 @@ GenericAttribute.cs:
 #    4|   0: [TypeMention] MyGeneric2Attribute<object, object>
 #    4|     1: [TypeMention] object
 #    4|     2: [TypeMention] object
-#    6| [Class] MyGenericAttribute<>
+#    6| [Class] MyGenericAttribute`1
 #-----|   1: (Type parameters)
 #    6|     0: [TypeParameter] T
 #-----|   3: (Base types)
 #    6|     0: [TypeMention] Attribute
-#    7| [Class] MyGeneric2Attribute<,>
+#    7| [Class] MyGeneric2Attribute`2
 #-----|   1: (Type parameters)
 #    7|     0: [TypeParameter] T
 #    7|     1: [TypeParameter] U
@@ -494,7 +494,7 @@ NameofScope.cs:
 #    8|       4: [AssignExpr] ... = ...
 #    8|         0: [FieldAccess] access to field S
 #    8|         1: [ParameterAccess] access to parameter s
-#   12|   6: [Method] M1<>
+#   12|   6: [Method] M1`1
 #   12|     -1: [TypeMention] Void
 #-----|     0: (Attributes)
 #   11|       1: [DefaultAttribute] [My(...)]
@@ -530,7 +530,7 @@ NameofScope.cs:
 #   17|             0: [NameOfExpr] nameof(...)
 #   17|               0: [ParameterAccess] access to parameter z
 #   17|     4: [ParameterAccess] access to parameter z
-#   19|   9: [Method] M4<>
+#   19|   9: [Method] M4`1
 #   19|     -1: [TypeMention] object
 #-----|     1: (Type parameters)
 #   19|       0: [TypeParameter] S
@@ -659,7 +659,7 @@ PatternMatchSpan.cs:
 #   16|         3: [BlockStmt] {...}
 #   16|           0: [BreakStmt] break;
 RelaxedShift.cs:
-#    1| [Interface] IShiftOperators<,,>
+#    1| [Interface] IShiftOperators`3
 #-----|   1: (Type parameters)
 #    1|     0: [TypeParameter] TSelf
 #    1|     1: [TypeParameter] TOther
@@ -1037,7 +1037,7 @@ SignAnalysis.cs:
 #   39|                 0: [ParameterAccess] access to parameter x
 #   39|                 1: [ParameterAccess] access to parameter y
 StaticInterfaceMembers.cs:
-#    1| [Interface] INumber<>
+#    1| [Interface] INumber`1
 #-----|   1: (Type parameters)
 #    1|     0: [TypeParameter] T
 #    3|   4: [IncrementOperator] ++