From b57e67b8a104028fc6f5a907ad2e95f97575350a Mon Sep 17 00:00:00 2001
From: Geoffrey Washburn <geoffrey.washburn@epfl.ch>
Date: Wed, 7 May 2008 15:27:17 +0000
Subject: Option asserts that its argument is not null.

---
 src/library/scala/Option.scala | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/library/scala/Option.scala b/src/library/scala/Option.scala
index b24b575216..2d07a05944 100644
--- a/src/library/scala/Option.scala
+++ b/src/library/scala/Option.scala
@@ -131,10 +131,13 @@ sealed abstract class Option[+A] extends Product {
 /** Class <code>Some[A]</code> represents existing values of type
  *  <code>A</code>.
  *
+ *  The argument may not be null.
+ *
  *  @author  Martin Odersky
  *  @version 1.0, 16/07/2003
  */
 final case class Some[+A](x: A) extends Option[A] {
+  assert (x != null)
   def isEmpty = false
   def get = x
 }
-- 
cgit v1.2.3