Skip to content

Commit b7395e9

Browse files
paulppaulp
committed
Reverted ProductN parent for case classes.
Looks like we will need blood, toil, tears, and sweat. No review.
1 parent 0a31808 commit b7395e9

File tree

8 files changed

+89
-77
lines changed

8 files changed

+89
-77
lines changed

‎src/compiler/scala/tools/nsc/ast/parser/Parsers.scala

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2687,13 +2687,14 @@ self =>
26872687
if (mods.isCase) {
26882688
val arity = if (vparamss.isEmpty || vparamss.head.isEmpty) 0 else vparamss.head.size
26892689
productConstr :: serializableConstr :: {
2690-
if (arity == 0 || settings.YnoProductN.value) Nil
2691-
else List(
2692-
AppliedTypeTree(
2693-
productConstrN(arity),
2694-
vparamss.head map (vd => vd.tpt.duplicate setPos vd.tpt.pos.focus)
2695-
)
2696-
)
2690+
Nil
2691+
// if (arity == 0 || settings.YnoProductN.value) Nil
2692+
// else List(
2693+
// AppliedTypeTree(
2694+
// productConstrN(arity),
2695+
// vparamss.head map (vd => vd.tpt.duplicate setPos vd.tpt.pos.focus)
2696+
// )
2697+
// )
26972698
}
26982699
}
26992700
else Nil

‎test/files/pos/caseclass-parents.flags renamed to ‎test/disabled/pos/caseclass-parents.flags

File renamed without changes.

‎test/files/pos/caseclass-parents.scala renamed to ‎test/disabled/pos/caseclass-parents.scala

File renamed without changes.

‎test/files/pos/caseclass-productN.flags renamed to ‎test/disabled/pos/caseclass-productN.flags

File renamed without changes.

‎test/files/pos/caseclass-productN.scala renamed to ‎test/disabled/pos/caseclass-productN.scala

File renamed without changes.

‎test/files/presentation/properties.check

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,14 @@ reload: properties.scala
33
askTypeCompletion at properties.scala(29,33)
44
================================================================================
55
[response] aksTypeCompletion at (29,33)
6-
retrieved 51 members
6+
retrieved 50 members
77
`method !=(x$1: Any)Boolean`
88
`method !=(x$1: AnyRef)Boolean`
99
`method ##()Int`
1010
`method +(other: String)String`
1111
`method ->[B](y: B)(properties.Property[String], B)`
1212
`method ==(x$1: Any)Boolean`
1313
`method ==(x$1: AnyRef)Boolean`
14-
`method _1=> String`
1514
`method apply()String`
1615
`method asInstanceOf[T0]=> T0`
1716
`method canEqual(that: Any)Boolean`
@@ -55,15 +54,14 @@ retrieved 51 members
5554
askTypeCompletion at properties.scala(29,67)
5655
================================================================================
5756
[response] aksTypeCompletion at (29,67)
58-
retrieved 51 members
57+
retrieved 50 members
5958
`method !=(x$1: Any)Boolean`
6059
`method !=(x$1: AnyRef)Boolean`
6160
`method ##()Int`
6261
`method +(other: String)String`
6362
`method ->[B](y: B)(properties.Property[String], B)`
6463
`method ==(x$1: Any)Boolean`
6564
`method ==(x$1: AnyRef)Boolean`
66-
`method _1=> String`
6765
`method apply()String`
6866
`method asInstanceOf[T0]=> T0`
6967
`method canEqual(that: Any)Boolean`

‎test/files/run/inline-ex-handlers.check

Lines changed: 76 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,49 @@
1-
422c422
1+
172c172
2+
< locals: value x$1, value temp1
3+
---
4+
> locals: value x$1, value temp1, variable boxed1
5+
174c174
6+
< blocks: [1,2,3,4]
7+
---
8+
> blocks: [1,2,3]
9+
187,189d186
10+
< 92 JUMP 4
11+
<
12+
< 4:
13+
195a193,194
14+
> 92 STORE_LOCAL(variable boxed1)
15+
> 92 LOAD_LOCAL(variable boxed1)
16+
386c385
217
< blocks: [1,2,3,4,5,7,8,10]
318
---
419
> blocks: [1,2,3,4,5,7,8,10,11]
5-
446c446,447
20+
410c409,418
621
< 103 THROW(MyException)
722
---
823
> ? STORE_LOCAL(value ex$1)
924
> ? JUMP 11
10-
447a449,456
25+
>
1126
> 11:
1227
> 101 LOAD_LOCAL(value ex$1)
13-
> 101 STORE_LOCAL(value temp1)
14-
> 101 SCOPE_ENTER value temp1
15-
> 101 LOAD_LOCAL(value temp1)
28+
> 101 STORE_LOCAL(value temp2)
29+
> 101 SCOPE_ENTER value temp2
30+
> 101 LOAD_LOCAL(value temp2)
1631
> 101 IS_INSTANCE REF(class MyException)
1732
> 101 CZJUMP (BOOL)NE ? 4 : 5
18-
>
19-
537c546
33+
501c509
2034
< blocks: [1,2,3,4,6,7,8,9,10]
2135
---
2236
> blocks: [1,2,3,4,6,7,8,9,10,11,12,13]
23-
566c575
37+
530c538,543
2438
< 306 THROW(MyException)
2539
---
2640
> ? JUMP 11
27-
567a577,581
41+
>
2842
> 11:
2943
> ? LOAD_LOCAL(variable monitor4)
3044
> 305 MONITOR_EXIT
3145
> ? JUMP 12
32-
>
33-
572c586,592
46+
536c549,555
3447
< ? THROW(Throwable)
3548
---
3649
> ? JUMP 12
@@ -40,7 +53,7 @@
4053
> 304 MONITOR_EXIT
4154
> ? STORE_LOCAL(value t)
4255
> ? JUMP 13
43-
578c598,611
56+
542c561,574
4457
< ? THROW(Throwable)
4558
---
4659
> ? STORE_LOCAL(value t)
@@ -57,19 +70,19 @@
5770
> 310 CALL_PRIMITIVE(EndConcat)
5871
> 310 CALL_METHOD scala.Predef.println (dynamic)
5972
> 310 JUMP 2
60-
602c635
73+
566c598
6174
< catch (Throwable) in ArrayBuffer(7, 8, 9, 10) starting at: 6
6275
---
6376
> catch (Throwable) in ArrayBuffer(7, 8, 9, 10, 11) starting at: 6
64-
605c638
77+
569c601
6578
< catch (Throwable) in ArrayBuffer(4, 6, 7, 8, 9, 10) starting at: 3
6679
---
6780
> catch (Throwable) in ArrayBuffer(4, 6, 7, 8, 9, 10, 11, 12) starting at: 3
68-
637c670
81+
601c633
6982
< blocks: [1,2,3,4,5,6,7,9,10]
7083
---
7184
> blocks: [1,2,3,4,5,6,7,9,10,11,12]
72-
661c694,700
85+
625c657,663
7386
< 78 THROW(IllegalArgumentException)
7487
---
7588
> ? STORE_LOCAL(value e)
@@ -79,7 +92,7 @@
7992
> 81 LOAD_LOCAL(value e)
8093
> ? STORE_LOCAL(variable exc1)
8194
> ? JUMP 12
82-
690c729,743
95+
654c692,706
8396
< 81 THROW(Exception)
8497
---
8598
> ? STORE_LOCAL(variable exc1)
@@ -97,57 +110,56 @@
97110
> 84 STORE_LOCAL(variable result)
98111
> 84 LOAD_LOCAL(variable exc1)
99112
> 84 THROW(Throwable)
100-
712c765
113+
676c728
101114
< catch (<none>) in ArrayBuffer(4, 6, 7, 9) starting at: 3
102115
---
103116
> catch (<none>) in ArrayBuffer(4, 6, 7, 9, 11) starting at: 3
104-
738c791
117+
702c754
105118
< blocks: [1,2,3,4,5,6,7,8,11,12,13,14,15,16,18,19]
106119
---
107120
> blocks: [1,2,3,4,5,6,7,8,11,12,13,14,15,16,18,19,20,21,22]
108-
762c815,816
121+
726c778,787
109122
< 172 THROW(MyException)
110123
---
111124
> ? STORE_LOCAL(value ex$4)
112125
> ? JUMP 20
113-
763a818,825
126+
>
114127
> 20:
115128
> 170 LOAD_LOCAL(value ex$4)
116-
> 170 STORE_LOCAL(value temp10)
117-
> 170 SCOPE_ENTER value temp10
118-
> 170 LOAD_LOCAL(value temp10)
129+
> 170 STORE_LOCAL(value temp11)
130+
> 170 SCOPE_ENTER value temp11
131+
> 170 LOAD_LOCAL(value temp11)
119132
> 170 IS_INSTANCE REF(class MyException)
120133
> 170 CZJUMP (BOOL)NE ? 12 : 13
121-
>
122-
816c878,879
134+
780c841,842
123135
< 177 THROW(MyException)
124136
---
125137
> ? STORE_LOCAL(value ex$5)
126138
> ? JUMP 21
127-
820c883,892
139+
784c846,855
128140
< 170 THROW(Throwable)
129141
---
130142
> ? STORE_LOCAL(value ex$5)
131143
> ? JUMP 21
132144
>
133145
> 21:
134146
> 169 LOAD_LOCAL(value ex$5)
135-
> 169 STORE_LOCAL(value temp13)
136-
> 169 SCOPE_ENTER value temp13
137-
> 169 LOAD_LOCAL(value temp13)
147+
> 169 STORE_LOCAL(value temp14)
148+
> 169 SCOPE_ENTER value temp14
149+
> 169 LOAD_LOCAL(value temp14)
138150
> 169 IS_INSTANCE REF(class MyException)
139151
> 169 CZJUMP (BOOL)NE ? 5 : 6
140-
851c923,924
152+
815c886,887
141153
< 182 THROW(MyException)
142154
---
143155
> ? STORE_LOCAL(variable exc2)
144156
> ? JUMP 22
145-
855c928,929
157+
819c891,905
146158
< 169 THROW(Throwable)
147159
---
148160
> ? STORE_LOCAL(variable exc2)
149161
> ? JUMP 22
150-
856a931,943
162+
>
151163
> 22:
152164
> 184 LOAD_MODULE object Predef
153165
> 184 CONSTANT("finally")
@@ -160,58 +172,57 @@
160172
> 185 STORE_LOCAL(variable result)
161173
> 185 LOAD_LOCAL(variable exc2)
162174
> 185 THROW(Throwable)
163-
>
164-
877c964
175+
841c927
165176
< catch (Throwable) in ArrayBuffer(11, 12, 13, 14, 15, 16, 18) starting at: 4
166177
---
167178
> catch (Throwable) in ArrayBuffer(11, 12, 13, 14, 15, 16, 18, 20) starting at: 4
168-
880c967
179+
844c930
169180
< catch (<none>) in ArrayBuffer(4, 5, 6, 7, 11, 12, 13, 14, 15, 16, 18) starting at: 3
170181
---
171182
> catch (<none>) in ArrayBuffer(4, 5, 6, 7, 11, 12, 13, 14, 15, 16, 18, 20, 21) starting at: 3
172-
906c993
183+
870c956
173184
< blocks: [1,2,3,6,7,8,10,11,13]
174185
---
175186
> blocks: [1,2,3,6,7,8,10,11,13,14]
176-
930c1017,1026
187+
894c980,989
177188
< 124 THROW(MyException)
178189
---
179190
> ? STORE_LOCAL(value ex$2)
180191
> ? JUMP 14
181192
>
182193
> 14:
183194
> 122 LOAD_LOCAL(value ex$2)
184-
> 122 STORE_LOCAL(value temp4)
185-
> 122 SCOPE_ENTER value temp4
186-
> 122 LOAD_LOCAL(value temp4)
195+
> 122 STORE_LOCAL(value temp5)
196+
> 122 SCOPE_ENTER value temp5
197+
> 122 LOAD_LOCAL(value temp5)
187198
> 122 IS_INSTANCE REF(class MyException)
188199
> 122 CZJUMP (BOOL)NE ? 7 : 8
189-
978c1074
200+
942c1037
190201
< catch (IllegalArgumentException) in ArrayBuffer(6, 7, 8, 10, 11, 13) starting at: 3
191202
---
192203
> catch (IllegalArgumentException) in ArrayBuffer(6, 7, 8, 10, 11, 13, 14) starting at: 3
193-
1004c1100
204+
968c1063
194205
< blocks: [1,2,3,4,5,9,10,11,13]
195206
---
196207
> blocks: [1,2,3,4,5,9,10,11,13,14]
197-
1028c1124,1133
208+
992c1087,1096
198209
< 148 THROW(MyException)
199210
---
200211
> ? STORE_LOCAL(value ex$3)
201212
> ? JUMP 14
202213
>
203214
> 14:
204215
> 145 LOAD_LOCAL(value ex$3)
205-
> 145 STORE_LOCAL(value temp7)
206-
> 145 SCOPE_ENTER value temp7
207-
> 145 LOAD_LOCAL(value temp7)
216+
> 145 STORE_LOCAL(value temp8)
217+
> 145 SCOPE_ENTER value temp8
218+
> 145 LOAD_LOCAL(value temp8)
208219
> 145 IS_INSTANCE REF(class MyException)
209220
> 145 CZJUMP (BOOL)NE ? 4 : 5
210-
1272c1377
221+
1236c1340
211222
< blocks: [1,2,3,4,5,7]
212223
---
213224
> blocks: [1,2,3,4,5,7,8]
214-
1296c1401,1408
225+
1260c1364,1371
215226
< 38 THROW(IllegalArgumentException)
216227
---
217228
> ? STORE_LOCAL(value e)
@@ -222,33 +233,33 @@
222233
> 42 CONSTANT("IllegalArgumentException")
223234
> 42 CALL_METHOD scala.Predef.println (dynamic)
224235
> 42 JUMP 2
225-
1345c1457
236+
1309c1420
226237
< blocks: [1,2,3,4,5,7,8,10,11,13]
227238
---
228239
> blocks: [1,2,3,4,5,7,8,10,11,13,14]
229-
1369c1481,1482
240+
1333c1444,1445
230241
< 203 THROW(MyException)
231242
---
232243
> ? STORE_LOCAL(value ex$6)
233244
> ? JUMP 14
234-
1389c1502,1511
245+
1353c1465,1474
235246
< 209 THROW(MyException)
236247
---
237248
> ? STORE_LOCAL(value ex$6)
238249
> ? JUMP 14
239250
>
240251
> 14:
241252
> 200 LOAD_LOCAL(value ex$6)
242-
> 200 STORE_LOCAL(value temp16)
243-
> 200 SCOPE_ENTER value temp16
244-
> 200 LOAD_LOCAL(value temp16)
253+
> 200 STORE_LOCAL(value temp17)
254+
> 200 SCOPE_ENTER value temp17
255+
> 200 LOAD_LOCAL(value temp17)
245256
> 200 IS_INSTANCE REF(class MyException)
246257
> 200 CZJUMP (BOOL)NE ? 4 : 5
247-
1452c1574
258+
1416c1537
248259
< blocks: [1,2,3,4,5,7]
249260
---
250261
> blocks: [1,2,3,4,5,7,8]
251-
1476c1598,1605
262+
1440c1561,1568
252263
< 58 THROW(IllegalArgumentException)
253264
---
254265
> ? STORE_LOCAL(value e)
@@ -259,11 +270,11 @@
259270
> 62 CONSTANT("RuntimeException")
260271
> 62 CALL_METHOD scala.Predef.println (dynamic)
261272
> 62 JUMP 2
262-
1525c1654
273+
1489c1617
263274
< blocks: [1,2,3,4]
264275
---
265276
> blocks: [1,2,3,4,5]
266-
1545c1674,1679
277+
1509c1637,1642
267278
< 229 THROW(MyException)
268279
---
269280
> ? JUMP 5
@@ -272,19 +283,19 @@
272283
> ? LOAD_LOCAL(variable monitor1)
273284
> 228 MONITOR_EXIT
274285
> 228 THROW(Throwable)
275-
1551c1685
286+
1515c1648
276287
< ? THROW(Throwable)
277288
---
278289
> 228 THROW(Throwable)
279-
1579c1713
290+
1543c1676
280291
< locals: value args, variable result, variable monitor2, variable monitorResult1
281292
---
282293
> locals: value exception$1, value args, variable result, variable monitor2, variable monitorResult1
283-
1581c1715
294+
1545c1678
284295
< blocks: [1,2,3,4]
285296
---
286297
> blocks: [1,2,3,4,5]
287-
1604c1738,1746
298+
1568c1701,1709
288299
< 245 THROW(MyException)
289300
---
290301
> ? STORE_LOCAL(value exception$1)
@@ -296,7 +307,7 @@
296307
> ? LOAD_LOCAL(variable monitor2)
297308
> 244 MONITOR_EXIT
298309
> 244 THROW(Throwable)
299-
1610c1752
310+
1574c1715
300311
< ? THROW(Throwable)
301312
---
302313
> 244 THROW(Throwable)

0 commit comments

Comments
 (0)