diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/ghdldrv/ghdlprint.adb | 2 | ||||
| -rw-r--r-- | src/std_names.adb | 6 | ||||
| -rw-r--r-- | src/std_names.ads | 20 | ||||
| -rw-r--r-- | src/vhdl/vhdl-scanner.adb | 6 | ||||
| -rw-r--r-- | src/vhdl/vhdl-tokens.adb | 6 | ||||
| -rw-r--r-- | src/vhdl/vhdl-tokens.ads | 3 |
6 files changed, 29 insertions, 14 deletions
diff --git a/src/ghdldrv/ghdlprint.adb b/src/ghdldrv/ghdlprint.adb index 65eec4ed3..c4eb08da7 100644 --- a/src/ghdldrv/ghdlprint.adb +++ b/src/ghdldrv/ghdlprint.adb @@ -383,7 +383,7 @@ package body Ghdlprint is Disp_Text; Put ("</tt>"); end case; - when Tok_Mod .. Tok_Sequence => + when Tok_Mod .. Tok_Vunit => Disp_Reserved; when Tok_Semi_Colon => Disp_Spaces; diff --git a/src/std_names.adb b/src/std_names.adb index e13c010e6..bdc11e695 100644 --- a/src/std_names.adb +++ b/src/std_names.adb @@ -162,6 +162,9 @@ package body Std_Names is Def ("restrict", Name_Restrict); Def ("restrict_guarantee", Name_Restrict_Guarantee); Def ("sequence", Name_Sequence); + Def ("vmode", Name_Vmode); + Def ("vprop", Name_Vprop); + Def ("vunit", Name_Vunit); Def ("across", Name_Across); Def ("break", Name_Break); @@ -786,9 +789,6 @@ package body Std_Names is Def ("rose", Name_Rose); Def ("strong", Name_Strong); Def ("union", Name_Union); - Def ("vmode", Name_Vmode); - Def ("vprop", Name_Vprop); - Def ("vunit", Name_Vunit); Def ("w", Name_W); Def ("whilenot", Name_Whilenot); Def ("within", Name_Within); diff --git a/src/std_names.ads b/src/std_names.ads index 0e08cac9d..a00d89585 100644 --- a/src/std_names.ads +++ b/src/std_names.ads @@ -181,8 +181,11 @@ package Std_Names is Name_Restrict : constant Name_Id := Name_First_Keyword + 104; Name_Restrict_Guarantee : constant Name_Id := Name_First_Keyword + 105; Name_Sequence : constant Name_Id := Name_First_Keyword + 106; + Name_Vmode : constant Name_Id := Name_First_Keyword + 107; + Name_Vprop : constant Name_Id := Name_First_Keyword + 108; + Name_Vunit : constant Name_Id := Name_First_Keyword + 109; + Name_Last_Vhdl08 : constant Name_Id := Name_Vunit; - Name_Last_Vhdl08 : constant Name_Id := Name_Sequence; subtype Name_Id_Vhdl08_Reserved_Words is Name_Id range Name_Assume .. Name_Last_Vhdl08; @@ -899,10 +902,10 @@ package Std_Names is Name_Ef : constant Name_Id := Name_First_PSL + 09; Name_Eg : constant Name_Id := Name_First_PSL + 10; Name_Ex : constant Name_Id := Name_First_PSL + 11; - Name_Endpoint : constant Name_Id := Name_First_PSL + 12; + Name_Endpoint : constant Name_Id := Name_First_PSL + 12; Name_Eventually : constant Name_Id := Name_First_PSL + 13; Name_Fairness : constant Name_Id := Name_First_PSL + 14; - Name_Fell : constant Name_Id := Name_First_PSL + 15; + Name_Fell : constant Name_Id := Name_First_PSL + 15; Name_Forall : constant Name_Id := Name_First_PSL + 16; Name_G : constant Name_Id := Name_First_PSL + 17; -- Name_In @@ -927,13 +930,10 @@ package Std_Names is Name_Strong : constant Name_Id := Name_First_PSL + 28; -- union -- until - Name_Vmode : constant Name_Id := Name_First_PSL + 29; - Name_Vprop : constant Name_Id := Name_First_PSL + 30; - Name_Vunit : constant Name_Id := Name_First_PSL + 31; - 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_W : constant Name_Id := Name_First_PSL + 29; + Name_Whilenot : constant Name_Id := Name_First_PSL + 30; + Name_Within : constant Name_Id := Name_First_PSL + 31; + Name_X : constant Name_Id := Name_First_PSL + 32; 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 e71b2936e..d0b2910bc 100644 --- a/src/vhdl/vhdl-scanner.adb +++ b/src/vhdl/vhdl-scanner.adb @@ -1272,6 +1272,12 @@ package body Vhdl.Scanner is Current_Token := Tok_Restrict; when Std_Names.Name_Restrict_Guarantee => Current_Token := Tok_Restrict_Guarantee; + when Std_Names.Name_Vmode => + Current_Token := Tok_Vmode; + when Std_Names.Name_Vprop => + Current_Token := Tok_Vprop; + when Std_Names.Name_Vunit => + Current_Token := Tok_Vunit; when others => Current_Token := Tok_Identifier; end case; diff --git a/src/vhdl/vhdl-tokens.adb b/src/vhdl/vhdl-tokens.adb index b06f916d7..089f8173f 100644 --- a/src/vhdl/vhdl-tokens.adb +++ b/src/vhdl/vhdl-tokens.adb @@ -370,6 +370,12 @@ package body Vhdl.Tokens is return "restrict_guarantee"; when Tok_Sequence => return "sequence"; + when Tok_Vmode => + return "vmode"; + when Tok_Vprop => + return "vprop"; + when Tok_Vunit => + return "vunit"; -- AMS-VHDL when Tok_Across => diff --git a/src/vhdl/vhdl-tokens.ads b/src/vhdl/vhdl-tokens.ads index 739134d2c..93b3c77a2 100644 --- a/src/vhdl/vhdl-tokens.ads +++ b/src/vhdl/vhdl-tokens.ads @@ -246,6 +246,9 @@ package Vhdl.Tokens is Tok_Restrict, Tok_Restrict_Guarantee, Tok_Sequence, + Tok_Vmode, + Tok_Vprop, + Tok_Vunit, -- AMS reserved words Tok_Across, |