diff options
| -rw-r--r-- | sources/scala/Array.java | 122 | ||||
| -rw-r--r-- | sources/scala/runtime/RunTime.java | 226 | ||||
| -rw-r--r-- | sources/scalac/transformer/Erasure.java | 2 |
3 files changed, 148 insertions, 202 deletions
diff --git a/sources/scala/Array.java b/sources/scala/Array.java index 83be225526..b0849c32c1 100644 --- a/sources/scala/Array.java +++ b/sources/scala/Array.java @@ -4,113 +4,59 @@ ** __\ \/ /__/ __ |/ /__/ __ | ** ** /____/\___/_/ |_/____/_/ | | ** ** |/ ** -** $Id$ \* */ -package scala; +// $Id$ +package scala; -/** @meta class [?T] extends scala.Function1[scala.Int, ?T] with scala.ScalaObject with java.lang.Cloneable with java.io.Serializable; - */ +/** @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 - extends java.lang.Object - implements ScalaObject, Function1, Cloneable, java.io.Serializable { - - /** @meta constr (scala.Int); - */ - public Array() { - } - - /** @meta method []scala.Int; - */ - public abstract int length(); - - public boolean isDefinedAt(int x) { - return (x >= 0) && (x < length()); - } - - /** @meta method (scala.Int, ?T) scala.Unit; - */ - public abstract void update(int i, java.lang.Object x); + implements Function1, ScalaObject, Cloneable, java.io.Serializable +{ - /** @meta method (scala.Int) ?T; - */ - public abstract java.lang.Object apply(int i); - - public java.lang.Object apply(java.lang.Object i) { - return apply(((scala.Int)i).value); - } + /** @meta constr (scala.Int); */ + public Array() {} - /** @meta method () scala.Array[scala.AnyRef]; - */ - public java.lang.Object[] asObjectArray() { - throw new ClassCastException(); - } - - /** @meta method (scala.Function1[?T, scala.Unit]) scala.Unit; - */ - public void foreach(Function1 f) { - for (int i = 0; i < length(); i++) - f.apply(apply(scala.runtime.RunTime.box_ivalue(i))); - } + /** @meta method []scala.Array[?T]; */ + public abstract Object value(); - /** @meta method (scala.Function1[?T, scala.Boolean]) scala.Boolean; - */ - public boolean forall(Function1 f) { - for (int i = 0; i < length(); i++) - if (!((scala.Boolean)f.apply(apply(scala.runtime.RunTime.box_ivalue(i)))).value) - return false; - return true; - } - - /** @meta method (scala.Function1[?T, scala.Boolean]) scala.Boolean; - */ - public boolean exists(Function1 f) { - for (int i = 0; i < length(); i++) - if (((scala.Boolean)f.apply(apply(scala.runtime.RunTime.box_ivalue(i)))).value) - return true; - return false; - } - - /** @meta method () scala.Array[?T]; - */ - public java.lang.Object asArray() { - throw new ClassCastException(); - } - - public boolean[] asBooleanArray() { - throw new ClassCastException(); - } - - public byte[] asByteArray() { - throw new ClassCastException(); - } - - public short[] asShortArray() { - throw new ClassCastException(); - } + /** @meta method []scala.Int; */ + public abstract int length(); + /** @meta method (scala.Int)?T; */ + public abstract Object apply(int i); + /** @meta method (scala.Int,?T)scala.Unit; */ + public abstract void update(int i, Object x); - public char[] asCharArray() { - throw new ClassCastException(); + /** @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)); } - public int[] asIntArray() { - throw new ClassCastException(); + /** @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; } - public long[] asLongArray() { - throw new ClassCastException(); + /** @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 float[] asFloatArray() { - throw new ClassCastException(); + public final boolean isDefinedAt(int i) { + return (0 <= i) && (i < length()); } - public double[] asDoubleArray() { - throw new ClassCastException(); + public final Object apply(Object i) { + return apply(((Int)i).value); } public int $tag() { - return 0; + return 0; } + } diff --git a/sources/scala/runtime/RunTime.java b/sources/scala/runtime/RunTime.java index d32a1fed8a..fbc08e716e 100644 --- a/sources/scala/runtime/RunTime.java +++ b/sources/scala/runtime/RunTime.java @@ -75,7 +75,7 @@ public abstract class RunTime { // Public Functions - Boxing primitives public static Unit box_uvalue( ) { - return uvalue; + return uvalue; } public static Boolean box_zvalue(boolean x) { @@ -120,47 +120,47 @@ public abstract class RunTime { /** @meta method (scala.Array[scala.Boolean]) scala.Array[scala.Boolean];*/ public static Array box_zarray(boolean[] xs) { - return new ZArray(xs); + return new ZArray(xs); } /** @meta method (scala.Array[scala.Byte]) scala.Array[scala.Byte]; */ public static Array box_barray(byte [] xs) { - return new BArray(xs); + return new BArray(xs); } /** @meta method (scala.Array[scala.Short]) scala.Array[scala.Short]; */ public static Array box_sarray(short [] xs) { - return new SArray(xs); + return new SArray(xs); } /** @meta method (scala.Array[scala.Char]) scala.Array[scala.Char]; */ public static Array box_carray(char [] xs) { - return new CArray(xs); + return new CArray(xs); } /** @meta method (scala.Array[scala.Int]) scala.Array[scala.Int]; */ public static Array box_iarray(int [] xs) { - return new IArray(xs); + return new IArray(xs); } /** @meta method (scala.Array[scala.Long]) scala.Array[scala.Long]; */ public static Array box_larray(long [] xs) { - return new LArray(xs); + return new LArray(xs); } /** @meta method (scala.Array[scala.Float]) scala.Array[scala.Float]; */ public static Array box_farray(float [] xs) { - return new FArray(xs); + return new FArray(xs); } /** @meta method (scala.Array[scala.Double]) scala.Array[scala.Double]; */ public static Array box_darray(double [] xs) { - return new DArray(xs); + return new DArray(xs); } /** @meta method [?T < scala.AnyRef](scala.Array[?T]) scala.Array[?T]; */ public static Array box_oarray(Object [] xs) { - return new OArray(xs); + return new OArray(xs); } /** @meta method [?T](scala.Array[?T]) scala.Array[?T]; */ @@ -193,43 +193,43 @@ public abstract class RunTime { /** @meta method (scala.Array[scala.Boolean]) scala.Array[scala.Boolean];*/ public static boolean[] unbox_zarray(Array xs) { - return xs == null ? null : xs.asBooleanArray(); + return xs == null ? null : ((ZArray)xs).value; } /** @meta method (scala.Array[scala.Byte]) scala.Array[scala.Byte]; */ public static byte [] unbox_barray(Array xs) { - return xs == null ? null : xs.asByteArray (); + return xs == null ? null : ((BArray)xs).value; } /** @meta method (scala.Array[scala.Short]) scala.Array[scala.Short]; */ public static short [] unbox_sarray(Array xs) { - return xs == null ? null : xs.asShortArray (); + return xs == null ? null : ((SArray)xs).value; } /** @meta method (scala.Array[scala.Char]) scala.Array[scala.Char]; */ public static char [] unbox_carray(Array xs) { - return xs == null ? null : xs.asCharArray (); + return xs == null ? null : ((CArray)xs).value; } /** @meta method (scala.Array[scala.Int]) scala.Array[scala.Int]; */ public static int [] unbox_iarray(Array xs) { - return xs == null ? null : xs.asIntArray (); + return xs == null ? null : ((IArray)xs).value; } /** @meta method (scala.Array[scala.Long]) scala.Array[scala.Long]; */ public static long [] unbox_larray(Array xs) { - return xs == null ? null : xs.asLongArray (); + return xs == null ? null : ((LArray)xs).value; } /** @meta method (scala.Array[scala.Float]) scala.Array[scala.Float]; */ public static float [] unbox_farray(Array xs) { - return xs == null ? null : xs.asFloatArray (); + return xs == null ? null : ((FArray)xs).value; } /** @meta method (scala.Array[scala.Double]) scala.Array[scala.Double]; */ public static double [] unbox_darray(Array xs) { - return xs == null ? null : xs.asDoubleArray (); + return xs == null ? null : ((DArray)xs).value; } - /** @meta method [?T < scala.AnyRef](scala.Array[?T]) scala.Array[?T]; */ + /** @meta method [?T < scala.AnyRef](scala.Array[?T]) scala.Array[scala.AnyRef]; */ public static Object [] unbox_oarray(Array xs) { - return xs == null ? null : xs.asObjectArray (); + return xs == null ? null : ((OArray)xs).value; } - /** @meta method [?T](scala.Array[?T]) scala.Array[?T]; */ + /** @meta method [?T](scala.Array[?T]) scala.AnyRef; */ public static Object unbox__array(Array xs) { - return xs == null ? null : xs.asArray (); + return xs == null ? null : xs.value(); } //######################################################################## @@ -342,111 +342,111 @@ public abstract class RunTime { // classes confuse pico which then attributes the metadata to the // wrong members. -class UValue extends Unit { public UValue( ) { super( ); } } -class ZValue extends Boolean { public ZValue(boolean x) { super(x); } } -class BValue extends Byte { public BValue(byte x) { super(x); } } -class SValue extends Short { public SValue(short x) { super(x); } } -class CValue extends Char { public CValue(char x) { super(x); } } -class IValue extends Int { public IValue(int x) { super(x); } } -class LValue extends Long { public LValue(long x) { super(x); } } -class FValue extends Float { public FValue(float x) { super(x); } } -class DValue extends Double { public DValue(double x) { super(x); } } - -class ZArray extends Array { - private final boolean[] xs; - public ZArray(boolean[] xs) { this.xs = xs; } - public boolean[] asBooleanArray() { return xs; } - public Object asArray() { return xs; } - public Object apply(int i) { return RunTime.box_zvalue(xs[i]); } - public void update(int i, Object x) { xs[i] = ((Boolean)x).value; } - public int length() { return xs.length; } - public String toString() { return String.valueOf(xs); } +final class UValue extends Unit { public UValue( ) { super( ); } } +final class ZValue extends Boolean { public ZValue(boolean x) { super(x); } } +final class BValue extends Byte { public BValue(byte x) { super(x); } } +final class SValue extends Short { public SValue(short x) { super(x); } } +final class CValue extends Char { public CValue(char x) { super(x); } } +final class IValue extends Int { public IValue(int x) { super(x); } } +final class LValue extends Long { public LValue(long x) { super(x); } } +final class FValue extends Float { public FValue(float x) { super(x); } } +final class DValue extends Double { public DValue(double x) { super(x); } } + +/** @meta class extends scala.Array[scala.Boolean]; */ +final class ZArray extends Array { + public final boolean[] value; + public ZArray(boolean[] value) { this.value = value; } + public Object value() { return value; } + public Object apply(int i) { return RunTime.box_zvalue(value[i]); } + public void update(int i, Object x) { value[i] = ((Boolean)x).value; } + public int length() { return value.length; } + public String toString() { return String.valueOf(value); } } -class BArray extends Array { - private final byte[] xs; - public BArray(byte[] xs) { this.xs = xs; } - public byte[] asByteArray() { return xs; } - public Object asArray() { return xs; } - public Object apply(int i) { return RunTime.box_bvalue(xs[i]); } - public void update(int i, Object x) { xs[i] = ((Byte)x).value; } - public int length() { return xs.length; } - public String toString() { return String.valueOf(xs); } +/** @meta class extends scala.Array[scala.Byte]; */ +final class BArray extends Array { + public final byte[] value; + public BArray(byte[] value) { this.value = value; } + public Object value() { return value; } + public Object apply(int i) { return RunTime.box_bvalue(value[i]); } + public void update(int i, Object x) { value[i] = ((Byte)x).value; } + public int length() { return value.length; } + public String toString() { return String.valueOf(value); } } -class SArray extends Array { - private final short[] xs; - public SArray(short[] xs) { this.xs = xs; } - public short[] asShortArray() { return xs; } - public Object asArray() { return xs; } - public Object apply(int i) { return RunTime.box_svalue(xs[i]); } - public void update(int i, Object x) { xs[i] = ((Short)x).value; } - public int length() { return xs.length; } - public String toString() { return String.valueOf(xs); } +/** @meta class extends scala.Array[scala.Short]; */ +final class SArray extends Array { + public final short[] value; + public SArray(short[] value) { this.value = value; } + public Object value() { return value; } + public Object apply(int i) { return RunTime.box_svalue(value[i]); } + public void update(int i, Object x) { value[i] = ((Short)x).value; } + public int length() { return value.length; } + public String toString() { return String.valueOf(value); } } -class CArray extends Array { - private final char[] xs; - public CArray(char[] xs) { this.xs = xs; } - public char[] asCharArray() { return xs; } - public Object asArray() { return xs; } - public Object apply(int i) { return RunTime.box_cvalue(xs[i]); } - public void update(int i, Object x) { xs[i] = ((Char)x).value; } - public int length() { return xs.length; } - public String toString() { return String.valueOf((Object)xs); } +/** @meta class extends scala.Array[scala.Char]; */ +final class CArray extends Array { + public final char[] value; + public CArray(char[] value) { this.value = value; } + public Object value() { return value; } + public Object apply(int i) { return RunTime.box_cvalue(value[i]); } + public void update(int i, Object x) { value[i] = ((Char)x).value; } + public int length() { return value.length; } + public String toString() { return String.valueOf((Object)value); } } -class IArray extends Array { - private final int[] xs; - public IArray(int[] xs) { this.xs = xs; } - public int[] asIntArray() { return xs; } - public Object asArray() { return xs; } - public Object apply(int i) { return RunTime.box_ivalue(xs[i]); } - public void update(int i, Object x) { xs[i] = ((Int)x).value; } - public int length() { return xs.length; } - public String toString() { return String.valueOf(xs); } +/** @meta class extends scala.Array[scala.Int]; */ +final class IArray extends Array { + public final int[] value; + public IArray(int[] value) { this.value = value; } + public Object value() { return value; } + public Object apply(int i) { return RunTime.box_ivalue(value[i]); } + public void update(int i, Object x) { value[i] = ((Int)x).value; } + public int length() { return value.length; } + public String toString() { return String.valueOf(value); } } -class LArray extends Array { - private final long[] xs; - public LArray(long[] xs) { this.xs = xs; } - public long[] asLongArray() { return xs; } - public Object asArray() { return xs; } - public Object apply(int i) { return RunTime.box_lvalue(xs[i]); } - public void update(int i, Object x) { xs[i] = ((Long)x).value; } - public int length() { return xs.length; } - public String toString() { return String.valueOf(xs); } +/** @meta class extends scala.Array[scala.Long]; */ +final class LArray extends Array { + public final long[] value; + public LArray(long[] value) { this.value = value; } + public Object value() { return value; } + public Object apply(int i) { return RunTime.box_lvalue(value[i]); } + public void update(int i, Object x) { value[i] = ((Long)x).value; } + public int length() { return value.length; } + public String toString() { return String.valueOf(value); } } -class FArray extends Array { - private final float[] xs; - public FArray(float[] xs) { this.xs = xs; } - public float[] asFloatArray() { return xs; } - public Object asArray() { return xs; } - public Object apply(int i) { return RunTime.box_fvalue(xs[i]); } - public void update(int i, Object x) { xs[i] = ((Float)x).value; } - public int length() { return xs.length; } - public String toString() { return String.valueOf(xs); } +/** @meta class extends scala.Array[scala.Float]; */ +final class FArray extends Array { + public final float[] value; + public FArray(float[] value) { this.value = value; } + public Object value() { return value; } + public Object apply(int i) { return RunTime.box_fvalue(value[i]); } + public void update(int i, Object x) { value[i] = ((Float)x).value; } + public int length() { return value.length; } + public String toString() { return String.valueOf(value); } } -class DArray extends Array { - private final double[] xs; - public DArray(double[] xs) { this.xs = xs; } - public double[] asDoubleArray() { return xs; } - public Object asArray() { return xs; } - public Object apply(int i) { return RunTime.box_dvalue(xs[i]); } - public void update(int i, Object x) { xs[i] = ((Double)x).value; } - public int length() { return xs.length; } - public String toString() { return String.valueOf(xs); } +/** @meta class extends scala.Array[scala.Double]; */ +final class DArray extends Array { + public final double[] value; + public DArray(double[] value) { this.value = value; } + public Object value() { return value; } + public Object apply(int i) { return RunTime.box_dvalue(value[i]); } + public void update(int i, Object x) { value[i] = ((Double)x).value; } + public int length() { return value.length; } + public String toString() { return String.valueOf(value); } } -class OArray extends Array { - private final Object[] xs; - public OArray(Object[] xs) { this.xs = xs; } - public Object[] asObjectArray() { return xs; } - public Object asArray() { return xs; } - public Object apply(int i) { return xs[i]; } - public void update(int i, Object x) { xs[i] = x; } - public int length() { return xs.length; } - public String toString() { return String.valueOf(xs); } +/** @meta class [?T < scala.AnyRef] extends scala.Array[?T]; */ +final class OArray extends Array { + public final Object[] value; + public OArray(Object[] value) { this.value = value; } + public Object value() { return value; } + public Object apply(int i) { return value[i]; } + public void update(int i, Object x) { value[i] = x; } + public int length() { return value.length; } + public String toString() { return String.valueOf(value); } } diff --git a/sources/scalac/transformer/Erasure.java b/sources/scalac/transformer/Erasure.java index 4189834d1b..d200aab112 100644 --- a/sources/scalac/transformer/Erasure.java +++ b/sources/scalac/transformer/Erasure.java @@ -327,7 +327,7 @@ public class Erasure extends GenTransformer implements Modifiers { return unbox(coerce(tree, boxUnboxedType(pt)), pt); } else if (isUnboxedArrayType(pt)) { if (tree.type.symbol() == definitions.ARRAY_CLASS) - return unbox(tree, pt); + return coerce(unbox(tree, pt), pt); } else if (pt.symbol() == definitions.ARRAY_CLASS) { Tree boxtree = gen.mkGlobalRef(tree.pos, primitives.BOX__ARRAY); return gen.mkApply_V(boxtree, new Tree[]{tree}); |