Skip to content

Commit

Permalink
Added check_equal for character.
Browse files Browse the repository at this point in the history
  • Loading branch information
@LarsAsplund
LarsAsplund committed May 19, 2021
1 parent 9d6c76b commit 37bd8bc
Show file tree
Hide file tree
Showing 3 changed files with 199 additions and 10 deletions.
120 changes: 120 additions & 0 deletions vunit/vhdl/check/src/check.vhd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2198,6 +2198,14 @@ package body check_pkg is
return time'image(data);
end function to_string;

function to_string (
constant data : character)
return string is
constant full_string : string(1 to 3) := character'image(data);
begin
return full_string(2 to 2);
end function to_string;

function max (
constant value_1 : integer;
constant value_2 : integer)
Expand Down Expand Up @@ -4212,6 +4220,118 @@ package body check_pkg is
return pass;
end;

procedure check_equal(
constant got : in character;
constant expected : in character;
constant msg : in string := check_result_tag;
constant level : in log_level_t := null_log_level;
constant line_num : in natural := 0;
constant file_name : in string := "") is
variable pass : boolean;
begin
-- pragma translate_off
check_equal(default_checker, pass, got, expected, msg, level, line_num, file_name);
-- pragma translate_on
end;

procedure check_equal(
variable pass : out boolean;
constant got : in character;
constant expected : in character;
constant msg : in string := check_result_tag;
constant level : in log_level_t := null_log_level;
constant line_num : in natural := 0;
constant file_name : in string := "") is
begin
-- pragma translate_off
check_equal(default_checker, pass, got, expected, msg, level, line_num, file_name);
-- pragma translate_on
end;

procedure check_equal(
constant checker : in checker_t;
variable pass : out boolean;
constant got : in character;
constant expected : in character;
constant msg : in string := check_result_tag;
constant level : in log_level_t := null_log_level;
constant line_num : in natural := 0;
constant file_name : in string := "") is
begin
-- pragma translate_off
if got = expected then
pass := true;
if is_pass_visible(checker) then
passing_check(
checker,
std_msg(
"Equality check passed", msg,
"Got " & to_string(got) & "."),
line_num, file_name);
else
passing_check(checker);
end if;
else
pass := false;
failing_check(
checker,
std_msg(
"Equality check failed", msg,
"Got " & to_string(got) & ". " &
"Expected " & to_string(expected) & "."),
level, line_num, file_name);
end if;
-- pragma translate_on
end;

procedure check_equal(
constant checker : in checker_t;
constant got : in character;
constant expected : in character;
constant msg : in string := check_result_tag;
constant level : in log_level_t := null_log_level;
constant line_num : in natural := 0;
constant file_name : in string := "") is
variable pass : boolean;
begin
-- pragma translate_off
check_equal(checker, pass, got, expected, msg, level, line_num, file_name);
-- pragma translate_on
end;

impure function check_equal(
constant got : in character;
constant expected : in character;
constant msg : in string := check_result_tag;
constant level : in log_level_t := null_log_level;
constant line_num : in natural := 0;
constant file_name : in string := "")
return boolean is
variable pass : boolean;
begin
-- pragma translate_off
check_equal(default_checker, pass, got, expected, msg, level, line_num, file_name);
-- pragma translate_on
return pass;
end;

impure function check_equal(
constant checker : in checker_t;
constant got : in character;
constant expected : in character;
constant msg : in string := check_result_tag;
constant level : in log_level_t := null_log_level;
constant line_num : in natural := 0;
constant file_name : in string := "")
return boolean is
variable pass : boolean;
begin
-- pragma translate_off
check_equal(checker, pass, got, expected, msg, level, line_num, file_name);
-- pragma translate_on
return pass;
end;

procedure check_equal(
constant got : in time;
constant expected : in time;
Expand Down
55 changes: 55 additions & 0 deletions vunit/vhdl/check/src/check_api.vhd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1895,6 +1895,61 @@ package check_pkg is
constant file_name : in string := "")
return boolean;

procedure check_equal(
constant got : in character;
constant expected : in character;
constant msg : in string := check_result_tag;
constant level : in log_level_t := null_log_level;
constant line_num : in natural := 0;
constant file_name : in string := "");

procedure check_equal(
variable pass : out boolean;
constant got : in character;
constant expected : in character;
constant msg : in string := check_result_tag;
constant level : in log_level_t := null_log_level;
constant line_num : in natural := 0;
constant file_name : in string := "");

procedure check_equal(
constant checker : in checker_t;
variable pass : out boolean;
constant got : in character;
constant expected : in character;
constant msg : in string := check_result_tag;
constant level : in log_level_t := null_log_level;
constant line_num : in natural := 0;
constant file_name : in string := "");

procedure check_equal(
constant checker : in checker_t;
constant got : in character;
constant expected : in character;
constant msg : in string := check_result_tag;
constant level : in log_level_t := null_log_level;
constant line_num : in natural := 0;
constant file_name : in string := "");

impure function check_equal(
constant got : in character;
constant expected : in character;
constant msg : in string := check_result_tag;
constant level : in log_level_t := null_log_level;
constant line_num : in natural := 0;
constant file_name : in string := "")
return boolean;

impure function check_equal(
constant checker : in checker_t;
constant got : in character;
constant expected : in character;
constant msg : in string := check_result_tag;
constant level : in log_level_t := null_log_level;
constant line_num : in natural := 0;
constant file_name : in string := "")
return boolean;

procedure check_equal(
constant got : in time;
constant expected : in time;
Expand Down
34 changes: 24 additions & 10 deletions vunit/vhdl/check/tools/generate_check_equal.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -436,25 +436,25 @@
(
"std_logic",
"std_logic",
"'1'",
"'1'",
"'0'",
"'0'",
"'1'",
"'1'",
"'0'",
"std_logic'('1')",
"std_logic'('1')",
"std_logic'('0')",
"std_logic'('0')",
"std_logic'('1')",
"std_logic'('1')",
"std_logic'('0')",
"1",
"1",
"0",
),
(
"std_logic",
"boolean",
"'1'",
"std_logic'('1')",
"true",
"'0'",
"std_logic'('0')",
"false",
"'1'",
"std_logic'('1')",
"true",
"false",
"1",
Expand Down Expand Up @@ -503,6 +503,20 @@
"test",
"tests",
),
(
"character",
"character",
"character'('x')",
"character'('x')",
"character'val(0)",
"character'val(0)",
"character'val(255)",
"character'val(255)",
"character'('y')",
"x",
"x",
"y",
),
(
"time",
"time",
Expand Down

0 comments on commit 37bd8bc

Please sign in to comment.