summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorburaq <buraq@epfl.ch>2003-07-08 10:01:07 +0000
committerburaq <buraq@epfl.ch>2003-07-08 10:01:07 +0000
commitb7f7cddf7cb4ce9df8e6fff89b2f59f989d72100 (patch)
tree167812b441df14e197137f5e1d6878c71f811d1d
parentd2df7c9c9a02cd91d2dabaf4709ab77235df13c2 (diff)
downloadscala-b7f7cddf7cb4ce9df8e6fff89b2f59f989d72100.tar.gz
scala-b7f7cddf7cb4ce9df8e6fff89b2f59f989d72100.tar.bz2
scala-b7f7cddf7cb4ce9df8e6fff89b2f59f989d72100.zip
error message for iterator
seqTrace hack (temporary)
-rw-r--r--sources/scala/List.scala5
-rw-r--r--sources/scala/Predef.scala3
2 files changed, 7 insertions, 1 deletions
diff --git a/sources/scala/List.scala b/sources/scala/List.scala
index ddc2570225..162a0c5974 100644
--- a/sources/scala/List.scala
+++ b/sources/scala/List.scala
@@ -62,7 +62,10 @@ trait List[+a] extends Seq[a] {
def elements: Iterator[a] = new Iterator[a] {
var current = List.this;
def hasNext: Boolean = !current.isEmpty;
- def next: a = { val result = current.head; current = current.tail; result }
+ def next: a = { if( !hasNext )
+ { error( "next on empty Iterator" ) }
+ else
+ { val result = current.head; current = current.tail; result } }
}
/** Returns the list without its last element.
diff --git a/sources/scala/Predef.scala b/sources/scala/Predef.scala
index f835fdd64a..ebe450a42b 100644
--- a/sources/scala/Predef.scala
+++ b/sources/scala/Predef.scala
@@ -58,4 +58,7 @@ object Predef {
type Triple = Tuple3;
def Triple[a, b, c](x: a, y: b, z: c) = Tuple3(x, y, z);
+
+ type Trace = SeqTrace;
+ type emptyTrace = SeqTraceNil;
}