Updated to new syntax.

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());
     }