Skip to content

Commit 4b846ad

Browse files
jezhigginsjezhiggins
committed
clang-format fixes
1 parent b2d3e88 commit 4b846ad

File tree

2 files changed

+70
-41
lines changed

2 files changed

+70
-41
lines changed

‎src/analyses/variable-sensitivity/value_set_abstract_value.cpp

Lines changed: 47 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -128,44 +128,66 @@ void value_set_abstract_valuet::output(
128128
}
129129

130130
static void merge_all_possible_results(
131-
std::shared_ptr<const value_set_abstract_valuet> &out_value, const exprt &expr, const std::vector<const value_set_abstract_valuet*> &operand_value_sets, const namespacet &ns, std::vector<exprt> &operands_so_far)
131+
std::shared_ptr<const value_set_abstract_valuet> &out_value,
132+
const exprt &expr,
133+
const std::vector<const value_set_abstract_valuet *> &operand_value_sets,
134+
const namespacet &ns,
135+
std::vector<exprt> &operands_so_far)
132136
{
133-
if(expr.operands().size() == operands_so_far.size()) {
137+
if(expr.operands().size() == operands_so_far.size())
138+
{
134139
exprt expr_with_evaluated_operands_filled_in = expr;
135140
expr_with_evaluated_operands_filled_in.operands() = operands_so_far;
136141
simplify(expr_with_evaluated_operands_filled_in, ns);
137-
if(expr_with_evaluated_operands_filled_in.is_constant()) {
142+
if(expr_with_evaluated_operands_filled_in.is_constant())
143+
{
138144
bool out_modifications;
139145
auto post_merge = abstract_objectt::merge(
140146
out_value,
141-
std::make_shared<value_set_abstract_valuet>(expr.type(), value_set_abstract_valuet::valuest{expr_with_evaluated_operands_filled_in}),
147+
std::make_shared<value_set_abstract_valuet>(
148+
expr.type(),
149+
value_set_abstract_valuet::valuest{
150+
expr_with_evaluated_operands_filled_in}),
142151
out_modifications);
143-
if(auto post_merge_casted = std::dynamic_pointer_cast<const value_set_abstract_valuet>(post_merge)) {
152+
if(
153+
auto post_merge_casted =
154+
std::dynamic_pointer_cast<const value_set_abstract_valuet>(
155+
post_merge))
156+
{
144157
out_value = post_merge_casted;
145158
return;
146159
}
147160
}
148161
out_value = std::make_shared<value_set_abstract_valuet>(expr.type());
149-
} else {
150-
for(auto const &operand_value : operand_value_sets[operands_so_far.size()]->get_values()) {
162+
}
163+
else
164+
{
165+
for(auto const &operand_value :
166+
operand_value_sets[operands_so_far.size()]->get_values())
167+
{
151168
operands_so_far.push_back(operand_value);
152-
merge_all_possible_results(out_value, expr, operand_value_sets, ns, operands_so_far);
169+
merge_all_possible_results(
170+
out_value, expr, operand_value_sets, ns, operands_so_far);
153171
operands_so_far.pop_back();
154172
}
155173
}
156174
}
157175

158-
static std::shared_ptr<const value_set_abstract_valuet> merge_all_possible_results(
176+
static std::shared_ptr<const value_set_abstract_valuet>
177+
merge_all_possible_results(
159178
const exprt &expr,
160-
const std::vector<const value_set_abstract_valuet*> &operand_value_sets,
179+
const std::vector<const value_set_abstract_valuet *> &operand_value_sets,
161180
const namespacet &ns)
162181
{
163-
const bool is_top = false;
164-
const bool is_bottom = true;
165-
auto result_abstract_value = std::make_shared<const value_set_abstract_valuet>(expr.type(), is_top, is_bottom);
166-
auto operands_so_far = std::vector<exprt>{};
167-
merge_all_possible_results(result_abstract_value, expr, operand_value_sets, ns, operands_so_far);
168-
return result_abstract_value;
182+
const bool is_top = false;
183+
const bool is_bottom = true;
184+
auto result_abstract_value =
185+
std::make_shared<const value_set_abstract_valuet>(
186+
expr.type(), is_top, is_bottom);
187+
auto operands_so_far = std::vector<exprt>{};
188+
merge_all_possible_results(
189+
result_abstract_value, expr, operand_value_sets, ns, operands_so_far);
190+
return result_abstract_value;
169191
}
170192

171193
abstract_object_pointert value_set_abstract_valuet::expression_transform(
@@ -177,11 +199,16 @@ abstract_object_pointert value_set_abstract_valuet::expression_transform(
177199
// TODO possible special case handling for things like
178200
// __CPROVER_rounding_mode where we know what valid values look like
179201
// which we could make use of in place of TOP
180-
auto operand_value_sets = std::vector<const value_set_abstract_valuet*>{};
181-
for(auto const &possible_value_set : operands) {
202+
auto operand_value_sets = std::vector<const value_set_abstract_valuet *>{};
203+
for(auto const &possible_value_set : operands)
204+
{
182205
PRECONDITION(possible_value_set != nullptr);
183-
const auto as_value_set = dynamic_cast<const value_set_abstract_valuet*>(possible_value_set.get());
184-
if(as_value_set == nullptr || as_value_set->is_top() || as_value_set->is_bottom()) {
206+
const auto as_value_set =
207+
dynamic_cast<const value_set_abstract_valuet *>(possible_value_set.get());
208+
if(
209+
as_value_set == nullptr || as_value_set->is_top() ||
210+
as_value_set->is_bottom())
211+
{
185212
return std::make_shared<value_set_abstract_valuet>(expr.type());
186213
}
187214
operand_value_sets.push_back(as_value_set);

‎unit/analyses/variable-sensitivity/value_set/abstract_value.cpp

Lines changed: 23 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -372,34 +372,33 @@ static abstract_environmentt get_value_set_abstract_environment()
372372
return abstract_environmentt{};
373373
}
374374

375-
TEST_CASE(
376-
"Eval on an constant gives us that constant", VALUE_SET_TEST_TAGS)
375+
TEST_CASE("Eval on an constant gives us that constant", VALUE_SET_TEST_TAGS)
377376
{
378377
const auto environment = get_value_set_abstract_environment();
379378
namespacet ns{symbol_tablet{}};
380-
const auto zero =
381-
from_integer(0, signedbv_typet{32});
379+
const auto zero = from_integer(0, signedbv_typet{32});
382380
const auto eval_result = environment.eval(zero, ns);
383381
REQUIRE(eval_result != nullptr);
384382
REQUIRE(!eval_result->is_top());
385383
REQUIRE(!eval_result->is_bottom());
386384
const auto eval_result_as_value_set =
387-
std::dynamic_pointer_cast<const value_set_abstract_valuet>(eval_result->unwrap_context());
385+
std::dynamic_pointer_cast<const value_set_abstract_valuet>(
386+
eval_result->unwrap_context());
388387
REQUIRE(eval_result_as_value_set != nullptr);
389388
REQUIRE(eval_result_as_value_set->get_values().size() == 1);
390-
REQUIRE_THAT(eval_result_as_value_set->get_values(),
391-
ContainsAllOf{zero});
389+
REQUIRE_THAT(eval_result_as_value_set->get_values(), ContainsAllOf{zero});
392390
}
393391

394392
TEST_CASE(
395-
"Eval on a plus expression with constant operands gives us the result of that plus",
393+
"Eval on a plus expression with constant operands gives us the result of "
394+
"that plus",
396395
VALUE_SET_TEST_TAGS)
397396
{
398397
const auto environment = get_value_set_abstract_environment();
399398
namespacet ns{symbol_tablet{}};
400399
const auto s32_type = signedbv_typet{32};
401-
const auto three =from_integer(3, s32_type);
402-
const auto five =from_integer(5, s32_type);
400+
const auto three = from_integer(3, s32_type);
401+
const auto five = from_integer(5, s32_type);
403402
const auto three_plus_five = plus_exprt{three, five};
404403

405404
auto eval_result = environment.eval(three_plus_five, ns);
@@ -408,15 +407,17 @@ TEST_CASE(
408407
REQUIRE(!eval_result->is_bottom());
409408

410409
const auto eval_result_as_value_set =
411-
std::dynamic_pointer_cast<const value_set_abstract_valuet>(eval_result->unwrap_context());
410+
std::dynamic_pointer_cast<const value_set_abstract_valuet>(
411+
eval_result->unwrap_context());
412412
REQUIRE(eval_result_as_value_set != nullptr);
413413
const auto eight = from_integer(8, s32_type);
414414
REQUIRE(eval_result_as_value_set->get_values().size() == 1);
415415
REQUIRE_THAT(eval_result_as_value_set->get_values(), ContainsAllOf{eight});
416416
}
417417

418418
TEST_CASE(
419-
"Eval on a multiply expression on symbols gives us the results of that multiplication",
419+
"Eval on a multiply expression on symbols gives us the results of that "
420+
"multiplication",
420421
VALUE_SET_TEST_TAGS)
421422
{
422423
auto environment = get_value_set_abstract_environment();
@@ -445,31 +446,32 @@ TEST_CASE(
445446
const auto six = from_integer(6, s32_type);
446447

447448
const auto three_or_five = std::make_shared<const value_set_abstract_valuet>(
448-
s32_type,
449-
value_set_abstract_valuet::valuest{three, five});
449+
s32_type, value_set_abstract_valuet::valuest{three, five});
450450
environment.assign(a_symbol.symbol_expr(), three_or_five, ns);
451451

452452
const auto four_or_six = std::make_shared<const value_set_abstract_valuet>(
453-
s32_type,
454-
value_set_abstract_valuet::valuest{four, six});
453+
s32_type, value_set_abstract_valuet::valuest{four, six});
455454
environment.assign(b_symbol.symbol_expr(), four_or_six, ns);
456455

457-
const auto a_times_b = mult_exprt{a_symbol.symbol_expr(), b_symbol.symbol_expr()};
456+
const auto a_times_b =
457+
mult_exprt{a_symbol.symbol_expr(), b_symbol.symbol_expr()};
458458

459459
const auto eval_result = environment.eval(a_times_b, ns);
460460
REQUIRE(eval_result != nullptr);
461461
REQUIRE(!eval_result->is_top());
462462
REQUIRE(!eval_result->is_bottom());
463463

464464
const auto eval_result_as_value_set =
465-
std::dynamic_pointer_cast<const value_set_abstract_valuet>(eval_result->unwrap_context());
465+
std::dynamic_pointer_cast<const value_set_abstract_valuet>(
466+
eval_result->unwrap_context());
466467
REQUIRE(eval_result_as_value_set != nullptr);
467468
REQUIRE(eval_result_as_value_set->get_values().size() == 4);
468469

469470
const auto twelve = from_integer(12, s32_type);
470471
const auto eighteen = from_integer(18, s32_type);
471472
const auto twenty = from_integer(20, s32_type);
472473
const auto twentyfour = from_integer(30, s32_type);
473-
REQUIRE_THAT(eval_result_as_value_set->get_values(),
474-
ContainsAllOf(twelve, eighteen, twenty, twentyfour));
475-
}
474+
REQUIRE_THAT(
475+
eval_result_as_value_set->get_values(),
476+
ContainsAllOf(twelve, eighteen, twenty, twentyfour));
477+
}

0 commit comments

Comments
 (0)