Skip to content

Issue#1399: external names would end processing of the name production. #1400

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Issue#1399: external names would end processing of the name production. #1400

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
70 changes: 38 additions & 32 deletions tests/vhdlFile/alias_declaration/classification_results.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,19 +14,7 @@
3 |
<class 'vsg.parser.blank_line'>
--------------------------------------------------------------------------------
4 |
<class 'vsg.parser.blank_line'>
--------------------------------------------------------------------------------
5 |
<class 'vsg.parser.blank_line'>
--------------------------------------------------------------------------------
6 |
<class 'vsg.parser.blank_line'>
--------------------------------------------------------------------------------
7 |
<class 'vsg.parser.blank_line'>
--------------------------------------------------------------------------------
8 | alias ident : std_logic_vector(3 downto 0) is write_enable [name1, name2 return integer];
4 | alias ident : std_logic_vector(3 downto 0) is write_enable [name1, name2 return integer];
<class 'vsg.token.alias_declaration.alias_keyword'>
<class 'vsg.token.alias_declaration.alias_designator'>
<class 'vsg.token.alias_declaration.colon'>
Expand All @@ -47,10 +35,10 @@
<class 'vsg.token.signature.close_bracket'>
<class 'vsg.token.alias_declaration.semicolon'>
--------------------------------------------------------------------------------
9 |
5 |
<class 'vsg.parser.blank_line'>
--------------------------------------------------------------------------------
10 | alias ident : std_logic_vector(3 downto 0) is write_enable [name1, name2];
6 | alias ident : std_logic_vector(3 downto 0) is write_enable [name1, name2];
<class 'vsg.token.alias_declaration.alias_keyword'>
<class 'vsg.token.alias_declaration.alias_designator'>
<class 'vsg.token.alias_declaration.colon'>
Expand All @@ -69,10 +57,10 @@
<class 'vsg.token.signature.close_bracket'>
<class 'vsg.token.alias_declaration.semicolon'>
--------------------------------------------------------------------------------
11 |
7 |
<class 'vsg.parser.blank_line'>
--------------------------------------------------------------------------------
12 | alias ident : std_logic_vector(3 downto 0) is write_enable [return integer];
8 | alias ident : std_logic_vector(3 downto 0) is write_enable [return integer];
<class 'vsg.token.alias_declaration.alias_keyword'>
<class 'vsg.token.alias_declaration.alias_designator'>
<class 'vsg.token.alias_declaration.colon'>
Expand All @@ -90,10 +78,10 @@
<class 'vsg.token.signature.close_bracket'>
<class 'vsg.token.alias_declaration.semicolon'>
--------------------------------------------------------------------------------
13 |
9 |
<class 'vsg.parser.blank_line'>
--------------------------------------------------------------------------------
14 | alias ident : std_logic_vector(3 downto 0) is write_enable(15 downto 0);
10 | alias ident : std_logic_vector(3 downto 0) is write_enable(15 downto 0);
<class 'vsg.token.alias_declaration.alias_keyword'>
<class 'vsg.token.alias_declaration.alias_designator'>
<class 'vsg.token.alias_declaration.colon'>
Expand All @@ -112,13 +100,13 @@
<class 'vsg.token.todo.close_parenthesis'>
<class 'vsg.token.alias_declaration.semicolon'>
--------------------------------------------------------------------------------
15 |
11 |
<class 'vsg.parser.blank_line'>
--------------------------------------------------------------------------------
16 |
12 |
<class 'vsg.parser.blank_line'>
--------------------------------------------------------------------------------
17 | alias ident is write_enable [name1, name2 return integer];
13 | alias ident is write_enable [name1, name2 return integer];
<class 'vsg.token.alias_declaration.alias_keyword'>
<class 'vsg.token.alias_declaration.alias_designator'>
<class 'vsg.token.alias_declaration.is_keyword'>
Expand All @@ -132,10 +120,10 @@
<class 'vsg.token.signature.close_bracket'>
<class 'vsg.token.alias_declaration.semicolon'>
--------------------------------------------------------------------------------
18 |
14 |
<class 'vsg.parser.blank_line'>
--------------------------------------------------------------------------------
19 | alias ident is write_enable [name1, name2];
15 | alias ident is write_enable [name1, name2];
<class 'vsg.token.alias_declaration.alias_keyword'>
<class 'vsg.token.alias_declaration.alias_designator'>
<class 'vsg.token.alias_declaration.is_keyword'>
Expand All @@ -147,10 +135,10 @@
<class 'vsg.token.signature.close_bracket'>
<class 'vsg.token.alias_declaration.semicolon'>
--------------------------------------------------------------------------------
20 |
16 |
<class 'vsg.parser.blank_line'>
--------------------------------------------------------------------------------
21 | alias ident is write_enable [return integer];
17 | alias ident is write_enable [return integer];
<class 'vsg.token.alias_declaration.alias_keyword'>
<class 'vsg.token.alias_declaration.alias_designator'>
<class 'vsg.token.alias_declaration.is_keyword'>
Expand All @@ -161,26 +149,44 @@
<class 'vsg.token.signature.close_bracket'>
<class 'vsg.token.alias_declaration.semicolon'>
--------------------------------------------------------------------------------
22 |
18 |
<class 'vsg.parser.blank_line'>
--------------------------------------------------------------------------------
23 | alias ident is write_enable;
19 | alias ident is write_enable;
<class 'vsg.token.alias_declaration.alias_keyword'>
<class 'vsg.token.alias_declaration.alias_designator'>
<class 'vsg.token.alias_declaration.is_keyword'>
<class 'vsg.parser.todo'>
<class 'vsg.token.alias_declaration.semicolon'>
--------------------------------------------------------------------------------
24 |
20 |
<class 'vsg.parser.blank_line'>
--------------------------------------------------------------------------------
21 | alias alias_sop : std_logic is << signal .tb_top.submodule.i_rx_data : t_mac_interface >> .sop;
<class 'vsg.token.alias_declaration.alias_keyword'>
<class 'vsg.token.alias_declaration.alias_designator'>
<class 'vsg.token.alias_declaration.colon'>
<class 'vsg.token.type_mark.name'>
<class 'vsg.token.alias_declaration.is_keyword'>
<class 'vsg.token.external_signal_name.double_less_than'>
<class 'vsg.token.external_signal_name.signal_keyword'>
<class 'vsg.token.external_signal_name.external_pathname'>
<class 'vsg.token.external_signal_name.colon'>
<class 'vsg.token.type_mark.name'>
<class 'vsg.token.external_signal_name.double_greater_than'>
<class 'vsg.parser.todo'>
<class 'vsg.token.alias_declaration.semicolon'>
--------------------------------------------------------------------------------
22 |
<class 'vsg.parser.blank_line'>
--------------------------------------------------------------------------------
25 | begin
23 | begin
<class 'vsg.token.architecture_body.begin_keyword'>
--------------------------------------------------------------------------------
26 |
24 |
<class 'vsg.parser.blank_line'>
--------------------------------------------------------------------------------
27 | end architecture RTL;
25 | end architecture RTL;
<class 'vsg.token.architecture_body.end_keyword'>
<class 'vsg.token.architecture_body.end_architecture_keyword'>
<class 'vsg.token.architecture_body.architecture_simple_name'>
Expand Down
6 changes: 2 additions & 4 deletions tests/vhdlFile/alias_declaration/classification_test_input.vhd
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@

architecture RTL of FIFO is





alias ident : std_logic_vector(3 downto 0) is write_enable [name1, name2 return integer];

alias ident : std_logic_vector(3 downto 0) is write_enable [name1, name2];
Expand All @@ -22,6 +18,8 @@ architecture RTL of FIFO is

alias ident is write_enable;

alias alias_sop : std_logic is << signal .tb_top.submodule.i_rx_data : t_mac_interface >> .sop;

begin

end architecture RTL;
5 changes: 1 addition & 4 deletions vsg/vhdlFile/classify/name.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,8 @@ def classify_until(lUntils, iToken, lObjects, oType=parser.todo):
NOTE: At the moment, everything will be set to parser.todo.
"""

iReturn = external_name.detect(iToken, lObjects)
if iReturn != iToken:
return iReturn
iCurrent = external_name.detect(iToken, lObjects)

iCurrent = iToken
iStop = len(lObjects) - 1
iOpenParenthesis = 0
iCloseParenthesis = 0
Expand Down
Loading