Skip to content

SMV: cleanup ports/parameters in parse tree #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

Merged
merged 1 commit into from
Nov 10, 2025
Merged

SMV: cleanup ports/parameters in parse tree #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
20 changes: 7 additions & 13 deletions src/smvlang/parser.y
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -360,11 +360,13 @@ module_name: IDENTIFIER_Token
| STRING_Token
;

module_head: MODULE_Token module_name { new_module($2); }
module_head: MODULE_Token module_name
{
new_module($2);
}
| MODULE_Token module_name '(' module_parameters_opt ')'
{
auto &module = new_module($2);
module.parameters = stack_expr($4);
new_module($2);
}
;

Expand Down Expand Up @@ -579,24 +581,16 @@ var_list : var_decl

module_parameter: identifier
{
const irep_idt &identifier=stack_expr($1).get(ID_identifier);
const irep_idt &identifier=stack_expr($1).id();
smv_parse_treet::mc_vart &var=PARSER.module->vars[identifier];
var.var_class=smv_parse_treet::mc_vart::ARGUMENT;
PARSER.module->ports.push_back(identifier);
PARSER.module->parameters.push_back(identifier);
}
;

module_parameters:
module_parameter
{
init($$);
mto($$, $1);
}
| module_parameters ',' module_parameter
{
$$ = $1;
mto($$, $3);
}
;

module_parameters_opt:
Expand Down
4 changes: 2 additions & 2 deletions src/smvlang/smv_language.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,8 +136,8 @@ void smv_languaget::show_parse(std::ostream &out, message_handlert &)

out << " PARAMETERS:\n";

for(auto &parameter : module.parameters.get_sub())
out << " " << parameter.id() << '\n';
for(auto &parameter : module.parameters)
out << " " << parameter << '\n';

out << '\n';

Expand Down
4 changes: 1 addition & 3 deletions src/smvlang/smv_parse_tree.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ class smv_parse_treet
struct modulet
{
irep_idt name, base_name;
irept parameters;
std::list<irep_idt> parameters;

struct itemt
{
Expand Down Expand Up @@ -288,8 +288,6 @@ class smv_parse_treet

mc_varst vars;
enum_sett enum_set;

std::list<irep_idt> ports;
};

typedef std::unordered_map<irep_idt, modulet, irep_id_hash> modulest;
Expand Down
4 changes: 2 additions & 2 deletions src/smvlang/smv_typecheck.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,9 +169,9 @@ void smv_typecheckt::convert_ports(
{
irept::subt &ports=dest.add(ID_ports).get_sub();

ports.reserve(smv_module.ports.size());
ports.reserve(smv_module.parameters.size());

for(const auto &port_name : smv_module.ports)
for(const auto &port_name : smv_module.parameters)
{
ports.push_back(exprt(ID_symbol));
ports.back().set(
Expand Down
Loading