From af4e7965f1dd96e601e250e9d214890ee4c74cb5 Mon Sep 17 00:00:00 2001
From: Jesse Luehrs <doy@tozt.net>
Date: Sat, 23 Feb 2013 16:34:13 -0600
Subject: clean up plan object creation a bit

---
 src/main/scala/org/perl8/test/Utils.scala        | 3 +--
 src/main/scala/org/perl8/test/package.scala      | 3 ++-
 src/main/scala/org/perl8/test/tap/Consumer.scala | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/main/scala/org/perl8/test/Utils.scala b/src/main/scala/org/perl8/test/Utils.scala
index 31a66b1..66befd3 100644
--- a/src/main/scala/org/perl8/test/Utils.scala
+++ b/src/main/scala/org/perl8/test/Utils.scala
@@ -17,7 +17,7 @@ object Utils {
   }
 
   case class SkipAll (
-    override val message: Option[String]
+    override val message: Option[String] = None
   ) extends Plan {
     override val plan    = 0
     override val skipAll = true
@@ -25,7 +25,6 @@ object Utils {
 
   object SkipAll {
     def apply (reason: String) = new SkipAll(Some(reason))
-    def apply ()               = new SkipAll(None)
   }
 
   trait Message
diff --git a/src/main/scala/org/perl8/test/package.scala b/src/main/scala/org/perl8/test/package.scala
index 1d3b118..75c661c 100644
--- a/src/main/scala/org/perl8/test/package.scala
+++ b/src/main/scala/org/perl8/test/package.scala
@@ -4,13 +4,14 @@ package object test {
   import language.implicitConversions
 
   implicit def intToPlan (p: Int): Plan =
-    new NumericPlan(p)
+    NumericPlan(p)
 
   implicit def stringToMessage (s: String): Utils.Message =
     new Utils.HasMessage(s)
 
   type Plan        = Utils.Plan
   type NumericPlan = Utils.NumericPlan
+  val NumericPlan  = Utils.NumericPlan
   type SkipAll     = Utils.SkipAll
   val SkipAll      = Utils.SkipAll
 
diff --git a/src/main/scala/org/perl8/test/tap/Consumer.scala b/src/main/scala/org/perl8/test/tap/Consumer.scala
index 2c542f1..299e390 100644
--- a/src/main/scala/org/perl8/test/tap/Consumer.scala
+++ b/src/main/scala/org/perl8/test/tap/Consumer.scala
@@ -37,8 +37,8 @@ object Consumer {
 
     def plan: Parser[Plan] =
       (planValue <~ ws) ~ opt(planDirective) ^^ {
-        case planValue ~ Some(SkipDirective(d)) => new SkipAll(d)
-        case planValue ~ None                   => new NumericPlan(planValue)
+        case planValue ~ Some(SkipDirective(d)) => SkipAll(d)
+        case planValue ~ None                   => NumericPlan(planValue)
       }
 
     def result (indent: String): Parser[TestResult] =
-- 
cgit v1.2.3-54-g00ecf