diff options
author | Matthias Zenger <mzenger@gmail.com> | 2004-04-16 15:07:28 +0000 |
---|---|---|
committer | Matthias Zenger <mzenger@gmail.com> | 2004-04-16 15:07:28 +0000 |
commit | acbf344574105550d65426a28ae2e54fdb2e70a8 (patch) | |
tree | c78143e75471b2bc3f2abf90557f145236000d64 /sources | |
parent | d57f01bdefdaa7647640424db59b4593ba73d7bf (diff) | |
download | scala-acbf344574105550d65426a28ae2e54fdb2e70a8.tar.gz scala-acbf344574105550d65426a28ae2e54fdb2e70a8.tar.bz2 scala-acbf344574105550d65426a28ae2e54fdb2e70a8.zip |
*** empty log message ***
Diffstat (limited to 'sources')
-rw-r--r-- | sources/scala/Ord.scala | 4 | ||||
-rw-r--r-- | sources/scala/Symbol.scala | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/sources/scala/Ord.scala b/sources/scala/Ord.scala index 911d58d29f..07619d552e 100644 --- a/sources/scala/Ord.scala +++ b/sources/scala/Ord.scala @@ -20,11 +20,13 @@ trait Ord[t <: Ord[t]]: t { */ -trait Ord[+T <: Ord[T]] { +trait Ord[+T <: Ord[T]]: T { def < [S >: T <: Ord[S]](that: S): Boolean; def <=[S >: T <: Ord[S]](that: S): Boolean = this < that || this == that; def > [S >: T <: Ord[S]](that: S): Boolean = that < this; def >=[S >: T <: Ord[S]](that: S): Boolean = that <= this; + def min[S >: T <: Ord[S]](that: S): S = if (this < that) this else that; + def max[S >: T <: Ord[S]](that: S): S = if (this < that) that else this; } /* diff --git a/sources/scala/Symbol.scala b/sources/scala/Symbol.scala index 1d6bfe6fbb..832b9721ed 100644 --- a/sources/scala/Symbol.scala +++ b/sources/scala/Symbol.scala @@ -9,6 +9,7 @@ package scala; + /** Instances of <code>Symbol</code> can be created easily with * Scala's built-in quote mechanism. For instance, the Scala term * <code>'mysym</code> will invoke the constructor of the @@ -18,14 +19,11 @@ package scala; * @author Martin Odersky * @version 1.7, 08/12/2003 */ -case class Symbol( name: String ) { +final case class Symbol(name: String) { - /** Converts this symbol to a string + /** Converts this symbol to a string. */ override def toString(): String = { "'" + name } - - final def <=(value: String) = new Pair(name, value); - } |