Skip to content
This repository
Browse code

Merge pull request #1674 from scalamacros/topic/showraw

SI-6718 fixes a volatile test
  • Loading branch information...
commit 4c3aaad77fd41765aa2a06039ede143d6911d422 2 parents 2a8291a + 20c2a50
Josh Suereth authored November 27, 2012
4  test/files/run/showraw_aliases.check
... ...
@@ -1,2 +1,2 @@
1  
-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")]))
2  
-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")]))
  1
+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")]))
  2
+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")]))
6  test/files/run/showraw_aliases.scala
@@ -9,7 +9,9 @@ object Test extends App {
9 9
   """)
10 10
   val ttree = tb.typeCheck(tree)
11 11
 
12  
-  def stabilize(s: String) = """#\d+""".r.replaceAllIn(s, "#<id>")
13  
-  println(showRaw(ttree))
  12
+  def stabilizeIds(s: String) = """#\d+""".r.replaceAllIn(s, "#<id>")
  13
+  def stabilizePositions(s: String) = """\d+""".r.replaceAllIn(s, "<offset>")
  14
+  def stabilize(s: String) = stabilizePositions(stabilizeIds(s))
  15
+  println(stabilize(showRaw(ttree)))
14 16
   println(stabilize(showRaw(ttree, printIds = true)))
15 17
 }

0 notes on commit 4c3aaad

Please sign in to comment.
Something went wrong with that request. Please try again.