Skip to content

use code_blockt::statements() where appropriate #2830

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
Oct 20, 2018
Merged

use code_blockt::statements() where appropriate #2830

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
3 changes: 1 addition & 2 deletions jbmc/src/java_bytecode/java_bytecode_convert_method.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1773,8 +1773,7 @@ codet java_bytecode_convert_methodt::convert_instructions(
more_code.statements().end());
}
else
for(const auto &statement : more_code.statements())
c.copy_to_operands(statement);
to_code_block(c).append(more_code);
}
}
a_it2->second.stack=stack;
Expand Down
2 changes: 1 addition & 1 deletion src/ansi-c/c_typecheck_base.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ class c_typecheck_baset:

virtual void typecheck_assign(codet &expr);
virtual void typecheck_asm(codet &code);
virtual void typecheck_block(codet &code);
virtual void typecheck_block(code_blockt &code);
virtual void typecheck_break(codet &code);
virtual void typecheck_continue(codet &code);
virtual void typecheck_decl(codet &code);
Expand Down
18 changes: 8 additions & 10 deletions src/ansi-c/c_typecheck_code.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ void c_typecheck_baset::typecheck_code(codet &code)
else if(statement==ID_gcc_switch_case_range)
typecheck_gcc_switch_case_range(code);
else if(statement==ID_block)
typecheck_block(code);
typecheck_block(to_code_block(code));
else if(statement==ID_decl_block)
{
}
Expand Down Expand Up @@ -181,23 +181,21 @@ void c_typecheck_baset::typecheck_assign(codet &code)
implicit_typecast(code.op1(), code.op0().type());
}

void c_typecheck_baset::typecheck_block(codet &code)
void c_typecheck_baset::typecheck_block(code_blockt &code)
{
Forall_operands(it, code)
typecheck_code(to_code(*it));
for(auto &c : code.statements())
typecheck_code(c);

// do decl-blocks

code_blockt new_ops;
new_ops.operands().reserve(code.operands().size());
new_ops.statements().reserve(code.statements().size());

Forall_operands(it1, code)
for(auto &code_op : code.statements())
{
if(it1->is_nil())
if(code_op.is_nil())
continue;

codet &code_op=to_code(*it1);

if(code_op.get_statement()==ID_label)
{
// these may be nested
Expand All @@ -217,7 +215,7 @@ void c_typecheck_baset::typecheck_block(codet &code)
new_ops.move(code_op);
}

code.operands().swap(new_ops.operands());
code.statements().swap(new_ops.statements());
}

void c_typecheck_baset::typecheck_break(codet &code)
Expand Down
2 changes: 1 addition & 1 deletion src/cpp/cpp_typecheck.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -424,7 +424,7 @@ class cpp_typecheckt:public c_typecheck_baset
void typecheck_try_catch(codet &);
void typecheck_member_initializer(codet &);
void typecheck_decl(codet &) override;
void typecheck_block(codet &) override;
void typecheck_block(code_blockt &) override;
void typecheck_ifthenelse(code_ifthenelset &) override;
void typecheck_while(code_whilet &) override;
void typecheck_switch(code_switcht &) override;
Expand Down
2 changes: 1 addition & 1 deletion src/cpp/cpp_typecheck_code.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -446,7 +446,7 @@ void cpp_typecheckt::typecheck_decl(codet &code)
code.swap(new_code);
}

void cpp_typecheckt::typecheck_block(codet &code)
void cpp_typecheckt::typecheck_block(code_blockt &code)
{
cpp_save_scopet saved_scope(cpp_scopes);
cpp_scopes.new_block_scope();
Expand Down
6 changes: 2 additions & 4 deletions src/goto-instrument/dump_c.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -621,7 +621,7 @@ void dump_ct::cleanup_decl(
system_headers);
p2s();

POSTCONDITION(b.operands().size()==1);
POSTCONDITION(b.statements().size() == 1);
decl.swap(b.op0());
}

Expand Down Expand Up @@ -943,10 +943,8 @@ void dump_ct::cleanup_harness(code_blockt &b)
decls.add(d);
}

Forall_operands(it, b)
for(auto &code : b.statements())
{
codet &code=to_code(*it);

if(code.get_statement()==ID_function_call)
{
exprt &func=to_code_function_call(code).function();
Expand Down
7 changes: 2 additions & 5 deletions src/goto-instrument/goto_program2code.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1681,12 +1681,9 @@ static bool has_labels(const codet &code)
return false;
}

static bool move_label_ifthenelse(
exprt &expr,
exprt &label_dest)
static bool move_label_ifthenelse(exprt &expr, exprt &label_dest)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Unrelated changes?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That was clang-format.

{
if(expr.is_nil() ||
to_code(expr).get_statement()!=ID_block)
if(expr.is_nil() || to_code(expr).get_statement() != ID_block)
return false;

code_blockt &block=to_code_block(to_code(expr));
Expand Down