Use Expr.ofList

nicolasstucki · cheeseng · commit 7610931f3017 · 2019-12-23T22:55:28.000+08:00
diff --git a/scalatest.dotty/src/main/scala/org/scalatest/diagrams/DiagramsMacro.scala b/scalatest.dotty/src/main/scala/org/scalatest/diagrams/DiagramsMacro.scala
@@ -135,7 +135,7 @@ object DiagramsMacro {
                 val left = l.seal.cast[DiagrammedExpr[T]]
                 val rights = rs.map(_.seal.cast[DiagrammedExpr[_]])
                 val res = Select.unique(l, "value").select(sel.symbol).appliedToArgs(diagrams.map(r => Select.unique(r, "value")) ++ others).seal.cast[R]
-                '{ DiagrammedExpr.applyExpr[R]($left, ${rights.toExprOfList}, $res, $anchor) }.unseal
+                '{ DiagrammedExpr.applyExpr[R]($left, ${Expr.ofList(rights)}, $res, $anchor) }.unseal
               }
             }
         }
@@ -155,7 +155,7 @@ object DiagramsMacro {
             val left = l.seal.cast[DiagrammedExpr[T]]
             val rights = rs.map(_.seal.cast[DiagrammedExpr[_]])
             val res = Select.unique(l, "value").select(sel.symbol).appliedToArgs(diagrams.map(r => Select.unique(r, "value")) ++ others).seal.cast[R]
-            '{ DiagrammedExpr.applyExpr[R]($left, ${rights.toExprOfList}, $res, $anchor) }.unseal
+            '{ DiagrammedExpr.applyExpr[R]($left, ${Expr.ofList(rights)}, $res, $anchor) }.unseal
           }
         }
 
@@ -197,7 +197,7 @@ object DiagramsMacro {
             val rights = rs.map(_.seal.cast[DiagrammedExpr[_]])
             val res = Select.unique(l, "value").select(sel.symbol).appliedToTypes(targs.map(_.tpe))
                             .appliedToArgs(diagrams.map(r => Select.unique(r, "value")) ++ others).seal.cast[R]
-            '{ DiagrammedExpr.applyExpr[R]($left, ${rights.toExprOfList}, $res, $anchor) }.unseal
+            '{ DiagrammedExpr.applyExpr[R]($left, ${Expr.ofList(rights)}, $res, $anchor) }.unseal
           }
         }
 

Original file line number	Diff line number	Diff line change
`@@ -135,7 +135,7 @@ object DiagramsMacro {`
`135`	`135`	`val left = l.seal.cast[DiagrammedExpr[T]]`
`136`	`136`	`val rights = rs.map(_.seal.cast[DiagrammedExpr[_]])`
`137`	`137`	`val res = Select.unique(l, "value").select(sel.symbol).appliedToArgs(diagrams.map(r => Select.unique(r, "value")) ++ others).seal.cast[R]`
`138`		`- '{ DiagrammedExpr.applyExpr[R]($left, ${rights.toExprOfList}, $res, $anchor) }.unseal`
	`138`	`+ '{ DiagrammedExpr.applyExpr[R]($left, ${Expr.ofList(rights)}, $res, $anchor) }.unseal`
`139`	`139`	`}`
`140`	`140`	`}`
`141`	`141`	`}`
`@@ -155,7 +155,7 @@ object DiagramsMacro {`
`155`	`155`	`val left = l.seal.cast[DiagrammedExpr[T]]`
`156`	`156`	`val rights = rs.map(_.seal.cast[DiagrammedExpr[_]])`
`157`	`157`	`val res = Select.unique(l, "value").select(sel.symbol).appliedToArgs(diagrams.map(r => Select.unique(r, "value")) ++ others).seal.cast[R]`
`158`		`- '{ DiagrammedExpr.applyExpr[R]($left, ${rights.toExprOfList}, $res, $anchor) }.unseal`
	`158`	`+ '{ DiagrammedExpr.applyExpr[R]($left, ${Expr.ofList(rights)}, $res, $anchor) }.unseal`
`159`	`159`	`}`
`160`	`160`	`}`
`161`	`161`
`@@ -197,7 +197,7 @@ object DiagramsMacro {`
`197`	`197`	`val rights = rs.map(_.seal.cast[DiagrammedExpr[_]])`
`198`	`198`	`val res = Select.unique(l, "value").select(sel.symbol).appliedToTypes(targs.map(_.tpe))`
`199`	`199`	`.appliedToArgs(diagrams.map(r => Select.unique(r, "value")) ++ others).seal.cast[R]`
`200`		`- '{ DiagrammedExpr.applyExpr[R]($left, ${rights.toExprOfList}, $res, $anchor) }.unseal`
	`200`	`+ '{ DiagrammedExpr.applyExpr[R]($left, ${Expr.ofList(rights)}, $res, $anchor) }.unseal`
`201`	`201`	`}`
`202`	`202`	`}`
`203`	`203`