luke
/
iverilog
mirror of https://github.com/steveicarus/iverilog.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

vhdlpp: Added a few missing FILE_NAME directives in the parser.

This commit is contained in:
Maciej Suminski 2016-02-15 16:53:49 +01:00
parent b4baace4b1
commit f620727555
1 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
vhdlpp/parse.y
View File

@ -760,9 +760,11 @@ composite_type_definition
| K_array '(' index_subtype_definition_list ')' K_of subtype_indication | K_array '(' index_subtype_definition_list ')' K_of subtype_indication
{ std::list<ExpRange*> r; { std::list<ExpRange*> r;
// NULL boundaries indicate unbounded array type // NULL boundaries indicate unbounded array type
r.push_back(new ExpRange(NULL, NULL, ExpRange::DOWNTO)); ExpRange*tmp = new ExpRange(NULL, NULL, ExpRange::DOWNTO);
VTypeArray*tmp = new VTypeArray($6, &r); r.push_back(tmp);
$$ = tmp; FILE_NAME(tmp, @1);
VTypeArray*arr = new VTypeArray($6, &r);
$$ = arr;
} }
| record_type_definition | record_type_definition
@ -1317,6 +1319,7 @@ file_open_information
{ {
ExpName*mode = new ExpName(lex_strings.make($2)); ExpName*mode = new ExpName(lex_strings.make($2));
delete[]$2; delete[]$2;
FILE_NAME(mode, @1);
$$ = new file_open_info_t(new ExpString($4), mode); $$ = new file_open_info_t(new ExpString($4), mode);
} }
| K_is STRING_LITERAL | K_is STRING_LITERAL
@ -1720,7 +1723,6 @@ name /* IEEE 1076-2008 P8.1 */
| indexed_name | indexed_name
{ $$ = $1; } { $$ = $1; }
| selected_name '(' expression_list ')' | selected_name '(' expression_list ')'
{ {
ExpName*name = dynamic_cast<ExpName*>($1); ExpName*name = dynamic_cast<ExpName*>($1);
@ -1924,7 +1926,7 @@ primary
| name '\'' IDENTIFIER argument_list_opt | name '\'' IDENTIFIER argument_list_opt
{ ExpAttribute*tmp = NULL; { ExpAttribute*tmp = NULL;
perm_string attr = lex_strings.make($3); perm_string attr = lex_strings.make($3);
ExpName*base = dynamic_cast<ExpName*>($1); ExpName*base = dynamic_cast<ExpName*>($1);
const VType*type = parse_type_by_name(base->peek_name()); const VType*type = parse_type_by_name(base->peek_name());
if(type) { if(type) {
@ -1933,7 +1935,7 @@ primary
tmp = new ExpObjAttribute(base, attr, $4); tmp = new ExpObjAttribute(base, attr, $4);
} }
FILE_NAME(tmp, @3); FILE_NAME(tmp, @1);
delete[]$3; delete[]$3;
$$ = tmp; $$ = tmp;
} }
@ -1950,8 +1952,8 @@ primary
} }
| REAL_LITERAL | REAL_LITERAL
{ ExpReal*tmp = new ExpReal($1); { ExpReal*tmp = new ExpReal($1);
FILE_NAME(tmp, @1); FILE_NAME(tmp, @1);
$$ = tmp; $$ = tmp;
} }
| STRING_LITERAL | STRING_LITERAL
{ ExpString*tmp = new ExpString($1); { ExpString*tmp = new ExpString($1);
@ -2153,6 +2155,7 @@ process_sensitivity_list
range range
: simple_expression direction simple_expression : simple_expression direction simple_expression
{ ExpRange* tmp = new ExpRange($1, $3, $2); { ExpRange* tmp = new ExpRange($1, $3, $2);
FILE_NAME(tmp, @1);
$$ = tmp; $$ = tmp;
} }
| name '\'' K_range | name '\'' K_range
@ -2161,6 +2164,7 @@ range
ExpName*name = NULL; ExpName*name = NULL;
if((name = dynamic_cast<ExpName*>($1))) { if((name = dynamic_cast<ExpName*>($1))) {
tmp = new ExpRange(name, false); tmp = new ExpRange(name, false);
FILE_NAME(tmp, @1);
} else { } else {
errormsg(@1, "'range attribute can be used with named expressions only"); errormsg(@1, "'range attribute can be used with named expressions only");
} }
@ -2172,6 +2176,7 @@ range
ExpName*name = NULL; ExpName*name = NULL;
if((name = dynamic_cast<ExpName*>($1))) { if((name = dynamic_cast<ExpName*>($1))) {
tmp = new ExpRange(name, true); tmp = new ExpRange(name, true);
FILE_NAME(tmp, @1);
} else { } else {
errormsg(@1, "'reverse_range attribute can be used with named expressions only"); errormsg(@1, "'reverse_range attribute can be used with named expressions only");
} }
@ -2515,6 +2520,7 @@ simple_expression_2
tmp = new ExpArithmetic(item.op, tmp, item.term); tmp = new ExpArithmetic(item.op, tmp, item.term);
} }
delete lst; delete lst;
FILE_NAME(tmp, @1);
$$ = tmp; $$ = tmp;
} }
; ;
@ -2897,7 +2903,9 @@ waveform_element
: expression : expression
{ $$ = $1; } { $$ = $1; }
| expression K_after expression | expression K_after expression
{ $$ = new ExpDelay($1, $3); } { ExpDelay*tmp = new ExpDelay($1, $3);
FILE_NAME(tmp, @1);
$$ = tmp; }
| K_null | K_null
{ $$ = 0; } { $$ = 0; }
; ;