- Moved EMPTY_ARRAY constant from Ext classes t...

- Moved EMPTY_ARRAY constant from Ext classes to class Tree.

5 files changed, 16 insertions, 18 deletions

diff --git a/sources/scalac/ast/Tree.java b/sources/scalac/ast/Tree.java
index a3cc94cf3e..ae166080d0 100644
--- a/sources/scalac/ast/Tree.java
+++ b/sources/scalac/ast/Tree.java
@@ -29,6 +29,10 @@ public class Tree {
 
     /** Empty tree array */
     public static final Tree[] EMPTY_ARRAY = new Tree[0];
+    public static final ValDef[] ValDef_EMPTY_ARRAY = new ValDef[0];
+    public static final ValDef[][] ValDef_EMPTY_ARRAY_ARRAY = new ValDef[0][];
+    public static final TypeDef[] TypeDef_EMPTY_ARRAY = new TypeDef[0];
+    public static final CaseDef[] CaseDef_EMPTY_ARRAY = new CaseDef[0];
 
     //########################################################################
     // Public Cases
@@ -691,10 +695,6 @@ public class Tree {
     }
 
     public static class ExtValDef extends ValDef {
-
-	public static final ValDef[] EMPTY_ARRAY = new ValDef[0];
-	public static final ValDef[][] EMPTY_ARRAY_ARRAY = new ValDef[0][0];
-
         private Symbol symbol;
 
         public ExtValDef(int mods, Name name, Tree tpe, Tree rhs)
@@ -750,8 +750,6 @@ public class Tree {
     public static class ExtTypeDef extends TypeDef {
         private Symbol symbol;
 
-	public static final TypeDef[] EMPTY_ARRAY = new TypeDef[0];
-
         public ExtTypeDef(int mods, Name name, Tree rhs)
         {
             super(mods, name, rhs);
diff --git a/sources/scalac/ast/parser/Parser.java b/sources/scalac/ast/parser/Parser.java
index 771979fcda..0a58f28dcd 100644
--- a/sources/scalac/ast/parser/Parser.java
+++ b/sources/scalac/ast/parser/Parser.java
@@ -257,10 +257,10 @@ public class Parser implements Tokens {
 	case Typed(Ident(_), _):
 	    return new ValDef[]{convertToParam(t)};
 	case Block(Tree[] stats):
-	    if (stats.length == 0) return Tree.ExtValDef.EMPTY_ARRAY;
+	    if (stats.length == 0) return Tree.ValDef_EMPTY_ARRAY;
 	}
 	syntaxError(t.pos, "malformed formal parameter list", false);
-	return Tree.ExtValDef.EMPTY_ARRAY;
+	return Tree.ValDef_EMPTY_ARRAY;
     }
 
     /** Convert list of trees to formal parameter list
@@ -1512,7 +1512,7 @@ public class Parser implements Tokens {
 	Name name = ident();
 	TypeDef[] tparams = typeParamClauseOpt();
 	ValDef[][] params = (s.token == LPAREN) ? new ValDef[][]{paramClause()}
-	    : Tree.ExtValDef.EMPTY_ARRAY_ARRAY;
+	    : Tree.ValDef_EMPTY_ARRAY_ARRAY;
         return make.ClassDef(pos, mods, name.toTypeName(), tparams, params,
 			     simpleTypedOpt(), classTemplate());
     }
diff --git a/sources/scalac/typechecker/Analyzer.java b/sources/scalac/typechecker/Analyzer.java
index d5cda31ee1..c72b2a55f4 100644
--- a/sources/scalac/typechecker/Analyzer.java
+++ b/sources/scalac/typechecker/Analyzer.java
@@ -1981,8 +1981,8 @@ public class Analyzer extends Transformer implements Modifiers, Kinds {
 			    templ.pos,
 			    0,
 			    Names.ANON_CLASS_NAME.toTypeName(),
-			    Tree.ExtTypeDef.EMPTY_ARRAY,
-			    new ValDef[][]{Tree.ExtValDef.EMPTY_ARRAY},
+			    Tree.TypeDef_EMPTY_ARRAY,
+			    new ValDef[][]{Tree.ValDef_EMPTY_ARRAY},
 			    Tree.Empty,
 			    templ);
 			//new TextTreePrinter().print(cd).println().end();//DEBUG
diff --git a/sources/scalac/typechecker/DeSugarize.java b/sources/scalac/typechecker/DeSugarize.java
index ec3fa5edf0..3b490178f5 100644
--- a/sources/scalac/typechecker/DeSugarize.java
+++ b/sources/scalac/typechecker/DeSugarize.java
@@ -201,7 +201,7 @@ public class DeSugarize implements Kinds, Modifiers {
 
 	    Tree applyDef = make.DefDef(
 		tree.pos, 0, Names.apply,
-		Tree.ExtTypeDef.EMPTY_ARRAY, new ValDef[][]{vparams},
+		Tree.TypeDef_EMPTY_ARRAY, new ValDef[][]{vparams},
 		restpe, body);
 
 	    Tree result = make.New(tree.pos,
@@ -264,14 +264,14 @@ public class DeSugarize implements Kinds, Modifiers {
 	    make.Select(tree.pos,
 		make.Ident(tree.pos, x), Names.match), new Tree[]{tree});
 	Tree applyDef = make.DefDef(
-	    tree.pos, 0, Names.apply, Tree.ExtTypeDef.EMPTY_ARRAY, vparams,
+	    tree.pos, 0, Names.apply, Tree.TypeDef_EMPTY_ARRAY, vparams,
 	    gen.mkType(tree.pos, restpe), body);
 	Tree tree1 = isDefinedAtVisitor(tree);
 	Tree body1 = make.Apply(tree.pos,
 	    make.Select(tree.pos,
 		make.Ident(tree.pos, x), Names.match), new Tree[]{tree1});
 	Tree isDefinedAtDef = make.DefDef(
-	    tree.pos, 0, Names.isDefinedAt, Tree.ExtTypeDef.EMPTY_ARRAY,
+	    tree.pos, 0, Names.isDefinedAt, Tree.TypeDef_EMPTY_ARRAY,
 	    Tree.duplicator.transform(vparams),
 	    gen.mkType(tree.pos, global.definitions.BOOLEAN_TYPE), body1);
 	Tree result = make.New(tree.pos,
@@ -526,7 +526,7 @@ public class DeSugarize implements Kinds, Modifiers {
 	    if ((mods1 & MUTABLE) == 0) mods1 |= STABLE;
 	    Tree getter = make.DefDef(
 		tree.pos, mods1, name,
-		Tree.ExtTypeDef.EMPTY_ARRAY, Tree.ExtValDef.EMPTY_ARRAY_ARRAY,
+		Tree.TypeDef_EMPTY_ARRAY, Tree.ValDef_EMPTY_ARRAY_ARRAY,
 		tpe,
 		((mods & DEFERRED) != 0) ? Tree.Empty
 		    : make.Ident(tree.pos, valname));
@@ -536,7 +536,7 @@ public class DeSugarize implements Kinds, Modifiers {
 	    } else {
 		Tree setter = make.DefDef(
 		    tree.pos, mods1, setterName(name),
-		    Tree.ExtTypeDef.EMPTY_ARRAY,
+		    Tree.TypeDef_EMPTY_ARRAY,
 		    new ValDef[][]{{
 			(ValDef) make.ValDef(
 			    tree.pos, SYNTHETIC, parameterName(0), tpe, Tree.Empty)}},
diff --git a/sources/scalac/typechecker/RefCheck.java b/sources/scalac/typechecker/RefCheck.java
index aac469d161..53258e5dd1 100644
--- a/sources/scalac/typechecker/RefCheck.java
+++ b/sources/scalac/typechecker/RefCheck.java
@@ -136,8 +136,8 @@ public class RefCheck extends Transformer implements Modifiers, Kinds {
 	    tree.pos,
 	    mods | FINAL | MODUL,
 	    name.toTypeName(),
-	    Tree.ExtTypeDef.EMPTY_ARRAY,
-	    Tree.ExtValDef.EMPTY_ARRAY_ARRAY,
+	    Tree.TypeDef_EMPTY_ARRAY,
+	    Tree.ValDef_EMPTY_ARRAY_ARRAY,
 	    Tree.Empty,
 	    templ)
 	    .setSymbol(sym.moduleClass()).setType(tree.type);