- Adapted to the new compiler

5 files changed, 12 insertions, 12 deletions

diff --git a/sources/scala/tools/scalac/ast/TreeList.scala b/sources/scala/tools/scalac/ast/TreeList.scala
index 198e4fdbbd..e8ac0fb35b 100644
--- a/sources/scala/tools/scalac/ast/TreeList.scala
+++ b/sources/scala/tools/scalac/ast/TreeList.scala
@@ -14,7 +14,7 @@ package scala.tools.scalac.ast {
 /** List of trees.
  */
 
-final class TreeList(ts: Array[Tree]) with Iterable[Tree] {
+final class TreeList(ts: Array[Tree]) extends Iterable[Tree] {
 
   private var trees = ts;
   private var len = ts.length;
diff --git a/sources/scala/tools/scalac/ast/parser/Parser.scala b/sources/scala/tools/scalac/ast/parser/Parser.scala
index 2e3957851f..ae5d490ffe 100644
--- a/sources/scala/tools/scalac/ast/parser/Parser.scala
+++ b/sources/scala/tools/scalac/ast/parser/Parser.scala
@@ -167,7 +167,7 @@ class Parser(unit: CompilationUnit) {
 
   /** Join the comment associated with a definition
   */
-  def joinComment(def trees: Array[Tree]): Array[Tree] = {
+  def joinComment(trees: => Array[Tree]): Array[Tree] = {
     // push comment
     commentStack.push(if (s.docBuffer == null) null else s.docBuffer.toString());
     s.docBuffer = null;
diff --git a/sources/scala/tools/scalac/ast/printer/TextTreePrinter.scala b/sources/scala/tools/scalac/ast/printer/TextTreePrinter.scala
index 91c38c2184..1dc36779ad 100644
--- a/sources/scala/tools/scalac/ast/printer/TextTreePrinter.scala
+++ b/sources/scala/tools/scalac/ast/printer/TextTreePrinter.scala
@@ -29,7 +29,7 @@ import java.util.ArrayList;
  * @version 1.0
  */
 class TextTreePrinter(global0: scalac_Global, out0: PrintWriter)
-  with TreePrinter
+  extends TreePrinter
 {
   //##########################################################################
   // Public Fields
diff --git a/sources/scala/tools/scalac/icode/ICInstruction.scala b/sources/scala/tools/scalac/icode/ICInstruction.scala
index 2cf541e258..db1ed3c180 100644
--- a/sources/scala/tools/scalac/icode/ICInstruction.scala
+++ b/sources/scala/tools/scalac/icode/ICInstruction.scala
@@ -61,7 +61,7 @@ case class CONSTANT(constant: AConstant) extends ICInstruction{
   * Stack: ...:array[a](Ref):index(Int)
   *    ->: ...:element(a)
   */
-case class LOAD_ARRAY_ITEM extends ICInstruction {
+case class LOAD_ARRAY_ITEM() extends ICInstruction {
   /** Returns a string representation of this instruction */
   override def toString(): String = "LOAD_ARRAY_ITEM";
 
@@ -97,7 +97,7 @@ case class LOAD_FIELD(field: Symbol, isStatic: boolean) extends ICInstruction {
   * Stack: ...:array[a](Ref):index(Int):value(a)
   *    ->: ...
   */
-case class STORE_ARRAY_ITEM extends ICInstruction {
+case class STORE_ARRAY_ITEM() extends ICInstruction {
   /** Returns a string representation of this instruction */
   override def toString(): String = "STORE_ARRAY_ITEM";
 
@@ -285,7 +285,7 @@ case class CZJUMP(successBlock: IBasicBlock, failureBlock: IBasicBlock, cond: AT
   * Stack: ...
   *    ->: ...
   */
-case class RETURN extends ICInstruction {
+case class RETURN() extends ICInstruction {
   /** Returns a string representation of this instruction */
   override def toString(): String ="RETURN";
 
@@ -297,7 +297,7 @@ case class RETURN extends ICInstruction {
   * Stack: ...:Throwable(Ref)
   *    ->: ...:
   */
-case class THROW extends ICInstruction {
+case class THROW() extends ICInstruction {
 /** Returns a string representation of this instruction */
   override def toString(): String ="THROW";
 
@@ -333,7 +333,7 @@ case class DROP (typ: Type) extends ICInstruction {
   * Stack: ...:object(ref)
   *    ->: ...:
   */
-  case class MONITOR_ENTER extends ICInstruction {
+  case class MONITOR_ENTER() extends ICInstruction {
 
     /** Returns a string representation of this instruction */
     override def toString(): String ="MONITOR_ENTER";
@@ -346,7 +346,7 @@ case class DROP (typ: Type) extends ICInstruction {
   * Stack: ...:object(ref)
   *    ->: ...:
   */
-  case class MONITOR_EXIT extends ICInstruction {
+  case class MONITOR_EXIT() extends ICInstruction {
 
     /** Returns a string representation of this instruction */
     override def toString(): String ="MONITOR_EXIT";
diff --git a/sources/scala/tools/scalac/transformer/matching/Autom2Scala.scala b/sources/scala/tools/scalac/transformer/matching/Autom2Scala.scala
index dffd1f77d5..eac38280ae 100644
--- a/sources/scala/tools/scalac/transformer/matching/Autom2Scala.scala
+++ b/sources/scala/tools/scalac/transformer/matching/Autom2Scala.scala
@@ -25,7 +25,7 @@ package scala.tools.scalac.transformer.matching {
 
   /**  @param owner owner of the pattern matching expression
    */
-  class Autom2Scala(val dfa: DetWordAutom, val elementType: Type, val owner: Symbol, val cf: CodeFactory)  with PatternTool(cf.unit) {
+  class Autom2Scala(val dfa: DetWordAutom, val elementType: Type, val owner: Symbol, val cf: CodeFactory) extends PatternTool(cf.unit) {
 
     protected var optimize = true;
 
@@ -54,7 +54,7 @@ package scala.tools.scalac.transformer.matching {
     var pos: Int = Position.FIRSTPOS;
 
     def funRetType(): Type = {
-      funSym.getType().match {
+      funSym.getType() match {
         case Type.MethodType( _, retType )=>
           retType;
         case _ => throw new RuntimeException();
@@ -82,7 +82,7 @@ package scala.tools.scalac.transformer.matching {
     def currentElem() = { gen.Ident( cf.pos, curSym ).setType( curSym.getType() ); }
 
     def currentMatches(label: Label): Tree = {
-      label.match {
+      label match {
         case TreeLabel( pat ) =>
           _cur_match( pat );
         case SimpleLabel(lit: Tree.Literal) =>