Skip to content

Commit bf29a51

Browse files
nicolasstuckinicolasstucki
committed
Adapt checkfile
1 parent 6625e95 commit bf29a51

File tree

3 files changed

+30
-92
lines changed

3 files changed

+30
-92
lines changed

‎tests/run-macros/quote-matching-optimize-1.check‎

Lines changed: 12 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,52 +1,32 @@
11
Original: ls.filter(((x: scala.Int) => x.<(3))).filter(((x: scala.Int) => x.>(1)))
2-
Optimized: {
3-
type t$_$1
4-
ls.filter(((x: t$_$1) => x.<(3).&&(x.>(1))))
5-
}
2+
Optimized: ls.filter(((x: scala.Int) => x.<(3).&&(x.>(1))))
63
Result: List(2)
74

85
Original: ls2.filter(((x: scala.Char) => x.<('c'))).filter(((x: scala.Char) => x.>('a')))
9-
Optimized: {
10-
type t$_$1
11-
ls2.filter(((x: t$_$1) => x.<('c').&&(x.>('a'))))
12-
}
6+
Optimized: ls2.filter(((x: scala.Char) => x.<('c').&&(x.>('a'))))
137
Result: List(b)
148

159
Original: ls.filter(((x: scala.Int) => x.<(3))).filter(((x: scala.Int) => x.>(1))).filter(((x: scala.Int) => x.==(2)))
16-
Optimized: {
17-
type t$_$1
18-
ls.filter(((x: scala.Int) => x.<(3))).filter(((x: t$_$1) => x.>(1).&&(x.==(2))))
19-
}
10+
Optimized: ls.filter(((x: scala.Int) => x.<(3))).filter(((x: scala.Int) => x.>(1).&&(x.==(2))))
2011
Result: List(2)
2112

2213
1
2314
2
2415
Original: ls.filter(((x: scala.Int) => x.<(3))).foreach[scala.Unit](((x: scala.Int) => scala.Predef.println(x)))
25-
Optimized: {
26-
type t$_$3
27-
ls.foreach[scala.Unit](((x: t$_$3) => if (x.<(3)) scala.Predef.println(x) else ()))
28-
}
16+
Optimized: ls.foreach[scala.Unit](((x: scala.Int) => if (x.<(3)) scala.Predef.println(x) else ()))
2917
Result: ()
3018

3119
Original: scala.List.apply[scala.Int]((1, 2, 3: scala.<repeated>[scala.Int])).map[scala.Int, scala.collection.immutable.List[scala.Int]](((a: scala.Int) => a.*(2)))(scala.collection.immutable.List.canBuildFrom[scala.Int]).map[java.lang.String, scala.collection.immutable.List[java.lang.String]](((b: scala.Int) => b.toString()))(scala.collection.immutable.List.canBuildFrom[java.lang.String])
32-
Optimized: {
33-
type v$_$1
34-
type t$_$2
35-
scala.List.apply[scala.Int]((1, 2, 3: scala.<repeated>[scala.Int])).map[v$_$1, scala.collection.immutable.List[v$_$1]](((x: t$_$2) => {
36-
val x$5: scala.Int = x.*(2)
37-
x$5.toString()
38-
}))(scala.collection.immutable.List.canBuildFrom[v$_$1])
39-
}
20+
Optimized: scala.List.apply[scala.Int]((1, 2, 3: scala.<repeated>[scala.Int])).map[java.lang.String, scala.collection.immutable.List[java.lang.String]](((x: scala.Int) => {
21+
val x$5: scala.Int = x.*(2)
22+
x$5.toString()
23+
}))(scala.collection.immutable.List.canBuildFrom[java.lang.String])
4024
Result: List(2, 4, 6)
4125

4226
Original: scala.List.apply[scala.Int]((55, 67, 87: scala.<repeated>[scala.Int])).map[scala.Char, scala.collection.immutable.List[scala.Char]](((a: scala.Int) => a.toChar))(scala.collection.immutable.List.canBuildFrom[scala.Char]).map[java.lang.String, scala.collection.immutable.List[java.lang.String]](((b: scala.Char) => b.toString()))(scala.collection.immutable.List.canBuildFrom[java.lang.String])
43-
Optimized: {
44-
type v$_$1
45-
type t$_$2
46-
scala.List.apply[scala.Int]((55, 67, 87: scala.<repeated>[scala.Int])).map[v$_$1, scala.collection.immutable.List[v$_$1]](((x: t$_$2) => {
47-
val x$10: scala.Char = x.toChar
48-
x$10.toString()
49-
}))(scala.collection.immutable.List.canBuildFrom[v$_$1])
50-
}
27+
Optimized: scala.List.apply[scala.Int]((55, 67, 87: scala.<repeated>[scala.Int])).map[java.lang.String, scala.collection.immutable.List[java.lang.String]](((x: scala.Int) => {
28+
val x$10: scala.Char = x.toChar
29+
x$10.toString()
30+
}))(scala.collection.immutable.List.canBuildFrom[java.lang.String])
5131
Result: List(7, C, W)
5232

‎tests/run-macros/quote-matching-optimize-2.check‎

Lines changed: 12 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,53 +1,32 @@
11
Original: ls.filter(((x: scala.Int) => x.<(3))).filter(((x: scala.Int) => x.>(1)))
2-
Optimized: {
3-
type t$_$1
4-
ls.filter(((x: t$_$1) => x.<(3).&&(x.>(1))))
5-
}
2+
Optimized: ls.filter(((x: scala.Int) => x.<(3).&&(x.>(1))))
63
Result: List(2)
74

85
Original: ls2.filter(((x: scala.Char) => x.<('c'))).filter(((x: scala.Char) => x.>('a')))
9-
Optimized: {
10-
type t$_$1
11-
ls2.filter(((x: t$_$1) => x.<('c').&&(x.>('a'))))
12-
}
6+
Optimized: ls2.filter(((x: scala.Char) => x.<('c').&&(x.>('a'))))
137
Result: List(b)
148

159
Original: ls.filter(((x: scala.Int) => x.<(3))).filter(((x: scala.Int) => x.>(1))).filter(((x: scala.Int) => x.==(2)))
16-
Optimized: {
17-
type t$_$1
18-
ls.filter(((x: scala.Int) => x.<(3))).filter(((x: t$_$1) => x.>(1).&&(x.==(2))))
19-
}
10+
Optimized: ls.filter(((x: scala.Int) => x.<(3))).filter(((x: scala.Int) => x.>(1).&&(x.==(2))))
2011
Result: List(2)
2112

2213
1
2314
2
2415
Original: ls.filter(((x: scala.Int) => x.<(3))).foreach[scala.Unit](((x: scala.Int) => scala.Predef.println(x)))
25-
Optimized: {
26-
type t$_$3
27-
type u$_$1
28-
ls.foreach[scala.Any](((x: t$_$3) => if (x.<(3)) scala.Predef.println(x) else ()))
29-
}
16+
Optimized: ls.foreach[scala.Any](((x: scala.Int) => if (x.<(3)) scala.Predef.println(x) else ()))
3017
Result: ()
3118

3219
Original: ls.map[scala.Int, scala.collection.immutable.List[scala.Int]](((a: scala.Int) => a.*(2)))(scala.collection.immutable.List.canBuildFrom[scala.Int]).map[java.lang.String, scala.collection.immutable.List[java.lang.String]](((b: scala.Int) => b.toString()))(scala.collection.immutable.List.canBuildFrom[java.lang.String])
33-
Optimized: {
34-
type v$_$1
35-
type t$_$2
36-
ls.map[v$_$1, scala.collection.immutable.List[v$_$1]](((x: t$_$2) => {
37-
val x$5: scala.Int = x.*(2)
38-
x$5.toString()
39-
}))(scala.collection.immutable.List.canBuildFrom[v$_$1])
40-
}
20+
Optimized: ls.map[java.lang.String, scala.collection.immutable.List[java.lang.String]](((x: scala.Int) => {
21+
val x$5: scala.Int = x.*(2)
22+
x$5.toString()
23+
}))(scala.collection.immutable.List.canBuildFrom[java.lang.String])
4124
Result: List(2, 4, 6)
4225

4326
Original: ls.map[scala.Char, scala.collection.immutable.List[scala.Char]](((a: scala.Int) => a.toChar))(scala.collection.immutable.List.canBuildFrom[scala.Char]).map[java.lang.String, scala.collection.immutable.List[java.lang.String]](((b: scala.Char) => b.toString()))(scala.collection.immutable.List.canBuildFrom[java.lang.String])
44-
Optimized: {
45-
type v$_$1
46-
type t$_$2
47-
ls.map[v$_$1, scala.collection.immutable.List[v$_$1]](((x: t$_$2) => {
48-
val x$10: scala.Char = x.toChar
49-
x$10.toString()
50-
}))(scala.collection.immutable.List.canBuildFrom[v$_$1])
51-
}
27+
Optimized: ls.map[java.lang.String, scala.collection.immutable.List[java.lang.String]](((x: scala.Int) => {
28+
val x$10: scala.Char = x.toChar
29+
x$10.toString()
30+
}))(scala.collection.immutable.List.canBuildFrom[java.lang.String])
5231
Result: List(, , )
5332

‎tests/run-macros/quote-matching-optimize-3.check‎

Lines changed: 6 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,47 +1,26 @@
11
Original: ls.filter(((x: scala.Int) => x.<(3))).filter(((x: scala.Int) => x.>(1)))
2-
Optimized: {
3-
type t$_$1
4-
ls.filter(((x: t$_$1) => ((x: scala.Int) => x.<(3)).apply(x).&&(((x: scala.Int) => x.>(1)).apply(x))))
5-
}
2+
Optimized: ls.filter(((x: scala.Int) => ((x: scala.Int) => x.<(3)).apply(x).&&(((x: scala.Int) => x.>(1)).apply(x))))
63
Result: List(2)
74

85
Original: ls2.filter(((x: scala.Char) => x.<('c'))).filter(((x: scala.Char) => x.>('a')))
9-
Optimized: {
10-
type t$_$1
11-
ls2.filter(((x: t$_$1) => ((x: scala.Char) => x.<('c')).apply(x).&&(((x: scala.Char) => x.>('a')).apply(x))))
12-
}
6+
Optimized: ls2.filter(((x: scala.Char) => ((x: scala.Char) => x.<('c')).apply(x).&&(((x: scala.Char) => x.>('a')).apply(x))))
137
Result: List(b)
148

159
Original: ls.filter(((x: scala.Int) => x.<(3))).filter(((x: scala.Int) => x.>(1))).filter(((x: scala.Int) => x.==(2)))
16-
Optimized: {
17-
type t$_$1
18-
ls.filter(((x: scala.Int) => x.<(3))).filter(((x: t$_$1) => ((x: scala.Int) => x.>(1)).apply(x).&&(((x: scala.Int) => x.==(2)).apply(x))))
19-
}
10+
Optimized: ls.filter(((x: scala.Int) => x.<(3))).filter(((x: scala.Int) => ((x: scala.Int) => x.>(1)).apply(x).&&(((x: scala.Int) => x.==(2)).apply(x))))
2011
Result: List(2)
2112

2213
1
2314
2
2415
Original: ls.filter(((x: scala.Int) => x.<(3))).foreach[scala.Unit](((x: scala.Int) => scala.Predef.println(x)))
25-
Optimized: {
26-
type t$_$2
27-
type u$_$1
28-
ls.foreach[scala.Any](((x: t$_$2) => if (((x: scala.Int) => x.<(3)).apply(x)) ((x: scala.Int) => scala.Predef.println(x)).apply(x) else ()))
29-
}
16+
Optimized: ls.foreach[scala.Any](((x: scala.Int) => if (((x: scala.Int) => x.<(3)).apply(x)) ((x: scala.Int) => scala.Predef.println(x)).apply(x) else ()))
3017
Result: ()
3118

3219
Original: ls.map[scala.Long, scala.collection.immutable.List[scala.Long]](((a: scala.Int) => a.toLong))(scala.collection.immutable.List.canBuildFrom[scala.Long]).map[java.lang.String, scala.collection.immutable.List[java.lang.String]](((b: scala.Long) => b.toString()))(scala.collection.immutable.List.canBuildFrom[java.lang.String])
33-
Optimized: {
34-
type tt$_$1
35-
type uu$_$1
36-
ls.map[java.lang.String, scala.collection.immutable.List[java.lang.String]](((x: tt$_$1) => ((b: scala.Long) => b.toString()).apply(((a: scala.Int) => a.toLong).apply(x))))(scala.collection.immutable.List.canBuildFrom[java.lang.String])
37-
}
20+
Optimized: ls.map[java.lang.String, scala.collection.immutable.List[java.lang.String]](((x: scala.Int) => ((b: scala.Long) => b.toString()).apply(((a: scala.Int) => a.toLong).apply(x))))(scala.collection.immutable.List.canBuildFrom[java.lang.String])
3821
Result: List(1, 2, 3)
3922

4023
Original: ls.map[scala.Char, scala.collection.immutable.List[scala.Char]](((a: scala.Int) => a.toChar))(scala.collection.immutable.List.canBuildFrom[scala.Char]).map[java.lang.String, scala.collection.immutable.List[java.lang.String]](((b: scala.Char) => b.toString()))(scala.collection.immutable.List.canBuildFrom[java.lang.String])
41-
Optimized: {
42-
type tt$_$1
43-
type uu$_$1
44-
ls.map[java.lang.String, scala.collection.immutable.List[java.lang.String]](((x: tt$_$1) => ((b: scala.Char) => b.toString()).apply(((a: scala.Int) => a.toChar).apply(x))))(scala.collection.immutable.List.canBuildFrom[java.lang.String])
45-
}
24+
Optimized: ls.map[java.lang.String, scala.collection.immutable.List[java.lang.String]](((x: scala.Int) => ((b: scala.Char) => b.toString()).apply(((a: scala.Int) => a.toChar).apply(x))))(scala.collection.immutable.List.canBuildFrom[java.lang.String])
4625
Result: List(, , )
4726

0 commit comments

Comments
 (0)