2 files changed, 27 insertions, 29 deletions

diff --git a/cmd/planr/sub/cli.go b/cmd/planr/sub/cli.go
index d667b88..3c58f4e 100644
--- a/cmd/planr/sub/cli.go
+++ b/cmd/planr/sub/cli.go
@@ -14,25 +14,23 @@ var (
   col_label = color.New(color.FgCyan)
 );
 
-func tcTitle(tc planr.TestCase) string {
-  title := tc.Cname
+func tcTitle(tr planr.TestResult) string {
+  title := tr.Tc.Cname
 
-  if tc.Config.Title != nil {
-    title = *tc.Config.Title
+  if tr.Tc.Config.Title != nil {
+    title = *tr.Tc.Config.Title
   }
 
   return title
 }
 
-func tcStatus(tc planr.TestCase) string {
+func tcStatus(tc planr.TestResult) string {
     status := "SILENT"
 
-    if tc.Result != nil {
-      if tc.Result.Status == planr.PASSING {
-        status = "PASS"
-      } else {
-        status = "FAIL"
-      }
+    if tc.Status == planr.PASSING {
+      status = "PASS"
+    } else {
+      status = "FAIL"
     }
 
     return status
@@ -59,9 +57,9 @@ func pprintFenced(title, value string) {
   fmt.Println(fence)
 }
 
-func tcStatusLine(tc planr.TestCase) {
-  title  := tcTitle(tc)
-  status := tcStatus(tc)
+func tcStatusLine(tr planr.TestResult) {
+  title  := tcTitle(tr)
+  status := tcStatus(tr)
 
   if status == "PASS" {
     col_pass.Printf("[%s] ", status);
@@ -72,8 +70,10 @@ func tcStatusLine(tc planr.TestCase) {
   col_title.Println(title);  
 }
 
-func tcPprint(tc planr.TestCase) {
-  tcStatusLine(tc)
+func tcPprint(tr planr.TestResult) {
+  tcStatusLine(tr)
+
+  tc := tr.Tc
 
   pprintLabeled("id", tc.Cname)
 
@@ -86,22 +86,20 @@ func tcPprint(tc planr.TestCase) {
     pprintLabeled("description", *tc.Config.Description)
   }
 
-  res := tc.Result
-
-  if res.Status == planr.COMPILATION_FAILURE {
+  if tr.Status == planr.COMPILATION_FAILURE {
     
-    if res.DebugOutput != "" {
+    if tr.DebugOutput != "" {
       fmt.Println()
-      pprintFenced("compilation output", tc.Result.DebugOutput);
+      pprintFenced("compilation output", tr.DebugOutput);
     } else {
       fmt.Println("WARN: No debug output provided")
     }
 
-  } else if res.Status == planr.RUNTIME_FAILURE {
+  } else if tr.Status == planr.RUNTIME_FAILURE {
 
-    if tc.Result.TestOutput != "" {
+    if tr.TestOutput != "" {
       fmt.Println()
-      pprintFenced("test output", tc.Result.TestOutput);
+      pprintFenced("test output", tr.TestOutput);
     }
     
   }
diff --git a/cmd/planr/sub/evaluate.go b/cmd/planr/sub/evaluate.go
index 0366d44..18cccb1 100644
--- a/cmd/planr/sub/evaluate.go
+++ b/cmd/planr/sub/evaluate.go
@@ -6,26 +6,26 @@ import (
 
 func Evaluate(runner planr.Runner, params []string) {
   tcs := runner.CollectCases()
-  tcs = runner.Evaluate(tcs)
+  trs := runner.Evaluate(tcs)
 
   earned := 0.0
   total  := 0.0
   passed := 0
-  for _, tc := range tcs {
-    cfg := tc.Config
+  for _, tr := range trs {
+    cfg := tr.Tc.Config
 
     if cfg.Points != nil {
       points := float64(*cfg.Points)
 
       total += points
 
-      if tc.Result.Status == planr.PASSING {
+      if tr.Status == planr.PASSING {
         earned += points
         passed++
       }
     }
 
-    tcPprint(tc)
+    tcPprint(tr)
   }
 
   printResults(