Skip to content

Commit 8c78d87

Browse files
jezhigginsjezhiggins
committed
Apply clang-format
1 parent c6e03b2 commit 8c78d87

File tree

9 files changed

+44
-41
lines changed

9 files changed

+44
-41
lines changed

‎src/analyses/variable-sensitivity/abstract_enviroment.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030

3131
class variable_sensitivity_object_factoryt;
3232
using variable_sensitivity_object_factory_ptrt =
33-
std::shared_ptr<variable_sensitivity_object_factoryt>;
33+
std::shared_ptr<variable_sensitivity_object_factoryt>;
3434

3535
class abstract_environmentt
3636
{
@@ -41,8 +41,8 @@ class abstract_environmentt
4141

4242
abstract_environmentt(
4343
variable_sensitivity_object_factory_ptrt _object_factory)
44-
: bottom(true),
45-
object_factory(_object_factory) {
44+
: bottom(true), object_factory(_object_factory)
45+
{
4646
}
4747

4848
/// These three are really the heart of the method

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

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -612,16 +612,16 @@ class variable_sensitivity_dependence_domain_factoryt
612612
explicit variable_sensitivity_dependence_domain_factoryt(
613613
variable_sensitivity_dependence_grapht &_dg,
614614
variable_sensitivity_object_factory_ptrt _object_factory)
615-
: dg(_dg),
616-
object_factory(_object_factory)
615+
: dg(_dg), object_factory(_object_factory)
617616
{
618617
}
619618

620619
std::unique_ptr<statet> make(locationt l) const override
621620
{
622621
auto node_id = dg.add_node();
623622
dg.nodes[node_id].PC = l;
624-
auto p = util_make_unique<variable_sensitivity_dependence_domaint>(node_id, object_factory);
623+
auto p = util_make_unique<variable_sensitivity_dependence_domaint>(
624+
node_id, object_factory);
625625
CHECK_RETURN(p->is_bottom());
626626

627627
return std::unique_ptr<statet>(p.release());
@@ -638,7 +638,9 @@ variable_sensitivity_dependence_grapht::variable_sensitivity_dependence_grapht(
638638
variable_sensitivity_object_factory_ptrt _object_factory)
639639
: ai_three_way_merget(
640640
util_make_unique<ai_history_factory_default_constructort<ahistoricalt>>(),
641-
util_make_unique<variable_sensitivity_dependence_domain_factoryt>(*this, _object_factory),
641+
util_make_unique<variable_sensitivity_dependence_domain_factoryt>(
642+
*this,
643+
_object_factory),
642644
util_make_unique<location_sensitive_storaget>()),
643645
goto_functions(goto_functions),
644646
ns(_ns)

‎src/analyses/variable-sensitivity/variable_sensitivity_dependence_graph.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,8 @@ class variable_sensitivity_dependence_domaint
7676

7777
explicit variable_sensitivity_dependence_domaint(
7878
node_indext id,
79-
variable_sensitivity_object_factory_ptrt object_factory
80-
) : variable_sensitivity_domaint(object_factory),
79+
variable_sensitivity_object_factory_ptrt object_factory)
80+
: variable_sensitivity_domaint(object_factory),
8181
node_id(id),
8282
has_values(false),
8383
has_changed(false)

‎src/analyses/variable-sensitivity/variable_sensitivity_domain.h

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,8 @@ class variable_sensitivity_domaint : public ai_domain_baset
7676
public:
7777
explicit variable_sensitivity_domaint(
7878
variable_sensitivity_object_factory_ptrt _object_factory)
79-
: abstract_state(_object_factory) {
79+
: abstract_state(_object_factory)
80+
{
8081
}
8182

8283
/// Compute the abstract transformer for a single instruction
@@ -217,7 +218,7 @@ class variable_sensitivity_domaint : public ai_domain_baset
217218
#endif
218219
};
219220

220-
template<>
221+
template <>
221222
class ai_domain_factory_default_constructort<variable_sensitivity_domaint>
222223
: public ai_domain_factoryt<variable_sensitivity_domaint>
223224
{
@@ -226,7 +227,8 @@ class ai_domain_factory_default_constructort<variable_sensitivity_domaint>
226227

227228
explicit ai_domain_factory_default_constructort(
228229
variable_sensitivity_object_factory_ptrt _object_factory)
229-
: object_factory(_object_factory) {
230+
: object_factory(_object_factory)
231+
{
230232
}
231233

232234
std::unique_ptr<statet> make(locationt l) const override

‎src/analyses/variable-sensitivity/variable_sensitivity_object_factory.h

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -124,19 +124,20 @@ struct vsd_configt
124124

125125
class variable_sensitivity_object_factoryt;
126126
using variable_sensitivity_object_factory_ptrt =
127-
std::shared_ptr<variable_sensitivity_object_factoryt>;
127+
std::shared_ptr<variable_sensitivity_object_factoryt>;
128128

129129
class variable_sensitivity_object_factoryt
130130
{
131131
public:
132-
static variable_sensitivity_object_factory_ptrt configured_with(
133-
const vsd_configt &options) {
132+
static variable_sensitivity_object_factory_ptrt
133+
configured_with(const vsd_configt &options)
134+
{
134135
return std::make_shared<variable_sensitivity_object_factoryt>(options);
135136
}
136137

137138
explicit variable_sensitivity_object_factoryt(const vsd_configt &options)
138-
: configuration(options),
139-
initialized(true) {
139+
: configuration(options), initialized(true)
140+
{
140141
}
141142

142143
/// Get the appropriate abstract object for the variable under

‎src/goto-analyzer/goto_analyzer_parse_options.cpp

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -447,7 +447,8 @@ ai_baset *goto_analyzer_parse_optionst::build_analyzer(
447447
const namespacet &ns)
448448
{
449449
auto vsd_config = vsd_configt::from_options(options);
450-
auto vs_object_factory = variable_sensitivity_object_factoryt::configured_with(vsd_config);
450+
auto vs_object_factory =
451+
variable_sensitivity_object_factoryt::configured_with(vsd_config);
451452

452453
// These support all of the option categories
453454
if(
@@ -488,8 +489,8 @@ ai_baset *goto_analyzer_parse_optionst::build_analyzer(
488489
}
489490
else if(options.get_bool_option("vsd"))
490491
{
491-
df = util_make_unique<
492-
variable_sensitivity_domain_factoryt>(vs_object_factory);
492+
df = util_make_unique<variable_sensitivity_domain_factoryt>(
493+
vs_object_factory);
493494
}
494495
// non-null is not fully supported, despite the historical options
495496
// dependency-graph is quite heavily tied to the legacy-ait infrastructure
@@ -544,7 +545,8 @@ ai_baset *goto_analyzer_parse_optionst::build_analyzer(
544545
}
545546
else if(options.get_bool_option("vsd"))
546547
{
547-
auto df = util_make_unique<variable_sensitivity_domain_factoryt>(vs_object_factory);
548+
auto df = util_make_unique<variable_sensitivity_domain_factoryt>(
549+
vs_object_factory);
548550
return new ait<variable_sensitivity_domaint>(std::move(df));
549551
}
550552
else if(options.get_bool_option("intervals"))

‎unit/analyses/variable-sensitivity/constant_abstract_value/merge.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ SCENARIO(
3030

3131
auto object_factory = variable_sensitivity_object_factoryt::configured_with(
3232
vsd_configt::constant_domain());
33-
abstract_environmentt enviroment { object_factory };
33+
abstract_environmentt enviroment{object_factory};
3434
enviroment.make_top();
3535
symbol_tablet symbol_table;
3636
namespacet ns(symbol_table);

‎unit/analyses/variable-sensitivity/interval_abstract_value/meet.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ SCENARIO(
4646
auto object_factory = variable_sensitivity_object_factoryt::configured_with(
4747
vsd_configt::intervals());
4848

49-
abstract_environmentt enviroment { object_factory };
49+
abstract_environmentt enviroment{object_factory};
5050
enviroment.make_top();
5151
symbol_tablet symbol_table;
5252
namespacet ns(symbol_table);

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

Lines changed: 14 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -70,13 +70,12 @@ class ContainsAllOf
7070
std::unique_ptr<variable_sensitivity_domain_factoryt> domain_factory()
7171
{
7272
auto vs_object_factory =
73-
std::make_shared<variable_sensitivity_object_factoryt>(vsd_configt {});
73+
std::make_shared<variable_sensitivity_object_factoryt>(vsd_configt{});
7474

75-
return
76-
util_make_unique<variable_sensitivity_domain_factoryt>(vs_object_factory);
75+
return util_make_unique<variable_sensitivity_domain_factoryt>(
76+
vs_object_factory);
7777
}
7878

79-
8079
TEST_CASE(
8180
"A value set abstract object created from type is top",
8281
VALUE_SET_TEST_TAGS)
@@ -267,11 +266,10 @@ TEST_CASE(
267266
auto const value_set =
268267
value_set_abstract_valuet{type, value_set_abstract_valuet::valuest{}};
269268

270-
const ait<variable_sensitivity_domaint> ai { domain_factory() };
269+
const ait<variable_sensitivity_domaint> ai{domain_factory()};
271270

272271
std::stringstream ss;
273-
value_set.output(
274-
ss, ai, namespacet{symbol_tablet{}});
272+
value_set.output(ss, ai, namespacet{symbol_tablet{}});
275273
REQUIRE(ss.str() == "BOTTOM");
276274
}
277275

@@ -283,11 +281,10 @@ TEST_CASE(
283281
auto const value = from_integer(10, type);
284282
auto const value_set = value_set_abstract_valuet{type, {value}};
285283

286-
const ait<variable_sensitivity_domaint> ai { domain_factory() };
284+
const ait<variable_sensitivity_domaint> ai{domain_factory()};
287285

288286
std::stringstream ss;
289-
value_set.output(
290-
ss, ai, namespacet{symbol_tablet{}});
287+
value_set.output(ss, ai, namespacet{symbol_tablet{}});
291288
REQUIRE(ss.str() == "{ 10 }");
292289
}
293290

@@ -303,11 +300,10 @@ TEST_CASE(
303300
auto const value_set =
304301
value_set_abstract_valuet{type, {value1, value2, value3}};
305302

306-
const ait<variable_sensitivity_domaint> ai { domain_factory() };
303+
const ait<variable_sensitivity_domaint> ai{domain_factory()};
307304

308305
std::stringstream ss;
309-
value_set.output(
310-
ss, ai, namespacet{symbol_tablet{}});
306+
value_set.output(ss, ai, namespacet{symbol_tablet{}});
311307
REQUIRE(ss.str() == "{ 10 12 14 }");
312308
}
313309

@@ -326,11 +322,10 @@ TEST_CASE(
326322
auto const value_set = value_set_abstract_valuet{type, values};
327323
REQUIRE(value_set.is_top());
328324

329-
const ait<variable_sensitivity_domaint> ai { domain_factory() };
325+
const ait<variable_sensitivity_domaint> ai{domain_factory()};
330326

331327
std::stringstream ss;
332-
value_set.output(
333-
ss, ai, namespacet{symbol_tablet{}});
328+
value_set.output(ss, ai, namespacet{symbol_tablet{}});
334329
REQUIRE(ss.str() == "TOP");
335330
}
336331

@@ -386,8 +381,9 @@ static abstract_environmentt get_value_set_abstract_environment()
386381
config.advanced_sensitivities.new_value_set = true;
387382
config.context_tracking.data_dependency_context = false;
388383
config.context_tracking.last_write_context = false;
389-
auto object_factory = variable_sensitivity_object_factoryt::configured_with(config);
390-
auto environment = abstract_environmentt { object_factory };
384+
auto object_factory =
385+
variable_sensitivity_object_factoryt::configured_with(config);
386+
auto environment = abstract_environmentt{object_factory};
391387
environment.make_top();
392388
return environment;
393389
}

0 commit comments

Comments
 (0)