WIP

olafurpg · julienrf · commit 2466d82d95e9 · 2017-08-29T14:07:30.000+02:00
diff --git a/input/src/main/scala/fix/Collectionstrawman_v0.scala b/input/src/main/scala/fix/Collectionstrawman_v0.scala
@@ -1,6 +1,6 @@
 /* ONLY
 rewrite = "scala:fix.Collectionstrawman_v0"
-*/
+ */
 package fix
 
 object Collectionstrawman_v0_List {
@@ -48,5 +48,6 @@ object Collectionstrawman_v0_ArrayAndString {
 }
 
 object Collectionstrawman_v0_Range {
-  for (i <- 1 to 10; j <- 0 until 10) yield (i, j)
+  (1 to 10).map(_ + 2)
+  (0 until 10).map(_ + 3)
 }
diff --git a/output/src/main/scala/fix/Collectionstrawman_v0.scala b/output/src/main/scala/fix/Collectionstrawman_v0.scala
@@ -46,5 +46,6 @@ object Collectionstrawman_v0_ArrayAndString {
 }
 
 object Collectionstrawman_v0_Range {
-  for (i <- Range.inclusive(1, 10); j <- Range(0, 10)) yield (i, j)
+  Range.inclusive(1, 10).map(_ +  1)
+  Range(1, 10).map(_ +  1)
 }
diff --git a/rewrites/src/main/scala/fix/Collectionstrawman_v0.scala b/rewrites/src/main/scala/fix/Collectionstrawman_v0.scala
@@ -22,6 +22,7 @@ case class Collectionstrawman_v0(mirror: SemanticCtx)
   }
 
   def rewrite(ctx: RewriteCtx): Patch = {
+    ctx.debugMirror()
     def p(name: String) =
       s"scala.Predef.$name" -> s"strawman.collection.immutable.$name"
     def s(name: String, rename: Option[String] = None) =

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`/* ONLY`
`2`	`2`	`rewrite = "scala:fix.Collectionstrawman_v0"`
`3`		`-*/`
	`3`	`+ */`
`4`	`4`	`package fix`
`5`	`5`
`6`	`6`	`object Collectionstrawman_v0_List {`
`@@ -48,5 +48,6 @@ object Collectionstrawman_v0_ArrayAndString {`
`48`	`48`	`}`
`49`	`49`
`50`	`50`	`object Collectionstrawman_v0_Range {`
`51`		`- for (i <- 1 to 10; j <- 0 until 10) yield (i, j)`
	`51`	`+ (1 to 10).map(_ + 2)`
	`52`	`+ (0 until 10).map(_ + 3)`
`52`	`53`	`}`
Original file line number	Diff line number	Diff line change
`@@ -46,5 +46,6 @@ object Collectionstrawman_v0_ArrayAndString {`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`object Collectionstrawman_v0_Range {`
`49`		`- for (i <- Range.inclusive(1, 10); j <- Range(0, 10)) yield (i, j)`
	`49`	`+ Range.inclusive(1, 10).map(_ + 1)`
	`50`	`+ Range(1, 10).map(_ + 1)`
`50`	`51`	`}`
Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,7 @@ case class Collectionstrawman_v0(mirror: SemanticCtx)`
`22`	`22`	`}`
`23`	`23`
`24`	`24`	`def rewrite(ctx: RewriteCtx): Patch = {`
	`25`	`+ ctx.debugMirror()`
`25`	`26`	`def p(name: String) =`
`26`	`27`	`s"scala.Predef.$name" -> s"strawman.collection.immutable.$name"`
`27`	`28`	`def s(name: String, rename: Option[String] = None) =`