diff options
author | Iulian Dragos <jaguarul@gmail.com> | 2005-12-13 16:19:05 +0000 |
---|---|---|
committer | Iulian Dragos <jaguarul@gmail.com> | 2005-12-13 16:19:05 +0000 |
commit | 58375d932adab9889cbf373b08051f520ff46b69 (patch) | |
tree | 6a81a868c706bebf70f23a63ca10b4637262db7b /sources | |
parent | 354a2566de85e6e5993616a1843c024e4a2f98cf (diff) | |
download | scala-58375d932adab9889cbf373b08051f520ff46b69.tar.gz scala-58375d932adab9889cbf373b08051f520ff46b69.tar.bz2 scala-58375d932adab9889cbf373b08051f520ff46b69.zip |
Updated to new syntax.
Diffstat (limited to 'sources')
-rw-r--r-- | sources/scala/tools/nsc/ant/NSC.scala | 5 | ||||
-rw-r--r-- | sources/scala/tools/nsc/ast/TreeBrowsers.scala | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/sources/scala/tools/nsc/ant/NSC.scala b/sources/scala/tools/nsc/ant/NSC.scala index 3c72a8a0f1..4db46cc414 100644 --- a/sources/scala/tools/nsc/ant/NSC.scala +++ b/sources/scala/tools/nsc/ant/NSC.scala @@ -83,9 +83,10 @@ package scala.tools.nsc.ant { abstract class PermissibleValue { val values: List[String]; - def isPermissible(value: String): Boolean = + def isPermissible(value: String): Boolean = ( (value == "") || - values.exists(v: String => v startsWith value); + values.exists(v: String => v startsWith value) + ) } /** Defines valid values for the logging property. */ diff --git a/sources/scala/tools/nsc/ast/TreeBrowsers.scala b/sources/scala/tools/nsc/ast/TreeBrowsers.scala index 2c9aaaaa37..9e4821a734 100644 --- a/sources/scala/tools/nsc/ast/TreeBrowsers.scala +++ b/sources/scala/tools/nsc/ast/TreeBrowsers.scala @@ -215,7 +215,7 @@ abstract class TreeBrowsers { str.append(buf.toString()); } str.append("\nSymbol Attributes: \n").append(TreeInfo.symbolAttributes(t)); - str.append("\nType: \n").append(t.tpe.toString()); + str.append("\nType: \n").append(if (t.tpe ne null) t.tpe.toString() else ""); } setText(str.toString()); } |