natas_hw
/
legacy-svn-scala
mirror of https://github.com/scala/legacy-svn-scala
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- Flattened Byte, Short and Char 

git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@2139 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
This commit is contained in:
paltherr 2003-12-04 16:36:31 +00:00
parent ccd80a0cd2
commit 82302c36c0
9 changed files with 363 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

109
sources/scala/Byte.java
View File

@ -6,10 +6,115 @@
** |/ **
\* */
// $OldId: Byte.java,v 1.9 2002/04/15 16:21:39 paltherr Exp $
// $Id$
package scala;
public abstract class Byte extends Short {
public abstract class Byte extends AnyVal {
/** @meta method []scala.Short ; */
public short coerce() { return asShort (); }
/** @meta method []scala.Int ; */
public int coerce() { return asInt (); }
/** @meta method []scala.Long ; */
public long coerce() { return asLong (); }
/** @meta method []scala.Float ; */
public float coerce() { return asFloat (); }
/** @meta method []scala.Double; */
public double coerce() { return asDouble(); }
public abstract double asDouble();
public abstract float asFloat();
public abstract long asLong();
public abstract int asInt();
public abstract char asChar();
public abstract short asShort();
public abstract byte asByte();
public boolean equals(java.lang.Object other) {
return other instanceof Byte && $eq$eq(((Byte )other).asByte ());
}
public int hashCode() {
int bits = asByte ();
return bits;
}
public String toString() {
return String.valueOf(asByte ());
}
/** @meta method (scala.Any)scala.Boolean; */
public boolean $eq$eq (java.lang.Object other) { return equals(other); }
/** @meta method (scala.Any)scala.Boolean; */
public boolean $bang$eq(java.lang.Object other) { return !equals(other); }
/** @meta method []scala.Int ; */
public int $plus () { return +asInt () ; }
/** @meta method []scala.Int ; */
public int $minus () { return -asInt () ; }
/** @meta method []scala.Int ; */
public int $tilde () { return ~asInt () ; }
public String $plus (String that) { return asInt () + that; }
public double $plus (double that) { return asDouble() + that; }
public double $minus (double that) { return asDouble() - that; }
public double $times (double that) { return asDouble() * that; }
public double $div (double that) { return asDouble() / that; }
public double $percent (double that) { return asDouble() % that; }
public boolean $eq$eq (double that) { return asDouble() == that; }
public boolean $bang$eq (double that) { return asDouble() != that; }
public boolean $less (double that) { return asDouble() < that; }
public boolean $greater (double that) { return asDouble() > that; }
public boolean $less$eq (double that) { return asDouble() <= that; }
public boolean $greater$eq(double that) { return asDouble() >= that; }
public float $plus (float that) { return asFloat () + that; }
public float $minus (float that) { return asFloat () - that; }
public float $times (float that) { return asFloat () * that; }
public float $div (float that) { return asFloat () / that; }
public float $percent (float that) { return asFloat () % that; }
public boolean $eq$eq (float that) { return asFloat () == that; }
public boolean $bang$eq (float that) { return asFloat () != that; }
public boolean $less (float that) { return asFloat () < that; }
public boolean $greater (float that) { return asFloat () > that; }
public boolean $less$eq (float that) { return asFloat () <= that; }
public boolean $greater$eq(float that) { return asFloat () >= that; }
public int $less$less (int that) { return asInt () << that; }
public int $less$less (long that) { return asInt () << that; }
public int $greater$greater(int that) { return asInt () >> that; }
public int $greater$greater(long that) { return asInt () >> that; }
public int $greater$greater$greater(int that) { return asInt () >>>that; }
public int $greater$greater$greater(long that) { return asInt () >>>that; }
public long $amp (long that) { return asLong () & that; }
public long $bar (long that) { return asLong () | that; }
public long $up (long that) { return asLong () ^ that; }
public long $plus (long that) { return asLong () + that; }
public long $minus (long that) { return asLong () - that; }
public long $times (long that) { return asLong () * that; }
public long $div (long that) { return asLong () / that; }
public long $percent (long that) { return asLong () % that; }
public boolean $eq$eq (long that) { return asLong () == that; }
public boolean $bang$eq (long that) { return asLong () != that; }
public boolean $less (long that) { return asLong () < that; }
public boolean $greater (long that) { return asLong () > that; }
public boolean $less$eq (long that) { return asLong () <= that; }
public boolean $greater$eq(long that) { return asLong () >= that; }
public int $amp (int that) { return asInt () & that; }
public int $bar (int that) { return asInt () | that; }
public int $up (int that) { return asInt () ^ that; }
public int $plus (int that) { return asInt () + that; }
public int $minus (int that) { return asInt () - that; }
public int $times (int that) { return asInt () * that; }
public int $div (int that) { return asInt () / that; }
public int $percent (int that) { return asInt () % that; }
public boolean $eq$eq (int that) { return asInt () == that; }
public boolean $bang$eq (int that) { return asInt () != that; }
public boolean $less (int that) { return asInt () < that; }
public boolean $greater (int that) { return asInt () > that; }
public boolean $less$eq (int that) { return asInt () <= that; }
public boolean $greater$eq(int that) { return asInt () >= that; }
}

136
sources/scala/Char.java
View File

@ -6,29 +6,135 @@
** |/ **
\* */
// $OldId: Char.java,v 1.11 2002/05/15 15:03:38 roeckl Exp $
// $Id$
package scala;
public abstract class Char extends AnyVal {
public abstract class Char extends Int {
public String toString() { return String.valueOf((char)asInt()); }
/** @meta method scala.Boolean;
*/
public boolean isDigit() { return Character.isDigit((char)asInt()); }
/** @meta method []scala.Int ; */
public int coerce() { return asInt (); }
/** @meta method []scala.Long ; */
public long coerce() { return asLong (); }
/** @meta method []scala.Float ; */
public float coerce() { return asFloat (); }
/** @meta method []scala.Double; */
public double coerce() { return asDouble(); }
/** @meta method scala.Boolean;
*/
public boolean isLetter() { return Character.isLetter((char)asInt()); }
public abstract double asDouble();
public abstract float asFloat();
public abstract long asLong();
public abstract int asInt();
public abstract char asChar();
public abstract short asShort();
public abstract byte asByte();
/** @meta method scala.Boolean;
*/
public boolean isLetterOrDigit() { return Character.isLetterOrDigit((char)asInt()); }
public boolean equals(java.lang.Object other) {
return other instanceof Char && $eq$eq(((Char )other).asChar ());
}
public int hashCode() {
int bits = asChar ();
return bits;
}
public String toString() {
return String.valueOf(asChar ());
}
/** @meta method (scala.Any)scala.Boolean; */
public boolean $eq$eq (java.lang.Object other) { return equals(other); }
/** @meta method (scala.Any)scala.Boolean; */
public boolean $bang$eq(java.lang.Object other) { return !equals(other); }
/** @meta method []scala.Int ; */
public int $plus () { return +asInt () ; }
/** @meta method []scala.Int ; */
public int $minus () { return -asInt () ; }
/** @meta method []scala.Int ; */
public int $tilde () { return ~asInt () ; }
public String $plus (String that) { return asInt () + that; }
public double $plus (double that) { return asDouble() + that; }
public double $minus (double that) { return asDouble() - that; }
public double $times (double that) { return asDouble() * that; }
public double $div (double that) { return asDouble() / that; }
public double $percent (double that) { return asDouble() % that; }
public boolean $eq$eq (double that) { return asDouble() == that; }
public boolean $bang$eq (double that) { return asDouble() != that; }
public boolean $less (double that) { return asDouble() < that; }
public boolean $greater (double that) { return asDouble() > that; }
public boolean $less$eq (double that) { return asDouble() <= that; }
public boolean $greater$eq(double that) { return asDouble() >= that; }
public float $plus (float that) { return asFloat () + that; }
public float $minus (float that) { return asFloat () - that; }
public float $times (float that) { return asFloat () * that; }
public float $div (float that) { return asFloat () / that; }
public float $percent (float that) { return asFloat () % that; }
public boolean $eq$eq (float that) { return asFloat () == that; }
public boolean $bang$eq (float that) { return asFloat () != that; }
public boolean $less (float that) { return asFloat () < that; }
public boolean $greater (float that) { return asFloat () > that; }
public boolean $less$eq (float that) { return asFloat () <= that; }
public boolean $greater$eq(float that) { return asFloat () >= that; }
public int $less$less (int that) { return asInt () << that; }
public int $less$less (long that) { return asInt () << that; }
public int $greater$greater(int that) { return asInt () >> that; }
public int $greater$greater(long that) { return asInt () >> that; }
public int $greater$greater$greater(int that) { return asInt () >>>that; }
public int $greater$greater$greater(long that) { return asInt () >>>that; }
public long $amp (long that) { return asLong () & that; }
public long $bar (long that) { return asLong () | that; }
public long $up (long that) { return asLong () ^ that; }
public long $plus (long that) { return asLong () + that; }
public long $minus (long that) { return asLong () - that; }
public long $times (long that) { return asLong () * that; }
public long $div (long that) { return asLong () / that; }
public long $percent (long that) { return asLong () % that; }
public boolean $eq$eq (long that) { return asLong () == that; }
public boolean $bang$eq (long that) { return asLong () != that; }
public boolean $less (long that) { return asLong () < that; }
public boolean $greater (long that) { return asLong () > that; }
public boolean $less$eq (long that) { return asLong () <= that; }
public boolean $greater$eq(long that) { return asLong () >= that; }
public int $amp (int that) { return asInt () & that; }
public int $bar (int that) { return asInt () | that; }
public int $up (int that) { return asInt () ^ that; }
public int $plus (int that) { return asInt () + that; }
public int $minus (int that) { return asInt () - that; }
public int $times (int that) { return asInt () * that; }
public int $div (int that) { return asInt () / that; }
public int $percent (int that) { return asInt () % that; }
public boolean $eq$eq (int that) { return asInt () == that; }
public boolean $bang$eq (int that) { return asInt () != that; }
public boolean $less (int that) { return asInt () < that; }
public boolean $greater (int that) { return asInt () > that; }
public boolean $less$eq (int that) { return asInt () <= that; }
public boolean $greater$eq(int that) { return asInt () >= that; }
/** @meta method scala.Boolean; */
public boolean isDigit() {
return Character.isDigit((char)asChar());
}
/** @meta method scala.Boolean; */
public boolean isLetter() {
return Character.isLetter((char)asChar());
}
/** @meta method scala.Boolean; */
public boolean isLetterOrDigit() {
return Character.isLetterOrDigit((char)asChar());
}
/** @meta method scala.Boolean; */
public boolean isWhitespace() {
return Character.isWhitespace((char)asChar());
}
/** @meta method scala.Boolean;
*/
public boolean isWhitespace() { return Character.isWhitespace((char)asInt()); }
}

4
sources/scala/Double.java
View File

@ -19,6 +19,10 @@ public abstract class Double extends AnyVal {
public abstract double asDouble();
public abstract float asFloat();
public abstract long asLong();

4
sources/scala/Float.java
View File

@ -16,6 +16,10 @@ public abstract class Float extends AnyVal {
/** @meta method []scala.Double; */
public double coerce() { return asDouble(); }

6
sources/scala/Int.java
View File

@ -12,6 +12,10 @@ package scala;
public abstract class Int extends AnyVal {
/** @meta method []scala.Long ; */
public long coerce() { return asLong (); }
/** @meta method []scala.Float ; */
@ -31,7 +35,7 @@ public abstract class Int extends AnyVal {
return other instanceof Int && $eq$eq(((Int )other).asInt ());
}
public int hashCode() {
int bits = asInt ();
int bits = asInt ();
return bits;
}
public String toString() {

6
sources/scala/Long.java
View File

@ -14,6 +14,10 @@ public abstract class Long extends AnyVal {
/** @meta method []scala.Float ; */
public float coerce() { return asFloat (); }
/** @meta method []scala.Double; */
@ -31,7 +35,7 @@ public abstract class Long extends AnyVal {
return other instanceof Long && $eq$eq(((Long )other).asLong ());
}
public int hashCode() {
long bits = asLong();
long bits = asLong ();
return (int)(bits ^ (bits >>> 32));
}
public String toString() {

108
sources/scala/Short.java
View File

@ -6,11 +6,115 @@
** |/ **
\* */
// $OldId: Short.java,v 1.9 2002/04/15 16:21:39 paltherr Exp $
// $Id$
package scala;
public abstract class Short extends AnyVal {
/** @meta method []scala.Int ; */
public int coerce() { return asInt (); }
/** @meta method []scala.Long ; */
public long coerce() { return asLong (); }
/** @meta method []scala.Float ; */
public float coerce() { return asFloat (); }
/** @meta method []scala.Double; */
public double coerce() { return asDouble(); }
public abstract double asDouble();
public abstract float asFloat();
public abstract long asLong();
public abstract int asInt();
public abstract char asChar();
public abstract short asShort();
public abstract byte asByte();
public boolean equals(java.lang.Object other) {
return other instanceof Short && $eq$eq(((Short )other).asShort ());
}
public int hashCode() {
int bits = asShort ();
return bits;
}
public String toString() {
return String.valueOf(asShort ());
}
/** @meta method (scala.Any)scala.Boolean; */
public boolean $eq$eq (java.lang.Object other) { return equals(other); }
/** @meta method (scala.Any)scala.Boolean; */
public boolean $bang$eq(java.lang.Object other) { return !equals(other); }
/** @meta method []scala.Int ; */
public int $plus () { return +asInt () ; }
/** @meta method []scala.Int ; */
public int $minus () { return -asInt () ; }
/** @meta method []scala.Int ; */
public int $tilde () { return ~asInt () ; }
public String $plus (String that) { return asInt () + that; }
public double $plus (double that) { return asDouble() + that; }
public double $minus (double that) { return asDouble() - that; }
public double $times (double that) { return asDouble() * that; }
public double $div (double that) { return asDouble() / that; }
public double $percent (double that) { return asDouble() % that; }
public boolean $eq$eq (double that) { return asDouble() == that; }
public boolean $bang$eq (double that) { return asDouble() != that; }
public boolean $less (double that) { return asDouble() < that; }
public boolean $greater (double that) { return asDouble() > that; }
public boolean $less$eq (double that) { return asDouble() <= that; }
public boolean $greater$eq(double that) { return asDouble() >= that; }
public float $plus (float that) { return asFloat () + that; }
public float $minus (float that) { return asFloat () - that; }
public float $times (float that) { return asFloat () * that; }
public float $div (float that) { return asFloat () / that; }
public float $percent (float that) { return asFloat () % that; }
public boolean $eq$eq (float that) { return asFloat () == that; }
public boolean $bang$eq (float that) { return asFloat () != that; }
public boolean $less (float that) { return asFloat () < that; }
public boolean $greater (float that) { return asFloat () > that; }
public boolean $less$eq (float that) { return asFloat () <= that; }
public boolean $greater$eq(float that) { return asFloat () >= that; }
public int $less$less (int that) { return asInt () << that; }
public int $less$less (long that) { return asInt () << that; }
public int $greater$greater(int that) { return asInt () >> that; }
public int $greater$greater(long that) { return asInt () >> that; }
public int $greater$greater$greater(int that) { return asInt () >>>that; }
public int $greater$greater$greater(long that) { return asInt () >>>that; }
public long $amp (long that) { return asLong () & that; }
public long $bar (long that) { return asLong () | that; }
public long $up (long that) { return asLong () ^ that; }
public long $plus (long that) { return asLong () + that; }
public long $minus (long that) { return asLong () - that; }
public long $times (long that) { return asLong () * that; }
public long $div (long that) { return asLong () / that; }
public long $percent (long that) { return asLong () % that; }
public boolean $eq$eq (long that) { return asLong () == that; }
public boolean $bang$eq (long that) { return asLong () != that; }
public boolean $less (long that) { return asLong () < that; }
public boolean $greater (long that) { return asLong () > that; }
public boolean $less$eq (long that) { return asLong () <= that; }
public boolean $greater$eq(long that) { return asLong () >= that; }
public int $amp (int that) { return asInt () & that; }
public int $bar (int that) { return asInt () | that; }
public int $up (int that) { return asInt () ^ that; }
public int $plus (int that) { return asInt () + that; }
public int $minus (int that) { return asInt () - that; }
public int $times (int that) { return asInt () * that; }
public int $div (int that) { return asInt () / that; }
public int $percent (int that) { return asInt () % that; }
public boolean $eq$eq (int that) { return asInt () == that; }
public boolean $bang$eq (int that) { return asInt () != that; }
public boolean $less (int that) { return asInt () < that; }
public boolean $greater (int that) { return asInt () > that; }
public boolean $less$eq (int that) { return asInt () <= that; }
public boolean $greater$eq(int that) { return asInt () >= that; }
public abstract class Short extends Int {
}

20
test/files/run/arrays.scala
View File

@ -74,9 +74,9 @@ object arrays {
System.out.println();
check("zarray(0)", zarray(0), false);
check("barray(0)", barray(0), 0);
check("sarray(0)", sarray(0), 0);
check("carray(0)", carray(0), 0);
check("barray(0)", barray(0), 0: byte);
check("sarray(0)", sarray(0), 0: short);
check("carray(0)", carray(0), '\u0000');
check("iarray(0)", iarray(0), 0);
check("larray(0)", larray(0), 0l);
check("farray(0)", farray(0), 0f);
@ -85,9 +85,9 @@ object arrays {
System.out.println();
check("zarray(1)", zarray(1), false);
check("barray(1)", barray(1), 0);
check("sarray(1)", sarray(1), 0);
check("carray(1)", carray(1), 0);
check("barray(1)", barray(1), 0: byte);
check("sarray(1)", sarray(1), 0: short);
check("carray(1)", carray(1), '\u0000');
check("iarray(1)", iarray(1), 0);
check("larray(1)", larray(1), 0l);
check("farray(1)", farray(1), 0f);
@ -116,8 +116,8 @@ object arrays {
rarray(1) ="9";
check("zarray(0)", zarray(0), false);
check("barray(0)", barray(0), 1);
check("sarray(0)", sarray(0), 2);
check("barray(0)", barray(0), 1: byte);
check("sarray(0)", sarray(0), 2: short);
check("carray(0)", carray(0),'3');
check("iarray(0)", iarray(0), 4);
check("larray(0)", larray(0), 5l);
@ -127,8 +127,8 @@ object arrays {
System.out.println();
check("zarray(1)", zarray(1), true);
check("barray(1)", barray(1), 2);
check("sarray(1)", sarray(1), 3);
check("barray(1)", barray(1), 2: byte);
check("sarray(1)", sarray(1), 3: short);
check("carray(1)", carray(1),'4');
check("iarray(1)", iarray(1), 5);
check("larray(1)", larray(1), 6l);

6
test/files/run/iq.scala
View File

@ -45,11 +45,7 @@ object iq {
val q5c:Queue[char] = Queue.Empty.enqueue(0: char, 1: char,
2: char, 3: char,
4: char, 5: char,
6: char, 7: char,
8: char, 9: char);
val q5c:Queue[int] = Queue.Empty.enqueue(0, 1, 2, 3, 4, 5, 6, 7, 8, 9);
/* Testing ==
* Expected: q5 == q9: true