From ecf919092caea67b15a2b506235fd4f7d2ff0198 Mon Sep 17 00:00:00 2001
From: beardhatcode <mail.garonn@gmail.com>
Date: Fri, 19 Jan 2018 15:53:49 +0100
Subject: [PATCH] Attemt to make the checke cleaner

---
 simpletest/checker.pl | 39 ++++++++++++++++++++-------------------
 1 file changed, 20 insertions(+), 19 deletions(-)

diff --git a/simpletest/checker.pl b/simpletest/checker.pl
index 5e81286..08adf4b 100644
--- a/simpletest/checker.pl
+++ b/simpletest/checker.pl
@@ -2,7 +2,7 @@
           [ dotests/0
           ]).
 
-% I don't realy know why I've put these here anymore
+% Enable catching
 :- set_prolog_flag(unknown, error). 
 :- set_prolog_flag(report_error, true).
 % Print a one line trace in case an error occurs
@@ -29,33 +29,34 @@
     dotests(Tests).
 
 
+dotests(Tests) :-
+    dotests(Tests,Res),
+    open('result.json', write, Stream),
+    json_write(Stream,Res),
+    close(Stream).
+
 % When everyting is parsed the testresults are the results.
 % All tets are executed and the result is stored in a test_result(Res) using asertz/1.
 % This is needed because backtracking out of setup_call_catcher_cleanup/4 destroys
 % all choisepoints taken in the catcher.
-dotests([]) :-
-    findall(R,test_result(R), Res),
-    open('result.json', write, Stream),
-    json_write(Stream,Res),
-    close(Stream).
+dotests([],[]).
 
 
-dotests([[Name, ImplOk,ImplStud,AllowCP,Limit,Cases]|Xs]) :-
-    verified(Name, ImplOk,ImplStud,AllowCP,Limit,Cases),
-    dotests(Xs). 
+dotests([[Name, ImplOk,ImplStud,AllowCP,Limit,Cases]|Xs],[R|Rs]) :-
+    verified(Name, ImplOk,ImplStud,AllowCP,Limit,Cases, R),
+    dotests(Xs,Rs). 
 
 
 % Start with an empty result list
-verified(Name, ImplOk, ImplStud, AllowCP,Limit, List) :-
-    verified(Name, ImplOk, ImplStud, AllowCP,Limit, List, []).
+verified(Name, ImplOk, ImplStud, AllowCP,Limit, List,Results) :-
+    verified(Name, ImplOk, ImplStud, AllowCP,Limit, List, Results).
 
 % When all cases are handled write the result to a file
 :- use_module(library(http/json)).
-verified(Name, _, _, AllowCP,Limit, [], Result) :-
-    assertz(test_result(res{name: Name,allowcp:AllowCP, inferencelimit:Limit, result:Result})).
+verified(Name, _, _, AllowCP,Limit, [], []).
 
 % Checks what the result is of the correct code
-verified(Name, ImplOk, ImplStud, AllowCP,Limit, [Arg|RemArgs], Result) :-
+verified(Name, ImplOk, ImplStud, AllowCP,Limit, [Arg|RemArgs], Rs) :-
     ignore(catch(setup_call_catcher_cleanup(true,
         call_with_inference_limit(
                 catch(apply(ImplOk,Arg),Exception,true),
@@ -64,12 +65,12 @@
         Caught,
         (
             mkresult(Caught, LimitResult,Exception, Smry), 
-            verified_student(Smry, Name, ImplOk, ImplStud, AllowCP,Limit, Arg, RemArgs, Result)
+            verified_student(Smry, Name, ImplOk, ImplStud, AllowCP,Limit, Arg, RemArgs, Rs)
         )),_,true)).
 
 % checks the result of the students code
 % Extra catches required
-verified_student(Expected, Name, ImplOk, ImplStud, AllowCP,Limit, Arg, RemArgs, Result) :-
+verified_student(Expected, Name, ImplOk, ImplStud, AllowCP,Limit, Arg, RemArgs, [R|Rs]) :-
     ignore(setup_call_catcher_cleanup(true,
             call_with_inference_limit(
                 catch(apply(ImplStud,Arg),Exception,true),
@@ -79,8 +80,8 @@
         (
             H=..[ImplStud|Arg], swritef(C, '%q', [H]), 
             mkresult(Caught, LimitResult, Exception, Smry), 
-            verified(Name, ImplOk, ImplStud, AllowCP,Limit, RemArgs, 
-                [res{expected:Expected, got:Smry, term:C}|Result])
+            R = res{expected:Expected, got:Smry, term:C},
+            verified(Name, ImplOk, ImplStud, AllowCP,Limit, RemArgs, Rs)
         ))).
 
 
@@ -107,7 +108,7 @@
     swritef(Summary, '%q', [Exception]). 
 
 mkresult(fail,_,Summary) :- !,
-    swritef(Summary, '%q', [fail]). 
+    swritef(Summary, '%q', [false]). 
 
 mkresult(exit,!,Summary) :- !,
     swritef(Summary, '%q', [exit]).