vhdl: add tok_inherit. Preliminary work for #1899

5 files changed, 27 insertions, 21 deletions

diff --git a/src/std_names.adb b/src/std_names.adb
index ceabfec97..245c8a1a9 100644
--- a/src/std_names.adb
+++ b/src/std_names.adb
@@ -162,6 +162,7 @@ package body Std_Names is
       Def ("restrict",           Name_Restrict);
       Def ("restrict_guarantee", Name_Restrict_Guarantee);
       Def ("sequence",           Name_Sequence);
+      Def ("inherit",            Name_Inherit);
       Def ("vmode",              Name_Vmode);
       Def ("vprop",              Name_Vprop);
       Def ("vunit",              Name_Vunit);
@@ -829,7 +830,6 @@ package body Std_Names is
       Def ("forall",             Name_Forall);
       Def ("g",                  Name_G);
       Def ("inf",                Name_Inf);
-      Def ("inherit",            Name_Inherit);
       Def ("never",              Name_Never);
       Def ("next_a",             Name_Next_A);
       Def ("next_e",             Name_Next_E);
diff --git a/src/std_names.ads b/src/std_names.ads
index 4022a7493..5fc5bf919 100644
--- a/src/std_names.ads
+++ b/src/std_names.ads
@@ -181,9 +181,10 @@ package Std_Names is
    Name_Restrict :           constant Name_Id := Name_First_Keyword + 106;
    Name_Restrict_Guarantee : constant Name_Id := Name_First_Keyword + 107;
    Name_Sequence :           constant Name_Id := Name_First_Keyword + 108;
-   Name_Vmode :              constant Name_Id := Name_First_Keyword + 109;
-   Name_Vprop :              constant Name_Id := Name_First_Keyword + 110;
-   Name_Vunit :              constant Name_Id := Name_First_Keyword + 111;
+   Name_Inherit :            constant Name_Id := Name_First_Keyword + 109;
+   Name_Vmode :              constant Name_Id := Name_First_Keyword + 110;
+   Name_Vprop :              constant Name_Id := Name_First_Keyword + 111;
+   Name_Vunit :              constant Name_Id := Name_First_Keyword + 112;
    Name_Last_Vhdl08 :        constant Name_Id := Name_Vunit;
 
    subtype Name_Id_Vhdl08_Reserved_Words is
@@ -967,33 +968,33 @@ package Std_Names is
    Name_G :                  constant Name_Id := Name_First_PSL + 18;
    --  Name_In
    Name_Inf :                constant Name_Id := Name_First_PSL + 19;
-   Name_Inherit :            constant Name_Id := Name_First_PSL + 20;
+   --  Name_Inherit
    --  Name_Is
-   Name_Never :              constant Name_Id := Name_First_PSL + 21;
+   Name_Never :              constant Name_Id := Name_First_PSL + 20;
    --  Name_Next
-   Name_Next_A :             constant Name_Id := Name_First_PSL + 22;
-   Name_Next_E :             constant Name_Id := Name_First_PSL + 23;
-   Name_Next_Event :         constant Name_Id := Name_First_PSL + 24;
-   Name_Next_Event_A :       constant Name_Id := Name_First_PSL + 25;
-   Name_Next_Event_E :       constant Name_Id := Name_First_PSL + 26;
+   Name_Next_A :             constant Name_Id := Name_First_PSL + 21;
+   Name_Next_E :             constant Name_Id := Name_First_PSL + 22;
+   Name_Next_Event :         constant Name_Id := Name_First_PSL + 23;
+   Name_Next_Event_A :       constant Name_Id := Name_First_PSL + 24;
+   Name_Next_Event_E :       constant Name_Id := Name_First_PSL + 25;
    --  Name_Not
    --  Name_Or
    --  Name_Property
-   Name_Onehot :             constant Name_Id := Name_First_PSL + 27;
-   Name_Onehot0 :            constant Name_Id := Name_First_PSL + 28;
-   Name_Prev :               constant Name_Id := Name_First_PSL + 29;
+   Name_Onehot :             constant Name_Id := Name_First_PSL + 26;
+   Name_Onehot0 :            constant Name_Id := Name_First_PSL + 27;
+   Name_Prev :               constant Name_Id := Name_First_PSL + 28;
    --  Name_Restrict
    --  Name_Restrict_Guarantee
-   Name_Rose :               constant Name_Id := Name_First_PSL + 30;
+   Name_Rose :               constant Name_Id := Name_First_PSL + 29;
    --   sequence
-   Name_Strong :             constant Name_Id := Name_First_PSL + 31;
-   Name_Sync_Abort :         constant Name_Id := Name_First_PSL + 32;
+   Name_Strong :             constant Name_Id := Name_First_PSL + 30;
+   Name_Sync_Abort :         constant Name_Id := Name_First_PSL + 31;
    --   union
    --   until
-   Name_W :                  constant Name_Id := Name_First_PSL + 33;
-   Name_Whilenot :           constant Name_Id := Name_First_PSL + 34;
-   Name_Within :             constant Name_Id := Name_First_PSL + 35;
-   Name_X :                  constant Name_Id := Name_First_PSL + 36;
+   Name_W :                  constant Name_Id := Name_First_PSL + 32;
+   Name_Whilenot :           constant Name_Id := Name_First_PSL + 33;
+   Name_Within :             constant Name_Id := Name_First_PSL + 34;
+   Name_X :                  constant Name_Id := Name_First_PSL + 35;
    Name_Last_PSL :           constant Name_Id := Name_X;
 
    subtype Name_Id_PSL_Keywords is
diff --git a/src/vhdl/vhdl-scanner.adb b/src/vhdl/vhdl-scanner.adb
index 9c3d952ab..0527cd131 100644
--- a/src/vhdl/vhdl-scanner.adb
+++ b/src/vhdl/vhdl-scanner.adb
@@ -1323,6 +1323,8 @@ package body Vhdl.Scanner is
                            Current_Token := Tok_Vprop;
                         when Name_Vunit =>
                            Current_Token := Tok_Vunit;
+                        when Name_Inherit =>
+                           Current_Token := Tok_Inherit;
                         when others =>
                            Current_Token := Tok_Identifier;
                      end case;
diff --git a/src/vhdl/vhdl-tokens.adb b/src/vhdl/vhdl-tokens.adb
index b8838c1db..90ce05bcc 100644
--- a/src/vhdl/vhdl-tokens.adb
+++ b/src/vhdl/vhdl-tokens.adb
@@ -380,6 +380,8 @@ package body Vhdl.Tokens is
             return "restrict_guarantee";
          when Tok_Sequence =>
             return "sequence";
+         when Tok_Inherit =>
+            return "inherit";
          when Tok_Vmode =>
             return "vmode";
          when Tok_Vprop =>
diff --git a/src/vhdl/vhdl-tokens.ads b/src/vhdl/vhdl-tokens.ads
index 5caba9dd9..8812e20e7 100644
--- a/src/vhdl/vhdl-tokens.ads
+++ b/src/vhdl/vhdl-tokens.ads
@@ -253,6 +253,7 @@ package Vhdl.Tokens is
       Tok_Restrict,
       Tok_Restrict_Guarantee,
       Tok_Sequence,
+      Tok_Inherit,
       Tok_Vmode,
       Tok_Vprop,
       Tok_Vunit,