From 02c5293b6f7d19c4fdd6361ead4560ec92ad7e5c Mon Sep 17 00:00:00 2001 From: Guillaume Martres Date: Thu, 15 Aug 2019 17:28:58 +0200 Subject: [PATCH] Adapt macro tests to the 2.13 stdlib --- tests/run-macros/inferred-repeated-result.check | 8 ++++---- tests/run-macros/quote-matcher-runtime.check | 4 ++-- tests/run-macros/quote-matching-optimize-1.check | 12 ++++++------ .../quote-matching-optimize-1/Macro_1.scala | 2 +- tests/run-macros/quote-matching-optimize-2.check | 12 ++++++------ .../quote-matching-optimize-2/Macro_1.scala | 2 +- tests/run-macros/quote-matching-optimize-3.check | 8 ++++---- .../quote-matching-optimize-3/Macro_1.scala | 2 +- 8 files changed, 25 insertions(+), 25 deletions(-) diff --git a/tests/run-macros/inferred-repeated-result.check b/tests/run-macros/inferred-repeated-result.check index 4d3cdea7ed52..78f07c3f4f4d 100644 --- a/tests/run-macros/inferred-repeated-result.check +++ b/tests/run-macros/inferred-repeated-result.check @@ -1,4 +1,4 @@ -C.bar1 : scala.Option[scala.collection.Seq[scala.Predef.String]] -C.bar2 : scala.Option[scala.collection.Seq[scala.Predef.String]] -C.foo1 : scala.collection.Seq[scala.Predef.String] -C.foo2 : scala.collection.Seq[scala.Predef.String] +C.bar1 : scala.Option[scala.collection.immutable.Seq[scala.Predef.String]] +C.bar2 : scala.Option[scala.collection.immutable.Seq[scala.Predef.String]] +C.foo1 : scala.collection.immutable.Seq[scala.Predef.String] +C.foo2 : scala.collection.immutable.Seq[scala.Predef.String] diff --git a/tests/run-macros/quote-matcher-runtime.check b/tests/run-macros/quote-matcher-runtime.check index e772ae7edb1c..1f170a4fc01f 100644 --- a/tests/run-macros/quote-matcher-runtime.check +++ b/tests/run-macros/quote-matcher-runtime.check @@ -787,13 +787,13 @@ Pattern: { } Result: None -Scrutinee: scala.List.apply[scala.Int]((1, 2, 3: scala.[scala.Int])).map[scala.Double, scala.collection.immutable.List[scala.Double]](((x: scala.Int) => x.toDouble./(2)))(scala.collection.immutable.List.canBuildFrom[scala.Double]).map[java.lang.String, scala.collection.immutable.List[java.lang.String]](((y: scala.Double) => y.toString()))(scala.collection.immutable.List.canBuildFrom[java.lang.String]) +Scrutinee: scala.List.apply[scala.Int]((1, 2, 3: scala.[scala.Int])).map[scala.Double](((x: scala.Int) => x.toDouble./(2))).map[java.lang.String](((y: scala.Double) => y.toString())) Pattern: { @scala.internal.Quoted.patternBindHole type T @scala.internal.Quoted.patternBindHole type U @scala.internal.Quoted.patternBindHole type V - (scala.internal.Quoted.patternHole[scala.List[T]].map[U, scala.collection.immutable.List[U]](scala.internal.Quoted.patternHole[scala.Function1[T, U]])(scala.collection.immutable.List.canBuildFrom[U]).map[V, scala.collection.immutable.List[V]](scala.internal.Quoted.patternHole[scala.Function1[U, V]])(scala.collection.immutable.List.canBuildFrom[V]): scala.collection.immutable.List[scala.Any]) + (scala.internal.Quoted.patternHole[scala.List[T]].map[U](scala.internal.Quoted.patternHole[scala.Function1[T, U]]).map[V](scala.internal.Quoted.patternHole[scala.Function1[U, V]]): scala.collection.immutable.List[scala.Any]) } Result: Some(List(Type(scala.Int), Type(scala.Double), Type(java.lang.String), Expr(scala.List.apply[scala.Int]((1, 2, 3: scala.[scala.Int]))), Expr(((x: scala.Int) => x.toDouble./(2))), Expr(((y: scala.Double) => y.toString())))) diff --git a/tests/run-macros/quote-matching-optimize-1.check b/tests/run-macros/quote-matching-optimize-1.check index a6940021e7b8..2f86188f9fa9 100644 --- a/tests/run-macros/quote-matching-optimize-1.check +++ b/tests/run-macros/quote-matching-optimize-1.check @@ -16,17 +16,17 @@ Original: ls.filter(((x: scala.Int) => x.<(3))).foreach[scala.Unit](((x: scala.I Optimized: ls.foreach[scala.Unit](((x: scala.Int) => if (x.<(3)) scala.Predef.println(x) else ())) Result: () -Original: scala.List.apply[scala.Int]((1, 2, 3: scala.[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]) -Optimized: scala.List.apply[scala.Int]((1, 2, 3: scala.[scala.Int])).map[java.lang.String, scala.collection.immutable.List[java.lang.String]](((x: scala.Int) => { +Original: scala.List.apply[scala.Int]((1, 2, 3: scala.[scala.Int])).map[scala.Int](((a: scala.Int) => a.*(2))).map[java.lang.String](((b: scala.Int) => b.toString())) +Optimized: scala.List.apply[scala.Int]((1, 2, 3: scala.[scala.Int])).map[java.lang.String](((x: scala.Int) => { val x$1: scala.Int = x.*(2) x$1.toString() -}))(scala.collection.immutable.List.canBuildFrom[java.lang.String]) +})) Result: List(2, 4, 6) -Original: scala.List.apply[scala.Int]((55, 67, 87: scala.[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]) -Optimized: scala.List.apply[scala.Int]((55, 67, 87: scala.[scala.Int])).map[java.lang.String, scala.collection.immutable.List[java.lang.String]](((x: scala.Int) => { +Original: scala.List.apply[scala.Int]((55, 67, 87: scala.[scala.Int])).map[scala.Char](((a: scala.Int) => a.toChar)).map[java.lang.String](((b: scala.Char) => b.toString())) +Optimized: scala.List.apply[scala.Int]((55, 67, 87: scala.[scala.Int])).map[java.lang.String](((x: scala.Int) => { val x$2: scala.Char = x.toChar x$2.toString() -}))(scala.collection.immutable.List.canBuildFrom[java.lang.String]) +})) Result: List(7, C, W) diff --git a/tests/run-macros/quote-matching-optimize-1/Macro_1.scala b/tests/run-macros/quote-matching-optimize-1/Macro_1.scala index 91b89d6f0637..606a35bb808f 100644 --- a/tests/run-macros/quote-matching-optimize-1/Macro_1.scala +++ b/tests/run-macros/quote-matching-optimize-1/Macro_1.scala @@ -11,7 +11,7 @@ object Macro { case '{ type $t; ($ls: List[`$t`]).filter($f).filter($g) } => optimize('{ $ls.filter(x => ${f('x)} && ${g('x)}) }) - case '{ type $t; type $u; type $v; ($ls: List[`$t`]).map[`$u`, List[`$u`]]($f).map[`$v`, List[`$v`]]($g) } => + case '{ type $t; type $u; type $v; ($ls: List[`$t`]).map[`$u`]($f).map[`$v`]($g) } => optimize('{ $ls.map(x => ${g(f('x))}) }) case '{ type $t; ($ls: List[`$t`]).filter($f).foreach[Unit]($g) } => diff --git a/tests/run-macros/quote-matching-optimize-2.check b/tests/run-macros/quote-matching-optimize-2.check index d325040a76f3..ae181d841a14 100644 --- a/tests/run-macros/quote-matching-optimize-2.check +++ b/tests/run-macros/quote-matching-optimize-2.check @@ -16,17 +16,17 @@ Original: ls.filter(((x: scala.Int) => x.<(3))).foreach[scala.Unit](((x: scala.I Optimized: ls.foreach[scala.Any](((x: scala.Int) => if (x.<(3)) scala.Predef.println(x) else ())) Result: () -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]) -Optimized: ls.map[java.lang.String, scala.collection.immutable.List[java.lang.String]](((x: scala.Int) => { +Original: ls.map[scala.Int](((a: scala.Int) => a.*(2))).map[java.lang.String](((b: scala.Int) => b.toString())) +Optimized: ls.map[java.lang.String](((x: scala.Int) => { val x$1: scala.Int = x.*(2) x$1.toString() -}))(scala.collection.immutable.List.canBuildFrom[java.lang.String]) +})) Result: List(2, 4, 6) -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]) -Optimized: ls.map[java.lang.String, scala.collection.immutable.List[java.lang.String]](((x: scala.Int) => { +Original: ls.map[scala.Char](((a: scala.Int) => a.toChar)).map[java.lang.String](((b: scala.Char) => b.toString())) +Optimized: ls.map[java.lang.String](((x: scala.Int) => { val x$2: scala.Char = x.toChar x$2.toString() -}))(scala.collection.immutable.List.canBuildFrom[java.lang.String]) +})) Result: List(, , ) diff --git a/tests/run-macros/quote-matching-optimize-2/Macro_1.scala b/tests/run-macros/quote-matching-optimize-2/Macro_1.scala index 14592cae64c0..e88cb3689751 100644 --- a/tests/run-macros/quote-matching-optimize-2/Macro_1.scala +++ b/tests/run-macros/quote-matching-optimize-2/Macro_1.scala @@ -13,7 +13,7 @@ object Macro { case '{ ($ls: List[$t]).filter($f).filter($g) } => optimize('{ $ls.filter(x => ${f('x)} && ${g('x)}) }) - case '{ type $u; type $v; ($ls: List[$t]).map[`$u`, List[`$u`]]($f).map[`$v`, List[`$v`]]($g) } => + case '{ type $u; type $v; ($ls: List[$t]).map[`$u`]($f).map[`$v`]($g) } => optimize('{ $ls.map(x => ${g(f('x))}) }) case '{ ($ls: List[$t]).filter($f).foreach[$u]($g) } => diff --git a/tests/run-macros/quote-matching-optimize-3.check b/tests/run-macros/quote-matching-optimize-3.check index 257667305b70..cdfcd9b51eb8 100644 --- a/tests/run-macros/quote-matching-optimize-3.check +++ b/tests/run-macros/quote-matching-optimize-3.check @@ -16,11 +16,11 @@ Original: ls.filter(((x: scala.Int) => x.<(3))).foreach[scala.Unit](((x: scala.I 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 ())) Result: () -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]) -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]) +Original: ls.map[scala.Long](((a: scala.Int) => a.toLong)).map[java.lang.String](((b: scala.Long) => b.toString())) +Optimized: ls.map[java.lang.String](((x: scala.Int) => ((b: scala.Long) => b.toString()).apply(((a: scala.Int) => a.toLong).apply(x)))) Result: List(1, 2, 3) -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]) -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]) +Original: ls.map[scala.Char](((a: scala.Int) => a.toChar)).map[java.lang.String](((b: scala.Char) => b.toString())) +Optimized: ls.map[java.lang.String](((x: scala.Int) => ((b: scala.Char) => b.toString()).apply(((a: scala.Int) => a.toChar).apply(x)))) Result: List(, , ) diff --git a/tests/run-macros/quote-matching-optimize-3/Macro_1.scala b/tests/run-macros/quote-matching-optimize-3/Macro_1.scala index cf98b4b761fd..8a093feba362 100644 --- a/tests/run-macros/quote-matching-optimize-3/Macro_1.scala +++ b/tests/run-macros/quote-matching-optimize-3/Macro_1.scala @@ -13,7 +13,7 @@ object Macro { case '{ ($ls: List[$t]).filter($f).filter($g) } => optimize('{ $ls.filter(x => $f(x) && $g(x)) }) - case '{ type $uu; type $vv; ($ls: List[$tt]).map[`$uu`, List[`$uu`]]($f).map[String, List[String]]($g) } => + case '{ type $uu; type $vv; ($ls: List[$tt]).map[`$uu`]($f).map[String]($g) } => optimize('{ $ls.map(x => $g($f(x))) }) case '{ ($ls: List[$t]).filter($f).foreach[$u]($g) } =>