| Some x -> Some (f x)
end
+(* TODO: ~expect:Output of 'a | Exception of (exn -> bool) *)
type t =
{ name : string
; code : string
; out_lexing : (Tiger_parser.token list) option
; out_parsing : Tiger_absyn.t option
- ; is_error_expected : (Tiger_error.t -> bool)
+ ; is_error_expected_semant : (Tiger_error.t -> bool) option
}
type color =
let color_off = "\027[0m" in
sprintf "%s%s%s" color_on string color_off
+let status indicator info =
+ match info with
+ | "" -> indicator
+ | _ -> sprintf "%s: %s" indicator info
+
+(* TODO: Perhaps a global option whether to print non-fail info? *)
+let status_pass ?(info="") () =
+ status (color Green "Pass") info
+
+let status_fail ?(info="") () =
+ status (color Red "Fail") info
+
+let status_skip ?(info="") () =
+ (*let indicator = (color Yellow "Skip") in*)
+ let indicator = "Skip" in
+ status indicator info
+
let case
- ?(out_lexing)
- ?(out_parsing)
- ?(is_error_expected=(fun _ -> false))
+ ?(out_lexing=None)
+ ?(out_parsing=None)
+ ?(is_error_expected_semant=None)
~code
name
=
; code
; out_lexing
; out_parsing
- ; is_error_expected
+ ; is_error_expected_semant
}
let bar_sep = String.make 80 '-'
fun n ->
String.make (n * unit_spaces) ' '
-let pass_lexing code : (Tiger_parser.token list, string) result =
- let lexbuf = Lexing.from_string code in
+let lexbuf_set_filename lb filename
+: unit
+=
+ let Lexing.({lex_start_p; lex_curr_p; _}) = lb in
+ lb.Lexing.lex_start_p <- {lex_start_p with Lexing.pos_fname = filename};
+ lb.Lexing.lex_curr_p <- {lex_curr_p with Lexing.pos_fname = filename}
+
+let lexbuf_create ~filename ~code =
+ let lb = Lexing.from_string code in
+ lexbuf_set_filename lb filename;
+ lb
+
+let pass_lexing ~fake_filename ~code
+: (Tiger_parser.token list, string) result
+=
+ let lexbuf = lexbuf_create ~filename:fake_filename ~code in
let rec tokens () =
let token = Tiger_lexer.token lexbuf in
(* Avoiding fragile pattern-matching *)
| exception e -> Error (Printexc.to_string e)
| tokens -> Ok tokens
-let pass_parsing code : (Tiger_absyn.t, string) result =
- let lb = Lexing.from_string code in
+let pass_parsing ~fake_filename ~code
+: (Tiger_absyn.t, string) result
+=
+ let lb = lexbuf_create ~filename:fake_filename ~code in
match Tiger_parser.program Tiger_lexer.token lb with
| exception Parsing.Parse_error ->
let module L = Lexing in
| ast ->
Ok ast
+let pass_semant (absyn_opt : Tiger_absyn.t option)
+: (unit, string) result
+=
+ match absyn_opt with
+ | None ->
+ Error "AST not provided"
+ | Some absyn ->
+ Ok (Tiger_semant.transProg absyn)
+
let s = sprintf
let p = printf
let p_ln = print_newline
let p_indent n = p "%s" (indent n)
let run tests =
- let error_count = ref 0 in
- let run_pass ~f ~input ~expect_output ~is_error_expected =
+ let failure_count = ref 0 in
+ let run_pass ~f ~expect_output ~is_error_expected =
+ let is_error_expected =
+ match is_error_expected with
+ | None -> (fun _ -> false)
+ | Some f -> f
+ in
let output_status = "n/a" in
let output_value = None in
- match f input with
+ match f () with
| exception e ->
- let status_text, error_text =
+ let execution_status =
(match e with
| Tiger_error.T e when is_error_expected e ->
- ((color Green "OK"), Tiger_error.to_string e)
+ status_pass () (*~info:(Tiger_error.to_string e)*)
| Tiger_error.T e ->
- incr error_count;
- ((color Red "ERROR"), Tiger_error.to_string e)
+ incr failure_count;
+ status_fail () ~info:(Tiger_error.to_string e)
| e ->
- incr error_count;
- ((color Red "ERROR"), Printexc.to_string e)
+ incr failure_count;
+ status_fail () ~info:(Printexc.to_string e)
)
in
- ( s "%s: %s" status_text error_text
+ ( execution_status
, output_status
, output_value
)
- | Error msg ->
- incr error_count;
- ( s "%s: %s" (color Red "ERROR") msg
+ | Error info ->
+ incr failure_count;
+ ( status_fail ~info ()
, output_status
, output_value
)
| Ok produced ->
- let execution_status = s "%s" (color Green "OK") in
+ let execution_status = status_pass () in
let output_status =
match
Option.map expect_output (fun expected -> expected = produced)
with
| None ->
- s "%s" (color Yellow "expected output not provided")
+ status_skip () (*~info:"expected output not provided"*)
| Some true ->
- s "%s" (color Green "OK")
+ status_pass ()
| Some false ->
- incr error_count;
- s "%s" (color Red "ERROR")
+ incr failure_count;
+ status_fail ()
in
let output_value = Some produced in
(execution_status, output_status, output_value)
in
+ let test_case_count = ref 0 in
List.iter tests ~f:(
- fun {name; code; out_lexing; out_parsing; is_error_expected} ->
+ fun
+ { name
+ ; code
+ ; out_lexing
+ ; out_parsing
+ ; is_error_expected_semant
+ }
+ ->
+ incr test_case_count;
let (stat_lex_exe, stat_lex_out_cmp, _) =
run_pass
- ~f:pass_lexing
- ~input:code
+ ~f:(fun () -> pass_lexing ~fake_filename:name ~code)
~expect_output:out_lexing
- ~is_error_expected
+ ~is_error_expected:None
in
- let (stat_pars_exe, stat_pars_out_cmp, _) =
+ let (stat_pars_exe, stat_pars_out_cmp, absyn_opt) =
run_pass
- ~f:pass_parsing
- ~input:code
+ ~f:(fun () -> pass_parsing ~fake_filename:name ~code)
~expect_output:out_parsing
- ~is_error_expected
+ ~is_error_expected:None
+ in
+ let (stat_semant_exe, stat_semant_out_cmp, _) =
+ run_pass
+ ~f:(fun () -> pass_semant absyn_opt)
+ ~expect_output:(Some ())
+ ~is_error_expected:is_error_expected_semant
in
p "%s" bar_sep; p_ln ();
p "Test: %S" name; p_ln ();
p_indent 1; p "Parsing:"; p_ln ();
p_indent 2; p "exe: %s" stat_pars_exe ; p_ln ();
p_indent 2; p "out: %s" stat_pars_out_cmp; p_ln ();
+ p_indent 1; p "Semantic Analysis:"; p_ln ();
+ p_indent 2; p "exe: %s" stat_semant_exe ; p_ln ();
+ p_indent 2; p "out: %s" stat_semant_out_cmp; p_ln ();
);
p "%s" bar_end; p_ln ();
- let failures = !error_count in
- let clr = (if failures = 0 then Green else Red) in
- p "Failures: %s" (color clr (string_of_int failures)); p_ln ();
+ p "%s"
+ ( let info =
+ s "%d failures in %d test cases" !failure_count !test_case_count
+ in
+ match !failure_count with
+ | 0 -> status_pass () ~info
+ | _ -> status_fail () ~info
+ );
+ p_ln ();
p "%s" bar_end; p_ln ();
- exit failures
+ exit !failure_count
home / code / tiger.ml.git / blobdiff