Skip to content

Commit 632d1dc

Browse files
olafurpgjulienrf
authored andcommitted
WIP
1 parent e679c85 commit 632d1dc

File tree

4 files changed

+41
-24
lines changed

4 files changed

+41
-24
lines changed

input/src/main/scala/fix/Collectionstrawman_v0.scala

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
1-
/* ONLY
1+
/*
22
rewrite = "scala:fix.Collectionstrawman_v0"
3-
patches.replaceSymbols = [
4-
]
53
*/
64
package fix
75

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
/* ONLY
2+
rewrite = "scala:fix.Collectionstrawman_v0"
3+
*/
4+
package fix
5+
6+
import scala.concurrent.Future
7+
8+
class ListTest {
9+
def foo(x: Future[List[Int]]) = ???
10+
}
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
package fix
2+
3+
import scala.concurrent.Future
4+
5+
class ListTest {
6+
def foo(x: Future[List[Int]]) = ???
7+
}

rewrites/src/main/scala/fix/Collectionstrawman_v0.scala

Lines changed: 23 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,7 @@ case class Collectionstrawman_v0(mirror: SemanticCtx) extends SemanticRewrite(mi
1515
Symbol("_root_.scala.`::`."),
1616
Symbol("_root_.scala.`#::`."),
1717
Symbol("_root_.scala.Predef.Map."),
18-
Symbol("_root_.scala.Predef.intArrayOps."),
19-
Symbol("_root_.scala.Predef.augmentString."),
18+
Symbol("_root_.scala.Predef.augmentStrugming."),
2019
Symbol("_root_.scala.Predef.intArrayOps.")
2120
)
2221

@@ -41,25 +40,28 @@ case class Collectionstrawman_v0(mirror: SemanticCtx) extends SemanticRewrite(mi
4140
}
4241

4342
def rewrite(ctx: RewriteCtx): Patch = {
44-
ifSymbolFound(ctx) + ctx.replaceSymbols(
45-
"scala.collection.immutable.HashMap" ->
46-
"strawman.collection.immutable.HashMap",
47-
"scala.collection.immutable.Map" ->
48-
"strawman.collection.immutable.Map",
49-
"scala.Predef.Map" ->
50-
"strawman.collection.immutable.Map",
51-
"scala.collection.immutable.List" ->
52-
"strawman.collection.immutable.List",
53-
"scala.collection.immutable.Nil" ->
54-
"strawman.collection.immutable.Nil",
55-
"scala.package.Stream" ->
56-
"strawman.collection.immutable.LazyList",
57-
"scala.package.`#::`" ->
58-
"strawman.collection.immutable.LazyList.`#::`",
59-
"scala.package.Vector" ->
60-
"strawman.collection.immutable.Vector",
61-
"scala.collection.mutable.ArrayBuffer" ->
62-
"strawman.collection.mutable.ArrayBuffer"
43+
def p(name: String) =
44+
s"scala.Predef.$name" -> s"strawman.collection.immutable.$name"
45+
def s(name: String) =
46+
s"scala.$name" -> s"strawman.collection.immutable.$name"
47+
def i(name: String) =
48+
s"scala.collection.immutable.$name" -> s"strawman.collection.immutable.$name"
49+
def m(name: String) =
50+
s"scala.collection.mutable.$name" -> s"strawman.collection.mutable.$name"
51+
// ifSymbolFound(ctx) +
52+
ctx.replaceSymbols(
53+
i("HashMap"),
54+
i("Map"),
55+
p("Map"),
56+
s("List"),
57+
i("List"),
58+
s("Nil"),
59+
i("Nil"),
60+
s("Stream"),
61+
s("`#::`"),
62+
s("Vector"),
63+
i("Vector"),
64+
m("ArrayBuffer")
6365
)
6466
}
6567
}

0 commit comments

Comments
 (0)