Skip to content

Commit 4730f04

Browse files
ondrejmirtesondrejmirtes
committed
Regenerate TypeCombinator declarations for reduceRefinedConstantScalars()
Amp-Thread-ID: https://ampcode.com/threads/T-01a1819f-fbb7-7460-b1bd-aab545ccfc0a
1 parent fd2208f commit 4730f04

1 file changed

Lines changed: 79 additions & 72 deletions

File tree

‎turbo-ext/src/generated/TypeCombinator.h‎

Lines changed: 79 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -47,39 +47,42 @@ inline constexpr char strings[] =
4747
"a\0" /* 263 */
4848
"b\0" /* 265 */
4949
"isAlreadyNormalized\0" /* 267 */
50-
"compareTypesInUnion\0" /* 287 */
51-
"getAccessoryCaseStringTypes\0" /* 307 */
52-
"downgradeNonFalsyStringToNonEmpty\0" /* 335 */
53-
"removeDecimalIntStringAccessory\0" /* 369 */
54-
"subtractedType\0" /* 401 */
55-
"unionWithSubtractedType\0" /* 416 */
56-
"PHPStan\\Type\\SubtractableType\0" /* 440 */
57-
"intersectWithSubtractedType\0" /* 470 */
58-
"arrayTypes\0" /* 498 */
59-
"processArrayAccessoryTypes\0" /* 509 */
60-
"findEmptyArrayNextToOversizedArray\0" /* 536 */
61-
"processArrayTypes\0" /* 571 */
62-
"optimizeConstantArrays\0" /* 589 */
63-
"countConstantArrayValueTypes\0" /* 612 */
64-
"array\0" /* 641 */
65-
"PHPStan\\Type\\Constant\\ConstantArrayType\0" /* 647 */
66-
"getConstantScalarValuesByKey\0" /* 687 */
67-
"oneUnrelatedKeyAllowed\0" /* 716 */
68-
"haveDisjointConstantScalarValues\0" /* 739 */
69-
"constantArrays\0" /* 772 */
70-
"preserveTaggedUnions\0" /* 787 */
71-
"reduceArrays\0" /* 808 */
72-
"isPlainOrBenevolentUnion\0" /* 821 */
73-
"PHPStan\\Type\\UnionType\0" /* 846 */
74-
"intersectFiniteUnions\0" /* 869 */
75-
"finiteUnionMembers\0" /* 891 */
76-
"intersect\0" /* 910 */
77-
"doIntersect\0" /* 920 */
78-
"intersectDefiniteConstantArrays\0" /* 932 */
79-
"PHPStan\\Type\\IntersectionType\0" /* 964 */
80-
"mergeIntersectionsForUnion\0" /* 994 */
81-
"removeFalsey\0" /* 1021 */
82-
"removeTruthy"; /* 1034 */
50+
"intersections\0" /* 287 */
51+
"scalarTypes\0" /* 301 */
52+
"reduceRefinedConstantScalars\0" /* 313 */
53+
"compareTypesInUnion\0" /* 342 */
54+
"getAccessoryCaseStringTypes\0" /* 362 */
55+
"downgradeNonFalsyStringToNonEmpty\0" /* 390 */
56+
"removeDecimalIntStringAccessory\0" /* 424 */
57+
"subtractedType\0" /* 456 */
58+
"unionWithSubtractedType\0" /* 471 */
59+
"PHPStan\\Type\\SubtractableType\0" /* 495 */
60+
"intersectWithSubtractedType\0" /* 525 */
61+
"arrayTypes\0" /* 553 */
62+
"processArrayAccessoryTypes\0" /* 564 */
63+
"findEmptyArrayNextToOversizedArray\0" /* 591 */
64+
"processArrayTypes\0" /* 626 */
65+
"optimizeConstantArrays\0" /* 644 */
66+
"countConstantArrayValueTypes\0" /* 667 */
67+
"array\0" /* 696 */
68+
"PHPStan\\Type\\Constant\\ConstantArrayType\0" /* 702 */
69+
"getConstantScalarValuesByKey\0" /* 742 */
70+
"oneUnrelatedKeyAllowed\0" /* 771 */
71+
"haveDisjointConstantScalarValues\0" /* 794 */
72+
"constantArrays\0" /* 827 */
73+
"preserveTaggedUnions\0" /* 842 */
74+
"reduceArrays\0" /* 863 */
75+
"isPlainOrBenevolentUnion\0" /* 876 */
76+
"PHPStan\\Type\\UnionType\0" /* 901 */
77+
"intersectFiniteUnions\0" /* 924 */
78+
"finiteUnionMembers\0" /* 946 */
79+
"intersect\0" /* 965 */
80+
"doIntersect\0" /* 975 */
81+
"intersectDefiniteConstantArrays\0" /* 987 */
82+
"PHPStan\\Type\\IntersectionType\0" /* 1019 */
83+
"mergeIntersectionsForUnion\0" /* 1049 */
84+
"removeFalsey\0" /* 1076 */
85+
"removeTruthy"; /* 1089 */
8386
inline constexpr reg::PackedArg args[] = {
8487
reg::packed(0, MAY_BE_VOID), /* clearCache return */
8588
reg::packed(12, 0, 17), /* addNull $type */
@@ -110,6 +113,9 @@ inline constexpr reg::PackedArg args[] = {
110113
reg::packed(263, 0, 17), /* isAlreadyNormalized $a */
111114
reg::packed(265, 0, 17), /* isAlreadyNormalized $b */
112115
reg::packed(0, MAY_BE_BOOL), /* isAlreadyNormalized return */
116+
reg::packed(287, MAY_BE_ARRAY), /* reduceRefinedConstantScalars $intersections */
117+
reg::packed(301, MAY_BE_ARRAY), /* reduceRefinedConstantScalars $scalarTypes */
118+
reg::packed(0, MAY_BE_ARRAY), /* reduceRefinedConstantScalars return */
113119
reg::packed(263, 0, 17), /* compareTypesInUnion $a */
114120
reg::packed(265, 0, 17), /* compareTypesInUnion $b */
115121
reg::packed(0, MAY_BE_NULL | MAY_BE_ARRAY), /* compareTypesInUnion return */
@@ -120,46 +126,46 @@ inline constexpr reg::PackedArg args[] = {
120126
reg::packed(12, 0, 17), /* removeDecimalIntStringAccessory $type */
121127
reg::packed(0, 0, 17), /* removeDecimalIntStringAccessory return */
122128
reg::packed(12, 0, 17), /* unionWithSubtractedType $type */
123-
reg::packed(401, MAY_BE_NULL, 17), /* unionWithSubtractedType $subtractedType */
129+
reg::packed(456, MAY_BE_NULL, 17), /* unionWithSubtractedType $subtractedType */
124130
reg::packed(0, 0, 17), /* unionWithSubtractedType return */
125-
reg::packed(263, 0, 440), /* intersectWithSubtractedType $a */
131+
reg::packed(263, 0, 495), /* intersectWithSubtractedType $a */
126132
reg::packed(265, 0, 17), /* intersectWithSubtractedType $b */
127133
reg::packed(0, 0, 17), /* intersectWithSubtractedType return */
128-
reg::packed(498, MAY_BE_ARRAY), /* processArrayAccessoryTypes $arrayTypes */
134+
reg::packed(553, MAY_BE_ARRAY), /* processArrayAccessoryTypes $arrayTypes */
129135
reg::packed(0, MAY_BE_ARRAY), /* processArrayAccessoryTypes return */
130-
reg::packed(498, MAY_BE_ARRAY), /* findEmptyArrayNextToOversizedArray $arrayTypes */
136+
reg::packed(553, MAY_BE_ARRAY), /* findEmptyArrayNextToOversizedArray $arrayTypes */
131137
reg::packed(0, MAY_BE_NULL, 17), /* findEmptyArrayNextToOversizedArray return */
132-
reg::packed(498, MAY_BE_ARRAY), /* processArrayTypes $arrayTypes */
138+
reg::packed(553, MAY_BE_ARRAY), /* processArrayTypes $arrayTypes */
133139
reg::packed(0, MAY_BE_ARRAY), /* processArrayTypes return */
134140
reg::packed(126, MAY_BE_ARRAY), /* optimizeConstantArrays $types */
135141
reg::packed(0, MAY_BE_ARRAY), /* optimizeConstantArrays return */
136142
reg::packed(126, MAY_BE_ARRAY), /* countConstantArrayValueTypes $types */
137143
reg::packed(0, MAY_BE_LONG), /* countConstantArrayValueTypes return */
138-
reg::packed(641, 0, 647), /* getConstantScalarValuesByKey $array */
144+
reg::packed(696, 0, 702), /* getConstantScalarValuesByKey $array */
139145
reg::packed(0, MAY_BE_NULL | MAY_BE_ARRAY), /* getConstantScalarValuesByKey return */
140146
reg::packed(263, MAY_BE_NULL | MAY_BE_ARRAY), /* haveDisjointConstantScalarValues $a */
141147
reg::packed(265, MAY_BE_NULL | MAY_BE_ARRAY), /* haveDisjointConstantScalarValues $b */
142-
reg::packed(716, MAY_BE_BOOL), /* haveDisjointConstantScalarValues $oneUnrelatedKeyAllowed */
148+
reg::packed(771, MAY_BE_BOOL), /* haveDisjointConstantScalarValues $oneUnrelatedKeyAllowed */
143149
reg::packed(0, MAY_BE_BOOL), /* haveDisjointConstantScalarValues return */
144-
reg::packed(772, MAY_BE_ARRAY), /* reduceArrays $constantArrays */
145-
reg::packed(787, MAY_BE_BOOL), /* reduceArrays $preserveTaggedUnions */
150+
reg::packed(827, MAY_BE_ARRAY), /* reduceArrays $constantArrays */
151+
reg::packed(842, MAY_BE_BOOL), /* reduceArrays $preserveTaggedUnions */
146152
reg::packed(0, MAY_BE_ARRAY), /* reduceArrays return */
147153
reg::packed(12, 0, 17), /* isPlainOrBenevolentUnion $type */
148154
reg::packed(0, MAY_BE_BOOL), /* isPlainOrBenevolentUnion return */
149-
reg::packed(263, 0, 846), /* intersectFiniteUnions $a */
150-
reg::packed(265, 0, 846), /* intersectFiniteUnions $b */
155+
reg::packed(263, 0, 901), /* intersectFiniteUnions $a */
156+
reg::packed(265, 0, 901), /* intersectFiniteUnions $b */
151157
reg::packed(0, MAY_BE_NULL, 17), /* intersectFiniteUnions return */
152-
reg::packed(132, 0, 846), /* finiteUnionMembers $union */
158+
reg::packed(132, 0, 901), /* finiteUnionMembers $union */
153159
reg::packed(0, MAY_BE_NULL | MAY_BE_ARRAY), /* finiteUnionMembers return */
154160
reg::packed(126, 0, 17, false, true), /* intersect $types */
155161
reg::packed(0, 0, 17), /* intersect return */
156162
reg::packed(126, 0, 17, false, true), /* doIntersect $types */
157163
reg::packed(0, 0, 17), /* doIntersect return */
158-
reg::packed(263, 0, 647), /* intersectDefiniteConstantArrays $a */
159-
reg::packed(265, 0, 647), /* intersectDefiniteConstantArrays $b */
164+
reg::packed(263, 0, 702), /* intersectDefiniteConstantArrays $a */
165+
reg::packed(265, 0, 702), /* intersectDefiniteConstantArrays $b */
160166
reg::packed(0, 0, 17), /* intersectDefiniteConstantArrays return */
161-
reg::packed(263, 0, 964), /* mergeIntersectionsForUnion $a */
162-
reg::packed(265, 0, 964), /* mergeIntersectionsForUnion $b */
167+
reg::packed(263, 0, 1019), /* mergeIntersectionsForUnion $a */
168+
reg::packed(265, 0, 1019), /* mergeIntersectionsForUnion $b */
163169
reg::packed(0, MAY_BE_NULL, 17), /* mergeIntersectionsForUnion return */
164170
reg::packed(12, 0, 17), /* removeFalsey $type */
165171
reg::packed(0, 0, 17), /* removeFalsey return */
@@ -183,29 +189,30 @@ inline constexpr sigtab::Sig doUnion = { { 138 /* doUnion */, 0, 17, 1, 18, ZEND
183189
inline constexpr sigtab::Sig addMarker = { { 213 /* addMarker */, 2, 19, 2, 21, ZEND_ACC_PRIVATE | ZEND_ACC_STATIC } };
184190
inline constexpr sigtab::Sig unionWithMarkers = { { 228 /* unionWithMarkers */, 2, 22, 2, 24, ZEND_ACC_PRIVATE | ZEND_ACC_STATIC } };
185191
inline constexpr sigtab::Sig isAlreadyNormalized = { { 267 /* isAlreadyNormalized */, 3, 25, 3, 28, ZEND_ACC_PRIVATE | ZEND_ACC_STATIC } };
186-
inline constexpr sigtab::Sig compareTypesInUnion = { { 287 /* compareTypesInUnion */, 2, 29, 2, 31, ZEND_ACC_PRIVATE | ZEND_ACC_STATIC } };
187-
inline constexpr sigtab::Sig getAccessoryCaseStringTypes = { { 307 /* getAccessoryCaseStringTypes */, 1, 32, 1, 33, ZEND_ACC_PRIVATE | ZEND_ACC_STATIC } };
188-
inline constexpr sigtab::Sig downgradeNonFalsyStringToNonEmpty = { { 335 /* downgradeNonFalsyStringToNonEmpty */, 1, 34, 1, 35, ZEND_ACC_PRIVATE | ZEND_ACC_STATIC } };
189-
inline constexpr sigtab::Sig removeDecimalIntStringAccessory = { { 369 /* removeDecimalIntStringAccessory */, 1, 36, 1, 37, ZEND_ACC_PRIVATE | ZEND_ACC_STATIC } };
190-
inline constexpr sigtab::Sig unionWithSubtractedType = { { 416 /* unionWithSubtractedType */, 2, 38, 2, 40, ZEND_ACC_PRIVATE | ZEND_ACC_STATIC } };
191-
inline constexpr sigtab::Sig intersectWithSubtractedType = { { 470 /* intersectWithSubtractedType */, 2, 41, 2, 43, ZEND_ACC_PRIVATE | ZEND_ACC_STATIC } };
192-
inline constexpr sigtab::Sig processArrayAccessoryTypes = { { 509 /* processArrayAccessoryTypes */, 1, 44, 1, 45, ZEND_ACC_PRIVATE | ZEND_ACC_STATIC } };
193-
inline constexpr sigtab::Sig findEmptyArrayNextToOversizedArray = { { 536 /* findEmptyArrayNextToOversizedArray */, 1, 46, 1, 47, ZEND_ACC_PRIVATE | ZEND_ACC_STATIC } };
194-
inline constexpr sigtab::Sig processArrayTypes = { { 571 /* processArrayTypes */, 1, 48, 1, 49, ZEND_ACC_PRIVATE | ZEND_ACC_STATIC } };
195-
inline constexpr sigtab::Sig optimizeConstantArrays = { { 589 /* optimizeConstantArrays */, 1, 50, 1, 51, ZEND_ACC_PRIVATE | ZEND_ACC_STATIC } };
196-
inline constexpr sigtab::Sig countConstantArrayValueTypes = { { 612 /* countConstantArrayValueTypes */, 1, 52, 1, 53, ZEND_ACC_PUBLIC | ZEND_ACC_STATIC } };
197-
inline constexpr sigtab::Sig getConstantScalarValuesByKey = { { 687 /* getConstantScalarValuesByKey */, 1, 54, 1, 55, ZEND_ACC_PRIVATE | ZEND_ACC_STATIC } };
198-
inline constexpr sigtab::Sig haveDisjointConstantScalarValues = { { 739 /* haveDisjointConstantScalarValues */, 3, 56, 3, 59, ZEND_ACC_PRIVATE | ZEND_ACC_STATIC } };
199-
inline constexpr sigtab::Sig reduceArrays = { { 808 /* reduceArrays */, 2, 60, 2, 62, ZEND_ACC_PRIVATE | ZEND_ACC_STATIC } };
200-
inline constexpr sigtab::Sig isPlainOrBenevolentUnion = { { 821 /* isPlainOrBenevolentUnion */, 1, 63, 1, 64, ZEND_ACC_PRIVATE | ZEND_ACC_STATIC } };
201-
inline constexpr sigtab::Sig intersectFiniteUnions = { { 869 /* intersectFiniteUnions */, 2, 65, 2, 67, ZEND_ACC_PRIVATE | ZEND_ACC_STATIC } };
202-
inline constexpr sigtab::Sig finiteUnionMembers = { { 891 /* finiteUnionMembers */, 1, 68, 1, 69, ZEND_ACC_PRIVATE | ZEND_ACC_STATIC } };
203-
inline constexpr sigtab::Sig intersect = { { 910 /* intersect */, 0, 70, 1, 71, ZEND_ACC_PUBLIC | ZEND_ACC_STATIC } };
204-
inline constexpr sigtab::Sig doIntersect = { { 920 /* doIntersect */, 0, 72, 1, 73, ZEND_ACC_PUBLIC | ZEND_ACC_STATIC } };
205-
inline constexpr sigtab::Sig intersectDefiniteConstantArrays = { { 932 /* intersectDefiniteConstantArrays */, 2, 74, 2, 76, ZEND_ACC_PRIVATE | ZEND_ACC_STATIC } };
206-
inline constexpr sigtab::Sig mergeIntersectionsForUnion = { { 994 /* mergeIntersectionsForUnion */, 2, 77, 2, 79, ZEND_ACC_PRIVATE | ZEND_ACC_STATIC } };
207-
inline constexpr sigtab::Sig removeFalsey = { { 1021 /* removeFalsey */, 1, 80, 1, 81, ZEND_ACC_PUBLIC | ZEND_ACC_STATIC } };
208-
inline constexpr sigtab::Sig removeTruthy = { { 1034 /* removeTruthy */, 1, 82, 1, 83, ZEND_ACC_PUBLIC | ZEND_ACC_STATIC } };
192+
inline constexpr sigtab::Sig reduceRefinedConstantScalars = { { 313 /* reduceRefinedConstantScalars */, 2, 29, 2, 31, ZEND_ACC_PRIVATE | ZEND_ACC_STATIC } };
193+
inline constexpr sigtab::Sig compareTypesInUnion = { { 342 /* compareTypesInUnion */, 2, 32, 2, 34, ZEND_ACC_PRIVATE | ZEND_ACC_STATIC } };
194+
inline constexpr sigtab::Sig getAccessoryCaseStringTypes = { { 362 /* getAccessoryCaseStringTypes */, 1, 35, 1, 36, ZEND_ACC_PRIVATE | ZEND_ACC_STATIC } };
195+
inline constexpr sigtab::Sig downgradeNonFalsyStringToNonEmpty = { { 390 /* downgradeNonFalsyStringToNonEmpty */, 1, 37, 1, 38, ZEND_ACC_PRIVATE | ZEND_ACC_STATIC } };
196+
inline constexpr sigtab::Sig removeDecimalIntStringAccessory = { { 424 /* removeDecimalIntStringAccessory */, 1, 39, 1, 40, ZEND_ACC_PRIVATE | ZEND_ACC_STATIC } };
197+
inline constexpr sigtab::Sig unionWithSubtractedType = { { 471 /* unionWithSubtractedType */, 2, 41, 2, 43, ZEND_ACC_PRIVATE | ZEND_ACC_STATIC } };
198+
inline constexpr sigtab::Sig intersectWithSubtractedType = { { 525 /* intersectWithSubtractedType */, 2, 44, 2, 46, ZEND_ACC_PRIVATE | ZEND_ACC_STATIC } };
199+
inline constexpr sigtab::Sig processArrayAccessoryTypes = { { 564 /* processArrayAccessoryTypes */, 1, 47, 1, 48, ZEND_ACC_PRIVATE | ZEND_ACC_STATIC } };
200+
inline constexpr sigtab::Sig findEmptyArrayNextToOversizedArray = { { 591 /* findEmptyArrayNextToOversizedArray */, 1, 49, 1, 50, ZEND_ACC_PRIVATE | ZEND_ACC_STATIC } };
201+
inline constexpr sigtab::Sig processArrayTypes = { { 626 /* processArrayTypes */, 1, 51, 1, 52, ZEND_ACC_PRIVATE | ZEND_ACC_STATIC } };
202+
inline constexpr sigtab::Sig optimizeConstantArrays = { { 644 /* optimizeConstantArrays */, 1, 53, 1, 54, ZEND_ACC_PRIVATE | ZEND_ACC_STATIC } };
203+
inline constexpr sigtab::Sig countConstantArrayValueTypes = { { 667 /* countConstantArrayValueTypes */, 1, 55, 1, 56, ZEND_ACC_PUBLIC | ZEND_ACC_STATIC } };
204+
inline constexpr sigtab::Sig getConstantScalarValuesByKey = { { 742 /* getConstantScalarValuesByKey */, 1, 57, 1, 58, ZEND_ACC_PRIVATE | ZEND_ACC_STATIC } };
205+
inline constexpr sigtab::Sig haveDisjointConstantScalarValues = { { 794 /* haveDisjointConstantScalarValues */, 3, 59, 3, 62, ZEND_ACC_PRIVATE | ZEND_ACC_STATIC } };
206+
inline constexpr sigtab::Sig reduceArrays = { { 863 /* reduceArrays */, 2, 63, 2, 65, ZEND_ACC_PRIVATE | ZEND_ACC_STATIC } };
207+
inline constexpr sigtab::Sig isPlainOrBenevolentUnion = { { 876 /* isPlainOrBenevolentUnion */, 1, 66, 1, 67, ZEND_ACC_PRIVATE | ZEND_ACC_STATIC } };
208+
inline constexpr sigtab::Sig intersectFiniteUnions = { { 924 /* intersectFiniteUnions */, 2, 68, 2, 70, ZEND_ACC_PRIVATE | ZEND_ACC_STATIC } };
209+
inline constexpr sigtab::Sig finiteUnionMembers = { { 946 /* finiteUnionMembers */, 1, 71, 1, 72, ZEND_ACC_PRIVATE | ZEND_ACC_STATIC } };
210+
inline constexpr sigtab::Sig intersect = { { 965 /* intersect */, 0, 73, 1, 74, ZEND_ACC_PUBLIC | ZEND_ACC_STATIC } };
211+
inline constexpr sigtab::Sig doIntersect = { { 975 /* doIntersect */, 0, 75, 1, 76, ZEND_ACC_PUBLIC | ZEND_ACC_STATIC } };
212+
inline constexpr sigtab::Sig intersectDefiniteConstantArrays = { { 987 /* intersectDefiniteConstantArrays */, 2, 77, 2, 79, ZEND_ACC_PRIVATE | ZEND_ACC_STATIC } };
213+
inline constexpr sigtab::Sig mergeIntersectionsForUnion = { { 1049 /* mergeIntersectionsForUnion */, 2, 80, 2, 82, ZEND_ACC_PRIVATE | ZEND_ACC_STATIC } };
214+
inline constexpr sigtab::Sig removeFalsey = { { 1076 /* removeFalsey */, 1, 83, 1, 84, ZEND_ACC_PUBLIC | ZEND_ACC_STATIC } };
215+
inline constexpr sigtab::Sig removeTruthy = { { 1089 /* removeTruthy */, 1, 85, 1, 86, ZEND_ACC_PUBLIC | ZEND_ACC_STATIC } };
209216
} // namespace sig
210217

211218
} // namespace ptdecl::TypeCombinator

0 commit comments

Comments
 (0)