summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormichelou <michelou@epfl.ch>2007-10-08 16:09:53 +0000
committermichelou <michelou@epfl.ch>2007-10-08 16:09:53 +0000
commitd93d566e0845aeed5066c30b4bc0d99a2b4729c7 (patch)
tree2b473af875f6f4fc091db07dbcd9e2157a2ef726
parent3ef75fa07a6d3d64b50650856e9340142bdfcefe (diff)
downloadscala-d93d566e0845aeed5066c30b4bc0d99a2b4729c7.tar.gz
scala-d93d566e0845aeed5066c30b4bc0d99a2b4729c7.tar.bz2
scala-d93d566e0845aeed5066c30b4bc0d99a2b4729c7.zip
added node info for blocks
-rw-r--r--src/compiler/scala/tools/nsc/ast/NodePrinters.scala2
-rw-r--r--src/library/scala/Proxy.scala8
2 files changed, 5 insertions, 5 deletions
diff --git a/src/compiler/scala/tools/nsc/ast/NodePrinters.scala b/src/compiler/scala/tools/nsc/ast/NodePrinters.scala
index 05c65f4671..158340e519 100644
--- a/src/compiler/scala/tools/nsc/ast/NodePrinters.scala
+++ b/src/compiler/scala/tools/nsc/ast/NodePrinters.scala
@@ -148,7 +148,7 @@ abstract class NodePrinters {
}
printcln(")")
case Block(stats, expr) =>
- println("Block(")
+ println("Block(" + nodeinfo(tree))
if (stats.isEmpty)
println(" List() // no statement")
else {
diff --git a/src/library/scala/Proxy.scala b/src/library/scala/Proxy.scala
index 8cd3547d03..96931da5cb 100644
--- a/src/library/scala/Proxy.scala
+++ b/src/library/scala/Proxy.scala
@@ -1,7 +1,7 @@
/* __ *\
** ________ ___ / / ___ Scala API **
-** / __/ __// _ | / / / _ | (c) 2002-2006, LAMP/EPFL **
-** __\ \/ /__/ __ |/ /__/ __ | **
+** / __/ __// _ | / / / _ | (c) 2002-2007, LAMP/EPFL **
+** __\ \/ /__/ __ |/ /__/ __ | http://www.scala-lang.org/ **
** /____/\___/_/ |_/____/_/ | | **
** |/ **
\* */
@@ -26,8 +26,8 @@ trait Proxy {
def self: Any
override def hashCode: Int = self.hashCode
override def equals(that: Any): Boolean = that match {
- case that : Proxy => self.equals(that.self)
- case that => self.equals(that)
+ case that: Proxy => self equals that.self
+ case that => self equals that
}
override def toString: String = self.toString
}