From 13aeb49173bf851ee65cf49d314b80cb981b2a74 Mon Sep 17 00:00:00 2001 From: mihaylov Date: Wed, 5 Apr 2006 15:04:14 +0000 Subject: Removed the source for the primitive types; cre... Removed the source for the primitive types; create them in the compiler (in class Definitions) instead --- .../scala/tools/nsc/backend/ScalaPrimitives.scala | 87 --------- .../scala/tools/nsc/symtab/Definitions.scala | 195 ++++++++++++++++----- src/library/scala/AnyVal.java | 16 -- src/library/scala/Boolean.java | 32 ---- src/library/scala/Byte.java | 168 ------------------ src/library/scala/Char.java | 165 ----------------- src/library/scala/Double.java | 133 -------------- src/library/scala/Float.java | 136 -------------- src/library/scala/Int.java | 165 ----------------- src/library/scala/Long.java | 162 ----------------- src/library/scala/Short.java | 166 ------------------ src/library/scala/Unit.java | 25 --- 12 files changed, 156 insertions(+), 1294 deletions(-) delete mode 100644 src/library/scala/AnyVal.java delete mode 100644 src/library/scala/Boolean.java delete mode 100644 src/library/scala/Byte.java delete mode 100644 src/library/scala/Char.java delete mode 100644 src/library/scala/Double.java delete mode 100644 src/library/scala/Float.java delete mode 100644 src/library/scala/Int.java delete mode 100644 src/library/scala/Long.java delete mode 100644 src/library/scala/Short.java delete mode 100644 src/library/scala/Unit.java (limited to 'src') diff --git a/src/compiler/scala/tools/nsc/backend/ScalaPrimitives.scala b/src/compiler/scala/tools/nsc/backend/ScalaPrimitives.scala index 9d716f53ce..92078dda2c 100644 --- a/src/compiler/scala/tools/nsc/backend/ScalaPrimitives.scala +++ b/src/compiler/scala/tools/nsc/backend/ScalaPrimitives.scala @@ -237,7 +237,6 @@ abstract class ScalaPrimitives { addPrimitives(BooleanClass, nme.ADD, CONCAT); // scala.Byte - addCoercions(ByteClass); addPrimitives(ByteClass, nme.EQ, EQ); addPrimitives(ByteClass, nme.NE, NE); addPrimitives(ByteClass, nme.NOT, NOT); @@ -266,7 +265,6 @@ abstract class ScalaPrimitives { addPrimitives(ByteClass, nme.toDouble, B2D); // scala.Short - addCoercions(ShortClass); addPrimitives(ShortClass, nme.EQ, EQ); addPrimitives(ShortClass, nme.NE, NE); addPrimitives(ShortClass, nme.NOT, NOT); @@ -295,7 +293,6 @@ abstract class ScalaPrimitives { addPrimitives(ShortClass, nme.toDouble, S2D); // scala.Char - addCoercions(CharClass); addPrimitives(CharClass, nme.EQ, EQ); addPrimitives(CharClass, nme.NE, NE); addPrimitives(CharClass, nme.NOT, NOT); @@ -324,7 +321,6 @@ abstract class ScalaPrimitives { addPrimitives(CharClass, nme.toDouble, C2D); // scala.Int - addCoercions(IntClass); addPrimitives(IntClass, nme.EQ, EQ); addPrimitives(IntClass, nme.NE, NE); addPrimitives(IntClass, nme.NOT, NOT); @@ -353,7 +349,6 @@ abstract class ScalaPrimitives { addPrimitives(IntClass, nme.toDouble, I2D); // scala.Long - addCoercions(LongClass); addPrimitives(LongClass, nme.EQ, EQ); addPrimitives(LongClass, nme.NE, NE); addPrimitives(LongClass, nme.NOT, NOT); @@ -382,7 +377,6 @@ abstract class ScalaPrimitives { addPrimitives(LongClass, nme.toDouble, L2D); // scala.Float - addCoercion(FloatClass); addPrimitives(FloatClass, nme.EQ, EQ); addPrimitives(FloatClass, nme.NE, NE); addPrimitives(FloatClass, nme.ADD, ADD); @@ -466,87 +460,6 @@ abstract class ScalaPrimitives { } } - def addCoercion(cls: Symbol) = { - assert(cls == FloatClass, - "Only scala.Double has non-overloaded 'coerce'"); - val method = cls.info.member(nme.coerce); - addPrimitive(method, F2D); - } - - def addCoercions(cls: Symbol): Unit = { - val OverloadedType(_, coercions) = cls.info.member(nme.coerce).info; - if (cls == ByteClass) - coercions foreach ((m) => - if (m.info.resultType == ShortClass.tpe) - addPrimitive(m, B2S) - else if (m.info.resultType == IntClass.tpe) - addPrimitive(m, B2I) - else if (m.info.resultType == LongClass.tpe) - addPrimitive(m, B2L) - else if (m.info.resultType == FloatClass.tpe) - addPrimitive(m, B2F) - else if (m.info.resultType == DoubleClass.tpe) - addPrimitive(m, B2D) - else - abort("Unknown coercion method: " + m.info) - ) - else if (cls == ShortClass) - coercions foreach ((m) => - if (m.info.resultType == IntClass.tpe) - addPrimitive(m, S2I) - else if (m.info.resultType == LongClass.tpe) - addPrimitive(m, S2L) - else if (m.info.resultType == FloatClass.tpe) - addPrimitive(m, S2F) - else if (m.info.resultType == DoubleClass.tpe) - addPrimitive(m, S2D) - else - abort("Unknown coercion method: " + m.fullNameString) - ) - else if (cls == CharClass) - coercions foreach ((m) => - if (m.info.resultType == IntClass.tpe) - addPrimitive(m, C2I) - else if (m.info.resultType == LongClass.tpe) - addPrimitive(m, C2L) - else if (m.info.resultType == FloatClass.tpe) - addPrimitive(m, C2F) - else if (m.info.resultType == DoubleClass.tpe) - addPrimitive(m, C2D) - else - abort("Unknown coercion method: " + m.fullNameString) - ) - else if (cls == IntClass) - coercions foreach ((m) => - if (m.info.resultType == LongClass.tpe) - addPrimitive(m, I2L) - else if (m.info.resultType == FloatClass.tpe) - addPrimitive(m, I2F) - else if (m.info.resultType == DoubleClass.tpe) - addPrimitive(m, I2D) - else - abort("Unknown coercion method: " + m.fullNameString) - ) - else if (cls == LongClass) - coercions foreach ((m) => - if (m.info.resultType == FloatClass.tpe) - addPrimitive(m, L2F) - else if (m.info.resultType == DoubleClass.tpe) - addPrimitive(m, L2D) - else - abort("Unknown coercion method: " + m.fullNameString) - ) - else if (cls == FloatClass) - coercions foreach ((m) => - if (m.info.resultType == DoubleClass.tpe) - addPrimitive(m, F2D) - else - abort("Unknown coercion method: " + m.fullNameString) - ) - else - abort("Unknown value type: " + cls.fullNameString); - } - def isCoercion(code: Int): Boolean = (code >= B2B) && (code <= D2D); /** Check whether the given operation code is an array operation. */ diff --git a/src/compiler/scala/tools/nsc/symtab/Definitions.scala b/src/compiler/scala/tools/nsc/symtab/Definitions.scala index a32716927a..24c983f93f 100644 --- a/src/compiler/scala/tools/nsc/symtab/Definitions.scala +++ b/src/compiler/scala/tools/nsc/symtab/Definitions.scala @@ -247,6 +247,9 @@ trait Definitions requires SymbolTable { msym.setInfo(PolyType(List(tparam), tcon(tparam))) } + private def newParameterlessMethod(owner: Symbol, name: Name, restpe: Type) = + newMethod(owner, name).setInfo(PolyType(List(),restpe)) + private def newTypeParam(owner: Symbol, index: int): Symbol = owner.newTypeParameter(Position.NOPOS, "T" + index) .setInfo(TypeBounds(AllClass.typeConstructor, AnyClass.typeConstructor)); @@ -256,23 +259,128 @@ trait Definitions requires SymbolTable { val refClass = new HashMap[Symbol, Symbol]; private val abbrvTag = new HashMap[Symbol, char]; - private def getValueClass(name: String, tag: char): Symbol = { - val result = getClass("scala." + name); - boxedClass(result) = getClass("scala.runtime.Boxed" + name); - if (name != "Unit") { - boxedArrayClass(result) = getClass("scala.runtime.Boxed" + name + "Array"); - refClass(result) = getClass("scala.runtime." + name + "Ref"); + private def newValueClass(name: Name, tag: char): Symbol = { + val clazz = + newClass(ScalaPackageClass, name, List(AnyValClass.typeConstructor)); + boxedClass(clazz) = getClass("scala.runtime.Boxed" + name); + boxedArrayClass(clazz) = getClass("scala.runtime.Boxed" + name + "Array"); + refClass(clazz) = getClass("scala.runtime." + name + "Ref"); + abbrvTag(clazz) = tag; + clazz + } + + private def initValueClasses: Unit = { + val booltype = BooleanClass.typeConstructor; + val boolparam = List(booltype); + val bytetype = ByteClass.typeConstructor + val byteparam = List(bytetype) + val chartype = CharClass.typeConstructor + val charparam = List(chartype) + val shorttype = ShortClass.typeConstructor + val shortparam = List(shorttype) + val inttype = IntClass.typeConstructor + val intparam = List(inttype) + val longtype = LongClass.typeConstructor + val longparam = List(longtype) + val floattype = FloatClass.typeConstructor + val floatparam = List(floattype) + val doubletype = DoubleClass.typeConstructor + val doubleparam = List(doubletype) + val stringtype = StringClass.typeConstructor + + // init scala.Boolean + newParameterlessMethod(BooleanClass, nme.ZNOT, booltype); + newMethod(BooleanClass, nme.EQ, boolparam, booltype); + newMethod(BooleanClass, nme.NE, boolparam, booltype); + newMethod(BooleanClass, nme.ZOR, boolparam, booltype); + newMethod(BooleanClass, nme.ZAND, boolparam, booltype); + newMethod(BooleanClass, nme.OR, boolparam, booltype); + newMethod(BooleanClass, nme.AND, boolparam, booltype); + newMethod(BooleanClass, nme.XOR, boolparam, booltype); + + def initValueClass(clazz: Symbol, isCardinal: Boolean): Unit = { + def addBinops(params: List[Type], restype: Type, isCardinal: Boolean) = { + newMethod(clazz, nme.EQ, params, booltype) + newMethod(clazz, nme.NE, params, booltype) + newMethod(clazz, nme.LT, params, booltype) + newMethod(clazz, nme.LE, params, booltype) + newMethod(clazz, nme.GT, params, booltype) + newMethod(clazz, nme.GE, params, booltype) + newMethod(clazz, nme.ADD, params, restype) + newMethod(clazz, nme.SUB, params, restype) + newMethod(clazz, nme.MUL, params, restype) + newMethod(clazz, nme.DIV, params, restype) + newMethod(clazz, nme.MOD, params, restype) + if (isCardinal) { + newMethod(clazz, nme.OR, params, restype) + newMethod(clazz, nme.AND, params, restype) + newMethod(clazz, nme.XOR, params, restype) + } + } + + // conversion methods + newParameterlessMethod(clazz, nme.toByte, bytetype) + newParameterlessMethod(clazz, nme.toShort, shorttype) + newParameterlessMethod(clazz, nme.toChar, chartype) + newParameterlessMethod(clazz, nme.toInt, inttype) + newParameterlessMethod(clazz, nme.toLong, longtype) + newParameterlessMethod(clazz, nme.toFloat, floattype) + newParameterlessMethod(clazz, nme.toDouble, doubletype) + + // def +(s: String): String + newMethod(clazz, nme.ADD, List(stringtype), stringtype) + + val restype = + if ((clazz eq LongClass) || + (clazz eq FloatClass) || + (clazz eq DoubleClass)) + clazz.typeConstructor + else inttype + + // shift operations + if (isCardinal) { + newMethod(clazz, nme.LSL, intparam, restype) + newMethod(clazz, nme.LSL, longparam, restype) + newMethod(clazz, nme.LSR, intparam, restype) + newMethod(clazz, nme.LSR, longparam, restype) + newMethod(clazz, nme.ASR, intparam, restype) + newMethod(clazz, nme.ASR, longparam, restype) + } + + // unary operations + newParameterlessMethod(clazz, nme.ADD, restype) + newParameterlessMethod(clazz, nme.SUB, restype) + if (isCardinal) + newParameterlessMethod(clazz, nme.NOT, restype) + + // binary operations + val restype2 = if (isCardinal) longtype else restype + val restype3 = if (clazz eq DoubleClass) doubletype else floattype + addBinops(byteparam, restype, isCardinal) + addBinops(shortparam, restype, isCardinal) + addBinops(charparam, restype, isCardinal) + addBinops(intparam, restype, isCardinal) + addBinops(longparam, restype2, isCardinal) + addBinops(floatparam, restype3, false) + addBinops(doubleparam, doubletype, false) } - abbrvTag(result) = tag; - result + + initValueClass(ByteClass, true) + initValueClass(ShortClass, true) + initValueClass(CharClass, true) + initValueClass(IntClass, true) + initValueClass(LongClass, true) + initValueClass(FloatClass, false) + initValueClass(DoubleClass, false) } /** Is symbol a value class? */ - def isValueClass(sym: Symbol): boolean = boxedClass contains sym; + def isValueClass(sym: Symbol): boolean = + (sym eq UnitClass) || (boxedClass contains sym); /** Is symbol a value class? */ def isNumericValueClass(sym: Symbol): boolean = - isValueClass(sym) && sym != BooleanClass && sym != UnitClass; + (sym ne BooleanClass) && (boxedClass contains sym); /** Is symbol a value or array class? */ def isUnboxedClass(sym: Symbol): boolean = isValueClass(sym) || sym == ArrayClass; @@ -313,16 +421,22 @@ trait Definitions requires SymbolTable { assert(ScalaPackage != null, "Scala package is null"); ScalaPackageClass = ScalaPackage.tpe.symbol; - AnyClass = newClass(ScalaPackageClass, "Any", List()); - AnyValClass = getClass("scala.AnyVal") setFlag SEALED; + AnyClass = newClass(ScalaPackageClass, nme.Any, List()); + + val anyparam = List(AnyClass.typeConstructor); + + AnyValClass = newClass(ScalaPackageClass, nme.AnyVal, anyparam) + .setFlag(SEALED); + ObjectClass = getClass("java.lang.Object"); - AnyRefClass = newAlias(ScalaPackageClass, "AnyRef", ObjectClass.typeConstructor); + AnyRefClass = + newAlias(ScalaPackageClass, nme.AnyRef, ObjectClass.typeConstructor); - AllRefClass = newClass(ScalaPackageClass, "AllRef", List(AnyRefClass.typeConstructor)) + AllRefClass = newClass(ScalaPackageClass, nme.AllRef, List(AnyRefClass.typeConstructor)) .setFlag(ABSTRACT | TRAIT | FINAL); - AllClass = newClass(ScalaPackageClass, "All", List(AnyClass.typeConstructor)) + AllClass = newClass(ScalaPackageClass, nme.All, anyparam) .setFlag(ABSTRACT | TRAIT | FINAL); StringClass = getClass("java.lang.String"); @@ -330,16 +444,18 @@ trait Definitions requires SymbolTable { NullPointerExceptionClass = getClass("java.lang.NullPointerException"); NonLocalReturnExceptionClass = getClass("scala.runtime.NonLocalReturnException"); - // the scala value classes - UnitClass = getValueClass("Unit", 'V'); - BooleanClass = getValueClass("Boolean", 'Z'); - ByteClass = getValueClass("Byte", 'B'); - ShortClass = getValueClass("Short", 'S'); - CharClass = getValueClass("Char", 'C'); - IntClass = getValueClass("Int", 'I'); - LongClass = getValueClass("Long", 'L'); - FloatClass = getValueClass("Float", 'F'); - DoubleClass = getValueClass("Double", 'D'); + UnitClass = + newClass(ScalaPackageClass, nme.Unit, List(AnyValClass.typeConstructor)); + abbrvTag(UnitClass) = 'V' + + BooleanClass = newValueClass(nme.Boolean, 'Z'); + ByteClass = newValueClass(nme.Byte, 'B'); + ShortClass = newValueClass(nme.Short, 'S'); + CharClass = newValueClass(nme.Char, 'C'); + IntClass = newValueClass(nme.Int, 'I'); + LongClass = newValueClass(nme.Long, 'L'); + FloatClass = newValueClass(nme.Float, 'F'); + DoubleClass = newValueClass(nme.Double, 'D'); // the scala reference classes ScalaObjectClass = getClass("scala.ScalaObject"); @@ -374,47 +490,48 @@ trait Definitions requires SymbolTable { for (val i <- List.range(0, MaxFunctionArity + 1)) FunctionClass(i) = getClass("scala.Function" + i); + initValueClasses; + + val booltype = BooleanClass.typeConstructor; + // members of class scala.Any - Any_== = newMethod( - AnyClass, "==", List(AnyClass.typeConstructor), BooleanClass.typeConstructor) setFlag FINAL; - Any_!= = newMethod( - AnyClass, "!=", List(AnyClass.typeConstructor), BooleanClass.typeConstructor) setFlag FINAL; - Any_equals = newMethod( - AnyClass, nme.equals_, List(AnyClass.typeConstructor), BooleanClass.typeConstructor); + Any_== = newMethod(AnyClass, "==", anyparam, booltype) setFlag FINAL; + Any_!= = newMethod(AnyClass, "!=", anyparam, booltype) setFlag FINAL; + Any_equals = newMethod(AnyClass, nme.equals_, anyparam, booltype); Any_hashCode = newMethod( AnyClass, nme.hashCode_, List(), IntClass.typeConstructor); Any_toString = newMethod( AnyClass, nme.toString_, List(), StringClass.typeConstructor); Any_isInstanceOf = newPolyMethod( - AnyClass, nme.isInstanceOf, tparam => BooleanClass.typeConstructor) setFlag FINAL; + AnyClass, nme.isInstanceOf, tparam => booltype) setFlag FINAL; Any_asInstanceOf = newPolyMethod( AnyClass, nme.asInstanceOf, tparam => tparam.typeConstructor) setFlag FINAL; Any_isInstanceOfErased = newPolyMethod( - AnyClass, nme.isInstanceOfErased, tparam => BooleanClass.typeConstructor) setFlag FINAL; + AnyClass, nme.isInstanceOfErased, tparam => booltype) setFlag FINAL; //todo: do we need this? Any_asInstanceOfErased = newPolyMethod( AnyClass, nme.asInstanceOfErased, tparam => tparam.typeConstructor) setFlag FINAL; // members of class java.lang.{Object, String} Object_== = newMethod( - ObjectClass, "==", List(AnyRefClass.typeConstructor), BooleanClass.typeConstructor) setFlag FINAL; + ObjectClass, "==", List(AnyRefClass.typeConstructor), booltype) setFlag FINAL; Object_!= = newMethod( - ObjectClass, "!=", List(AnyRefClass.typeConstructor), BooleanClass.typeConstructor) setFlag FINAL; + ObjectClass, "!=", List(AnyRefClass.typeConstructor), booltype) setFlag FINAL; Object_eq = newMethod( - ObjectClass, "eq", List(AnyRefClass.typeConstructor), BooleanClass.typeConstructor) setFlag FINAL; + ObjectClass, "eq", List(AnyRefClass.typeConstructor), booltype) setFlag FINAL; Object_ne = newMethod( - ObjectClass, "ne", List(AnyRefClass.typeConstructor), BooleanClass.typeConstructor) setFlag FINAL; + ObjectClass, "ne", List(AnyRefClass.typeConstructor), booltype) setFlag FINAL; Object_synchronized = newPolyMethod( ObjectClass, nme.synchronized_, tparam => MethodType(List(tparam.typeConstructor), tparam.typeConstructor)) setFlag FINAL; Object_isInstanceOf = newPolyMethod( ObjectClass, "$isInstanceOf", - tparam => MethodType(List(), BooleanClass.typeConstructor)) setFlag FINAL; + tparam => MethodType(List(), booltype)) setFlag FINAL; Object_asInstanceOf = newPolyMethod( ObjectClass, "$asInstanceOf", tparam => MethodType(List(), tparam.typeConstructor)) setFlag FINAL; String_+ = newMethod( - StringClass, "+", List(AnyClass.typeConstructor), StringClass.typeConstructor) setFlag FINAL; + StringClass, "+", anyparam, StringClass.typeConstructor) setFlag FINAL; PatternWildcard = NoSymbol.newValue(Position.NOPOS, "_").setInfo(AllClass.typeConstructor); diff --git a/src/library/scala/AnyVal.java b/src/library/scala/AnyVal.java deleted file mode 100644 index 6784bbfb60..0000000000 --- a/src/library/scala/AnyVal.java +++ /dev/null @@ -1,16 +0,0 @@ -/* __ *\ -** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2002-2006, LAMP/EPFL ** -** __\ \/ /__/ __ |/ /__/ __ | ** -** /____/\___/_/ |_/____/_/ | | ** -** |/ ** -\* */ - -// $Id$ - - -package scala; - - -/** @meta class extends scala.Any; */ -public abstract class AnyVal {} diff --git a/src/library/scala/Boolean.java b/src/library/scala/Boolean.java deleted file mode 100644 index 7113d9358a..0000000000 --- a/src/library/scala/Boolean.java +++ /dev/null @@ -1,32 +0,0 @@ -/* __ *\ -** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2002-2006, LAMP/EPFL ** -** __\ \/ /__/ __ |/ /__/ __ | ** -** /____/\___/_/ |_/____/_/ | | ** -** |/ ** -\* */ - -// $Id$ - - -package scala; - - -/** @meta class extends scala.AnyVal; */ -public abstract class Boolean extends AnyVal { - - // prevent inheriting from the class - private Boolean() {} - - /** @meta method []scala.Boolean; */ - abstract public boolean $bang(); - - abstract public boolean $eq$eq (boolean that); - abstract public boolean $bang$eq(boolean that); - abstract public boolean $bar$bar(boolean that); - abstract public boolean $amp$amp(boolean that); - abstract public boolean $bar (boolean that); - abstract public boolean $amp (boolean that); - abstract public boolean $up (boolean that); - -} diff --git a/src/library/scala/Byte.java b/src/library/scala/Byte.java deleted file mode 100644 index 733b9d09fd..0000000000 --- a/src/library/scala/Byte.java +++ /dev/null @@ -1,168 +0,0 @@ -/* __ *\ -** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2002-2006, LAMP/EPFL ** -** __\ \/ /__/ __ |/ /__/ __ | ** -** /____/\___/_/ |_/____/_/ | | ** -** |/ ** -\* */ - -// $Id$ - - -package scala; - - -/** @meta class extends scala.AnyVal; */ -public abstract class Byte extends AnyVal { - - // prevent inheriting from the class - private Byte() {} - - /** @meta method []scala.Byte; */ - abstract public byte toByte(); - - /** @meta method []scala.Short; */ - abstract public short toShort(); - - /** @meta method []scala.Char; */ - abstract public char toChar(); - - /** @meta method []scala.Int; */ - abstract public int toInt(); - - /** @meta method []scala.Long; */ - abstract public long toLong(); - - /** @meta method []scala.Float; */ - abstract public float toFloat(); - - /** @meta method []scala.Double; */ - abstract public double toDouble(); - - /** @meta method []scala.Short; */ - abstract public short coerce(); - /** @meta method []scala.Int; */ - abstract public int coerce(); - /** @meta method []scala.Long; */ - abstract public long coerce(); - /** @meta method []scala.Float; */ - abstract public float coerce(); - /** @meta method []scala.Double; */ - abstract public double coerce(); - - /** @meta method []scala.Int; */ - abstract public int $plus(); - /** @meta method []scala.Int; */ - abstract public int $minus(); - /** @meta method []scala.Int; */ - abstract public int $tilde(); - - abstract public String $plus (String that); - - abstract public boolean $eq$eq (double that); - abstract public boolean $bang$eq (double that); - abstract public boolean $less (double that); - abstract public boolean $greater (double that); - abstract public boolean $less$eq (double that); - abstract public boolean $greater$eq(double that); - abstract public double $plus (double that); - abstract public double $minus (double that); - abstract public double $times (double that); - abstract public double $div (double that); - abstract public double $percent (double that); - - abstract public boolean $eq$eq (float that); - abstract public boolean $bang$eq (float that); - abstract public boolean $less (float that); - abstract public boolean $greater (float that); - abstract public boolean $less$eq (float that); - abstract public boolean $greater$eq(float that); - abstract public float $plus (float that); - abstract public float $minus (float that); - abstract public float $times (float that); - abstract public float $div (float that); - abstract public float $percent (float that); - - abstract public int $less$less (int that); - abstract public int $less$less (long that); - abstract public int $greater$greater(int that); - abstract public int $greater$greater(long that); - abstract public int $greater$greater$greater(int that); - abstract public int $greater$greater$greater(long that); - - abstract public boolean $eq$eq (long that); - abstract public boolean $bang$eq (long that); - abstract public boolean $less (long that); - abstract public boolean $greater (long that); - abstract public boolean $less$eq (long that); - abstract public boolean $greater$eq(long that); - abstract public long $plus (long that); - abstract public long $minus (long that); - abstract public long $times (long that); - abstract public long $div (long that); - abstract public long $percent (long that); - abstract public long $bar (long that); - abstract public long $amp (long that); - abstract public long $up (long that); - - abstract public boolean $eq$eq (int that); - abstract public boolean $bang$eq (int that); - abstract public boolean $less (int that); - abstract public boolean $greater (int that); - abstract public boolean $less$eq (int that); - abstract public boolean $greater$eq(int that); - abstract public int $plus (int that); - abstract public int $minus (int that); - abstract public int $times (int that); - abstract public int $div (int that); - abstract public int $percent (int that); - abstract public int $bar (int that); - abstract public int $amp (int that); - abstract public int $up (int that); - - abstract public boolean $eq$eq (char that); - abstract public boolean $bang$eq (char that); - abstract public boolean $less (char that); - abstract public boolean $greater (char that); - abstract public boolean $less$eq (char that); - abstract public boolean $greater$eq(char that); - abstract public int $plus (char that); - abstract public int $minus (char that); - abstract public int $times (char that); - abstract public int $div (char that); - abstract public int $percent (char that); - abstract public int $bar (char that); - abstract public int $amp (char that); - abstract public int $up (char that); - - abstract public boolean $eq$eq (short that); - abstract public boolean $bang$eq (short that); - abstract public boolean $less (short that); - abstract public boolean $greater (short that); - abstract public boolean $less$eq (short that); - abstract public boolean $greater$eq(short that); - abstract public int $plus (short that); - abstract public int $minus (short that); - abstract public int $times (short that); - abstract public int $div (short that); - abstract public int $percent (short that); - abstract public int $bar (short that); - abstract public int $amp (short that); - abstract public int $up (short that); - - abstract public boolean $eq$eq (byte that); - abstract public boolean $bang$eq (byte that); - abstract public boolean $less (byte that); - abstract public boolean $greater (byte that); - abstract public boolean $less$eq (byte that); - abstract public boolean $greater$eq(byte that); - abstract public int $plus (byte that); - abstract public int $minus (byte that); - abstract public int $times (byte that); - abstract public int $div (byte that); - abstract public int $percent (byte that); - abstract public int $bar (byte that); - abstract public int $amp (byte that); - abstract public int $up (byte that); - -} diff --git a/src/library/scala/Char.java b/src/library/scala/Char.java deleted file mode 100644 index 8e82aa09f8..0000000000 --- a/src/library/scala/Char.java +++ /dev/null @@ -1,165 +0,0 @@ -/* __ *\ -** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2002-2006, LAMP/EPFL ** -** __\ \/ /__/ __ |/ /__/ __ | ** -** /____/\___/_/ |_/____/_/ | | ** -** |/ ** -\* */ - -// $Id$ - - -package scala; - - -/** @meta class extends scala.AnyVal; */ -public abstract class Char extends AnyVal { - - private Char() {} - - /** @meta method []scala.Byte; */ - abstract public byte toByte(); - - /** @meta method []scala.Short; */ - abstract public short toShort(); - - /** @meta method []scala.Char; */ - abstract public char toChar(); - - /** @meta method []scala.Int; */ - abstract public int toInt(); - - /** @meta method []scala.Long; */ - abstract public long toLong(); - - /** @meta method []scala.Float; */ - abstract public float toFloat(); - - /** @meta method []scala.Double; */ - abstract public double toDouble(); - - /** @meta method []scala.Int; */ - abstract public int coerce(); - /** @meta method []scala.Long; */ - abstract public long coerce(); - /** @meta method []scala.Float; */ - abstract public float coerce(); - /** @meta method []scala.Double; */ - abstract public double coerce(); - - /** @meta method []scala.Int; */ - abstract public int $plus(); - /** @meta method []scala.Int; */ - abstract public int $minus(); - /** @meta method []scala.Int; */ - abstract public int $tilde(); - - abstract public String $plus (String that); - - abstract public boolean $eq$eq (double that); - abstract public boolean $bang$eq (double that); - abstract public boolean $less (double that); - abstract public boolean $greater (double that); - abstract public boolean $less$eq (double that); - abstract public boolean $greater$eq(double that); - abstract public double $plus (double that); - abstract public double $minus (double that); - abstract public double $times (double that); - abstract public double $div (double that); - abstract public double $percent (double that); - - abstract public boolean $eq$eq (float that); - abstract public boolean $bang$eq (float that); - abstract public boolean $less (float that); - abstract public boolean $greater (float that); - abstract public boolean $less$eq (float that); - abstract public boolean $greater$eq(float that); - abstract public float $plus (float that); - abstract public float $minus (float that); - abstract public float $times (float that); - abstract public float $div (float that); - abstract public float $percent (float that); - - abstract public int $less$less (int that); - abstract public int $less$less (long that); - abstract public int $greater$greater(int that); - abstract public int $greater$greater(long that); - abstract public int $greater$greater$greater(int that); - abstract public int $greater$greater$greater(long that); - - abstract public boolean $eq$eq (long that); - abstract public boolean $bang$eq (long that); - abstract public boolean $less (long that); - abstract public boolean $greater (long that); - abstract public boolean $less$eq (long that); - abstract public boolean $greater$eq(long that); - abstract public long $plus (long that); - abstract public long $minus (long that); - abstract public long $times (long that); - abstract public long $div (long that); - abstract public long $percent (long that); - abstract public long $bar (long that); - abstract public long $amp (long that); - abstract public long $up (long that); - - abstract public boolean $eq$eq (int that); - abstract public boolean $bang$eq (int that); - abstract public boolean $less (int that); - abstract public boolean $greater (int that); - abstract public boolean $less$eq (int that); - abstract public boolean $greater$eq(int that); - abstract public int $plus (int that); - abstract public int $minus (int that); - abstract public int $times (int that); - abstract public int $div (int that); - abstract public int $percent (int that); - abstract public int $bar (int that); - abstract public int $amp (int that); - abstract public int $up (int that); - - abstract public boolean $eq$eq (char that); - abstract public boolean $bang$eq (char that); - abstract public boolean $less (char that); - abstract public boolean $greater (char that); - abstract public boolean $less$eq (char that); - abstract public boolean $greater$eq(char that); - abstract public int $plus (char that); - abstract public int $minus (char that); - abstract public int $times (char that); - abstract public int $div (char that); - abstract public int $percent (char that); - abstract public int $bar (char that); - abstract public int $amp (char that); - abstract public int $up (char that); - - abstract public boolean $eq$eq (short that); - abstract public boolean $bang$eq (short that); - abstract public boolean $less (short that); - abstract public boolean $greater (short that); - abstract public boolean $less$eq (short that); - abstract public boolean $greater$eq(short that); - abstract public int $plus (short that); - abstract public int $minus (short that); - abstract public int $times (short that); - abstract public int $div (short that); - abstract public int $percent (short that); - abstract public int $bar (short that); - abstract public int $amp (short that); - abstract public int $up (short that); - - abstract public boolean $eq$eq (byte that); - abstract public boolean $bang$eq (byte that); - abstract public boolean $less (byte that); - abstract public boolean $greater (byte that); - abstract public boolean $less$eq (byte that); - abstract public boolean $greater$eq(byte that); - abstract public int $plus (byte that); - abstract public int $minus (byte that); - abstract public int $times (byte that); - abstract public int $div (byte that); - abstract public int $percent (byte that); - abstract public int $bar (byte that); - abstract public int $amp (byte that); - abstract public int $up (byte that); - -} diff --git a/src/library/scala/Double.java b/src/library/scala/Double.java deleted file mode 100644 index 87b9f09650..0000000000 --- a/src/library/scala/Double.java +++ /dev/null @@ -1,133 +0,0 @@ -/* __ *\ -** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2002-2006, LAMP/EPFL ** -** __\ \/ /__/ __ |/ /__/ __ | ** -** /____/\___/_/ |_/____/_/ | | ** -** |/ ** -\* */ - -// $Id$ - - -package scala; - - -/** @meta class extends scala.AnyVal; */ -public abstract class Double extends AnyVal { - - // prevent inheriting from the class - private Double() {} - - /** @meta method []scala.Byte; */ - abstract public byte toByte(); - - /** @meta method []scala.Short; */ - abstract public short toShort(); - - /** @meta method []scala.Char; */ - abstract public char toChar(); - - /** @meta method []scala.Int; */ - abstract public int toInt(); - - /** @meta method []scala.Long; */ - abstract public long toLong(); - - /** @meta method []scala.Float; */ - abstract public float toFloat(); - - /** @meta method []scala.Double; */ - abstract public double toDouble(); - - /** @meta method []scala.Double; */ - abstract public double $plus(); - /** @meta method []scala.Double; */ - abstract public double $minus(); - - abstract public String $plus (String that); - - abstract public boolean $eq$eq (double that); - abstract public boolean $bang$eq (double that); - abstract public boolean $less (double that); - abstract public boolean $greater (double that); - abstract public boolean $less$eq (double that); - abstract public boolean $greater$eq(double that); - abstract public double $plus (double that); - abstract public double $minus (double that); - abstract public double $times (double that); - abstract public double $div (double that); - abstract public double $percent (double that); - - abstract public boolean $eq$eq (float that); - abstract public boolean $bang$eq (float that); - abstract public boolean $less (float that); - abstract public boolean $greater (float that); - abstract public boolean $less$eq (float that); - abstract public boolean $greater$eq(float that); - abstract public double $plus (float that); - abstract public double $minus (float that); - abstract public double $times (float that); - abstract public double $div (float that); - abstract public double $percent (float that); - - abstract public boolean $eq$eq (long that); - abstract public boolean $bang$eq (long that); - abstract public boolean $less (long that); - abstract public boolean $greater (long that); - abstract public boolean $less$eq (long that); - abstract public boolean $greater$eq(long that); - abstract public double $plus (long that); - abstract public double $minus (long that); - abstract public double $times (long that); - abstract public double $div (long that); - abstract public double $percent (long that); - - abstract public boolean $eq$eq (int that); - abstract public boolean $bang$eq (int that); - abstract public boolean $less (int that); - abstract public boolean $greater (int that); - abstract public boolean $less$eq (int that); - abstract public boolean $greater$eq(int that); - abstract public double $plus (int that); - abstract public double $minus (int that); - abstract public double $times (int that); - abstract public double $div (int that); - abstract public double $percent (int that); - - abstract public boolean $eq$eq (short that); - abstract public boolean $bang$eq (short that); - abstract public boolean $less (short that); - abstract public boolean $greater (short that); - abstract public boolean $less$eq (short that); - abstract public boolean $greater$eq(short that); - abstract public double $plus (short that); - abstract public double $minus (short that); - abstract public double $times (short that); - abstract public double $div (short that); - abstract public double $percent (short that); - - abstract public boolean $eq$eq (char that); - abstract public boolean $bang$eq (char that); - abstract public boolean $less (char that); - abstract public boolean $greater (char that); - abstract public boolean $less$eq (char that); - abstract public boolean $greater$eq(char that); - abstract public double $plus (char that); - abstract public double $minus (char that); - abstract public double $times (char that); - abstract public double $div (char that); - abstract public double $percent (char that); - - abstract public boolean $eq$eq (byte that); - abstract public boolean $bang$eq (byte that); - abstract public boolean $less (byte that); - abstract public boolean $greater (byte that); - abstract public boolean $less$eq (byte that); - abstract public boolean $greater$eq(byte that); - abstract public double $plus (byte that); - abstract public double $minus (byte that); - abstract public double $times (byte that); - abstract public double $div (byte that); - abstract public double $percent (byte that); - -} diff --git a/src/library/scala/Float.java b/src/library/scala/Float.java deleted file mode 100644 index a707c4c784..0000000000 --- a/src/library/scala/Float.java +++ /dev/null @@ -1,136 +0,0 @@ -/* __ *\ -** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2002-2006, LAMP/EPFL ** -** __\ \/ /__/ __ |/ /__/ __ | ** -** /____/\___/_/ |_/____/_/ | | ** -** |/ ** -\* */ - -// $Id$ - - -package scala; - - -/** @meta class extends scala.AnyVal; */ -public abstract class Float extends AnyVal { - - // prevent inheriting from the class - private Float() {} - - /** @meta method []scala.Byte; */ - abstract public byte toByte(); - - /** @meta method []scala.Short; */ - abstract public short toShort(); - - /** @meta method []scala.Char; */ - abstract public char toChar(); - - /** @meta method []scala.Int; */ - abstract public int toInt(); - - /** @meta method []scala.Long; */ - abstract public long toLong(); - - /** @meta method []scala.Float; */ - abstract public float toFloat(); - - /** @meta method []scala.Double; */ - abstract public double toDouble(); - - /** @meta method []scala.Double; */ - abstract public double coerce(); - - /** @meta method []scala.Float; */ - abstract public float $plus (); - /** @meta method []scala.Float; */ - abstract public float $minus (); - - abstract public String $plus (String that); - - abstract public boolean $eq$eq (double that); - abstract public boolean $bang$eq (double that); - abstract public boolean $less (double that); - abstract public boolean $greater (double that); - abstract public boolean $less$eq (double that); - abstract public boolean $greater$eq(double that); - abstract public double $plus (double that); - abstract public double $minus (double that); - abstract public double $times (double that); - abstract public double $div (double that); - abstract public double $percent (double that); - - abstract public boolean $eq$eq (float that); - abstract public boolean $bang$eq (float that); - abstract public boolean $less (float that); - abstract public boolean $greater (float that); - abstract public boolean $less$eq (float that); - abstract public boolean $greater$eq(float that); - abstract public float $plus (float that); - abstract public float $minus (float that); - abstract public float $times (float that); - abstract public float $div (float that); - abstract public float $percent (float that); - - abstract public boolean $eq$eq (long that); - abstract public boolean $bang$eq (long that); - abstract public boolean $less (long that); - abstract public boolean $greater (long that); - abstract public boolean $less$eq (long that); - abstract public boolean $greater$eq(long that); - abstract public float $plus (long that); - abstract public float $minus (long that); - abstract public float $times (long that); - abstract public float $div (long that); - abstract public float $percent (long that); - - abstract public boolean $eq$eq (int that); - abstract public boolean $bang$eq (int that); - abstract public boolean $less (int that); - abstract public boolean $greater (int that); - abstract public boolean $less$eq (int that); - abstract public boolean $greater$eq(int that); - abstract public float $plus (int that); - abstract public float $minus (int that); - abstract public float $times (int that); - abstract public float $div (int that); - abstract public float $percent (int that); - - abstract public boolean $eq$eq (short that); - abstract public boolean $bang$eq (short that); - abstract public boolean $less (short that); - abstract public boolean $greater (short that); - abstract public boolean $less$eq (short that); - abstract public boolean $greater$eq(short that); - abstract public float $plus (short that); - abstract public float $minus (short that); - abstract public float $times (short that); - abstract public float $div (short that); - abstract public float $percent (short that); - - abstract public boolean $eq$eq (char that); - abstract public boolean $bang$eq (char that); - abstract public boolean $less (char that); - abstract public boolean $greater (char that); - abstract public boolean $less$eq (char that); - abstract public boolean $greater$eq(char that); - abstract public float $plus (char that); - abstract public float $minus (char that); - abstract public float $times (char that); - abstract public float $div (char that); - abstract public float $percent (char that); - - abstract public boolean $eq$eq (byte that); - abstract public boolean $bang$eq (byte that); - abstract public boolean $less (byte that); - abstract public boolean $greater (byte that); - abstract public boolean $less$eq (byte that); - abstract public boolean $greater$eq(byte that); - abstract public float $plus (byte that); - abstract public float $minus (byte that); - abstract public float $times (byte that); - abstract public float $div (byte that); - abstract public float $percent (byte that); - -} diff --git a/src/library/scala/Int.java b/src/library/scala/Int.java deleted file mode 100644 index de200f56f6..0000000000 --- a/src/library/scala/Int.java +++ /dev/null @@ -1,165 +0,0 @@ -/* __ *\ -** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2002-2006, LAMP/EPFL ** -** __\ \/ /__/ __ |/ /__/ __ | ** -** /____/\___/_/ |_/____/_/ | | ** -** |/ ** -\* */ - -// $Id$ - - -package scala; - - -/** @meta class extends scala.AnyVal; */ -public abstract class Int extends AnyVal { - - // prevent inheriting from the class - private Int() {} - - /** @meta method []scala.Byte; */ - abstract public byte toByte(); - - /** @meta method []scala.Short; */ - abstract public short toShort(); - - /** @meta method []scala.Char; */ - abstract public char toChar(); - - /** @meta method []scala.Int; */ - abstract public int toInt(); - - /** @meta method []scala.Long; */ - abstract public long toLong(); - - /** @meta method []scala.Float; */ - abstract public float toFloat(); - - /** @meta method []scala.Double; */ - abstract public double toDouble(); - - /** @meta method []scala.Long; */ - abstract public long coerce(); - /** @meta method []scala.Float; */ - abstract public float coerce(); - /** @meta method []scala.Double; */ - abstract public double coerce(); - - /** @meta method []scala.Int; */ - abstract public int $plus(); - /** @meta method []scala.Int; */ - abstract public int $minus(); - /** @meta method []scala.Int; */ - abstract public int $tilde(); - - abstract public String $plus (String that); - - abstract public boolean $eq$eq (double that); - abstract public boolean $bang$eq (double that); - abstract public boolean $less (double that); - abstract public boolean $greater (double that); - abstract public boolean $less$eq (double that); - abstract public boolean $greater$eq(double that); - abstract public double $plus (double that); - abstract public double $minus (double that); - abstract public double $times (double that); - abstract public double $div (double that); - abstract public double $percent (double that); - - abstract public boolean $eq$eq (float that); - abstract public boolean $bang$eq (float that); - abstract public boolean $less (float that); - abstract public boolean $greater (float that); - abstract public boolean $less$eq (float that); - abstract public boolean $greater$eq(float that); - abstract public float $plus (float that); - abstract public float $minus (float that); - abstract public float $times (float that); - abstract public float $div (float that); - abstract public float $percent (float that); - - abstract public int $less$less (int that); - abstract public int $less$less (long that); - abstract public int $greater$greater(int that); - abstract public int $greater$greater(long that); - abstract public int $greater$greater$greater(int that); - abstract public int $greater$greater$greater(long that); - - abstract public boolean $eq$eq (long that); - abstract public boolean $bang$eq (long that); - abstract public boolean $less (long that); - abstract public boolean $greater (long that); - abstract public boolean $less$eq (long that); - abstract public boolean $greater$eq(long that); - abstract public long $plus (long that); - abstract public long $minus (long that); - abstract public long $times (long that); - abstract public long $div (long that); - abstract public long $percent (long that); - abstract public long $bar (long that); - abstract public long $amp (long that); - abstract public long $up (long that); - - abstract public boolean $eq$eq (int that); - abstract public boolean $bang$eq (int that); - abstract public boolean $less (int that); - abstract public boolean $greater (int that); - abstract public boolean $less$eq (int that); - abstract public boolean $greater$eq(int that); - abstract public int $plus (int that); - abstract public int $minus (int that); - abstract public int $times (int that); - abstract public int $div (int that); - abstract public int $percent (int that); - abstract public int $bar (int that); - abstract public int $amp (int that); - abstract public int $up (int that); - - - abstract public boolean $eq$eq (char that); - abstract public boolean $bang$eq (char that); - abstract public boolean $less (char that); - abstract public boolean $greater (char that); - abstract public boolean $less$eq (char that); - abstract public boolean $greater$eq(char that); - abstract public int $plus (char that); - abstract public int $minus (char that); - abstract public int $times (char that); - abstract public int $div (char that); - abstract public int $percent (char that); - abstract public int $bar (char that); - abstract public int $amp (char that); - abstract public int $up (char that); - - abstract public boolean $eq$eq (short that); - abstract public boolean $bang$eq (short that); - abstract public boolean $less (short that); - abstract public boolean $greater (short that); - abstract public boolean $less$eq (short that); - abstract public boolean $greater$eq(short that); - abstract public int $plus (short that); - abstract public int $minus (short that); - abstract public int $times (short that); - abstract public int $div (short that); - abstract public int $percent (short that); - abstract public int $bar (short that); - abstract public int $amp (short that); - abstract public int $up (short that); - - abstract public boolean $eq$eq (byte that); - abstract public boolean $bang$eq (byte that); - abstract public boolean $less (byte that); - abstract public boolean $greater (byte that); - abstract public boolean $less$eq (byte that); - abstract public boolean $greater$eq(byte that); - abstract public int $plus (byte that); - abstract public int $minus (byte that); - abstract public int $times (byte that); - abstract public int $div (byte that); - abstract public int $percent (byte that); - abstract public int $bar (byte that); - abstract public int $amp (byte that); - abstract public int $up (byte that); - -} diff --git a/src/library/scala/Long.java b/src/library/scala/Long.java deleted file mode 100644 index 0964d3f4d7..0000000000 --- a/src/library/scala/Long.java +++ /dev/null @@ -1,162 +0,0 @@ -/* __ *\ -** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2002-2006, LAMP/EPFL ** -** __\ \/ /__/ __ |/ /__/ __ | ** -** /____/\___/_/ |_/____/_/ | | ** -** |/ ** -\* */ - -// $Id$ - - -package scala; - - -/** @meta class extends scala.AnyVal; */ -public abstract class Long extends AnyVal { - - // prevent inheriting from the class - private Long() {} - - /** @meta method []scala.Byte; */ - abstract public byte toByte(); - - /** @meta method []scala.Short; */ - abstract public short toShort(); - - /** @meta method []scala.Char; */ - abstract public char toChar(); - - /** @meta method []scala.Int; */ - abstract public int toInt(); - - /** @meta method []scala.Long; */ - abstract public long toLong(); - - /** @meta method []scala.Float; */ - abstract public float toFloat(); - - /** @meta method []scala.Double; */ - abstract public double toDouble(); - - /** @meta method []scala.Double; */ - abstract public double coerce(); - /** @meta method []scala.Float; */ - abstract public float coerce(); - - /** @meta method []scala.Long; */ - abstract public long $plus(); - /** @meta method []scala.Long; */ - abstract public long $minus(); - /** @meta method []scala.Long; */ - abstract public long $tilde(); - - abstract public String $plus (String that); - - abstract public boolean $eq$eq (double that); - abstract public boolean $bang$eq (double that); - abstract public boolean $less (double that); - abstract public boolean $greater (double that); - abstract public boolean $less$eq (double that); - abstract public boolean $greater$eq(double that); - abstract public double $plus (double that); - abstract public double $minus (double that); - abstract public double $times (double that); - abstract public double $div (double that); - abstract public double $percent (double that); - - abstract public boolean $eq$eq (float that); - abstract public boolean $bang$eq (float that); - abstract public boolean $less (float that); - abstract public boolean $greater (float that); - abstract public boolean $less$eq (float that); - abstract public boolean $greater$eq(float that); - abstract public float $plus (float that); - abstract public float $minus (float that); - abstract public float $times (float that); - abstract public float $div (float that); - abstract public float $percent (float that); - - abstract public long $less$less (int that); - abstract public long $less$less (long that); - abstract public long $greater$greater(int that); - abstract public long $greater$greater(long that); - abstract public long $greater$greater$greater(int that); - abstract public long $greater$greater$greater(long that); - - abstract public boolean $eq$eq (long that); - abstract public boolean $bang$eq (long that); - abstract public boolean $less (long that); - abstract public boolean $greater (long that); - abstract public boolean $less$eq (long that); - abstract public boolean $greater$eq(long that); - abstract public long $plus (long that); - abstract public long $minus (long that); - abstract public long $times (long that); - abstract public long $div (long that); - abstract public long $percent (long that); - abstract public long $bar (long that); - abstract public long $amp (long that); - abstract public long $up (long that); - - abstract public boolean $eq$eq (int that); - abstract public boolean $bang$eq (int that); - abstract public boolean $less (int that); - abstract public boolean $greater (int that); - abstract public boolean $less$eq (int that); - abstract public boolean $greater$eq(int that); - abstract public long $plus (int that); - abstract public long $minus (int that); - abstract public long $times (int that); - abstract public long $div (int that); - abstract public long $percent (int that); - abstract public long $bar (int that); - abstract public long $amp (int that); - abstract public long $up (int that); - - abstract public boolean $eq$eq (char that); - abstract public boolean $bang$eq (char that); - abstract public boolean $less (char that); - abstract public boolean $greater (char that); - abstract public boolean $less$eq (char that); - abstract public boolean $greater$eq(char that); - abstract public long $plus (char that); - abstract public long $minus (char that); - abstract public long $times (char that); - abstract public long $div (char that); - abstract public long $percent (char that); - abstract public long $bar (char that); - abstract public long $amp (char that); - abstract public long $up (char that); - - abstract public boolean $eq$eq (short that); - abstract public boolean $bang$eq (short that); - abstract public boolean $less (short that); - abstract public boolean $greater (short that); - abstract public boolean $less$eq (short that); - abstract public boolean $greater$eq(short that); - abstract public long $plus (short that); - abstract public long $minus (short that); - abstract public long $times (short that); - abstract public long $div (short that); - abstract public long $percent (short that); - abstract public long $bar (short that); - abstract public long $amp (short that); - abstract public long $up (short that); - - abstract public boolean $eq$eq (byte that); - abstract public boolean $bang$eq (byte that); - abstract public boolean $less (byte that); - abstract public boolean $greater (byte that); - abstract public boolean $less$eq (byte that); - abstract public boolean $greater$eq(byte that); - abstract public long $plus (byte that); - abstract public long $minus (byte that); - abstract public long $times (byte that); - abstract public long $div (byte that); - abstract public long $percent (byte that); - abstract public long $bar (byte that); - abstract public long $amp (byte that); - abstract public long $up (byte that); - -} diff --git a/src/library/scala/Short.java b/src/library/scala/Short.java deleted file mode 100644 index 1f65fa0e2c..0000000000 --- a/src/library/scala/Short.java +++ /dev/null @@ -1,166 +0,0 @@ -/* __ *\ -** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2002-2006, LAMP/EPFL ** -** __\ \/ /__/ __ |/ /__/ __ | ** -** /____/\___/_/ |_/____/_/ | | ** -** |/ ** -\* */ - -// $Id$ - - -package scala; - - -/** @meta class extends scala.AnyVal; */ -public abstract class Short extends AnyVal { - - // prevent inheriting from the class - private Short() {} - - /** @meta method []scala.Byte; */ - abstract public byte toByte(); - - /** @meta method []scala.Short; */ - abstract public short toShort(); - - /** @meta method []scala.Char; */ - abstract public char toChar(); - - /** @meta method []scala.Int; */ - abstract public int toInt(); - - /** @meta method []scala.Long; */ - abstract public long toLong(); - - /** @meta method []scala.Float; */ - abstract public float toFloat(); - - /** @meta method []scala.Double; */ - abstract public double toDouble(); - - /** @meta method []scala.Int; */ - abstract public int coerce(); - /** @meta method []scala.Long; */ - abstract public long coerce(); - /** @meta method []scala.Float; */ - abstract public float coerce(); - /** @meta method []scala.Double; */ - abstract public double coerce(); - - /** @meta method []scala.Int; */ - abstract public int $plus(); - /** @meta method []scala.Int; */ - abstract public int $minus(); - /** @meta method []scala.Int; */ - abstract public int $tilde(); - - abstract public String $plus (String that); - - abstract public boolean $eq$eq (double that); - abstract public boolean $bang$eq (double that); - abstract public boolean $less (double that); - abstract public boolean $greater (double that); - abstract public boolean $less$eq (double that); - abstract public boolean $greater$eq(double that); - abstract public double $plus (double that); - abstract public double $minus (double that); - abstract public double $times (double that); - abstract public double $div (double that); - abstract public double $percent (double that); - - abstract public boolean $eq$eq (float that); - abstract public boolean $bang$eq (float that); - abstract public boolean $less (float that); - abstract public boolean $greater (float that); - abstract public boolean $less$eq (float that); - abstract public boolean $greater$eq(float that); - abstract public float $plus (float that); - abstract public float $minus (float that); - abstract public float $times (float that); - abstract public float $div (float that); - abstract public float $percent (float that); - - abstract public int $less$less (int that); - abstract public int $less$less (long that); - abstract public int $greater$greater(int that); - abstract public int $greater$greater(long that); - abstract public int $greater$greater$greater(int that); - abstract public int $greater$greater$greater(long that); - - abstract public boolean $eq$eq (long that); - abstract public boolean $bang$eq (long that); - abstract public boolean $less (long that); - abstract public boolean $greater (long that); - abstract public boolean $less$eq (long that); - abstract public boolean $greater$eq(long that); - abstract public long $plus (long that); - abstract public long $minus (long that); - abstract public long $times (long that); - abstract public long $div (long that); - abstract public long $percent (long that); - abstract public long $bar (long that); - abstract public long $amp (long that); - abstract public long $up (long that); - - abstract public boolean $eq$eq (int that); - abstract public boolean $bang$eq (int that); - abstract public boolean $less (int that); - abstract public boolean $greater (int that); - abstract public boolean $less$eq (int that); - abstract public boolean $greater$eq(int that); - abstract public int $plus (int that); - abstract public int $minus (int that); - abstract public int $times (int that); - abstract public int $div (int that); - abstract public int $percent (int that); - abstract public int $bar (int that); - abstract public int $amp (int that); - abstract public int $up (int that); - - abstract public boolean $eq$eq (char that); - abstract public boolean $bang$eq (char that); - abstract public boolean $less (char that); - abstract public boolean $greater (char that); - abstract public boolean $less$eq (char that); - abstract public boolean $greater$eq(char that); - abstract public int $plus (char that); - abstract public int $minus (char that); - abstract public int $times (char that); - abstract public int $div (char that); - abstract public int $percent (char that); - abstract public int $bar (char that); - abstract public int $amp (char that); - abstract public int $up (char that); - - abstract public boolean $eq$eq (short that); - abstract public boolean $bang$eq (short that); - abstract public boolean $less (short that); - abstract public boolean $greater (short that); - abstract public boolean $less$eq (short that); - abstract public boolean $greater$eq(short that); - abstract public int $plus (short that); - abstract public int $minus (short that); - abstract public int $times (short that); - abstract public int $div (short that); - abstract public int $percent (short that); - abstract public int $bar (short that); - abstract public int $amp (short that); - abstract public int $up (short that); - - abstract public boolean $eq$eq (byte that); - abstract public boolean $bang$eq (byte that); - abstract public boolean $less (byte that); - abstract public boolean $greater (byte that); - abstract public boolean $less$eq (byte that); - abstract public boolean $greater$eq(byte that); - abstract public int $plus (byte that); - abstract public int $minus (byte that); - abstract public int $times (byte that); - abstract public int $div (byte that); - abstract public int $percent (byte that); - abstract public int $bar (byte that); - abstract public int $amp (byte that); - abstract public int $up (byte that); - -} diff --git a/src/library/scala/Unit.java b/src/library/scala/Unit.java deleted file mode 100644 index ed4a8e6d5b..0000000000 --- a/src/library/scala/Unit.java +++ /dev/null @@ -1,25 +0,0 @@ -/* __ *\ -** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2002-2006, LAMP/EPFL ** -** __\ \/ /__/ __ |/ /__/ __ | ** -** /____/\___/_/ |_/____/_/ | | ** -** |/ ** -\* */ - -// $Id$ - - -package scala; - - -public abstract class Unit extends AnyVal { - - // prevent inheriting from the class - private Unit() {} - - /** @meta method (scala.Any)scala.Boolean; */ - abstract public boolean $eq$eq (java.lang.Object other); - /** @meta method (scala.Any)scala.Boolean; */ - abstract public boolean $bang$eq(java.lang.Object other); - -} -- cgit v1.2.3