Skip to content

Commit 563b771

Browse files
hvitvedtamasvajk
hvitved
authored and
tamasvajk
committed
C#: Update expected test output
1 parent 0a0657a commit 563b771

File tree

10 files changed

+51
-81
lines changed

10 files changed

+51
-81
lines changed

‎csharp/ql/test/library-tests/csharp8/NullableRefTypes.expected

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -299,7 +299,7 @@ expressionTypes
299299
| NullableRefTypes.cs:93:21:93:28 | "source" | string! |
300300
| NullableRefTypes.cs:94:13:94:13 | access to local variable y | string? |
301301
| NullableRefTypes.cs:94:13:94:25 | String y = ... | string? |
302-
| NullableRefTypes.cs:94:17:94:17 | access to local variable x | string! |
302+
| NullableRefTypes.cs:94:17:94:17 | access to local variable x | string? |
303303
| NullableRefTypes.cs:94:17:94:25 | ... ?? ... | string? |
304304
| NullableRefTypes.cs:94:22:94:25 | null | null |
305305
| NullableRefTypes.cs:95:16:95:16 | access to local variable z | string! |

‎csharp/ql/test/library-tests/csharp9/FunctionPointer.expected

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ type
99
| file://:0:0:0:0 | delegate* default<T,Int32> | int | DefaultCallingConvention |
1010
| file://:0:0:0:0 | delegate* default<Void*,Int32*> | int* | DefaultCallingConvention |
1111
| file://:0:0:0:0 | delegate* stdcall<Int32 ref,Object out,T,Void> | Void | StdCallCallingConvention |
12+
| file://:0:0:0:0 | delegate* unmanaged<Char*,IntPtr,Void> | Void | CallingConvention |
1213
unmanagedCallingConvention
1314
parameter
1415
| file://:0:0:0:0 | delegate* default<A,B> | 0 | file://:0:0:0:0 | | A |
@@ -27,6 +28,8 @@ parameter
2728
| file://:0:0:0:0 | delegate* stdcall<Int32 ref,Object out,T,Void> | 0 | file://:0:0:0:0 | | ref int! |
2829
| file://:0:0:0:0 | delegate* stdcall<Int32 ref,Object out,T,Void> | 1 | file://:0:0:0:0 | `1 | out object? |
2930
| file://:0:0:0:0 | delegate* stdcall<Int32 ref,Object out,T,Void> | 2 | file://:0:0:0:0 | `2 | T |
31+
| file://:0:0:0:0 | delegate* unmanaged<Char*,IntPtr,Void> | 0 | file://:0:0:0:0 | | char*! |
32+
| file://:0:0:0:0 | delegate* unmanaged<Char*,IntPtr,Void> | 1 | file://:0:0:0:0 | `1 | IntPtr! |
3033
invocation
3134
| FunctionPointer.cs:17:21:17:43 | function pointer call |
3235
| FunctionPointer.cs:23:13:23:44 | function pointer call |

‎csharp/ql/test/library-tests/csharp9/LocalFunctions.expected

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
noBody
22
| LocalFunction.cs:16:9:16:41 | localExtern |
33
localFunctionModifier
4-
| GlobalStmt.cs:13:1:15:1 | M | private |
54
| LambdaModifier.cs:8:9:8:36 | m | private |
65
| LocalFunction.cs:9:9:12:9 | mul | async |
76
| LocalFunction.cs:9:9:12:9 | mul | private |

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

Lines changed: 40 additions & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -404,39 +404,6 @@ FunctionPointer.cs:
404404
# 48| 14: [Class] B
405405
#-----| 3: (Base types)
406406
# 48| 0: [TypeMention] A
407-
GlobalStmt.cs:
408-
# 5| [Class] <Program>$
409-
# 5| 4: [Method] <Main>$
410-
#-----| 2: (Parameters)
411-
# 1| 0: [Parameter] args
412-
# 5| 4: [BlockStmt] {...}
413-
# 9| 0: [ExprStmt] ...;
414-
# 9| 0: [MethodCall] call to method WriteLine
415-
# 9| -1: [TypeAccess] access to type Console
416-
# 9| 0: [TypeMention] Console
417-
# 9| 0: [StringLiteral] "1"
418-
# 10| 1: [ExprStmt] ...;
419-
# 10| 0: [MethodCall] call to method WriteLine
420-
# 10| -1: [TypeAccess] access to type Console
421-
# 10| 0: [TypeMention] Console
422-
# 10| 0: [StringLiteral] "2"
423-
# 11| 2: [ExprStmt] ...;
424-
# 11| 0: [LocalFunctionCall] call to local function M
425-
# 11| -1: [LocalFunctionAccess] access to local function M
426-
# 13| 3: [LocalFunctionStmt] M(...)
427-
# 13| 0: [LocalFunction] M
428-
# 14| 4: [BlockStmt] {...}
429-
# 17| [Class] Attr
430-
#-----| 3: (Base types)
431-
# 17| 0: [TypeMention] Attribute
432-
# 19| 5: [Method] M1
433-
# 19| -1: [TypeMention] Void
434-
# 20| 4: [BlockStmt] {...}
435-
# 21| 0: [ExprStmt] ...;
436-
# 21| 0: [MethodCall] call to method WriteLine
437-
# 21| -1: [TypeAccess] access to type Console
438-
# 21| 0: [TypeMention] Console
439-
# 21| 0: [StringLiteral] "3"
440407
InitOnlyProperty.cs:
441408
# 3| [Class] Base
442409
# 5| 5: [Property] Prop0
@@ -812,12 +779,12 @@ Record.cs:
812779
# 4| [Record] Person
813780
# 4| 11: [NEOperator] !=
814781
#-----| 2: (Parameters)
815-
# 4| 0: [Parameter] r1
816-
# 4| 1: [Parameter] r2
782+
# 4| 0: [Parameter] left
783+
# 4| 1: [Parameter] right
817784
# 4| 12: [EQOperator] ==
818785
#-----| 2: (Parameters)
819-
# 4| 0: [Parameter] r1
820-
# 4| 1: [Parameter] r2
786+
# 4| 0: [Parameter] left
787+
# 4| 1: [Parameter] right
821788
# 4| 13: [Property] EqualityContract
822789
# 4| 3: [Getter] get_EqualityContract
823790
# 6| 14: [Property] LastName
@@ -842,12 +809,12 @@ Record.cs:
842809
# 12| [Record] Teacher
843810
# 12| 12: [NEOperator] !=
844811
#-----| 2: (Parameters)
845-
# 12| 0: [Parameter] r1
846-
# 12| 1: [Parameter] r2
812+
# 12| 0: [Parameter] left
813+
# 12| 1: [Parameter] right
847814
# 12| 13: [EQOperator] ==
848815
#-----| 2: (Parameters)
849-
# 12| 0: [Parameter] r1
850-
# 12| 1: [Parameter] r2
816+
# 12| 0: [Parameter] left
817+
# 12| 1: [Parameter] right
851818
# 12| 14: [Property] EqualityContract
852819
# 12| 3: [Getter] get_EqualityContract
853820
# 14| 15: [Property] Subject
@@ -870,12 +837,12 @@ Record.cs:
870837
# 20| [Record] Student
871838
# 20| 12: [NEOperator] !=
872839
#-----| 2: (Parameters)
873-
# 20| 0: [Parameter] r1
874-
# 20| 1: [Parameter] r2
840+
# 20| 0: [Parameter] left
841+
# 20| 1: [Parameter] right
875842
# 20| 13: [EQOperator] ==
876843
#-----| 2: (Parameters)
877-
# 20| 0: [Parameter] r1
878-
# 20| 1: [Parameter] r2
844+
# 20| 0: [Parameter] left
845+
# 20| 1: [Parameter] right
879846
# 20| 14: [Property] EqualityContract
880847
# 20| 3: [Getter] get_EqualityContract
881848
# 22| 15: [Property] Level
@@ -898,12 +865,12 @@ Record.cs:
898865
# 27| [Record] Person1
899866
# 27| 12: [NEOperator] !=
900867
#-----| 2: (Parameters)
901-
# 27| 0: [Parameter] r1
902-
# 27| 1: [Parameter] r2
868+
# 27| 0: [Parameter] left
869+
# 27| 1: [Parameter] right
903870
# 27| 13: [EQOperator] ==
904871
#-----| 2: (Parameters)
905-
# 27| 0: [Parameter] r1
906-
# 27| 1: [Parameter] r2
872+
# 27| 0: [Parameter] left
873+
# 27| 1: [Parameter] right
907874
# 27| 14: [Property] EqualityContract
908875
# 27| 3: [Getter] get_EqualityContract
909876
# 27| 15: [InstanceConstructor] Person1
@@ -925,12 +892,12 @@ Record.cs:
925892
# 29| [Record] Teacher1
926893
# 29| 13: [NEOperator] !=
927894
#-----| 2: (Parameters)
928-
# 29| 0: [Parameter] r1
929-
# 29| 1: [Parameter] r2
895+
# 29| 0: [Parameter] left
896+
# 29| 1: [Parameter] right
930897
# 29| 14: [EQOperator] ==
931898
#-----| 2: (Parameters)
932-
# 29| 0: [Parameter] r1
933-
# 29| 1: [Parameter] r2
899+
# 29| 0: [Parameter] left
900+
# 29| 1: [Parameter] right
934901
# 29| 15: [Property] EqualityContract
935902
# 29| 3: [Getter] get_EqualityContract
936903
# 29| 16: [InstanceConstructor] Teacher1
@@ -949,12 +916,12 @@ Record.cs:
949916
# 32| [Record] Student1
950917
# 32| 13: [NEOperator] !=
951918
#-----| 2: (Parameters)
952-
# 32| 0: [Parameter] r1
953-
# 32| 1: [Parameter] r2
919+
# 32| 0: [Parameter] left
920+
# 32| 1: [Parameter] right
954921
# 32| 14: [EQOperator] ==
955922
#-----| 2: (Parameters)
956-
# 32| 0: [Parameter] r1
957-
# 32| 1: [Parameter] r2
923+
# 32| 0: [Parameter] left
924+
# 32| 1: [Parameter] right
958925
# 32| 15: [Property] EqualityContract
959926
# 32| 3: [Getter] get_EqualityContract
960927
# 32| 16: [InstanceConstructor] Student1
@@ -973,12 +940,12 @@ Record.cs:
973940
# 35| [Record] Pet
974941
# 35| 12: [NEOperator] !=
975942
#-----| 2: (Parameters)
976-
# 35| 0: [Parameter] r1
977-
# 35| 1: [Parameter] r2
943+
# 35| 0: [Parameter] left
944+
# 35| 1: [Parameter] right
978945
# 35| 13: [EQOperator] ==
979946
#-----| 2: (Parameters)
980-
# 35| 0: [Parameter] r1
981-
# 35| 1: [Parameter] r2
947+
# 35| 0: [Parameter] left
948+
# 35| 1: [Parameter] right
982949
# 35| 14: [Property] EqualityContract
983950
# 35| 3: [Getter] get_EqualityContract
984951
# 35| 15: [InstanceConstructor] Pet
@@ -999,12 +966,12 @@ Record.cs:
999966
# 41| [Record] Dog
1000967
# 41| 12: [NEOperator] !=
1001968
#-----| 2: (Parameters)
1002-
# 41| 0: [Parameter] r1
1003-
# 41| 1: [Parameter] r2
969+
# 41| 0: [Parameter] left
970+
# 41| 1: [Parameter] right
1004971
# 41| 13: [EQOperator] ==
1005972
#-----| 2: (Parameters)
1006-
# 41| 0: [Parameter] r1
1007-
# 41| 1: [Parameter] r2
973+
# 41| 0: [Parameter] left
974+
# 41| 1: [Parameter] right
1008975
# 41| 14: [InstanceConstructor] Dog
1009976
#-----| 2: (Parameters)
1010977
# 41| 0: [Parameter] Name
@@ -1038,12 +1005,12 @@ Record.cs:
10381005
# 54| [Record] R1
10391006
# 54| 12: [NEOperator] !=
10401007
#-----| 2: (Parameters)
1041-
# 54| 0: [Parameter] r1
1042-
# 54| 1: [Parameter] r2
1008+
# 54| 0: [Parameter] left
1009+
# 54| 1: [Parameter] right
10431010
# 54| 13: [EQOperator] ==
10441011
#-----| 2: (Parameters)
1045-
# 54| 0: [Parameter] r1
1046-
# 54| 1: [Parameter] r2
1012+
# 54| 0: [Parameter] left
1013+
# 54| 1: [Parameter] right
10471014
# 54| 14: [Property] EqualityContract
10481015
# 54| 3: [Getter] get_EqualityContract
10491016
# 54| 15: [InstanceConstructor] R1
@@ -1058,12 +1025,12 @@ Record.cs:
10581025
# 56| [Record] R2
10591026
# 56| 13: [NEOperator] !=
10601027
#-----| 2: (Parameters)
1061-
# 56| 0: [Parameter] r1
1062-
# 56| 1: [Parameter] r2
1028+
# 56| 0: [Parameter] left
1029+
# 56| 1: [Parameter] right
10631030
# 56| 14: [EQOperator] ==
10641031
#-----| 2: (Parameters)
1065-
# 56| 0: [Parameter] r1
1066-
# 56| 1: [Parameter] r2
1032+
# 56| 0: [Parameter] left
1033+
# 56| 1: [Parameter] right
10671034
# 56| 15: [Property] EqualityContract
10681035
# 56| 3: [Getter] get_EqualityContract
10691036
# 56| 16: [InstanceConstructor] R2

‎csharp/ql/test/library-tests/csharp9/GlobalStmt.cs renamed to ‎csharp/ql/test/library-tests/csharp9/global/GlobalStmt.cs

File renamed without changes.

‎csharp/ql/test/library-tests/csharp9/globalStmt.expected renamed to ‎csharp/ql/test/library-tests/csharp9/global/globalStmt.expected

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ global_stmt
44
| GlobalStmt.cs:11:1:11:4 | ...; |
55
| GlobalStmt.cs:13:1:15:1 | M(...) |
66
globalBlock
7-
| GlobalStmt.cs:5:1:24:0 | {...} | GlobalStmt.cs:5:1:24:0 | <Main>$ | GlobalStmt.cs:1:1:1:0 | args | GlobalStmt.cs:5:1:24:0 | <Program>$ |
7+
| GlobalStmt.cs:5:1:24:0 | {...} | GlobalStmt.cs:5:1:24:0 | <Main>$ | GlobalStmt.cs:1:1:1:0 | args | GlobalStmt.cs:5:1:24:0 | Program |
88
methods
99
| GlobalStmt.cs:5:1:24:0 | <Main>$ | entry |
1010
| GlobalStmt.cs:19:8:19:9 | M1 | non-entry |

‎csharp/ql/test/library-tests/csharp9/globalStmt.ql renamed to ‎csharp/ql/test/library-tests/csharp9/global/globalStmt.ql

File renamed without changes.

‎csharp/ql/test/library-tests/csharp9/global/options

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
semmle-extractor-options: --standalone

‎csharp/ql/test/library-tests/csharp9/options

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
semmle-extractor-options: --standalone
1+
semmle-extractor-options: /r:System.Linq.dll

‎csharp/ql/test/library-tests/dataflow/tuples/PrintAst.expected

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -284,12 +284,12 @@ Tuples.cs:
284284
# 85| 9: [Record] R1
285285
# 85| 12: [NEOperator] !=
286286
#-----| 2: (Parameters)
287-
# 85| 0: [Parameter] r1
288-
# 85| 1: [Parameter] r2
287+
# 85| 0: [Parameter] left
288+
# 85| 1: [Parameter] right
289289
# 85| 13: [EQOperator] ==
290290
#-----| 2: (Parameters)
291-
# 85| 0: [Parameter] r1
292-
# 85| 1: [Parameter] r2
291+
# 85| 0: [Parameter] left
292+
# 85| 1: [Parameter] right
293293
# 85| 14: [Property] EqualityContract
294294
# 85| 3: [Getter] get_EqualityContract
295295
# 85| 15: [InstanceConstructor] R1

0 commit comments

Comments
 (0)