WIP non boxing

Author: nicolasstucki

library/src/scala/RefinedScrutinee.scala

@@ -1,17 +1,18 @@
 package scala
 
-class RefinedScrutinee[+Scrutinee /*<: Singleton*/, +Result] private (val result: Option[Result]) extends AnyVal {
+final class RefinedScrutinee[+Scrutinee /*<: Singleton*/, +Result] private (val result: Any) extends AnyVal {
   // Scrutinee in not a singleton to provide a better error message
 
   /** There is no result */
-  def isEmpty: Boolean = result.isEmpty
+  def isEmpty: Boolean = result == RefinedScrutinee.NoResult
 
   /** Get the result */
-  def get: Result = result.get
+  def get: Result = result.asInstanceOf[Result]
 }
 
 object RefinedScrutinee {
-  // TODO when bootstrapped: erase scrutinee as it is just an evidence for that existance of a term of type Scrutinee
-  def matchOf[Scrutinee <: Singleton, Result](/*erased*/ scrutinee: Scrutinee)(result: Result): RefinedScrutinee[Scrutinee, Result] = new RefinedScrutinee(Some(result))
-  def noMatch[Scrutinee <: Singleton, Result]: RefinedScrutinee[Scrutinee, Result] = new RefinedScrutinee(None)
+  private[RefinedScrutinee] object NoResult
+
+  def matchOf[Scrutinee <: Singleton, Result](scrutinee: Scrutinee)(result: Result): RefinedScrutinee[Scrutinee, Result] = new RefinedScrutinee(result)
+  def noMatch[Scrutinee <: Singleton, Result]: RefinedScrutinee[Scrutinee, Result] = new RefinedScrutinee(NoResult)
 }