Skip to content

Commit b265f7f

Browse files
Rename renaming_levelt to symex_renaming_levelt
This can avoid confusing with renamings used in other modules.
1 parent 9d231f7 commit b265f7f

File tree

3 files changed

+8
-7
lines changed

3 files changed

+8
-7
lines changed

src/goto-symex/goto_symex_state.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ class goto_symex_statet final
185185
exprt return_value;
186186
bool hidden_function;
187187

188-
renaming_levelt::current_namest old_level1;
188+
symex_renaming_levelt::current_namest old_level1;
189189

190190
typedef std::set<irep_idt> local_objectst;
191191
local_objectst local_objects;

src/goto-symex/renaming_level.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,8 @@ void symex_level1t::operator()(ssa_exprt &ssa_expr)
5656
ssa_expr.set_level_1(it->second.second);
5757
}
5858

59-
void symex_level1t::restore_from(const renaming_levelt::current_namest &other)
59+
void symex_level1t::restore_from(
60+
const symex_renaming_levelt::current_namest &other)
6061
{
6162
auto it = current_names.begin();
6263
for(const auto &pair : other)

src/goto-symex/renaming_level.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@ Author: Romain Brenguier, [email protected]
2222
/// expression and a counter.
2323
/// This is extended by the different symex_level structures which are used
2424
/// during symex to ensure static single assignment (SSA) form.
25-
struct renaming_levelt
25+
struct symex_renaming_levelt
2626
{
27-
virtual ~renaming_levelt() = default;
27+
virtual ~symex_renaming_levelt() = default;
2828

2929
/// Map identifier to ssa_exprt and counter
3030
typedef std::map<irep_idt, std::pair<ssa_exprt, unsigned>> current_namest;
@@ -55,7 +55,7 @@ struct renaming_levelt
5555
/// Functor to set the level 0 renaming of SSA expressions.
5656
/// Level 0 corresponds to threads.
5757
/// The renaming is built for one particular interleaving.
58-
struct symex_level0t : public renaming_levelt
58+
struct symex_level0t : public symex_renaming_levelt
5959
{
6060
void
6161
operator()(ssa_exprt &ssa_expr, const namespacet &ns, unsigned thread_nr);
@@ -67,7 +67,7 @@ struct symex_level0t : public renaming_levelt
6767
/// Functor to set the level 1 renaming of SSA expressions.
6868
/// Level 1 corresponds to function frames.
6969
/// This is to preserve locality in case of recursion
70-
struct symex_level1t : public renaming_levelt
70+
struct symex_level1t : public symex_renaming_levelt
7171
{
7272
void operator()(ssa_exprt &ssa_expr);
7373

@@ -81,7 +81,7 @@ struct symex_level1t : public renaming_levelt
8181
/// Functor to set the level 2 renaming of SSA expressions.
8282
/// Level 2 corresponds to SSA.
8383
/// This is to ensure each variable is only assigned once.
84-
struct symex_level2t : public renaming_levelt
84+
struct symex_level2t : public symex_renaming_levelt
8585
{
8686
symex_level2t() = default;
8787
~symex_level2t() override = default;

0 commit comments

Comments
 (0)