Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
21 changes: 21 additions & 0 deletions regression/ebmc/CLI/show-modules-smv.desc
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
CORE
show-modules-smv.smv
--show-modules
activate-multi-line-match
Module 1:
Location: file show-modules-smv\.smv line 3
Identifier: smv::main
Name: main

Module 2:
Location: file show-modules-smv\.smv line 8
Identifier: smv::bar
Name: bar

Module 3:
Location: file show-modules-smv\.smv line 13
Identifier: smv::foo
Name: foo
^EXIT=0$
^SIGNAL=0$
--
15 changes: 15 additions & 0 deletions regression/ebmc/CLI/show-modules-smv.smv
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
-- from the NuSMV 2.7 manual

MODULE main
VAR
a : bar;
m : foo(a);

MODULE bar
VAR
q : boolean;
p : boolean;

MODULE foo(c)
DEFINE
flag := c.q | c.p;
10 changes: 7 additions & 3 deletions src/smvlang/parser.y
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ Function: new_module

\*******************************************************************/

static smv_parse_treet::modulet &new_module(YYSTYPE &module_name)
static smv_parse_treet::modulet &new_module(YYSTYPE &location, YYSTYPE &module_name)
{
auto base_name = stack_expr(module_name).id_string();
const std::string identifier=smv_module_symbol(base_name);
Expand All @@ -186,6 +186,7 @@ static smv_parse_treet::modulet &new_module(YYSTYPE &module_name)
PARSER.parse_tree.module_map[identifier] = --PARSER.parse_tree.module_list.end();
module.name = identifier;
module.base_name = base_name;
module.source_location = stack_expr(location).source_location();
PARSER.module = &module;
return module;
}
Expand Down Expand Up @@ -363,8 +364,11 @@ module_name: IDENTIFIER_Token
| STRING_Token
;

module_head: MODULE_Token module_name { new_module($2); }
| MODULE_Token module_name { new_module($2); }
module_keyword: MODULE_Token { init($$); /* for the location */ }
;

module_head: module_keyword module_name { new_module($1, $2); }
| module_keyword module_name { new_module($1, $2); }
'(' module_parameters_opt ')'
;

Expand Down
23 changes: 20 additions & 3 deletions src/smvlang/smv_ebmc_language.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -70,9 +70,26 @@ std::optional<transition_systemt> smv_ebmc_languaget::transition_system()
return {};
}

if(
cmdline.isset("show-modules") || cmdline.isset("modules-xml") ||
cmdline.isset("json-modules"))
if(cmdline.isset("show-modules"))
{
std::size_t count = 0;
auto &out = std::cout;

for(const auto &module : parse_tree.module_list)
{
count++;

out << "Module " << count << ":" << '\n';

out << " Location: " << module.source_location << '\n';
out << " Identifier: " << module.name << '\n';
out << " Name: " << module.base_name << '\n' << '\n';
}

return {};
}

if(cmdline.isset("modules-xml") || cmdline.isset("json-modules"))
{
//show_modules(cmdline, message_handler);
return {};
Expand Down
1 change: 1 addition & 0 deletions src/smvlang/smv_parse_tree.h
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ class smv_parse_treet

struct modulet
{
source_locationt source_location;
irep_idt name, base_name;
std::vector<irep_idt> parameters;

Expand Down
Loading