Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 7ef9420

Browse files
smowtonigfoo
smowton
authored and
igfoo
committed
Accept test changes
1 parent 23e3bbe commit 7ef9420

2 files changed

Lines changed: 18 additions & 43 deletions

File tree

‎java/ql/test/kotlin/library-tests/reflection/PrintAst.expected‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -613,11 +613,11 @@ reflection.kt:
613613
# 41| 0: [ReturnStmt] return ...
614614
# 41| 0: [VarAccess] INSTANCE
615615
# 58| 3: [Class] Class1
616-
# 58| 4: [Constructor] Class1
616+
# 58| 3: [Constructor] Class1
617617
# 58| 5: [BlockStmt] { ... }
618618
# 58| 0: [SuperConstructorInvocationStmt] super(...)
619619
# 58| 1: [BlockStmt] { ... }
620-
# 59| 5: [Method] fn
620+
# 59| 4: [Method] fn
621621
# 59| 5: [BlockStmt] { ... }
622622
# 60| 0: [ExprStmt] <Expr>;
623623
# 60| 0: [MethodAccess] println(...)
@@ -947,7 +947,7 @@ reflection.kt:
947947
# 72| 0: [TypeAccess] Integer
948948
# 72| 0: [ClassInstanceExpr] new Rectangle(...)
949949
# 72| -3: [TypeAccess] Rectangle
950-
# 75| 6: [Class,GenericType,ParameterizedType] Generic
950+
# 75| 5: [Class,GenericType,ParameterizedType] Generic
951951
#-----| -2: (Generic Parameters)
952952
# 75| 0: [TypeVariable] T1
953953
# 75| 1: [Constructor] Generic
@@ -1033,8 +1033,8 @@ reflection.kt:
10331033
# 90| -2: [VarAccess] this.<dispatchReceiver>
10341034
# 90| -1: [ThisAccess] this
10351035
# 90| 0: [VarAccess] a0
1036-
# 90| 1: [FieldDeclaration] Class2<T> <dispatchReceiver>;
1037-
# 90| -1: [TypeAccess] Class2<T>
1036+
# 90| 1: [FieldDeclaration] Class2 <dispatchReceiver>;
1037+
# 90| -1: [TypeAccess] Class2
10381038
# 90| 0: [TypeAccess] T
10391039
# 90| -3: [TypeAccess] Function1<String,Inner<String>>
10401040
# 90| 0: [TypeAccess] String

‎java/ql/test/kotlin/library-tests/types/types.expected‎

Lines changed: 13 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -87,8 +87,8 @@
8787
| ? extends TypeArgument | Wildcard |
8888
| ? extends TypeSignature | Wildcard |
8989
| ? extends TypeVariable<?> | Wildcard |
90-
| ? extends TypeVariable<Class<T>> | Wildcard |
91-
| ? extends TypeVariable<Constructor<T>> | Wildcard |
90+
| ? extends TypeVariable<Class> | Wildcard |
91+
| ? extends TypeVariable<Constructor> | Wildcard |
9292
| ? extends TypeVariable<Method> | Wildcard |
9393
| ? extends U | Wildcard |
9494
| ? extends V | Wildcard |
@@ -242,8 +242,8 @@
242242
| Array<? extends TypeArgument> | Class, ParameterizedType |
243243
| Array<? extends TypeSignature> | Class, ParameterizedType |
244244
| Array<? extends TypeVariable<?>> | Class, ParameterizedType |
245-
| Array<? extends TypeVariable<Class<T>>> | Class, ParameterizedType |
246-
| Array<? extends TypeVariable<Constructor<T>>> | Class, ParameterizedType |
245+
| Array<? extends TypeVariable<Class>> | Class, ParameterizedType |
246+
| Array<? extends TypeVariable<Constructor>> | Class, ParameterizedType |
247247
| Array<? extends TypeVariable<Method>> | Class, ParameterizedType |
248248
| Array<? extends WorkQueue> | Class, ParameterizedType |
249249
| Array<A> | Class, ParameterizedType |
@@ -351,8 +351,8 @@
351351
| Array<TypeSignature> | Class, ParameterizedType |
352352
| Array<TypeVariable<>> | Class, ParameterizedType |
353353
| Array<TypeVariable<?>> | Class, ParameterizedType |
354-
| Array<TypeVariable<Class<T>>> | Class, ParameterizedType |
355-
| Array<TypeVariable<Constructor<T>>> | Class, ParameterizedType |
354+
| Array<TypeVariable<Class>> | Class, ParameterizedType |
355+
| Array<TypeVariable<Constructor>> | Class, ParameterizedType |
356356
| Array<TypeVariable<Method>> | Class, ParameterizedType |
357357
| Array<UnicodeScript> | Class, ParameterizedType |
358358
| Array<WorkQueue> | Class, ParameterizedType |
@@ -404,8 +404,8 @@
404404
| BaseStream<SplittableGenerator,Stream<SplittableGenerator>> | Interface, ParameterizedType |
405405
| BaseStream<StackFrame,Stream<StackFrame>> | Interface, ParameterizedType |
406406
| BaseStream<String,Stream<String>> | Interface, ParameterizedType |
407-
| BaseStream<T,S> | Interface, ParameterizedType |
408407
| BaseStream<T,Stream<T>> | Interface, ParameterizedType |
408+
| BaseStream<T,Stream> | Interface, ParameterizedType |
409409
| BaseStream<U,Stream<U>> | Interface, ParameterizedType |
410410
| BaseStream<URL,Stream<URL>> | Interface, ParameterizedType |
411411
| BaseType | Interface |
@@ -426,7 +426,6 @@
426426
| BiConsumer<R,? super T> | Interface, ParameterizedType |
427427
| BiConsumer<R,R> | Interface, ParameterizedType |
428428
| BiConsumer<R,T> | Interface, ParameterizedType |
429-
| BiConsumer<T,U> | Interface, ParameterizedType |
430429
| BiFunction | GenericType, Interface, ParameterizedType |
431430
| BiFunction<> | Interface, RawType |
432431
| BiFunction<? super K,? super K,? extends K> | Interface, ParameterizedType |
@@ -598,7 +597,6 @@
598597
| ClassSpecializer | Class, GenericType, ParameterizedType |
599598
| ClassSpecializer<> | Class, RawType |
600599
| ClassSpecializer<BoundMethodHandle,String,SpeciesData> | Class, ParameterizedType |
601-
| ClassSpecializer<T,K,S> | Class, ParameterizedType |
602600
| ClassTypeSignature | Class |
603601
| ClassTypeSignature[] | Array |
604602
| ClassValue | Class, GenericType, ParameterizedType |
@@ -961,7 +959,6 @@
961959
| EntrySetView | Class, GenericType, ParameterizedType |
962960
| EntrySpliterator | Class, GenericType, ParameterizedType |
963961
| EntrySpliterator<> | Class, RawType |
964-
| EntrySpliterator<K,V> | Class, ParameterizedType |
965962
| Enum | Class, GenericType, ParameterizedType |
966963
| Enum<> | Class, RawType |
967964
| Enum<>[] | Array |
@@ -1357,7 +1354,6 @@
13571354
| KeySetView<K,V> | Class, ParameterizedType |
13581355
| KeySpliterator | Class, GenericType, ParameterizedType |
13591356
| KeySpliterator<> | Class, RawType |
1360-
| KeySpliterator<K,V> | Class, ParameterizedType |
13611357
| Kind | Class |
13621358
| Kind | GenericType, Interface, ParameterizedType |
13631359
| Kind<> | Interface, RawType |
@@ -1492,37 +1488,21 @@
14921488
| MapEntry | Class, GenericType, ParameterizedType |
14931489
| MapMode | Class |
14941490
| MapReduceEntriesTask | Class, GenericType, ParameterizedType |
1495-
| MapReduceEntriesTask<K,V,U> | Class, ParameterizedType |
14961491
| MapReduceEntriesToDoubleTask | Class, GenericType, ParameterizedType |
1497-
| MapReduceEntriesToDoubleTask<K,V> | Class, ParameterizedType |
14981492
| MapReduceEntriesToIntTask | Class, GenericType, ParameterizedType |
1499-
| MapReduceEntriesToIntTask<K,V> | Class, ParameterizedType |
15001493
| MapReduceEntriesToLongTask | Class, GenericType, ParameterizedType |
1501-
| MapReduceEntriesToLongTask<K,V> | Class, ParameterizedType |
15021494
| MapReduceKeysTask | Class, GenericType, ParameterizedType |
1503-
| MapReduceKeysTask<K,V,U> | Class, ParameterizedType |
15041495
| MapReduceKeysToDoubleTask | Class, GenericType, ParameterizedType |
1505-
| MapReduceKeysToDoubleTask<K,V> | Class, ParameterizedType |
15061496
| MapReduceKeysToIntTask | Class, GenericType, ParameterizedType |
1507-
| MapReduceKeysToIntTask<K,V> | Class, ParameterizedType |
15081497
| MapReduceKeysToLongTask | Class, GenericType, ParameterizedType |
1509-
| MapReduceKeysToLongTask<K,V> | Class, ParameterizedType |
15101498
| MapReduceMappingsTask | Class, GenericType, ParameterizedType |
1511-
| MapReduceMappingsTask<K,V,U> | Class, ParameterizedType |
15121499
| MapReduceMappingsToDoubleTask | Class, GenericType, ParameterizedType |
1513-
| MapReduceMappingsToDoubleTask<K,V> | Class, ParameterizedType |
15141500
| MapReduceMappingsToIntTask | Class, GenericType, ParameterizedType |
1515-
| MapReduceMappingsToIntTask<K,V> | Class, ParameterizedType |
15161501
| MapReduceMappingsToLongTask | Class, GenericType, ParameterizedType |
1517-
| MapReduceMappingsToLongTask<K,V> | Class, ParameterizedType |
15181502
| MapReduceValuesTask | Class, GenericType, ParameterizedType |
1519-
| MapReduceValuesTask<K,V,U> | Class, ParameterizedType |
15201503
| MapReduceValuesToDoubleTask | Class, GenericType, ParameterizedType |
1521-
| MapReduceValuesToDoubleTask<K,V> | Class, ParameterizedType |
15221504
| MapReduceValuesToIntTask | Class, GenericType, ParameterizedType |
1523-
| MapReduceValuesToIntTask<K,V> | Class, ParameterizedType |
15241505
| MapReduceValuesToLongTask | Class, GenericType, ParameterizedType |
1525-
| MapReduceValuesToLongTask<K,V> | Class, ParameterizedType |
15261506
| MappedByteBuffer | Class |
15271507
| Member | Interface |
15281508
| MemberName | Class |
@@ -1616,13 +1596,11 @@
16161596
| OfMethod<> | Interface, RawType |
16171597
| OfMethod<Class<?>,MethodType> | Interface, ParameterizedType |
16181598
| OfMethod<ClassDesc,MethodTypeDesc> | Interface, ParameterizedType |
1619-
| OfMethod<F,M> | Interface, ParameterizedType |
16201599
| OfPrimitive | GenericType, Interface, ParameterizedType |
16211600
| OfPrimitive<> | Interface, RawType |
16221601
| OfPrimitive<Double,DoubleConsumer,OfDouble> | Interface, ParameterizedType |
16231602
| OfPrimitive<Integer,IntConsumer,OfInt> | Interface, ParameterizedType |
16241603
| OfPrimitive<Long,LongConsumer,OfLong> | Interface, ParameterizedType |
1625-
| OfPrimitive<T,T_CONS,T_SPLITR> | Interface, ParameterizedType |
16261604
| OffsetClock | Class |
16271605
| OffsetDateTime | Class |
16281606
| OffsetIdPrinterParser | Class |
@@ -1738,11 +1716,8 @@
17381716
| RecordComponent[] | Array |
17391717
| RecordSupport | Class |
17401718
| ReduceEntriesTask | Class, GenericType, ParameterizedType |
1741-
| ReduceEntriesTask<K,V> | Class, ParameterizedType |
17421719
| ReduceKeysTask | Class, GenericType, ParameterizedType |
1743-
| ReduceKeysTask<K,V> | Class, ParameterizedType |
17441720
| ReduceValuesTask | Class, GenericType, ParameterizedType |
1745-
| ReduceValuesTask<K,V> | Class, ParameterizedType |
17461721
| ReducedPrinterParser | Class |
17471722
| ReentrantLock | Class |
17481723
| Reference | Class, GenericType, ParameterizedType |
@@ -1759,6 +1734,7 @@
17591734
| Reference<ThreadLocal<?>> | Class, ParameterizedType |
17601735
| Reference<Version<?>> | Class, ParameterizedType |
17611736
| Reference<Version<T>> | Class, ParameterizedType |
1737+
| Reference<Version> | Class, ParameterizedType |
17621738
| ReferenceQueue | Class, GenericType, ParameterizedType |
17631739
| ReferenceQueue<? super T> | Class, ParameterizedType |
17641740
| ReferenceQueue<Class<?>> | Class, ParameterizedType |
@@ -1863,7 +1839,6 @@
18631839
| SoftReference<MethodHandle>[] | Array |
18641840
| SortedMap | GenericType, Interface, ParameterizedType |
18651841
| SortedMap<> | Interface, RawType |
1866-
| SortedMap<K,V> | Interface, ParameterizedType |
18671842
| SortedMap<String,Charset> | Interface, ParameterizedType |
18681843
| SourceClock | Class |
18691844
| Special | Class |
@@ -2045,10 +2020,10 @@
20452020
| TypeVariable<>[] | Array |
20462021
| TypeVariable<?> | Interface, ParameterizedType |
20472022
| TypeVariable<?>[] | Array |
2048-
| TypeVariable<Class<T>> | Interface, ParameterizedType |
2049-
| TypeVariable<Class<T>>[] | Array |
2050-
| TypeVariable<Constructor<T>> | Interface, ParameterizedType |
2051-
| TypeVariable<Constructor<T>>[] | Array |
2023+
| TypeVariable<Class> | Interface, ParameterizedType |
2024+
| TypeVariable<Class>[] | Array |
2025+
| TypeVariable<Constructor> | Interface, ParameterizedType |
2026+
| TypeVariable<Constructor>[] | Array |
20522027
| TypeVariable<Method> | Interface, ParameterizedType |
20532028
| TypeVariable<Method>[] | Array |
20542029
| TypeVariableSignature | Class |
@@ -2083,7 +2058,6 @@
20832058
| ValueRange | Class |
20842059
| ValueSpliterator | Class, GenericType, ParameterizedType |
20852060
| ValueSpliterator<> | Class, RawType |
2086-
| ValueSpliterator<K,V> | Class, ParameterizedType |
20872061
| ValuesView | Class, GenericType, ParameterizedType |
20882062
| VarForm | Class |
20892063
| VarHandle | Class |
@@ -2160,6 +2134,7 @@
21602134
| WeakReference<ThreadLocal<?>> | Class, ParameterizedType |
21612135
| WeakReference<Version<?>> | Class, ParameterizedType |
21622136
| WeakReference<Version<T>> | Class, ParameterizedType |
2137+
| WeakReference<Version> | Class, ParameterizedType |
21632138
| WeekBasedFieldPrinterParser | Class |
21642139
| Wildcard | Class |
21652140
| WildcardType | Interface |

0 commit comments

Comments
 (0)