Skip to content

Commit 5e51e4c

Browse files
committed
Clang format
1 parent c613526 commit 5e51e4c

File tree

7 files changed

+23
-37
lines changed

7 files changed

+23
-37
lines changed

regression/goto-analyzer/simple-union-access/test.desc

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@ union.c
33
--variable-sensitivity --vsd --verify
44
^EXIT=0$
55
^SIGNAL=0$
6-
^\[main.assertion.1\] line 14 x.a==0: UNKNOWN$
7-
^\[main.assertion.2\] line 15 x.a==1: UNKNOWN$
8-
^\[main.assertion.3\] line 16 x.b==0: UNKNOWN$
9-
^\[main.assertion.4\] line 17 x.b==1: UNKNOWN$
10-
^\[main.assertion.5\] line 20 x.a==0: UNKNOWN$
11-
^\[main.assertion.6\] line 21 x.a==1: UNKNOWN$
12-
^\[main.assertion.7\] line 22 x.b==0: UNKNOWN$
13-
^\[main.assertion.8\] line 23 x.b==1: UNKNOWN$
6+
^\[main.assertion.1\] line 13 x.a==0: UNKNOWN$
7+
^\[main.assertion.2\] line 14 x.a==1: UNKNOWN$
8+
^\[main.assertion.3\] line 15 x.b==0: UNKNOWN$
9+
^\[main.assertion.4\] line 16 x.b==1: UNKNOWN$
10+
^\[main.assertion.5\] line 19 x.a==0: UNKNOWN$
11+
^\[main.assertion.6\] line 20 x.a==1: UNKNOWN$
12+
^\[main.assertion.7\] line 21 x.b==0: UNKNOWN$
13+
^\[main.assertion.8\] line 22 x.b==1: UNKNOWN$
1414
--
1515
^warning: ignoring

regression/goto-analyzer/simple-union-access/union.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@
33
int main(int argc, char *argv[])
44
{
55
// Test if we can represent constant structs
6-
union union_struct
7-
{
6+
union union_struct {
87
int a;
98
int b;
109
};

src/analyses/variable-sensitivity/abstract_enviroment.cpp

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -56,16 +56,15 @@ abstract_environmentt::eval(const exprt &expr, const namespacet &ns) const
5656
return found_symbol_value;
5757
}
5858
}
59-
else if(simplified_id == ID_member || simplified_id == ID_index || simplified_id == ID_dereference)
59+
else if(
60+
simplified_id == ID_member || simplified_id == ID_index ||
61+
simplified_id == ID_dereference)
6062
{
6163
auto access_expr = simplified_expr;
6264
auto target = eval(access_expr.operands()[0], ns);
6365

6466
return target->expression_transform(
65-
access_expr,
66-
eval_operands(access_expr, *this, ns),
67-
*this,
68-
ns);
67+
access_expr, eval_operands(access_expr, *this, ns), *this, ns);
6968
}
7069
else if(simplified_id == ID_address_of)
7170
{
@@ -75,7 +74,9 @@ abstract_environmentt::eval(const exprt &expr, const namespacet &ns) const
7574
// Store the abstract object in the pointer
7675
return pointer_object;
7776
}
78-
else if(simplified_id == ID_array || simplified_id == ID_struct || simplified_id == ID_constant)
77+
else if(
78+
simplified_id == ID_array || simplified_id == ID_struct ||
79+
simplified_id == ID_constant)
7980
{
8081
return abstract_object_factory(simplified_expr.type(), simplified_expr, ns);
8182
}
@@ -431,10 +432,7 @@ abstract_object_pointert abstract_environmentt::eval_expression(
431432
abstract_object_factory(e.type(), ns, true);
432433

433434
return eval_obj->expression_transform(
434-
e,
435-
eval_operands(e, *this, ns),
436-
*this,
437-
ns);
435+
e, eval_operands(e, *this, ns), *this, ns);
438436
}
439437

440438
void abstract_environmentt::erase(const symbol_exprt &expr)
@@ -519,4 +517,3 @@ std::vector<abstract_object_pointert> eval_operands(
519517

520518
return operands;
521519
}
522-

src/analyses/variable-sensitivity/array_abstract_object.cpp

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -41,16 +41,13 @@ abstract_object_pointert array_abstract_objectt::expression_transform(
4141
const abstract_environmentt &environment,
4242
const namespacet &ns) const
4343
{
44-
if (expr.id() == ID_index)
44+
if(expr.id() == ID_index)
4545
{
4646
return read(environment, expr, ns);
4747
}
4848

4949
return abstract_objectt::expression_transform(
50-
expr,
51-
operands,
52-
environment,
53-
ns);
50+
expr, operands, environment, ns);
5451
}
5552

5653
abstract_object_pointert array_abstract_objectt::read(

src/analyses/variable-sensitivity/array_abstract_object.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,6 @@ class array_abstract_objectt : public abstract_objectt
6363
const abstract_environmentt &environment,
6464
const namespacet &ns) const override;
6565

66-
6766
/**
6867
* A helper function to evaluate an abstract object contained
6968
* within a container object. More precise abstractions may override this

src/analyses/variable-sensitivity/pointer_abstract_object.cpp

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,16 +42,13 @@ abstract_object_pointert pointer_abstract_objectt::expression_transform(
4242
const abstract_environmentt &environment,
4343
const namespacet &ns) const
4444
{
45-
if (expr.id() == ID_dereference)
45+
if(expr.id() == ID_dereference)
4646
{
4747
return read(environment, expr, ns);
4848
}
4949

5050
return abstract_objectt::expression_transform(
51-
expr,
52-
operands,
53-
environment,
54-
ns);
51+
expr, operands, environment, ns);
5552
}
5653

5754
abstract_object_pointert pointer_abstract_objectt::read(

src/analyses/variable-sensitivity/struct_abstract_object.cpp

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,16 +43,13 @@ abstract_object_pointert struct_abstract_objectt::expression_transform(
4343
const abstract_environmentt &environment,
4444
const namespacet &ns) const
4545
{
46-
if (expr.id() == ID_member)
46+
if(expr.id() == ID_member)
4747
{
4848
return read(environment, expr, ns);
4949
}
5050

5151
return abstract_objectt::expression_transform(
52-
expr,
53-
operands,
54-
environment,
55-
ns);
52+
expr, operands, environment, ns);
5653
}
5754

5855
abstract_object_pointert struct_abstract_objectt::read(

0 commit comments

Comments
 (0)