diff options
| author | Josh Suereth <Joshua.Suereth@gmail.com> | 2012-11-27 09:47:28 -0800 |
|---|---|---|
| committer | Josh Suereth <Joshua.Suereth@gmail.com> | 2012-11-27 09:47:28 -0800 |
| commit | 4c3aaad77fd41765aa2a06039ede143d6911d422 (patch) | |
| tree | 53a8a006b6c28a6307e3435b51fa50a1fc3aa6ab | |
| parent | 2a8291a3568abc848e79acaacd82e90932a77c8a (diff) | |
| parent | 20c2a50d7ce29a8593e92a2806031d5c08dc31b7 (diff) | |
| download | scala-4c3aaad77fd41765aa2a06039ede143d6911d422.tar.gz scala-4c3aaad77fd41765aa2a06039ede143d6911d422.tar.bz2 scala-4c3aaad77fd41765aa2a06039ede143d6911d422.zip | |
Merge pull request #1674 from scalamacros/topic/showraw
SI-6718 fixes a volatile test
| -rw-r--r-- | test/files/run/showraw_aliases.check | 4 | ||||
| -rw-r--r-- | test/files/run/showraw_aliases.scala | 6 |
2 files changed, 6 insertions, 4 deletions
diff --git a/test/files/run/showraw_aliases.check b/test/files/run/showraw_aliases.check index 1838bf9bec..aebd354031 100644 --- a/test/files/run/showraw_aliases.check +++ b/test/files/run/showraw_aliases.check @@ -1,2 +1,2 @@ -Block(List(Import(Select(Select(Ident(scala), scala.reflect), scala.reflect.runtime), List(ImportSelector(newTermName("universe"), 52, newTermName("ru"), 64)))), Select(Select(Select(Select(Ident(scala), scala.reflect), scala.reflect.runtime), scala.reflect.runtime.package), [newTermName("universe") aka newTermName("ru")])) -Block(List(Import(Select(Select(Ident(scala#<id>), scala.reflect#<id>), scala.reflect.runtime#<id>), List(ImportSelector(newTermName("universe"), 52, newTermName("ru"), 64)))), Select(Select(Select(Select(Ident(scala#<id>), scala.reflect#<id>), scala.reflect.runtime#<id>), scala.reflect.runtime.package#<id>), [newTermName("universe")#<id> aka newTermName("ru")])) +Block(List(Import(Select(Select(Ident(scala), scala.reflect), scala.reflect.runtime), List(ImportSelector(newTermName("universe"), <offset>, newTermName("ru"), <offset>)))), Select(Select(Select(Select(Ident(scala), scala.reflect), scala.reflect.runtime), scala.reflect.runtime.package), [newTermName("universe") aka newTermName("ru")])) +Block(List(Import(Select(Select(Ident(scala#<id>), scala.reflect#<id>), scala.reflect.runtime#<id>), List(ImportSelector(newTermName("universe"), <offset>, newTermName("ru"), <offset>)))), Select(Select(Select(Select(Ident(scala#<id>), scala.reflect#<id>), scala.reflect.runtime#<id>), scala.reflect.runtime.package#<id>), [newTermName("universe")#<id> aka newTermName("ru")])) diff --git a/test/files/run/showraw_aliases.scala b/test/files/run/showraw_aliases.scala index 3a68ca37b2..65b4fcb1cd 100644 --- a/test/files/run/showraw_aliases.scala +++ b/test/files/run/showraw_aliases.scala @@ -9,7 +9,9 @@ object Test extends App { """) val ttree = tb.typeCheck(tree) - def stabilize(s: String) = """#\d+""".r.replaceAllIn(s, "#<id>") - println(showRaw(ttree)) + def stabilizeIds(s: String) = """#\d+""".r.replaceAllIn(s, "#<id>") + def stabilizePositions(s: String) = """\d+""".r.replaceAllIn(s, "<offset>") + def stabilize(s: String) = stabilizePositions(stabilizeIds(s)) + println(stabilize(showRaw(ttree))) println(stabilize(showRaw(ttree, printIds = true))) }
\ No newline at end of file |