From cce31df3a7327c5e35fbfa818d87580219e73128 Mon Sep 17 00:00:00 2001
From: Tristan Gingold
Date: Sun, 14 Dec 2014 21:08:06 +0100
Subject: Reduce size of configuration declaration and guard signal
 declaration.

---
 src/vhdl/iirs.adb | 12 ++++++------
 src/vhdl/iirs.ads | 16 ++++++++--------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/vhdl/iirs.adb b/src/vhdl/iirs.adb
index 6b3a3a0..d35b374 100644
--- a/src/vhdl/iirs.adb
+++ b/src/vhdl/iirs.adb
@@ -296,6 +296,7 @@ package body Iirs is
            | Iir_Kind_Subnature_Declaration
            | Iir_Kind_Package_Declaration
            | Iir_Kind_Package_Body
+           | Iir_Kind_Configuration_Declaration
            | Iir_Kind_Unit_Declaration
            | Iir_Kind_Attribute_Declaration
            | Iir_Kind_Group_Template_Declaration
@@ -306,6 +307,7 @@ package body Iirs is
            | Iir_Kind_Free_Quantity_Declaration
            | Iir_Kind_Enumeration_Literal
            | Iir_Kind_Object_Alias_Declaration
+           | Iir_Kind_Guard_Signal_Declaration
            | Iir_Kind_Signal_Declaration
            | Iir_Kind_Variable_Declaration
            | Iir_Kind_Interface_Constant_Declaration
@@ -445,7 +447,6 @@ package body Iirs is
            | Iir_Kind_Subtype_Definition
            | Iir_Kind_Scalar_Nature_Definition
            | Iir_Kind_Package_Instantiation_Declaration
-           | Iir_Kind_Configuration_Declaration
            | Iir_Kind_Entity_Declaration
            | Iir_Kind_Architecture_Body
            | Iir_Kind_Package_Header
@@ -461,7 +462,6 @@ package body Iirs is
            | Iir_Kind_Function_Body
            | Iir_Kind_Procedure_Body
            | Iir_Kind_File_Declaration
-           | Iir_Kind_Guard_Signal_Declaration
            | Iir_Kind_Constant_Declaration
            | Iir_Kind_Iterator_Declaration
            | Iir_Kind_Interface_Package_Declaration
@@ -1918,14 +1918,14 @@ package body Iirs is
    begin
       pragma Assert (Target /= Null_Iir);
       pragma Assert (Has_Block_Statement (Get_Kind (Target)));
-      return Get_Field7 (Target);
+      return Get_Field5 (Target);
    end Get_Block_Statement;
 
    procedure Set_Block_Statement (Target : Iir; Block : Iir) is
    begin
       pragma Assert (Target /= Null_Iir);
       pragma Assert (Has_Block_Statement (Get_Kind (Target)));
-      Set_Field7 (Target, Block);
+      Set_Field5 (Target, Block);
    end Set_Block_Statement;
 
    function Get_Signal_Driver (Target : Iir_Signal_Declaration) return Iir is
@@ -3185,14 +3185,14 @@ package body Iirs is
    begin
       pragma Assert (Guard /= Null_Iir);
       pragma Assert (Has_Guard_Sensitivity_List (Get_Kind (Guard)));
-      return Iir_To_Iir_List (Get_Field6 (Guard));
+      return Iir_To_Iir_List (Get_Field4 (Guard));
    end Get_Guard_Sensitivity_List;
 
    procedure Set_Guard_Sensitivity_List (Guard : Iir; List : Iir_List) is
    begin
       pragma Assert (Guard /= Null_Iir);
       pragma Assert (Has_Guard_Sensitivity_List (Get_Kind (Guard)));
-      Set_Field6 (Guard, Iir_List_To_Iir (List));
+      Set_Field4 (Guard, Iir_List_To_Iir (List));
    end Set_Guard_Sensitivity_List;
 
    function Get_Block_Block_Configuration (Block : Iir) return Iir is
diff --git a/src/vhdl/iirs.ads b/src/vhdl/iirs.ads
index 57deca8..b1214c7 100644
--- a/src/vhdl/iirs.ads
+++ b/src/vhdl/iirs.ads
@@ -765,7 +765,7 @@ package Iirs is
    --
    --   Get/Set_End_Has_Identifier (Flag9)
 
-   -- Iir_Kind_Configuration_Declaration (Medium)
+   -- Iir_Kind_Configuration_Declaration (Short)
    --
    --   Get/Set_Parent (Field0)
    --   Get/Set_Design_Unit (Alias Field0)
@@ -1373,7 +1373,7 @@ package Iirs is
    --
    --   Get/Set_Name_Staticness (State2)
 
-   -- Iir_Kind_Guard_Signal_Declaration (Medium)
+   -- Iir_Kind_Guard_Signal_Declaration (Short)
    --
    --   Get/Set_Parent (Field0)
    --
@@ -1383,9 +1383,9 @@ package Iirs is
    --
    --   Get/Set_Identifier (Field3)
    --
-   --   Get/Set_Guard_Sensitivity_List (Field6)
+   --   Get/Set_Guard_Sensitivity_List (Field4)
    --
-   --   Get/Set_Block_Statement (Field7)
+   --   Get/Set_Block_Statement (Field5)
    --
    --   Get/Set_Has_Active_Flag (Flag2)
    --
@@ -1694,10 +1694,10 @@ package Iirs is
    --
    --   Get/Set_Chain (Field2)
    --
-   --   Get/Set_Default_Value (Field4)
-   --
    --   Get/Set_Identifier (Field3)
    --
+   --   Get/Set_Default_Value (Field4)
+   --
    --   Get/Set_Tolerance (Field7)
    --
    --   Get/Set_Plus_Terminal (Field8)
@@ -5440,7 +5440,7 @@ package Iirs is
    function Get_Design_Unit (Target : Iir) return Iir;
    procedure Set_Design_Unit (Target : Iir; Unit : Iir);
 
-   --  Field: Field7
+   --  Field: Field5
    function Get_Block_Statement (Target : Iir) return Iir;
    procedure Set_Block_Statement (Target : Iir; Block : Iir);
 
@@ -5896,7 +5896,7 @@ package Iirs is
    procedure Set_Guard_Decl (Target : Iir_Block_Statement; Decl : Iir);
 
    --  Sensitivity list for the implicit guard signal.
-   --  Field: Field6 (uc)
+   --  Field: Field4 (uc)
    function Get_Guard_Sensitivity_List (Guard : Iir) return Iir_List;
    procedure Set_Guard_Sensitivity_List (Guard : Iir; List : Iir_List);
 
-- 
cgit