luke/iverilog
1
0
Fork 0
mirror of https://github.com/steveicarus/iverilog.git synced 2026-09-08 04:20:49 +02:00
Code Issues Packages Projects Releases Wiki Activity

Disambiguate parameter names from named types

Browse Source 
A parameter declaration can start with its name (`parameter T = 1`) or a
named type (`parameter T P = 1`). If dimensions follow the first identifier,
they can be unpacked dimensions of the parameter or packed dimensions of the
type. The parser must see whether another identifier follows to distinguish
these forms.

In preparation for removing `TYPE_IDENTIFIER`, keep the identifier, dimensions
and possible parameter name together until the grammar has enough lookahead.
Build an unresolved named type for the typed form and leave type validation to
elaboration.

Keep implicit types out of parameter port list items that omit the `parameter`
keyword.

Signed-off-by: Lars-Peter Clausen <[email protected]>
This commit is contained in:
Lars-Peter Clausen
2026-09-06 19:00:00 -07:00
parent ddb446db29
commit 383ba1938d
1 changed files with 20 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
parse.y
+20 -22
View File
@@ -1342,7 +1342,6 @@ Module::port_t *module_declare_interface_port(const YYLTYPE&loc, char *type,
%type <type_id_range> data_type_or_implicit_plus_id
%type <type_id_range> data_type_or_implicit_plus_id_dim
%type <type_id_range> data_type_or_implicit_or_void_plus_id
%type <type_id_range> data_type_or_parameter_id_base
%type <type_id_range> data_type_or_parameter_id_dim
%type <type_id_range> partial_port_name_dim
%type <type_id_range> partial_port_type_plus_id_dim
@@ -3112,25 +3111,23 @@ data_type_or_implicit_plus_id_dim
// separate from data_type_or_implicit_plus_id_dim so a bare typedef name can
// still be parsed as a parameter name while implicit types like `signed P`
// and `[3:0] P` are rejected.
data_type_or_parameter_id_base
: IDENTIFIER
{ set_type_id_range($$, nullptr, $1, @1, nullptr);
}
| atomic_type identifier_name
{ set_type_id_range($$, $1, $2, @2, nullptr);
}
| ps_type_identifier_dim identifier_name
{ set_type_id_range($$, $1, $2, @2, nullptr);
}
;
data_type_or_parameter_id_dim
: TYPE_IDENTIFIER dimensions_opt
{ set_type_id_range($$, nullptr, $1.text, @1, $2);
: identifier_name dimensions_opt
{ set_type_id_range($$, nullptr, $1, @1, $2);
}
| data_type_or_parameter_id_base dimensions_opt
{ $$ = $1;
$$.ranges = $2;
| identifier_name dimensions_opt identifier_name dimensions_opt
{ auto tmp = pform_new_type_identifier(@1, nullptr, $1);
tmp = pform_make_parray_type(@2, tmp, $2);
set_type_id_range($$, tmp, $3, @3, $4);
}
| atomic_type identifier_name dimensions_opt
{ set_type_id_range($$, $1, $2, @2, $3);
}
| package_scope identifier_name dimensions_opt identifier_name dimensions_opt
{ lex_in_package_scope(nullptr);
auto tmp = pform_new_type_identifier(@2, $1, $2);
tmp = pform_make_parray_type(@3, tmp, $3);
set_type_id_range($$, tmp, $4, @4, $5);
}
;
@@ -6288,13 +6285,14 @@ parameter_assign_with_type
;
value_parameter_assign_with_type
: data_type_or_implicit_plus_id_dim initializer_opt parameter_value_ranges_opt
: value_parameter_assign_without_parameter
| implicit_type identifier_name dimensions_opt initializer_opt parameter_value_ranges_opt
{ param_is_type = false;
param_type_restrict = {};
param_data_type = $1.type;
pform_set_parameter($1.id_loc, $1.id, param_is_local,
param_data_type = $1;
pform_set_parameter(@2, $2, param_is_local,
param_is_type, param_type_restrict,
param_data_type, $1.ranges, $2, $3);
param_data_type, $3, $4, $5);
}
;