- Removed Function1 and ScalaObject from Array ...

- Removed Function1 and ScalaObject from Array superclasses

2 files changed, 3 insertions, 41 deletions

diff --git a/sources/scala/Array.java b/sources/scala/Array.java
index 329523f648..feedf687d5 100644
--- a/sources/scala/Array.java
+++ b/sources/scala/Array.java
@@ -12,10 +12,8 @@ package scala;
 
 import scala.runtime.types.ScalaClassType;
 
-/** @meta class [?T] extends scala.AnyRef with scala.Function1[scala.Int, ?T] with scala.ScalaObject with java.lang.Cloneable with java.io.Serializable; */
-public abstract class Array
-    implements Function1, ScalaObject, Cloneable, java.io.Serializable
-{
+/** @meta class [?T] extends scala.AnyRef with java.lang.Cloneable with java.io.Serializable; */
+public abstract class Array implements Cloneable, java.io.Serializable {
 
     /** @meta constr (scala.Int); */
     public Array() {}
@@ -30,40 +28,4 @@ public abstract class Array
     /** @meta method (scala.Int,?T)scala.Unit; */
     public abstract void update(int i, Object x);
 
-    /** @meta method (scala.Function1[?T,scala.Unit])scala.Unit; */
-    public final void foreach(Function1 f) {
-        for (int i = 0, l = length(); i < l; i++) f.apply(apply(i));
-    }
-
-    /** @meta method (scala.Function1[?T,scala.Boolean])scala.Boolean; */
-    public final boolean forall(Function1 f) {
-        for (int i = 0, l = length(); i < l; i++)
-            if (!((scala.Boolean)f.apply(apply(i))).value) return false;
-        return true;
-    }
-
-    /** @meta method (scala.Function1[?T,scala.Boolean])scala.Boolean; */
-    public final boolean exists(Function1 f) {
-        for (int i = 0, l = length(); i < l; i++)
-            if (((scala.Boolean)f.apply(apply(i))).value) return true;
-        return false;
-    }
-
-    public final boolean isDefinedAt(int i) {
-        return (0 <= i) && (i < length());
-    }
-
-    public final Object apply(Object i) {
-        return apply(((Int)i).value);
-    }
-
-    public ScalaClassType getType() {
-        // TODO
-        throw new Error("Scala arrays are not polymorphic yet...");
-    }
-
-    public int $tag() {
-        return 0;
-    }
-
 }
diff --git a/sources/scalac/backend/Primitives.java b/sources/scalac/backend/Primitives.java
index ccb5f7a251..3334b35748 100644
--- a/sources/scalac/backend/Primitives.java
+++ b/sources/scalac/backend/Primitives.java
@@ -683,7 +683,7 @@ public class Primitives {
         // !!! addAll(defs.ARRAY_CLASS, Names.hashCode, Primitive.HASHCODE, 1);
         // !!! addAll(defs.ARRAY_CLASS, Names.toString, Primitive.TOSTRING, 1);
         addAll(defs.ARRAY_CLASS, Names.length, Primitive.LENGTH, 1);
-        addAll(defs.ARRAY_CLASS, Names.apply, Primitive.APPLY, 2);
+        addAll(defs.ARRAY_CLASS, Names.apply, Primitive.APPLY, 1);
         addAll(defs.ARRAY_CLASS, Names.update, Primitive.UPDATE, 1);
 
         // scala.runtime.RunTime