diff --git a/tests/function/rule_508_test_input.fixed.vhd b/tests/function/rule_508_test_input.fixed.vhd index 23a110e2..9315e00c 100644 --- a/tests/function/rule_508_test_input.fixed.vhd +++ b/tests/function/rule_508_test_input.fixed.vhd @@ -1,88 +1,7 @@ architecture rtl of test is - function my_func ( - param1 : in integer; - variable param2 : out integer; - constant param3 : in integer; - signal param4 : out integer; - file param5 : my_file - ) return integer is - - constant con : integer := param1; - variable var : integer := param4; - - procedure my_proc ( - param1 : in integer; - variable param2 : out integer; - constant param3 : in integer; - signal param4 : out integer; - file param5 : my_file - ) is - constant con : integer := param1; - begin - loop - next when param3 = param4; - end loop; - end procedure; - - function my_func ( - param1 : in integer; - variable param2 : out integer; - constant param3 : in integer; - signal param4 : out integer; - file param5 : my_file - ) return integer is - - constant con : integer := param1; - variable var : integer := param4; - - begin - - -- PARAM1 - sig <= param1 + param2; - var := param1 + param2; - sig <= param1 when true else param2; - var := param1 when true else param2; - with param5 select param4 := - param1 when 1, - param2 when 0, - param3 when others; - with param4 select param5 <= - param1 when 1, - param2 when 0, - param3 when others; - - return param1; - - end function my_func; - - begin - - -- PARAM1 - sig <= param1 + param2; - var := param1 + param2; - sig <= param1 when true else param2; - var := param1 when true else param2; - with param5 select param4 := - param1 when 1, - param2 when 0, - param3 when others; - with param4 select param5 <= - param1 when 1, - param2 when 0, - param3 when others; - - return my_func( - param1 => param1, - param2 => param2, - param3 => param3, - param4 => param4, - param5 => param5 - ); - - end function my_func; - + -- Simple function function my_func ( Param1 : in integer; variable Param2 : out integer; @@ -114,6 +33,7 @@ architecture rtl of test is end function my_func; + -- No parameters in this function - the contents shouldn't change. function my_func return integer is constant con : integer := PARAM1; @@ -139,6 +59,166 @@ architecture rtl of test is end function my_func; + -- Function with nested subprograms. + function my_func ( + param1 : in integer; + variable param2 : out integer; + constant param3 : in integer; + signal param4 : out integer; + file param5 : my_file + ) return integer is + + constant con : integer := param1; + variable var : integer := param4; + + procedure PARAM1 ( + PARAM1 : in integer; + variable PARAM2 : out integer; + constant PARAM3 : in integer + ) is + constant con : integer := param1; + begin + loop + next when parAM3 = param4; + end loop; + end procedure; + + function my_func ( + variable Param2 : out integer; + constant Param3 : in integer; + signal Param4 : out integer; + file Param5 : my_file + ) return integer is + + constant con : integer := param1; + variable var : integer := Param4; + + begin + + -- PARAM1 + sig <= param1 + Param2; + var := param1 + Param2; + sig <= param1 when true else Param2; + var := param1 when true else Param2; + with Param5 select Param4 := + param1 when 1, + Param2 when 0, + Param3 when others; + with Param4 select Param5 <= + param1 when 1, + Param2 when 0, + Param3 when others; + + return param1; + + end function my_func; + + begin + + -- PARAM1 + sig <= param1 + param2; + var := param1 + param2; + sig <= param1 when true else param2; + var := param1 when true else param2; + with param5 select param4 := + param1 when 1, + param2 when 0, + param3 when others; + with param4 select param5 <= + param1 when 1, + param2 when 0, + param3 when others; + + return my_func( + param1 => param1, + param2 => param2, + param3 => param3, + param4 => param4, + param5 => param5 + ); + + end function my_func; + + -- Procedure with nested subprograms. + procedure my_proc ( + param1 : in integer; + variable param2 : out integer; + constant param3 : in integer; + signal param4 : out integer; + file param5 : my_file + ) is + + constant con : integer := PARAM1; + variable var : integer := PARam4; + + procedure PARAM1 ( + PARAM1 : in integer; + variable PARAM2 : out integer; + constant PARAM3 : in integer + ) is + constant con : integer := PARaM1; + begin + loop + next when PARaM3 = PARam4; + end loop; + end procedure; + + function my_func ( + variable Param2 : out integer; + constant Param3 : in integer; + signal Param4 : out integer; + file Param5 : my_file + ) return integer is + + constant con : integer := PARAM1; + variable var : integer := Param4; + + begin + + -- PARAM1 + sig <= PARAM1 + Param2; + var := PARAM1 + Param2; + sig <= PARAM1 when true else Param2; + var := PARAM1 when true else Param2; + with Param5 select Param4 := + PARAM1 when 1, + Param2 when 0, + Param3 when others; + with Param4 select Param5 <= + PARAM1 when 1, + Param2 when 0, + Param3 when others; + + return PARAM1; + + end function my_func; + + begin + + -- PARAM1 + sig <= PARAM1 + PARAM2; + var := PARAM1 + PARAM2; + sig <= PARAM1 when true else PARAM2; + var := PARAM1 when true else PARAM2; + with PARAM5 select PARAM4 := + PARAM1 when 1, + PARAM2 when 0, + PARAM3 when others; + with PARAM4 select PARAM5 <= + PARAM1 when 1, + PARAM2 when 0, + PARAM3 when others; + + return my_func( + param1 => parAm1, + param2 => parAm2, + param3 => parAm3, + param4 => parAm4, + param5 => parAm5 + ); + + end procedure my_proc; + begin end architecture rtl; diff --git a/tests/function/rule_508_test_input.vhd b/tests/function/rule_508_test_input.vhd index 1a2936d1..84e11e99 100644 --- a/tests/function/rule_508_test_input.vhd +++ b/tests/function/rule_508_test_input.vhd @@ -1,88 +1,7 @@ architecture rtl of test is - function my_func ( - param1 : in integer; - variable param2 : out integer; - constant param3 : in integer; - signal param4 : out integer; - file param5 : my_file - ) return integer is - - constant con : integer := PARAM1; - variable var : integer := PARAM4; - - procedure my_proc ( - PARAM1 : in integer; - variable PARAM2 : out integer; - constant PARAM3 : in integer; - signal PARAM4 : out integer; - file PARAM5 : my_file - ) is - constant con : integer := param1; - begin - loop - next when param3 = param4; - end loop; - end procedure; - - function my_func ( - Param1 : in integer; - variable Param2 : out integer; - constant Param3 : in integer; - signal Param4 : out integer; - file Param5 : my_file - ) return integer is - - constant con : integer := PARAM1; - variable var : integer := PARAM4; - - begin - - -- PARAM1 - sig <= PARAM1 + PARAM2; - var := PARAM1 + PARAM2; - sig <= PARAM1 when true else PARAM2; - var := PARAM1 when true else PARAM2; - with PARAM5 select PARAM4 := - PARAM1 when 1, - PARAM2 when 0, - PARAM3 when others; - with PARAM4 select PARAM5 <= - PARAM1 when 1, - PARAM2 when 0, - PARAM3 when others; - - return PARAM1; - - end function my_func; - - begin - - -- PARAM1 - sig <= Param1 + Param2; - var := Param1 + Param2; - sig <= Param1 when true else Param2; - var := Param1 when true else Param2; - with Param5 select Param4 := - Param1 when 1, - Param2 when 0, - Param3 when others; - with Param4 select Param5 <= - Param1 when 1, - Param2 when 0, - Param3 when others; - - return my_func( - Param1 => Param1, - Param2 => Param2, - Param3 => Param3, - Param4 => Param4, - Param5 => Param5 - ); - - end function my_func; - + -- Simple function function my_func ( Param1 : in integer; variable Param2 : out integer; @@ -114,6 +33,7 @@ architecture rtl of test is end function my_func; + -- No parameters in this function - the contents shouldn't change. function my_func return integer is constant con : integer := PARAM1; @@ -139,6 +59,166 @@ architecture rtl of test is end function my_func; + -- Function with nested subprograms. + function my_func ( + param1 : in integer; + variable param2 : out integer; + constant param3 : in integer; + signal param4 : out integer; + file param5 : my_file + ) return integer is + + constant con : integer := paRAM1; + variable var : integer := paRAM4; + + procedure PARAM1 ( + PARAM1 : in integer; + variable PARAM2 : out integer; + constant PARAM3 : in integer + ) is + constant con : integer := param1; + begin + loop + next when parAM3 = PARAm4; + end loop; + end procedure; + + function my_func ( + variable Param2 : out integer; + constant Param3 : in integer; + signal Param4 : out integer; + file Param5 : my_file + ) return integer is + + constant con : integer := param1; + variable var : integer := PARAM4; + + begin + + -- PARAM1 + sig <= PARAM1 + ParaM2; + var := PARAM1 + ParaM2; + sig <= PARAM1 when true else ParaM2; + var := PARAM1 when true else ParaM2; + with param5 select param4 := + PARAM1 when 1, + ParaM2 when 0, + Param3 when others; + with param4 select param5 <= + PARAM1 when 1, + ParaM2 when 0, + Param3 when others; + + return PARAM1; + + end function my_func; + + begin + + -- PARAM1 + sig <= PARAM1 + PARAM2; + var := PARAM1 + PARAM2; + sig <= PARAM1 when true else PARAM2; + var := PARAM1 when true else PARAM2; + with PARAM5 select PARAM4 := + PARAM1 when 1, + PARAM2 when 0, + PARAM3 when others; + with PARAM4 select PARAM5 <= + PARAM1 when 1, + PARAM2 when 0, + PARAM3 when others; + + return my_func( + param1 => pAram1, + param2 => pAram2, + param3 => pAram3, + param4 => pAram4, + param5 => pAram5 + ); + + end function my_func; + + -- Procedure with nested subprograms. + procedure my_proc ( + param1 : in integer; + variable param2 : out integer; + constant param3 : in integer; + signal param4 : out integer; + file param5 : my_file + ) is + + constant con : integer := PARAM1; + variable var : integer := PARam4; + + procedure PARAM1 ( + PARAM1 : in integer; + variable PARAM2 : out integer; + constant PARAM3 : in integer + ) is + constant con : integer := PARaM1; + begin + loop + next when PARaM3 = PARam4; + end loop; + end procedure; + + function my_func ( + variable Param2 : out integer; + constant Param3 : in integer; + signal Param4 : out integer; + file Param5 : my_file + ) return integer is + + constant con : integer := PARAM1; + variable var : integer := param4; + + begin + + -- PARAM1 + sig <= PARAM1 + PARAM2; + var := PARAM1 + PARAM2; + sig <= PARAM1 when true else PARAM2; + var := PARAM1 when true else PARAM2; + with PARAM5 select PARAM4 := + PARAM1 when 1, + PARAM2 when 0, + PARAM3 when others; + with PARAM4 select PARAM5 <= + PARAM1 when 1, + PARAM2 when 0, + PARAM3 when others; + + return PARAM1; + + end function my_func; + + begin + + -- PARAM1 + sig <= PARAM1 + PARAM2; + var := PARAM1 + PARAM2; + sig <= PARAM1 when true else PARAM2; + var := PARAM1 when true else PARAM2; + with PARAM5 select PARAM4 := + PARAM1 when 1, + PARAM2 when 0, + PARAM3 when others; + with PARAM4 select PARAM5 <= + PARAM1 when 1, + PARAM2 when 0, + PARAM3 when others; + + return my_func( + param1 => parAm1, + param2 => parAm2, + param3 => parAm3, + param4 => parAm4, + param5 => parAm5 + ); + + end procedure my_proc; + begin end architecture rtl; diff --git a/tests/function/test_rule_508.py b/tests/function/test_rule_508.py index 2c838663..0664b252 100644 --- a/tests/function/test_rule_508.py +++ b/tests/function/test_rule_508.py @@ -33,11 +33,10 @@ class test_function_rule(unittest.TestCase): self.assertEqual(oRule.groups, ["case", "case::name"]) lExpected = [] - lExpected.extend([12, 13, 16, 17, 18, 19, 20, 30, 31, 32, 33, 34, 37, 37, 38, 38, 43, 43, 43, 43, 44, 44, 44]) - lExpected.extend([44, 45, 45, 45, 45, 46, 46, 46, 46, 47, 47, 47, 47, 48, 48, 49, 49, 50, 50, 51, 51, 51, 51]) - lExpected.extend([52, 52, 53, 53, 54, 54, 56, 56, 63, 63, 64, 64, 65, 65, 66, 66, 67, 67, 68, 69, 70, 71, 71]) - lExpected.extend([72, 73, 74, 77, 77, 78, 78, 79, 79, 80, 80, 81, 81, 94, 95, 100, 100, 101, 101, 102, 102]) - lExpected.extend([103, 103, 104, 104, 105, 106, 107, 108, 108, 109, 110, 111, 113]) + lExpected.extend([13, 14, 19, 19, 20, 20, 21, 21, 22, 22, 23, 23, 24, 25, 26, 27, 27, 28, 29, 30, 32, 71, 72]) + lExpected.extend([82, 94, 99, 99, 100, 100, 101, 101, 102, 102, 103, 103, 104, 105, 107, 107, 108, 109, 112]) + lExpected.extend([119, 119, 120, 120, 121, 121, 122, 122, 123, 123, 124, 125, 126, 127, 127, 128, 129, 130]) + lExpected.extend([133, 134, 135, 136, 137, 174, 179, 180, 181, 182, 183, 183, 185, 186, 187, 187, 189, 190]) oRule.analyze(self.oFile) self.assertEqual(lExpected, utils.extract_violation_lines_from_violation_object(oRule.violations))