Issue#1492: Removed constrained_array_definition_100, shuffled other rules names down.

JHertz5 · JHertz5 · commit 04cf277b5494 · 2025-09-11T23:39:42.000+01:00
diff --git a/docs/configuring_whitespace_rules.rst b/docs/configuring_whitespace_rules.rst
@@ -162,7 +162,6 @@ Rules Enforcing Whitespace
 * `constant_101 <constant_rules.html#constant-101>`_
 * `constrained_array_definition_100 <constrained_array_definition_rules.html#constrained-array-definition-100>`_
 * `constrained_array_definition_101 <constrained_array_definition_rules.html#constrained-array-definition-101>`_
-* `constrained_array_definition_102 <constrained_array_definition_rules.html#constrained-array-definition-102>`_
 * `context_002 <context_rules.html#context-002>`_
 * `context_017 <context_rules.html#context-017>`_
 * `context_018 <context_rules.html#context-018>`_
diff --git a/docs/constrained_array_definition_rules.rst b/docs/constrained_array_definition_rules.rst
@@ -8,29 +8,6 @@ constrained_array_definition_100
 
 |phase_2| |error| |whitespace|
 
-This rule checks for whitespace after the **array** keyword.
-
-|configuring_whitespace_rules_link|
-
-**Violation**
-
-.. code-block:: vhdl
-
-   type t_u_array is array (1 downto 0) of unsigned;
-   type t_u_array is array     (1 downto 0) of unsigned;
-
-**Fix**
-
-.. code-block:: vhdl
-
-   type t_u_array is array(1 downto 0) of unsigned;
-   type t_u_array is array(1 downto 0) of unsigned;
-
-constrained_array_definition_101
-################################
-
-|phase_2| |error| |whitespace|
-
 This rule checks for a single space before the **of** keyword.
 
 |configuring_whitespace_rules_link|
@@ -47,7 +24,7 @@ This rule checks for a single space before the **of** keyword.
 
    type t_u_array is array(1 downto 0) of unsigned;
 
-constrained_array_definition_102
+constrained_array_definition_101
 ################################
 
 |phase_2| |error| |whitespace|
diff --git a/docs/rule_groups/whitespace_rule_group.rst b/docs/rule_groups/whitespace_rule_group.rst
@@ -56,7 +56,6 @@ Rules Enforcing Whitespace Rule Group
 * `constant_101 <../constant_rules.html#constant-101>`_
 * `constrained_array_definition_100 <../constrained_array_definition_rules.html#constrained-array-definition-100>`_
 * `constrained_array_definition_101 <../constrained_array_definition_rules.html#constrained-array-definition-101>`_
-* `constrained_array_definition_102 <../constrained_array_definition_rules.html#constrained-array-definition-102>`_
 * `context_002 <../context_rules.html#context-002>`_
 * `context_017 <../context_rules.html#context-017>`_
 * `context_018 <../context_rules.html#context-018>`_
diff --git a/docs/unbounded_array_definition_rules.rst b/docs/unbounded_array_definition_rules.rst
@@ -16,7 +16,7 @@ This rule checks for whitespace after the **array** keyword.
 
 .. code-block:: vhdl
 
-   type t_u_array_unconstrained is array(natural range <>) of unsigned;
+   type t_u_array_unconstrained is array (natural range <>) of unsigned;
    type t_u_array_unconstrained is array     (natural range <>) of unsigned;
 
 **Fix**
@@ -45,7 +45,7 @@ This rule checks for a single space before the **of** keyword.
 
 .. code-block:: vhdl
 
-   type t_u_array_unconstrained is array (natural range <>) of unsigned;
+   type t_u_array_unconstrained is array(natural range <>) of unsigned;
 
 unbounded_array_definition_102
 ##############################
@@ -66,7 +66,7 @@ This rule checks for a single space after the **of** keyword.
 
 .. code-block:: vhdl
 
-   type t_u_array_unconstrained is array (natural range <>) of unsigned;
+   type t_u_array_unconstrained is array(natural range <>) of unsigned;
 
 unbounded_array_definition_500
 ##############################
diff --git a/tests/constrained_array_definition/rule_100_test_input.fixed.vhd b/tests/constrained_array_definition/rule_100_test_input.fixed.vhd
@@ -3,11 +3,9 @@ architecture RTL of FIFO is
 
   type my_array is array(natural range 0 to 7) of std_logic_vector(7 downto 0);
   type my_array is array(natural range 0 to 7) of std_logic_vector(7 downto 0);
-  type my_array is array(natural range 0 to 7) of std_logic_vector(7 downto 0);
 
   type my_array is array(0 to 7) of std_logic_vector(7 downto 0);
   type my_array is array(0 to 7) of std_logic_vector(7 downto 0);
-  type my_array is array(0 to 7) of std_logic_vector(7 downto 0);
 
 begin
 
diff --git a/tests/constrained_array_definition/rule_100_test_input.vhd b/tests/constrained_array_definition/rule_100_test_input.vhd
@@ -1,12 +1,10 @@
 
 architecture RTL of FIFO is
 
-  type my_array is array       (natural range 0 to 7) of std_logic_vector(7 downto 0);
-  type my_array is array (natural range 0 to 7) of std_logic_vector(7 downto 0);
+  type my_array is array(natural range 0 to 7)      of std_logic_vector(7 downto 0);
   type my_array is array(natural range 0 to 7) of std_logic_vector(7 downto 0);
 
-  type my_array is array       (0 to 7) of std_logic_vector(7 downto 0);
-  type my_array is array (0 to 7) of std_logic_vector(7 downto 0);
+  type my_array is array(0 to 7)      of std_logic_vector(7 downto 0);
   type my_array is array(0 to 7) of std_logic_vector(7 downto 0);
 
 begin
diff --git a/tests/constrained_array_definition/rule_101_test_input.vhd b/tests/constrained_array_definition/rule_101_test_input.vhd
@@ -1,10 +1,10 @@
 
 architecture RTL of FIFO is
 
-  type my_array is array(natural range 0 to 7)      of std_logic_vector(7 downto 0);
+  type my_array is array(natural range 0 to 7) of        std_logic_vector(7 downto 0);
   type my_array is array(natural range 0 to 7) of std_logic_vector(7 downto 0);
 
-  type my_array is array(0 to 7)      of std_logic_vector(7 downto 0);
+  type my_array is array(0 to 7) of        std_logic_vector(7 downto 0);
   type my_array is array(0 to 7) of std_logic_vector(7 downto 0);
 
 begin
diff --git a/tests/constrained_array_definition/rule_102_test_input.fixed.vhd b/tests/constrained_array_definition/rule_102_test_input.fixed.vhd
diff --git a/tests/constrained_array_definition/rule_102_test_input.vhd b/tests/constrained_array_definition/rule_102_test_input.vhd
diff --git a/tests/constrained_array_definition/test_rule_100.py b/tests/constrained_array_definition/test_rule_100.py
@@ -30,7 +30,7 @@ def test_rule_100(self):
         self.assertEqual(oRule.name, "constrained_array_definition")
         self.assertEqual(oRule.identifier, "100")
 
-        lExpected = [4, 5, 8, 9]
+        lExpected = [4, 7]
 
         oRule.analyze(self.oFile)
         self.assertEqual(lExpected, utils.extract_violation_lines_from_violation_object(oRule.violations))
diff --git a/tests/constrained_array_definition/test_rule_102.py b/tests/constrained_array_definition/test_rule_102.py
diff --git a/vsg/rules/constrained_array_definition/__init__.py b/vsg/rules/constrained_array_definition/__init__.py
@@ -2,6 +2,5 @@
 
 from .rule_100 import rule_100
 from .rule_101 import rule_101
-from .rule_102 import rule_102
 from .rule_500 import rule_500
 from .rule_501 import rule_501
diff --git a/vsg/rules/constrained_array_definition/rule_100.py b/vsg/rules/constrained_array_definition/rule_100.py
@@ -1,33 +1,31 @@
 # -*- coding: utf-8 -*-
 
 from vsg import token
-from vsg.rules.whitespace_after_token import Rule
+from vsg.rules.whitespace_before_token import Rule
 
 lTokens = []
-lTokens.append(token.constrained_array_definition.array_keyword)
+lTokens.append(token.constrained_array_definition.of_keyword)
 
 
 class rule_100(Rule):
     """
-    This rule checks for whitespace after the **array** keyword.
+    This rule checks for a single space before the **of** keyword.
 
     |configuring_whitespace_rules_link|
 
     **Violation**
 
     .. code-block:: vhdl
 
-       type t_u_array is array (1 downto 0) of unsigned;
-       type t_u_array is array     (1 downto 0) of unsigned;
+       type t_u_array is array(1 downto 0)    of unsigned;
 
     **Fix**
 
     .. code-block:: vhdl
 
        type t_u_array is array(1 downto 0) of unsigned;
-       type t_u_array is array(1 downto 0) of unsigned;
     """
 
     def __init__(self):
         super().__init__(lTokens)
-        self.number_of_spaces = 0
+        self.number_of_spaces = 1
diff --git a/vsg/rules/constrained_array_definition/rule_101.py b/vsg/rules/constrained_array_definition/rule_101.py
@@ -1,23 +1,23 @@
 # -*- coding: utf-8 -*-
 
 from vsg import token
-from vsg.rules.whitespace_before_token import Rule
+from vsg.rules.whitespace_after_token import Rule
 
 lTokens = []
 lTokens.append(token.constrained_array_definition.of_keyword)
 
 
 class rule_101(Rule):
     """
-    This rule checks for a single space before the **of** keyword.
+    This rule checks for a single space after the **of** keyword.
 
     |configuring_whitespace_rules_link|
 
     **Violation**
 
     .. code-block:: vhdl
 
-       type t_u_array is array(1 downto 0)    of unsigned;
+       type t_u_array is array(1 downto 0) of     unsigned;
 
     **Fix**
 
diff --git a/vsg/rules/constrained_array_definition/rule_102.py b/vsg/rules/constrained_array_definition/rule_102.py
