diff --git a/doc/html-manual/boop-example/driver.c b/doc/html-manual/boop-example/driver.c
index ff9ec214b76..815fc5b7c7b 100644
--- a/doc/html-manual/boop-example/driver.c
+++ b/doc/html-manual/boop-example/driver.c
@@ -18,7 +18,7 @@ int dummy_open (struct inode *inode, struct file *filp)
if (locked)
return -1;
locked = TRUE;
-
+
return 0; /* success */
}
@@ -30,7 +30,7 @@ unsigned int dummy_read (struct file *filp, char *buf, int max)
n = nondet_int ();
__CPROVER_assume ((n >= 0) && (n <= max));
/* writing to the buffer is not modeled here */
-
+
return n;
}
return -1;
@@ -46,4 +46,3 @@ int dummy_release (struct inode *inode, struct file *filp)
}
return -1;
}
-
diff --git a/doc/html-manual/boop-example/spec.c b/doc/html-manual/boop-example/spec.c
index b8e714356d3..d35513ecf90 100644
--- a/doc/html-manual/boop-example/spec.c
+++ b/doc/html-manual/boop-example/spec.c
@@ -31,7 +31,7 @@ int main ()
unsigned int count;
unsigned char random;
- int lock_held = 0;
+ int lock_held = 0;
dummy_major = register_chrdev (0, "dummy");
inode.i_rdev = dummy_major << MINORBITS;
@@ -49,14 +49,14 @@ int main ()
switch (random)
{
- case 1:
+ case 1:
rval = dummy_open (&inode, &my_file);
if (rval == 0)
lock_held = TRUE;
break;
case 2:
__CPROVER_assume (lock_held);
- count = dummy_read (&my_file, buffer, BUF_SIZE);
+ count = dummy_read (&my_file, buffer, BUF_SIZE);
break;
case 3:
dummy_release (&inode, &my_file);
diff --git a/doc/html-manual/gcc-wrap.c b/doc/html-manual/gcc-wrap.c
index 0ac8a3d9239..8894b904ef4 100644
--- a/doc/html-manual/gcc-wrap.c
+++ b/doc/html-manual/gcc-wrap.c
@@ -16,7 +16,7 @@ void run(const char *what, char *const argv[])
/* now create new process */
childpid = fork();
-
+
if(childpid>=0) /* fork succeeded */
{
if(childpid==0) /* fork() returns 0 to the child process */
@@ -40,24 +40,24 @@ void run(const char *what, char *const argv[])
exit(1);
}
}
-
+
int main(int argc, char * argv[])
{
// First do original call.
-
+
// on some systems, gcc gets confused if it is not argument 0
// (which normally contains the path to the executable being called).
argv[0]=strdup(gcc);
run(gcc, argv);
-
+
// now do preprocessing call
char **new_argv=malloc(sizeof(char *)*(argc+1));
-
+
_Bool compile=0;
_Bool assemble=0;
_Bool next_is_o=0;
-
+
unsigned i;
for(i=0; iHardware Verification
-
diff --git a/doc/html-manual/pid.c b/doc/html-manual/pid.c
index 4d33545647a..fd2f7e27a85 100644
--- a/doc/html-manual/pid.c
+++ b/doc/html-manual/pid.c
@@ -30,7 +30,7 @@ float desired_pitch;
float climb_sum_err=0;
/** Computes desired_gaz and desired_pitch */
-void climb_pid_run()
+void climb_pid_run()
{
float err=estimator_z_dot-desired_climb;
@@ -39,7 +39,7 @@ void climb_pid_run()
float pprz=fgaz*MAX_PPRZ;
desired_gaz=((pprz>=0 && pprz<=MAX_PPRZ) ? pprz : (pprz>MAX_PPRZ ? MAX_PPRZ : 0));
-
+
/** pitch offset for climb */
float pitch_of_vz=(desired_climb>0) ? desired_climb*pitch_of_vz_pgain : 0;
desired_pitch=nav_pitch+pitch_of_vz;
@@ -55,18 +55,18 @@ int main()
while(1)
{
- /** Non-deterministic input values */
+ /** Non-deterministic input values */
desired_climb=nondet_float();
estimator_z_dot=nondet_float();
- /** Range of input values */
+ /** Range of input values */
__CPROVER_assume(desired_climb>=-MAX_CLIMB && desired_climb<=MAX_CLIMB);
__CPROVER_assume(estimator_z_dot>=-MAX_CLIMB && estimator_z_dot<=MAX_CLIMB);
__CPROVER_input("desired_climb", desired_climb);
__CPROVER_input("estimator_z_dot", estimator_z_dot);
- climb_pid_run();
+ climb_pid_run();
__CPROVER_output("desired_gaz", desired_gaz);
__CPROVER_output("desired_pitch", desired_pitch);
@@ -75,4 +75,3 @@ int main()
return 0;
}
-
diff --git a/doc/html-manual/ring_buffer1.c b/doc/html-manual/ring_buffer1.c
index f90be79f1ab..323d97b474e 100644
--- a/doc/html-manual/ring_buffer1.c
+++ b/doc/html-manual/ring_buffer1.c
@@ -15,14 +15,14 @@ unsigned int ring_buffer[SIZE];
int main()
{
unsigned index=0;
-
+
while(1)
{
unsigned output;
output=ring_buffer[index];
printf("%u\n", output);
assert(output<=MAX);
-
+
ring_buffer[index]=sample();
index=(index+1)%SIZE;
diff --git a/doc/html-manual/ring_buffer2.c b/doc/html-manual/ring_buffer2.c
index 475260f8232..e852d2c9c56 100644
--- a/doc/html-manual/ring_buffer2.c
+++ b/doc/html-manual/ring_buffer2.c
@@ -15,14 +15,14 @@ unsigned int ring_buffer[SIZE];
int main()
{
unsigned index=0, previous_index=SIZE-1;
-
+
while(1)
{
unsigned output;
output=(ring_buffer[index]+ring_buffer[previous_index])/2;
assert(ring_buffer[index]<=MAX);
assert(output<=MAX);
-
+
ring_buffer[index]=sample();
previous_index=index;
diff --git a/regression/ansi-c/Array_Declarator1/main.c b/regression/ansi-c/Array_Declarator1/main.c
index e7bc36d0cc5..93ca50ede43 100644
--- a/regression/ansi-c/Array_Declarator1/main.c
+++ b/regression/ansi-c/Array_Declarator1/main.c
@@ -22,7 +22,7 @@ keyword static also appears within the [ and ] of the array type
derivation, then for each call to the function, the value of the
corresponding actual argument shall provide access to the first element
of an array with at least as many elements as specified by the size
-expression.
+expression.
6.7.5.3(21):
The following are all compatible function prototype declarators.
@@ -39,10 +39,10 @@ as are:
corresponding to a in any call to f must be a non-null pointer to the
first of at least three arrays of 5 doubles, which the others do not.)
-The comments in the rule for array_abstract_declarator in
+The comments in the rule for array_abstract_declarator in
src/ansi-c/parser.y indicate awareness of the standard regarding this
issue, however, it seems that the case where both TOK_STATIC and
-attribute_type_qualifier_list (in either order) occur is not covered,
+attribute_type_qualifier_list (in either order) occur is not covered,
even though the standard allows this combination.
Further investigation into this issue also revealed that the rules
diff --git a/regression/ansi-c/Array_Declarator3/main.c b/regression/ansi-c/Array_Declarator3/main.c
index c84e9a4ca4f..b0a3cba1564 100644
--- a/regression/ansi-c/Array_Declarator3/main.c
+++ b/regression/ansi-c/Array_Declarator3/main.c
@@ -7,4 +7,3 @@ int main(void)
int bar0[restrict] = {0};
return 0;
}
-
diff --git a/regression/ansi-c/Atomic1/main.c b/regression/ansi-c/Atomic1/main.c
index d7af26682bc..24083d42d12 100644
--- a/regression/ansi-c/Atomic1/main.c
+++ b/regression/ansi-c/Atomic1/main.c
@@ -1,9 +1,9 @@
// _Atomic is a C11 keyword. It can be used as a type qualifier
// and as a type specifier, which introduces ambiguity into the grammar.
-
+
// 6.7.2.4 - 4: If the _Atomic keyword is immediately followed by a left
// parenthesis, it is interpreted as a type specifier (with a type name),
-// not as a type qualifier.
+// not as a type qualifier.
// Visual Studio doesn't have it, will likely never have it.
diff --git a/regression/ansi-c/Header_files1/main.c b/regression/ansi-c/Header_files1/main.c
index 9a89425b6c0..040b61f6ea2 100644
--- a/regression/ansi-c/Header_files1/main.c
+++ b/regression/ansi-c/Header_files1/main.c
@@ -28,4 +28,3 @@ int main()
{
return 0;
}
-
diff --git a/regression/ansi-c/Header_files1/test.desc b/regression/ansi-c/Header_files1/test.desc
index 2967c9aa631..5dabd73bf87 100644
--- a/regression/ansi-c/Header_files1/test.desc
+++ b/regression/ansi-c/Header_files1/test.desc
@@ -8,4 +8,3 @@ main.c
^CONVERSION ERROR$
is not declared$
--
-
diff --git a/regression/ansi-c/Initializer_cast1/main.c b/regression/ansi-c/Initializer_cast1/main.c
index fe209ec38d8..a15d42f6038 100644
--- a/regression/ansi-c/Initializer_cast1/main.c
+++ b/regression/ansi-c/Initializer_cast1/main.c
@@ -21,18 +21,18 @@ int main()
struct S s;
union U u;
- // scalar
+ // scalar
l=(long){0x1};
-
+
// struct
s=(struct S){ 1, 2, 3, 4, 5, 6 };
-
+
// union
u=(union U)s;
-
+
// union
u=(union U){ 1 };
-
+
// array
const int *a=(array_type){ 1, 2, 3, 4 };
}
diff --git a/regression/ansi-c/KnR1/main.c b/regression/ansi-c/KnR1/main.c
index d192c54baa2..a72a852faf9 100644
--- a/regression/ansi-c/KnR1/main.c
+++ b/regression/ansi-c/KnR1/main.c
@@ -37,4 +37,3 @@ int main()
{
return d(-1)!=0;
}
-
diff --git a/regression/ansi-c/KnR2/main.c b/regression/ansi-c/KnR2/main.c
index ddde5205bb6..efe80ea626f 100644
--- a/regression/ansi-c/KnR2/main.c
+++ b/regression/ansi-c/KnR2/main.c
@@ -12,4 +12,3 @@ register int x;
int main()
{
}
-
diff --git a/regression/ansi-c/KnR3/main.c b/regression/ansi-c/KnR3/main.c
index 91a3f9c4c8e..a416f1fc921 100644
--- a/regression/ansi-c/KnR3/main.c
+++ b/regression/ansi-c/KnR3/main.c
@@ -29,4 +29,3 @@ int main()
{
return whois_func_head(0)==0;
}
-
diff --git a/regression/ansi-c/Lvalue1/main.c b/regression/ansi-c/Lvalue1/main.c
index fcc4e398374..b63d1451748 100644
--- a/regression/ansi-c/Lvalue1/main.c
+++ b/regression/ansi-c/Lvalue1/main.c
@@ -14,4 +14,3 @@ int main()
const char *f=&(__FUNCTION__[2]);
char *p=&(char){':'};
}
-
diff --git a/regression/ansi-c/MMX1/main.c b/regression/ansi-c/MMX1/main.c
index dfa5b682562..1114d40f6fc 100644
--- a/regression/ansi-c/MMX1/main.c
+++ b/regression/ansi-c/MMX1/main.c
@@ -5,13 +5,13 @@
int main()
{
// This is a gcc extension
- #ifdef __GNUC__
+ #ifdef __GNUC__
#ifdef __MMX__
__m64 x;
-
+
long long unsigned di;
-
- x=(__m64)di;
+
+ x=(__m64)di;
#endif
#endif
diff --git a/regression/ansi-c/Qualifiers1/main.c b/regression/ansi-c/Qualifiers1/main.c
index 71ffdd9ca4a..e1760882f58 100644
--- a/regression/ansi-c/Qualifiers1/main.c
+++ b/regression/ansi-c/Qualifiers1/main.c
@@ -16,11 +16,11 @@ int main()
volatile int * const p=(int * const)&a;
*((int * const)&a) = 1;
*p=2;
-
+
f(&a);
g(&a);
- // now with typedef
+ // now with typedef
ptr_constant pp1;
const_ptr_constant pp2=pp1;
}
diff --git a/regression/ansi-c/Recursive_Structure2/main.c b/regression/ansi-c/Recursive_Structure2/main.c
index 98c62554868..20fc636db65 100644
--- a/regression/ansi-c/Recursive_Structure2/main.c
+++ b/regression/ansi-c/Recursive_Structure2/main.c
@@ -12,4 +12,3 @@ int main()
return 0;
}
-
diff --git a/regression/ansi-c/Struct_Bitfields1/main.c b/regression/ansi-c/Struct_Bitfields1/main.c
index 045e50f7f6e..a65e86fba1a 100644
--- a/regression/ansi-c/Struct_Bitfields1/main.c
+++ b/regression/ansi-c/Struct_Bitfields1/main.c
@@ -44,7 +44,7 @@ int main()
s1.my_bit++;
++s1.my_bit;
(unsigned)s1.my_bit;
-
+
int *p;
p=p+s1.my_bit;
p=p-s1.my_bit;
diff --git a/regression/ansi-c/Struct_Enum_Padding1/main.c b/regression/ansi-c/Struct_Enum_Padding1/main.c
index 87f52665f12..ff842a308da 100644
--- a/regression/ansi-c/Struct_Enum_Padding1/main.c
+++ b/regression/ansi-c/Struct_Enum_Padding1/main.c
@@ -27,4 +27,3 @@ STATIC_ASSERT(sizeof(struct ofpact) == 4);
int main()
{
}
-
diff --git a/regression/ansi-c/Struct_Padding2/main.c b/regression/ansi-c/Struct_Padding2/main.c
index 2479688276d..415bf5e8f67 100644
--- a/regression/ansi-c/Struct_Padding2/main.c
+++ b/regression/ansi-c/Struct_Padding2/main.c
@@ -157,4 +157,3 @@ STATIC_ASSERT(
int main()
{
}
-
diff --git a/regression/ansi-c/Struct_Padding3/main.c b/regression/ansi-c/Struct_Padding3/main.c
index 3c88bc06137..e74d3e6722f 100644
--- a/regression/ansi-c/Struct_Padding3/main.c
+++ b/regression/ansi-c/Struct_Padding3/main.c
@@ -19,7 +19,7 @@ STATIC_ASSERT(__builtin_offsetof(struct my_struct1a, ch2)==5);
struct my_struct1b {
char ch1;
// this would normally be padded, but it won't!
- int i __attribute__((packed));
+ int i __attribute__((packed));
char ch2;
};
@@ -31,7 +31,7 @@ struct my_struct1c {
// this would normally be padded, but it won't!
struct
{
- int i;
+ int i;
} sub __attribute__((packed));
char ch2;
};
@@ -115,4 +115,3 @@ STATIC_ASSERT(__builtin_offsetof(struct my_struct3, i3)==28);
int main()
{
}
-
diff --git a/regression/ansi-c/Transparent_union1/main.c b/regression/ansi-c/Transparent_union1/main.c
index 23a60debf80..d977c176c9d 100644
--- a/regression/ansi-c/Transparent_union1/main.c
+++ b/regression/ansi-c/Transparent_union1/main.c
@@ -35,11 +35,11 @@ int main()
{
struct S1 s1;
struct S2 s2;
-
+
f1(&s1);
f1(&s2);
f1(0);
-
+
f2(0);
f2(1>2); // these are int
}
diff --git a/regression/ansi-c/Typecast_to_array_ptr1/main.c b/regression/ansi-c/Typecast_to_array_ptr1/main.c
index 1bab0d91b01..3b5be4b89c1 100644
--- a/regression/ansi-c/Typecast_to_array_ptr1/main.c
+++ b/regression/ansi-c/Typecast_to_array_ptr1/main.c
@@ -6,4 +6,3 @@ int main()
return 0;
}
-
diff --git a/regression/ansi-c/Typecast_to_union1/main.c b/regression/ansi-c/Typecast_to_union1/main.c
index 6da547e4d2b..8bed126e7cd 100644
--- a/regression/ansi-c/Typecast_to_union1/main.c
+++ b/regression/ansi-c/Typecast_to_union1/main.c
@@ -10,7 +10,7 @@ union U
int main()
{
union U u;
-
+
u=(union U)(1>2); // the relational operators return "int"
u=(union U)(1 && 1);
u=(union U)1.0; // the literal is double, not float
diff --git a/regression/ansi-c/Union_Initialization1/main.c b/regression/ansi-c/Union_Initialization1/main.c
index e6c8b97117d..9e8406c238c 100644
--- a/regression/ansi-c/Union_Initialization1/main.c
+++ b/regression/ansi-c/Union_Initialization1/main.c
@@ -7,7 +7,7 @@ typedef struct some_struct
long two;
} three;
} num_t;
-
+
int main()
{
num_t num1 = { 0 };
diff --git a/regression/ansi-c/Universal_characters1/main.c b/regression/ansi-c/Universal_characters1/main.c
index c2cc9358a60..30c9a445361 100644
--- a/regression/ansi-c/Universal_characters1/main.c
+++ b/regression/ansi-c/Universal_characters1/main.c
@@ -2,7 +2,7 @@ int identifier_\u0201_;
int \u0201_abc;
#define STATIC_ASSERT(condition) \
- int some_array##__LINE__[(condition) ? 1 : -1];
+ int some_array##__LINE__[(condition) ? 1 : -1];
char my_string[]="\u0201";
STATIC_ASSERT(sizeof(my_string)==3);
@@ -15,4 +15,3 @@ int main()
identifier_ȁ_=10;
ȁ_abc=10;
}
-
diff --git a/regression/ansi-c/VS_extensions1/main.c b/regression/ansi-c/VS_extensions1/main.c
index 1bea594ba1f..ca6a8434b06 100644
--- a/regression/ansi-c/VS_extensions1/main.c
+++ b/regression/ansi-c/VS_extensions1/main.c
@@ -22,7 +22,7 @@ struct __declspec(dllimport) some_struct_tag { int x; };
//__delegate int GetDayOfWeek();
-// __event
+// __event
void f4()
{
@@ -58,7 +58,7 @@ __int64 i64;
__int8 i8;
-// __interface
+// __interface
void f9()
{
@@ -83,7 +83,7 @@ void f9()
// __property
-// __raise
+// __raise
// __sealed
diff --git a/regression/ansi-c/Zero_Initialization1/main.c b/regression/ansi-c/Zero_Initialization1/main.c
index f51b398e018..3b7570d3ad3 100644
--- a/regression/ansi-c/Zero_Initialization1/main.c
+++ b/regression/ansi-c/Zero_Initialization1/main.c
@@ -12,7 +12,7 @@ extern inline void bar()
// similar with an incomplete array
extern char some_array[];
-
+
// similar with a union
extern union moo y;
diff --git a/regression/ansi-c/_Alignof1/main.c b/regression/ansi-c/_Alignof1/main.c
index 32af89e45f2..76f2a516e5e 100644
--- a/regression/ansi-c/_Alignof1/main.c
+++ b/regression/ansi-c/_Alignof1/main.c
@@ -1,5 +1,5 @@
#define STATIC_ASSERT(condition) \
- int some_array##__LINE__[(condition) ? 1 : -1];
+ int some_array##__LINE__[(condition) ? 1 : -1];
// C11: _Alignof
// 6.5.3.4
@@ -46,7 +46,7 @@ STATIC_ASSERT(_Alignof(struct foo)==128);
// gcc takes the following, but clang doesn't
STATIC_ASSERT(_Alignof(int __attribute__((aligned(128))))==128);
-#endif
+#endif
int main()
{
diff --git a/regression/ansi-c/_Bool1/main.c b/regression/ansi-c/_Bool1/main.c
index 7c1e8e3f494..16feeb70ce2 100644
--- a/regression/ansi-c/_Bool1/main.c
+++ b/regression/ansi-c/_Bool1/main.c
@@ -1,5 +1,5 @@
#define STATIC_ASSERT(condition) \
- int some_array##__LINE__[(condition) ? 1 : -1];
+ int some_array##__LINE__[(condition) ? 1 : -1];
// C11:
// 6.3.1.2 Boolean type
diff --git a/regression/ansi-c/_Generic1/main.c b/regression/ansi-c/_Generic1/main.c
index 40804e58dfa..b0d58d4860f 100644
--- a/regression/ansi-c/_Generic1/main.c
+++ b/regression/ansi-c/_Generic1/main.c
@@ -1,5 +1,5 @@
#define STATIC_ASSERT(condition) \
- int some_array##__LINE__[(condition) ? 1 : -1];
+ int some_array##__LINE__[(condition) ? 1 : -1];
#define G(X) _Generic((X), \
long double: 1, \
diff --git a/regression/ansi-c/arithmetic_right_shift1/main.c b/regression/ansi-c/arithmetic_right_shift1/main.c
index 9013df05cf4..e4423878e3b 100644
--- a/regression/ansi-c/arithmetic_right_shift1/main.c
+++ b/regression/ansi-c/arithmetic_right_shift1/main.c
@@ -1,7 +1,7 @@
#define static_assert(x) struct { char some[(x)?1:-1]; }
// arithmetic shift right isn't division!
-// http://en.wikipedia.org/wiki/Arithmetic_shift
+// http://en.wikipedia.org/wiki/Arithmetic_shift
static_assert((-70)/16==-4);
static_assert((-70)>>4==-5);
diff --git a/regression/ansi-c/array_initialization1/main.c b/regression/ansi-c/array_initialization1/main.c
index 142aa76948e..623adfbe40e 100644
--- a/regression/ansi-c/array_initialization1/main.c
+++ b/regression/ansi-c/array_initialization1/main.c
@@ -21,4 +21,3 @@ int main()
return 0;
}
-
diff --git a/regression/ansi-c/asm1/main.c b/regression/ansi-c/asm1/main.c
index e4e3b8f9ee9..243c1f36fb0 100644
--- a/regression/ansi-c/asm1/main.c
+++ b/regression/ansi-c/asm1/main.c
@@ -23,9 +23,9 @@ int main()
#ifdef __GNUC__
__asm volatile("mov ax, dx");
- // another gcc-extension
+ // another gcc-extension
register unsigned my_var asm("eax")=1;
-
+
// Apple added "ASM Blocks", similar to MS', to gcc
__asm {
mov al, 2
@@ -47,6 +47,6 @@ int main()
__asm mov dx, 0xD007
__asm out dx, al
#endif
-
+
return 0;
}
diff --git a/regression/ansi-c/asm3/other.c b/regression/ansi-c/asm3/other.c
index 03f7e46f1d9..1fae0c0aebe 100644
--- a/regression/ansi-c/asm3/other.c
+++ b/regression/ansi-c/asm3/other.c
@@ -5,4 +5,3 @@ int* other(int *) __asm__("" "my_real_name");
int *other(int *p) { return p; }
#endif
-
diff --git a/regression/ansi-c/character_literals1/main.c b/regression/ansi-c/character_literals1/main.c
index db347426c05..fb1e228979d 100644
--- a/regression/ansi-c/character_literals1/main.c
+++ b/regression/ansi-c/character_literals1/main.c
@@ -11,7 +11,7 @@ STATIC_ASSERT('\144' == 100);
STATIC_ASSERT('\xff' == (char)0xff);
// wide ones
-
+
STATIC_ASSERT(L'\xff'==255);
STATIC_ASSERT(L'a'=='a');
diff --git a/regression/ansi-c/decl_initialization1/main.c b/regression/ansi-c/decl_initialization1/main.c
index 492d47547da..9af910e996e 100644
--- a/regression/ansi-c/decl_initialization1/main.c
+++ b/regression/ansi-c/decl_initialization1/main.c
@@ -14,4 +14,3 @@ int main()
foo();
return cr_register_hook();
}
-
diff --git a/regression/ansi-c/decl_initialization2/main.c b/regression/ansi-c/decl_initialization2/main.c
index 96afef71d32..386538cd2c1 100644
--- a/regression/ansi-c/decl_initialization2/main.c
+++ b/regression/ansi-c/decl_initialization2/main.c
@@ -14,4 +14,3 @@ int main()
foo();
return cr_register_hook();
}
-
diff --git a/regression/ansi-c/enum1/main.c b/regression/ansi-c/enum1/main.c
index 1a8c2161496..3edb2d4a7b0 100644
--- a/regression/ansi-c/enum1/main.c
+++ b/regression/ansi-c/enum1/main.c
@@ -9,4 +9,3 @@ int main()
return 0;
}
-
diff --git a/regression/ansi-c/enum3/main.c b/regression/ansi-c/enum3/main.c
index ff41f84f8b7..bd9942fbe67 100644
--- a/regression/ansi-c/enum3/main.c
+++ b/regression/ansi-c/enum3/main.c
@@ -62,4 +62,3 @@ int main()
{
}
#endif
-
diff --git a/regression/ansi-c/enum8/main.c b/regression/ansi-c/enum8/main.c
index c320c754d12..f1493804506 100644
--- a/regression/ansi-c/enum8/main.c
+++ b/regression/ansi-c/enum8/main.c
@@ -6,4 +6,3 @@ enum {
int main (void) {
return 0;
}
-
diff --git a/regression/ansi-c/extern_inline1/main.c b/regression/ansi-c/extern_inline1/main.c
index 886e207a79c..ffc07bd7344 100644
--- a/regression/ansi-c/extern_inline1/main.c
+++ b/regression/ansi-c/extern_inline1/main.c
@@ -27,4 +27,3 @@ int main()
assert(foo(0)==0);
#endif
}
-
diff --git a/regression/ansi-c/float_constant1/main.c b/regression/ansi-c/float_constant1/main.c
index b8ad9424408..3661c8a064f 100644
--- a/regression/ansi-c/float_constant1/main.c
+++ b/regression/ansi-c/float_constant1/main.c
@@ -1,5 +1,5 @@
#define STATIC_ASSERT(condition) \
- int some_array##__LINE__[(condition) ? 1 : -1];
+ int some_array##__LINE__[(condition) ? 1 : -1];
// hex-based constants
STATIC_ASSERT(0x1.0p-95f == 2.524355e-29f);
diff --git a/regression/ansi-c/for_scope1/main.c b/regression/ansi-c/for_scope1/main.c
index 92cd501e8e7..7feb28d0eb4 100644
--- a/regression/ansi-c/for_scope1/main.c
+++ b/regression/ansi-c/for_scope1/main.c
@@ -7,9 +7,9 @@ int main()
#else
// the following is ok in C99 and upwards
-
- for(unsigned i=0; i<10; i++);
+
+ for(unsigned i=0; i<10; i++);
for(char i=0; i<10; i++);
-
+
#endif
}
diff --git a/regression/ansi-c/gcc_attributes1/main.c b/regression/ansi-c/gcc_attributes1/main.c
index a934deaa2ae..f36e5c58a74 100644
--- a/regression/ansi-c/gcc_attributes1/main.c
+++ b/regression/ansi-c/gcc_attributes1/main.c
@@ -2,7 +2,7 @@
typedef int i32;
-i32 __attribute__((aligned)) counter;
+i32 __attribute__((aligned)) counter;
__attribute__((aligned)) __attribute__((aligned)) int x0;
const __attribute__((aligned)) int x1;
@@ -94,7 +94,7 @@ int gvar3 __attribute__((__aligned__));
struct Scomb {
int x;
} __attribute__ ((packed, aligned (64)));
-
+
#endif
int main()
diff --git a/regression/ansi-c/gcc_attributes2/main.c b/regression/ansi-c/gcc_attributes2/main.c
index b16ff84a4ed..d881abf7a1b 100644
--- a/regression/ansi-c/gcc_attributes2/main.c
+++ b/regression/ansi-c/gcc_attributes2/main.c
@@ -23,11 +23,10 @@ int main()
static_assert(sizeof(int16_t)==2, "width of int16_t");
static_assert(sizeof(int32_t)==4, "width of int32_t");
static_assert(sizeof(int64_t)==8, "width of int64_t");
-
+
// also directly in the sizeof
static_assert(sizeof(int __attribute__((__mode__(__DI__))))==8, "width of int64_t");
static_assert(sizeof(__attribute__((__mode__(__DI__))) int)==8, "width of int64_t");
- #endif
+ #endif
}
-
diff --git a/regression/ansi-c/gcc_attributes3/main.c b/regression/ansi-c/gcc_attributes3/main.c
index b5e66493694..d843a1b2dc2 100644
--- a/regression/ansi-c/gcc_attributes3/main.c
+++ b/regression/ansi-c/gcc_attributes3/main.c
@@ -1,5 +1,5 @@
#define STATIC_ASSERT(condition) \
- int some_array##__LINE__[(condition) ? 1 : -1];
+ int some_array##__LINE__[(condition) ? 1 : -1];
#ifdef __GNUC__
diff --git a/regression/ansi-c/gcc_attributes4/main.c b/regression/ansi-c/gcc_attributes4/main.c
index f71473cfbcb..3fa2abd8218 100644
--- a/regression/ansi-c/gcc_attributes4/main.c
+++ b/regression/ansi-c/gcc_attributes4/main.c
@@ -1,5 +1,5 @@
#define STATIC_ASSERT(condition) \
- int some_array[(condition) ? 1 : -1];
+ int some_array[(condition) ? 1 : -1];
#ifdef __GNUC__
diff --git a/regression/ansi-c/gcc_attributes5/main.c b/regression/ansi-c/gcc_attributes5/main.c
index 45233c24196..ae40a62d049 100644
--- a/regression/ansi-c/gcc_attributes5/main.c
+++ b/regression/ansi-c/gcc_attributes5/main.c
@@ -29,7 +29,7 @@ int (* __attribute__((cdecl,regparm(0))) foo4)(int x);
typedef int (__attribute__((cdecl,regparm(0))) foo5)(int x);
typedef int (__attribute__((cdecl,regparm(0))) *foo6)(int x);
typedef int* (__attribute__((cdecl,regparm(0))) *foo7)(int x);
-
+
#endif
int main()
diff --git a/regression/ansi-c/gcc_attributes6/main.c b/regression/ansi-c/gcc_attributes6/main.c
index aa73313fa0b..e874070e605 100644
--- a/regression/ansi-c/gcc_attributes6/main.c
+++ b/regression/ansi-c/gcc_attributes6/main.c
@@ -1,5 +1,5 @@
#define STATIC_ASSERT(condition) \
- int some_array[(condition) ? 1 : -1];
+ int some_array[(condition) ? 1 : -1];
#ifdef __GNUC__
diff --git a/regression/ansi-c/gcc_builtin_constant_p1/main.c b/regression/ansi-c/gcc_builtin_constant_p1/main.c
index 2fb3d255220..8ce2e0f5522 100644
--- a/regression/ansi-c/gcc_builtin_constant_p1/main.c
+++ b/regression/ansi-c/gcc_builtin_constant_p1/main.c
@@ -26,4 +26,3 @@ int main()
assert(i==0);
#endif
}
-
diff --git a/regression/ansi-c/gcc_builtins3/main.c b/regression/ansi-c/gcc_builtins3/main.c
index b1223972467..c527c50aa2c 100644
--- a/regression/ansi-c/gcc_builtins3/main.c
+++ b/regression/ansi-c/gcc_builtins3/main.c
@@ -14,4 +14,3 @@ void __attribute__((ms_abi)) bar(__builtin_ms_va_list authors, ...)
int main()
{
}
-
diff --git a/regression/ansi-c/gcc_types_compatible_p1/main.c b/regression/ansi-c/gcc_types_compatible_p1/main.c
index 92c0dae1bf7..403596c4276 100644
--- a/regression/ansi-c/gcc_types_compatible_p1/main.c
+++ b/regression/ansi-c/gcc_types_compatible_p1/main.c
@@ -1,6 +1,6 @@
#define STATIC_ASSERT(condition) \
int some_array[(condition) ? 1 : -1];
-
+
int i;
double d;
@@ -18,7 +18,7 @@ cranberry _cranberry;
#define __intN_t(N, MODE) \
typedef int int##N##_t __attribute__ ((__mode__ (MODE))); \
typedef unsigned int uint##N##_t __attribute__ ((__mode__ (MODE)))
-
+
__intN_t (8, __QI__);
__intN_t (16, __HI__);
__intN_t (32, __SI__);
diff --git a/regression/ansi-c/gcc_types_compatible_p3/main.c b/regression/ansi-c/gcc_types_compatible_p3/main.c
index 35dd8c552c4..5693270c7da 100644
--- a/regression/ansi-c/gcc_types_compatible_p3/main.c
+++ b/regression/ansi-c/gcc_types_compatible_p3/main.c
@@ -44,9 +44,9 @@ STATIC_ASSERT(__builtin_types_compatible_p(typeof(enum large_enum1), unsigned lo
// Also works when signed
enum large_enum2 { NEG=-1, LARGE_CONSTANT2=0x100000000 };
-STATIC_ASSERT(__builtin_types_compatible_p(typeof(LARGE_CONSTANT2), signed long) ||
+STATIC_ASSERT(__builtin_types_compatible_p(typeof(LARGE_CONSTANT2), signed long) ||
__builtin_types_compatible_p(typeof(LARGE_CONSTANT2), signed long long));
-STATIC_ASSERT(__builtin_types_compatible_p(typeof(enum large_enum2), signed long) ||
+STATIC_ASSERT(__builtin_types_compatible_p(typeof(enum large_enum2), signed long) ||
__builtin_types_compatible_p(typeof(enum large_enum2), signed long long));
// 'Packed' is interesting.
diff --git a/regression/ansi-c/integer_constant1/main.c b/regression/ansi-c/integer_constant1/main.c
index 7776545e708..f1cd209e840 100644
--- a/regression/ansi-c/integer_constant1/main.c
+++ b/regression/ansi-c/integer_constant1/main.c
@@ -1,5 +1,5 @@
#define STATIC_ASSERT(condition) \
- int some_array##__LINE__[(condition) ? 1 : -1];
+ int some_array##__LINE__[(condition) ? 1 : -1];
STATIC_ASSERT('\''==39);
STATIC_ASSERT(L'\''==39);
diff --git a/regression/ansi-c/pragma_pack1/main.c b/regression/ansi-c/pragma_pack1/main.c
index 508535d75cb..2f90725c359 100644
--- a/regression/ansi-c/pragma_pack1/main.c
+++ b/regression/ansi-c/pragma_pack1/main.c
@@ -46,4 +46,3 @@ int main()
printf("struct S: %lu\n", sizeof(struct S));
return 0;
}
-
diff --git a/regression/ansi-c/pragma_pack2/main.c b/regression/ansi-c/pragma_pack2/main.c
index 095a91d8c56..07b4d1a5b66 100644
--- a/regression/ansi-c/pragma_pack2/main.c
+++ b/regression/ansi-c/pragma_pack2/main.c
@@ -21,4 +21,3 @@ int main()
{
return 0;
}
-
diff --git a/regression/ansi-c/pragma_pack3/main.c b/regression/ansi-c/pragma_pack3/main.c
index c4857f6d3f2..7eb85820319 100644
--- a/regression/ansi-c/pragma_pack3/main.c
+++ b/regression/ansi-c/pragma_pack3/main.c
@@ -40,4 +40,3 @@ int main()
{
return 0;
}
-
diff --git a/regression/ansi-c/sizeof1/main.c b/regression/ansi-c/sizeof1/main.c
index e519b3736e2..a624bd9ff6e 100644
--- a/regression/ansi-c/sizeof1/main.c
+++ b/regression/ansi-c/sizeof1/main.c
@@ -2,7 +2,7 @@
#include // for size_t
#define STATIC_ASSERT(condition) \
- int some_array##__LINE__[(condition) ? 1 : -1];
+ int some_array##__LINE__[(condition) ? 1 : -1];
// check size_t
STATIC_ASSERT(sizeof(void *)==sizeof(size_t));
diff --git a/regression/ansi-c/sizeof3/main.c b/regression/ansi-c/sizeof3/main.c
index bab07828fc9..cd21d97cf1b 100644
--- a/regression/ansi-c/sizeof3/main.c
+++ b/regression/ansi-c/sizeof3/main.c
@@ -1,5 +1,5 @@
#define STATIC_ASSERT(condition) \
- int some_array##__LINE__[(condition) ? 1 : -1];
+ int some_array##__LINE__[(condition) ? 1 : -1];
struct empty_struct { };
union empty_union { };
diff --git a/regression/ansi-c/struct3/main.c b/regression/ansi-c/struct3/main.c
index 4d9dba5f6fa..c06578de812 100644
--- a/regression/ansi-c/struct3/main.c
+++ b/regression/ansi-c/struct3/main.c
@@ -1,5 +1,5 @@
//#define STATIC_ASSERT(condition) \
-// int some_array##__LINE__[(condition) ? 1 : -1];
+// int some_array##__LINE__[(condition) ? 1 : -1];
#define STATIC_ASSERT(condition) \
_Static_assert((condition), "assertion");
@@ -19,7 +19,7 @@ int main()
};
STATIC_ASSERT(sizeof(struct A)==sizeof(int));
-
+
{
struct A
{
diff --git a/regression/ansi-c/struct5/main.c b/regression/ansi-c/struct5/main.c
index 8b0db354337..6859074ce23 100644
--- a/regression/ansi-c/struct5/main.c
+++ b/regression/ansi-c/struct5/main.c
@@ -4,9 +4,9 @@ struct foo1
{
int x;
};
-
+
int y;
-};
+};
union foo2
{
@@ -14,18 +14,18 @@ union foo2
{
int x;
};
-
+
int y;
-};
+};
int main()
{
struct foo1 s;
union foo2 u;
-
+
s.y=1;
s.x=2;
-
+
u.y=1;
u.x=2;
diff --git a/regression/array-refinement-with-incr/Array_UF3/main.c b/regression/array-refinement-with-incr/Array_UF3/main.c
index 4a945f152e4..9c423192760 100644
--- a/regression/array-refinement-with-incr/Array_UF3/main.c
+++ b/regression/array-refinement-with-incr/Array_UF3/main.c
@@ -1,8 +1,8 @@
void main()
{
unsigned int N;
- __CPROVER_assume(N>0);
-
+ __CPROVER_assume(N>0);
+
unsigned int j,k;
int matrix[N], max;
diff --git a/regression/array-refinement/Array_UF3/main.c b/regression/array-refinement/Array_UF3/main.c
index 0b8403c00a4..4db1610f46e 100644
--- a/regression/array-refinement/Array_UF3/main.c
+++ b/regression/array-refinement/Array_UF3/main.c
@@ -1,8 +1,8 @@
main()
{
unsigned int N;
- __CPROVER_assume(N>0);
-
+ __CPROVER_assume(N>0);
+
unsigned int j,k;
int matrix[N], max;
@@ -17,4 +17,3 @@ main()
assert(matrix[0]
#include
-int x = 0, y;
+int x = 0, y;
void* thr1(void * arg)
{
diff --git a/regression/cbmc-concurrency/pthread_join1/main.c b/regression/cbmc-concurrency/pthread_join1/main.c
index 0f1bd148819..d6c2c815f20 100644
--- a/regression/cbmc-concurrency/pthread_join1/main.c
+++ b/regression/cbmc-concurrency/pthread_join1/main.c
@@ -21,4 +21,3 @@ int main()
assert(i==1); // should fail, as there are two threads
assert(i==2); // should pass
}
-
diff --git a/regression/cbmc-concurrency/pthread_join2/main.c b/regression/cbmc-concurrency/pthread_join2/main.c
index c964d185ed7..91ee9566794 100644
--- a/regression/cbmc-concurrency/pthread_join2/main.c
+++ b/regression/cbmc-concurrency/pthread_join2/main.c
@@ -32,7 +32,7 @@ struct chord_args_t
// Internal start routine for a thread in a chord
static void* chord_start_routine(void *ptr)
{
- struct chord_args_t *args = (struct chord_args_t *) ptr;
+ struct chord_args_t *args = (struct chord_args_t *) ptr;
// ignore errors
pthread_join(args->thread, NULL);
diff --git a/regression/cbmc-concurrency/recursion1/main.c b/regression/cbmc-concurrency/recursion1/main.c
index f4af36c6c46..dab775d4f60 100644
--- a/regression/cbmc-concurrency/recursion1/main.c
+++ b/regression/cbmc-concurrency/recursion1/main.c
@@ -22,4 +22,3 @@ int main()
return 0;
}
-
diff --git a/regression/cbmc-concurrency/sc2/main.c b/regression/cbmc-concurrency/sc2/main.c
index 3575d682d12..7fff830abb3 100644
--- a/regression/cbmc-concurrency/sc2/main.c
+++ b/regression/cbmc-concurrency/sc2/main.c
@@ -17,4 +17,3 @@ int main()
assert(global!=3); // safe // #4
global=3; // #5
}
-
diff --git a/regression/cbmc-concurrency/sc3/main.c b/regression/cbmc-concurrency/sc3/main.c
index 2235a20ac54..9714ecbbdc4 100644
--- a/regression/cbmc-concurrency/sc3/main.c
+++ b/regression/cbmc-concurrency/sc3/main.c
@@ -9,15 +9,15 @@ __CPROVER_thread_local int local2;
void f()
{
int local3;
-
+
local1=1;
local2=1;
local3=1;
-
+
local1++;
local2++;
local3++;
-
+
assert(local1==2);
assert(local2==2);
assert(local3==2);
diff --git a/regression/cbmc-concurrency/sc4/main.c b/regression/cbmc-concurrency/sc4/main.c
index d0c44cba275..2c5a07cb979 100644
--- a/regression/cbmc-concurrency/sc4/main.c
+++ b/regression/cbmc-concurrency/sc4/main.c
@@ -4,8 +4,8 @@ int main()
{
global=1;
global=2;
-
+
__CPROVER_ASYNC_1: assert(global==2);
-
+
assert(global==2);
}
diff --git a/regression/cbmc-concurrency/sc6/main.c b/regression/cbmc-concurrency/sc6/main.c
index 029434f6308..0115f470f74 100644
--- a/regression/cbmc-concurrency/sc6/main.c
+++ b/regression/cbmc-concurrency/sc6/main.c
@@ -20,4 +20,3 @@ int main(){
__CPROVER_assert(!(r1 == 1 && r2 == 1), "SC");
return 0;
}
-
diff --git a/regression/cbmc-concurrency/sc8/main.c b/regression/cbmc-concurrency/sc8/main.c
index cc23a0c90bb..b860527b95f 100644
--- a/regression/cbmc-concurrency/sc8/main.c
+++ b/regression/cbmc-concurrency/sc8/main.c
@@ -2,13 +2,13 @@ int i, j;
int main()
{
-
+
i++;
// j++;
-
+
__CPROVER_ASYNC_1: j++;
-
+
assert(0);
-
+
j++;
}
diff --git a/regression/cbmc-concurrency/struct_and_array1/main.c b/regression/cbmc-concurrency/struct_and_array1/main.c
index fdc909d823b..b7b0369a647 100644
--- a/regression/cbmc-concurrency/struct_and_array1/main.c
+++ b/regression/cbmc-concurrency/struct_and_array1/main.c
@@ -31,7 +31,7 @@ int main()
pthread_t t;
pthread_create(&t,NULL,foo1,NULL);
pthread_create(&t,NULL,foo2,NULL);
-
+
if(done1 && done2)
{
assert(st.x==st.y);
diff --git a/regression/cbmc-concurrency/svcomp13_qrcu_safe/main.c b/regression/cbmc-concurrency/svcomp13_qrcu_safe/main.c
index a06b18623d8..0f277272d38 100644
--- a/regression/cbmc-concurrency/svcomp13_qrcu_safe/main.c
+++ b/regression/cbmc-concurrency/svcomp13_qrcu_safe/main.c
@@ -10,7 +10,7 @@ extern int __VERIFIER_nondet_int();
int idx=0; // boolean to control which of the two elements will be used by readers
// (idx <= 0) then ctr1 is used
// (idx >= 1) then ctr2 is used
-int ctr1=1, ctr2=0;
+int ctr1=1, ctr2=0;
int readerprogress1=0, readerprogress2=0; // the progress is indicated by an integer:
// 0: reader not yet started
// 1: reader withing QRCU read-side critical section
@@ -42,7 +42,7 @@ void __VERIFIER_atomic_check_progress1(int readerstart1) {
if (__VERIFIER_nondet_int()) {
__VERIFIER_assume(readerstart1 == 1 && readerprogress1 == 1);
assert(0);
- }
+ }
return;
}
@@ -50,7 +50,7 @@ void __VERIFIER_atomic_check_progress2(int readerstart2) {
if (__VERIFIER_nondet_int()) {
__VERIFIER_assume(readerstart2 == 1 && readerprogress2 == 1);
assert(0);
- }
+ }
return;
}
diff --git a/regression/cbmc-concurrency/svcomp13_qrcu_unsafe/main.c b/regression/cbmc-concurrency/svcomp13_qrcu_unsafe/main.c
index 9bb52ce6f9b..4b8230404c6 100644
--- a/regression/cbmc-concurrency/svcomp13_qrcu_unsafe/main.c
+++ b/regression/cbmc-concurrency/svcomp13_qrcu_unsafe/main.c
@@ -10,7 +10,7 @@ extern int __VERIFIER_nondet_int();
int idx=0; // boolean to control which of the two elements will be used by readers
// (idx <= 0) then ctr1 is used
// (idx >= 1) then ctr2 is used
-int ctr1=1, ctr2=0;
+int ctr1=1, ctr2=0;
int readerprogress1=0, readerprogress2=0; // the progress is indicated by an integer:
// 0: reader not yet started
// 1: reader withing QRCU read-side critical section
@@ -42,7 +42,7 @@ void __VERIFIER_atomic_check_progress1(int readerstart1) {
if (__VERIFIER_nondet_int()) {
__VERIFIER_assume(readerstart1 == 1 && readerprogress1 == 1);
assert(0);
- }
+ }
return;
}
@@ -50,7 +50,7 @@ void __VERIFIER_atomic_check_progress2(int readerstart2) {
if (__VERIFIER_nondet_int()) {
__VERIFIER_assume(readerstart2 == 1 && readerprogress2 == 1);
assert(0);
- }
+ }
return;
}
diff --git a/regression/cbmc-concurrency/svcomp13_read_write_lock_safe/main.c b/regression/cbmc-concurrency/svcomp13_read_write_lock_safe/main.c
index 48b4eb886ee..116c0cf351b 100644
--- a/regression/cbmc-concurrency/svcomp13_read_write_lock_safe/main.c
+++ b/regression/cbmc-concurrency/svcomp13_read_write_lock_safe/main.c
@@ -44,4 +44,3 @@ __CPROVER_ASYNC_1: writer();
__CPROVER_ASYNC_1: reader();
return 0;
}
-
diff --git a/regression/cbmc-concurrency/thread_chain_posix1/main.c b/regression/cbmc-concurrency/thread_chain_posix1/main.c
index 6979059ccc6..9f1d31a7d0c 100644
--- a/regression/cbmc-concurrency/thread_chain_posix1/main.c
+++ b/regression/cbmc-concurrency/thread_chain_posix1/main.c
@@ -54,7 +54,7 @@ struct thread_chain_args_t
// Internal start routine for a thread in a thread_chain
static void* thread_chain_start_routine(void *ptr)
{
- struct thread_chain_args_t *args = (struct thread_chain_args_t *) ptr;
+ struct thread_chain_args_t *args = (struct thread_chain_args_t *) ptr;
// ignore errors
pthread_join(args->thread, NULL);
diff --git a/regression/cbmc-concurrency/thread_chain_posix2/main.c b/regression/cbmc-concurrency/thread_chain_posix2/main.c
index 6979059ccc6..9f1d31a7d0c 100644
--- a/regression/cbmc-concurrency/thread_chain_posix2/main.c
+++ b/regression/cbmc-concurrency/thread_chain_posix2/main.c
@@ -54,7 +54,7 @@ struct thread_chain_args_t
// Internal start routine for a thread in a thread_chain
static void* thread_chain_start_routine(void *ptr)
{
- struct thread_chain_args_t *args = (struct thread_chain_args_t *) ptr;
+ struct thread_chain_args_t *args = (struct thread_chain_args_t *) ptr;
// ignore errors
pthread_join(args->thread, NULL);
diff --git a/regression/cbmc-concurrency/thread_chain_posix3/main.c b/regression/cbmc-concurrency/thread_chain_posix3/main.c
index 6979059ccc6..9f1d31a7d0c 100644
--- a/regression/cbmc-concurrency/thread_chain_posix3/main.c
+++ b/regression/cbmc-concurrency/thread_chain_posix3/main.c
@@ -54,7 +54,7 @@ struct thread_chain_args_t
// Internal start routine for a thread in a thread_chain
static void* thread_chain_start_routine(void *ptr)
{
- struct thread_chain_args_t *args = (struct thread_chain_args_t *) ptr;
+ struct thread_chain_args_t *args = (struct thread_chain_args_t *) ptr;
// ignore errors
pthread_join(args->thread, NULL);
diff --git a/regression/cbmc-concurrency/thread_local1/main.c b/regression/cbmc-concurrency/thread_local1/main.c
index 6972b0d2e56..1cbad005d8e 100644
--- a/regression/cbmc-concurrency/thread_local1/main.c
+++ b/regression/cbmc-concurrency/thread_local1/main.c
@@ -18,4 +18,3 @@ int main()
pthread_create(&t, 0, thr1, 0);
pthread_create(&t, 0, thr1, 0);
}
-
diff --git a/regression/cbmc-concurrency/uf_with_threads1/main.c b/regression/cbmc-concurrency/uf_with_threads1/main.c
index 73dbe9ee399..1f916a80b1d 100644
--- a/regression/cbmc-concurrency/uf_with_threads1/main.c
+++ b/regression/cbmc-concurrency/uf_with_threads1/main.c
@@ -25,7 +25,7 @@ int main()
pthread_t t;
pthread_create(&t,NULL,foo1,NULL);
pthread_create(&t,NULL,foo2,NULL);
-
+
if(done1 && done2)
assert(res1 == res2);
}
diff --git a/regression/cbmc-cover/assertion1/main.c b/regression/cbmc-cover/assertion1/main.c
index 80e30689b08..ca0f7d96dd4 100644
--- a/regression/cbmc-cover/assertion1/main.c
+++ b/regression/cbmc-cover/assertion1/main.c
@@ -1,12 +1,12 @@
int main()
{
int input1, input2;
-
+
__CPROVER_input("input1", input1);
__CPROVER_input("input2", input2);
__CPROVER_assert(!input1, "");
-
+
if(input1)
{
__CPROVER_assert(!input1, ""); // will work, we ignore the assertion
diff --git a/regression/cbmc-cover/branch1/main.c b/regression/cbmc-cover/branch1/main.c
index 0c9e7eb23a7..92b64795521 100644
--- a/regression/cbmc-cover/branch1/main.c
+++ b/regression/cbmc-cover/branch1/main.c
@@ -1,10 +1,10 @@
int main()
{
int input1, input2;
-
+
__CPROVER_input("input1", input1);
__CPROVER_input("input2", input2);
-
+
if(input1)
{
if(input1) // dependent
diff --git a/regression/cbmc-cover/condition1/main.c b/regression/cbmc-cover/condition1/main.c
index c53207527eb..62341b53cd3 100644
--- a/regression/cbmc-cover/condition1/main.c
+++ b/regression/cbmc-cover/condition1/main.c
@@ -4,7 +4,7 @@ int main()
__CPROVER_input("input1", input1);
__CPROVER_input("input2", input2);
-
+
if(input1 && input2)
{
}
diff --git a/regression/cbmc-cover/cover1/main.c b/regression/cbmc-cover/cover1/main.c
index a9e743567e5..6928622d2dc 100644
--- a/regression/cbmc-cover/cover1/main.c
+++ b/regression/cbmc-cover/cover1/main.c
@@ -7,12 +7,12 @@ int main()
__CPROVER_cover(input1);
__CPROVER_cover(!input1);
-
+
if(input1)
{
__CPROVER_cover(!input1); // won't work
}
-
+
// should not produce a goal
__CPROVER_assert(input1, "");
}
diff --git a/regression/cbmc-cover/decision1/main.c b/regression/cbmc-cover/decision1/main.c
index ebd204036fb..cf2beee9b7e 100644
--- a/regression/cbmc-cover/decision1/main.c
+++ b/regression/cbmc-cover/decision1/main.c
@@ -1,7 +1,7 @@
int main()
{
int input1, input2, input3;
-
+
__CPROVER_input("input1", input1);
__CPROVER_input("input2", input2);
__CPROVER_input("input3", input3);
diff --git a/regression/cbmc-cover/location1/main.c b/regression/cbmc-cover/location1/main.c
index 0409678bb2f..81fd1d23bdb 100644
--- a/regression/cbmc-cover/location1/main.c
+++ b/regression/cbmc-cover/location1/main.c
@@ -2,7 +2,7 @@ int main()
{
int input1;
int x=0;
-
+
__CPROVER_input("input1", input1);
if(input1)
diff --git a/regression/cbmc-cover/mcdc14/main.c b/regression/cbmc-cover/mcdc14/main.c
index ebc094c78d5..8ee96b8a080 100644
--- a/regression/cbmc-cover/mcdc14/main.c
+++ b/regression/cbmc-cover/mcdc14/main.c
@@ -6,7 +6,7 @@ int main()
if (altitude > 2500)
{
- /* instructions */
+ /* instructions */
}
return 1;
diff --git a/regression/cbmc-cover/mcdc3/main.c b/regression/cbmc-cover/mcdc3/main.c
index 5800ada9ee6..d5dad1ac232 100644
--- a/regression/cbmc-cover/mcdc3/main.c
+++ b/regression/cbmc-cover/mcdc3/main.c
@@ -1,11 +1,11 @@
int main()
{
unsigned x, y;
-
+
__CPROVER_input("x", x);
__CPROVER_input("y", y);
-
- if (!(x>3) && y<5)
+
+ if (!(x>3) && y<5)
;
return 1;
diff --git a/regression/cbmc-cover/mcdc4/main.c b/regression/cbmc-cover/mcdc4/main.c
index 08ea1146922..fb1e8b9cc17 100644
--- a/regression/cbmc-cover/mcdc4/main.c
+++ b/regression/cbmc-cover/mcdc4/main.c
@@ -8,7 +8,7 @@ int main()
__CPROVER_input("C", C);
__CPROVER_input("D", D);
- if((A && B) || (C && D))
+ if((A && B) || (C && D))
{
}
else
diff --git a/regression/cbmc-cover/mcdc5/main.c b/regression/cbmc-cover/mcdc5/main.c
index 65a7761db1b..fbce43d7b52 100644
--- a/regression/cbmc-cover/mcdc5/main.c
+++ b/regression/cbmc-cover/mcdc5/main.c
@@ -7,7 +7,7 @@ int main()
__CPROVER_input("C", C);
__CPROVER_input("D", D);
- if((A || B) && (C || D))
+ if((A || B) && (C || D))
{
}
else
diff --git a/regression/cbmc-cover/mcdc6/main.c b/regression/cbmc-cover/mcdc6/main.c
index c3aa903c471..cbfdb77d01e 100644
--- a/regression/cbmc-cover/mcdc6/main.c
+++ b/regression/cbmc-cover/mcdc6/main.c
@@ -1,10 +1,10 @@
int main()
{
unsigned x;
-
+
__CPROVER_input("x", x);
-
- if(x<3)
+
+ if(x<3)
;
return 1;
diff --git a/regression/cbmc-cover/mcdc7/main.c b/regression/cbmc-cover/mcdc7/main.c
index e8a19b16588..e2395b86475 100644
--- a/regression/cbmc-cover/mcdc7/main.c
+++ b/regression/cbmc-cover/mcdc7/main.c
@@ -1,7 +1,7 @@
int main()
{
signed x, y;
-
+
__CPROVER_input("x", x);
__CPROVER_input("y", y);
diff --git a/regression/cbmc-cover/mcdc8/main.c b/regression/cbmc-cover/mcdc8/main.c
index 3eb9a0010e9..d286ec76092 100644
--- a/regression/cbmc-cover/mcdc8/main.c
+++ b/regression/cbmc-cover/mcdc8/main.c
@@ -1,7 +1,7 @@
int main()
{
_Bool a, b, c;
-
+
__CPROVER_input("a", a);
__CPROVER_input("b", b);
__CPROVER_input("c", c);
diff --git a/regression/cbmc-from-CVS/Array_Access3/main.c b/regression/cbmc-from-CVS/Array_Access3/main.c
index 94aeaf3ffc3..c3c0b2374ee 100644
--- a/regression/cbmc-from-CVS/Array_Access3/main.c
+++ b/regression/cbmc-from-CVS/Array_Access3/main.c
@@ -10,9 +10,9 @@ int main()
// not normal
2[a]=2;
-
+
assert(a[2]==2);
-
+
p=a;
// also a bit strange
diff --git a/regression/cbmc-from-CVS/Array_Pointer1/main.c b/regression/cbmc-from-CVS/Array_Pointer1/main.c
index 407fbf15add..200ace72223 100644
--- a/regression/cbmc-from-CVS/Array_Pointer1/main.c
+++ b/regression/cbmc-from-CVS/Array_Pointer1/main.c
@@ -14,7 +14,7 @@ int main()
j = a[1];
assert(j == 1);
-
+
// Assignment with (dummy) cast.
// The array should be zero-initialized.
p=(int *)a;
diff --git a/regression/cbmc-from-CVS/Array_Pointer6/main.c b/regression/cbmc-from-CVS/Array_Pointer6/main.c
index daebe6163a2..f5120136573 100644
--- a/regression/cbmc-from-CVS/Array_Pointer6/main.c
+++ b/regression/cbmc-from-CVS/Array_Pointer6/main.c
@@ -11,6 +11,6 @@ int main()
q=&array;
q++;
q--;
-
+
assert(**q==*p);
}
diff --git a/regression/cbmc-from-CVS/Array_Pointer7/main.c b/regression/cbmc-from-CVS/Array_Pointer7/main.c
index cf474a4534c..e6b01a5f5da 100644
--- a/regression/cbmc-from-CVS/Array_Pointer7/main.c
+++ b/regression/cbmc-from-CVS/Array_Pointer7/main.c
@@ -1,12 +1,12 @@
void f1()
{
int array1[4];
-
+
char *p=(char *)array1;
-
+
for(unsigned i=0; i=0 && index<100);
@@ -16,7 +16,7 @@ void testB()
{
char arrayB1[100], arrayB2[100];
- arrayB2[10]=11;
+ arrayB2[10]=11;
__CPROVER_array_copy(arrayB1, arrayB2);
__CPROVER_assert(arrayB1[10]==11, "arrayB1[10] is OK");
diff --git a/regression/cbmc-from-CVS/End_thread1/main.c b/regression/cbmc-from-CVS/End_thread1/main.c
index 4147fdf937c..70e318eed89 100644
--- a/regression/cbmc-from-CVS/End_thread1/main.c
+++ b/regression/cbmc-from-CVS/End_thread1/main.c
@@ -23,4 +23,3 @@ int main()
assert(i!=100);
}
-
diff --git a/regression/cbmc-from-CVS/Failed_Symbols1/main.c b/regression/cbmc-from-CVS/Failed_Symbols1/main.c
index 8edae80b335..85380e5f6aa 100644
--- a/regression/cbmc-from-CVS/Failed_Symbols1/main.c
+++ b/regression/cbmc-from-CVS/Failed_Symbols1/main.c
@@ -1,14 +1,14 @@
int main()
{
int *p, *q, *a, *b;
-
+
q=a;
p=b;
-
+
*p=1;
*q=2;
- // this should work if no pointer checks are enabled
+ // this should work if no pointer checks are enabled
assert(*p==1);
assert(*q==2);
}
diff --git a/regression/cbmc-from-CVS/Linked_List1/main.c b/regression/cbmc-from-CVS/Linked_List1/main.c
index 4439630d3a9..0d767e3b75f 100644
--- a/regression/cbmc-from-CVS/Linked_List1/main.c
+++ b/regression/cbmc-from-CVS/Linked_List1/main.c
@@ -9,7 +9,7 @@ int main() {
unsigned i;
struct nodet *list=(void *)0;
struct nodet *new_node;
-
+
for(i=0; i<10; i++) {
new_node=malloc(sizeof(*new_node));
new_node->n=list;
diff --git a/regression/cbmc-from-CVS/Malloc1/main.c b/regression/cbmc-from-CVS/Malloc1/main.c
index 8e18343df2f..847289aa064 100644
--- a/regression/cbmc-from-CVS/Malloc1/main.c
+++ b/regression/cbmc-from-CVS/Malloc1/main.c
@@ -7,16 +7,16 @@ int main() {
int *p;
unsigned o;
size_t n=nondet_uint();
-
+
__CPROVER_assume(n>=1);
__CPROVER_assume(n<10000000);
p=malloc(sizeof(int)*n);
-
+
o=n-1;
p[o]=1000;
-
+
assert(p[o]==1000);
free(p);
diff --git a/regression/cbmc-from-CVS/Malloc10/main.c b/regression/cbmc-from-CVS/Malloc10/main.c
index 36d20f30fa9..548a5c20caf 100644
--- a/regression/cbmc-from-CVS/Malloc10/main.c
+++ b/regression/cbmc-from-CVS/Malloc10/main.c
@@ -35,7 +35,7 @@ void drm_vm_open_locked(struct drm_device *dev)
}
}
-int main(void)
+int main(void)
{
struct drm_device dev;
drm_vm_open_locked(&dev);
diff --git a/regression/cbmc-from-CVS/Malloc11/main.c b/regression/cbmc-from-CVS/Malloc11/main.c
index afbb7eb5c75..2ef0fc461e2 100644
--- a/regression/cbmc-from-CVS/Malloc11/main.c
+++ b/regression/cbmc-from-CVS/Malloc11/main.c
@@ -24,7 +24,7 @@ int main()
if( a != NULL)
a[0]=0;
-
+
if(n>=1) assert(a[0]==0);
return 1;
diff --git a/regression/cbmc-from-CVS/Malloc2/main.c b/regression/cbmc-from-CVS/Malloc2/main.c
index 14c5e5a32f2..fd263964119 100644
--- a/regression/cbmc-from-CVS/Malloc2/main.c
+++ b/regression/cbmc-from-CVS/Malloc2/main.c
@@ -26,10 +26,10 @@ int main(void)
if (!pp)
return -10;
-
+
pp2=&(pp->irqc);
-
+
//*(&(pp->irqc))=0;
-
+
return 0;
}
diff --git a/regression/cbmc-from-CVS/Malloc3/main.c b/regression/cbmc-from-CVS/Malloc3/main.c
index 8fbe4adeca6..c4a06bdd8db 100644
--- a/regression/cbmc-from-CVS/Malloc3/main.c
+++ b/regression/cbmc-from-CVS/Malloc3/main.c
@@ -8,7 +8,7 @@ int main() {
p=malloc(sizeof(int)*10);
free(p);
-
+
// bad!
p[1]=1;
}
diff --git a/regression/cbmc-from-CVS/Malloc5/main.c b/regression/cbmc-from-CVS/Malloc5/main.c
index 21cfd0dd48f..51d367ea2c5 100644
--- a/regression/cbmc-from-CVS/Malloc5/main.c
+++ b/regression/cbmc-from-CVS/Malloc5/main.c
@@ -6,11 +6,11 @@ int analyze_this()
char *p_char=malloc(sizeof(char));
int *p_int=malloc(sizeof(int));
void *p;
-
+
p=nondet_bool()?p_char:p_int;
p_int=p;
-
+
// this should fail, as a char is too small
*p_int=1;
}
diff --git a/regression/cbmc-from-CVS/Malloc6/main.c b/regression/cbmc-from-CVS/Malloc6/main.c
index 901f53b9056..075afaa94dc 100644
--- a/regression/cbmc-from-CVS/Malloc6/main.c
+++ b/regression/cbmc-from-CVS/Malloc6/main.c
@@ -6,11 +6,11 @@ int analyze_this()
char *p_char=malloc(sizeof(char));
int *p_int=malloc(sizeof(int));
void *p;
-
+
p=nondet_bool()?p_char:p_int;
p_int=p;
-
+
// this should not fail
if((void *)p_int!=(void *)p_char)
*p_int=1;
diff --git a/regression/cbmc-from-CVS/Malloc7/main.c b/regression/cbmc-from-CVS/Malloc7/main.c
index 540a10e6781..a9666086375 100644
--- a/regression/cbmc-from-CVS/Malloc7/main.c
+++ b/regression/cbmc-from-CVS/Malloc7/main.c
@@ -13,12 +13,12 @@ int main()
struct X *p;
struct X x;
int *q;
-
+
p=malloc(sizeof(struct X));
q=&(p->i);
-
+
*q=1;
- // should pass
+ // should pass
assert(p->i==1);
}
diff --git a/regression/cbmc-from-CVS/Malloc8/main.c b/regression/cbmc-from-CVS/Malloc8/main.c
index ab33864c9bf..045aec63d0d 100644
--- a/regression/cbmc-from-CVS/Malloc8/main.c
+++ b/regression/cbmc-from-CVS/Malloc8/main.c
@@ -9,10 +9,10 @@ int main() {
struct person** ptr_ptr_p1;
ptr_ptr_p1 = malloc(sizeof(struct person*));
*ptr_ptr_p1 = malloc(sizeof(struct person));
-
+
// Piecewise assignments are ok with cbmc
struct person* ptr_p;
- ptr_p = *ptr_ptr_p1;
+ ptr_p = *ptr_ptr_p1;
ptr_p->name = "Dummy";
printf("%s\n", ptr_p->name);
diff --git a/regression/cbmc-from-CVS/Malloc9/main.c b/regression/cbmc-from-CVS/Malloc9/main.c
index de6fbf068b1..c61812ca576 100644
--- a/regression/cbmc-from-CVS/Malloc9/main.c
+++ b/regression/cbmc-from-CVS/Malloc9/main.c
@@ -18,7 +18,7 @@ struct S2
int main(void)
{
_Bool b;
-
+
if(b)
{
struct S1 *p=my_malloc(sizeof(struct S1));
@@ -29,6 +29,6 @@ int main(void)
struct S2 *p=my_malloc(sizeof(struct S2));
p->y=1;
}
-
+
return 0;
}
diff --git a/regression/cbmc-from-CVS/Minisat_Simp1/main.c b/regression/cbmc-from-CVS/Minisat_Simp1/main.c
index 8810b4799ae..83e859d45d3 100644
--- a/regression/cbmc-from-CVS/Minisat_Simp1/main.c
+++ b/regression/cbmc-from-CVS/Minisat_Simp1/main.c
@@ -4,10 +4,9 @@ int isnan(double);
int main()
{
double my_d, dabs;
-
+
__CPROVER_assume(!isnan(my_d));
-
+
dabs=(my_d<0)?-my_d:my_d;
assert(fabs(my_d)==dabs);
}
-
diff --git a/regression/cbmc-from-CVS/Pointer1/main.c b/regression/cbmc-from-CVS/Pointer1/main.c
index d3f956a0f88..23795f17e22 100644
--- a/regression/cbmc-from-CVS/Pointer1/main.c
+++ b/regression/cbmc-from-CVS/Pointer1/main.c
@@ -1,10 +1,10 @@
int main()
{
- int a, b, c, *p;
-
+ int a, b, c, *p;
+
if(c) p=&a; else p=&b;
-
+
*p=3;
-
+
assert(b==3 || a==3);
}
diff --git a/regression/cbmc-from-CVS/Pointer10/main.c b/regression/cbmc-from-CVS/Pointer10/main.c
index df0ad71d088..0cb84393e53 100644
--- a/regression/cbmc-from-CVS/Pointer10/main.c
+++ b/regression/cbmc-from-CVS/Pointer10/main.c
@@ -14,11 +14,11 @@ main()
p=&(s.array[4]);
*p=5;
-
+
assert(s.array[4]==5);
-
+
p=&s.z;
*p=6;
-
+
assert(s.z==6);
}
diff --git a/regression/cbmc-from-CVS/Pointer11/main.c b/regression/cbmc-from-CVS/Pointer11/main.c
index 4889d0cd1cc..6de67d9ce7b 100644
--- a/regression/cbmc-from-CVS/Pointer11/main.c
+++ b/regression/cbmc-from-CVS/Pointer11/main.c
@@ -9,12 +9,12 @@ main()
{
struct S s[10];
int *p, *q, x=nondet_int(), y=nondet_int();
-
+
__CPROVER_assume(x==0);
__CPROVER_assume(y==0);
-
+
p=&(s[x].a);
q=&(s[y].a);
-
+
assert(p==q);
}
diff --git a/regression/cbmc-from-CVS/Pointer12/main.c b/regression/cbmc-from-CVS/Pointer12/main.c
index 02e67312a68..dc9fe5120f5 100644
--- a/regression/cbmc-from-CVS/Pointer12/main.c
+++ b/regression/cbmc-from-CVS/Pointer12/main.c
@@ -1,10 +1,10 @@
void f(const int *p)
{
int *q;
-
+
// this is ok
q=(int *)p;
-
+
// this, too!
*q=1;
}
@@ -12,6 +12,6 @@ void f(const int *p)
main()
{
int x;
-
+
f(&x);
}
diff --git a/regression/cbmc-from-CVS/Pointer15/main.c b/regression/cbmc-from-CVS/Pointer15/main.c
index 59679d6191e..fe750738dd0 100644
--- a/regression/cbmc-from-CVS/Pointer15/main.c
+++ b/regression/cbmc-from-CVS/Pointer15/main.c
@@ -5,6 +5,6 @@ int main()
int c;
p=(c?p:0);
-
+
p=(int * const)0;
}
diff --git a/regression/cbmc-from-CVS/Pointer17/main.c b/regression/cbmc-from-CVS/Pointer17/main.c
index 32dec818a7e..709520ba95c 100644
--- a/regression/cbmc-from-CVS/Pointer17/main.c
+++ b/regression/cbmc-from-CVS/Pointer17/main.c
@@ -5,7 +5,7 @@ int main()
int i;
q=&i;
p=&q;
-
-
+
+
**p=1;
}
diff --git a/regression/cbmc-from-CVS/Pointer20/main.c b/regression/cbmc-from-CVS/Pointer20/main.c
index 027747c2d1d..c92e561b243 100644
--- a/regression/cbmc-from-CVS/Pointer20/main.c
+++ b/regression/cbmc-from-CVS/Pointer20/main.c
@@ -6,7 +6,7 @@ int global;
void f() {
int local;
int input;
-
+
input=nondet_int();
p=input?&local:&global;
diff --git a/regression/cbmc-from-CVS/Pointer24/main.c b/regression/cbmc-from-CVS/Pointer24/main.c
index 417bec90822..b2597b963f9 100644
--- a/regression/cbmc-from-CVS/Pointer24/main.c
+++ b/regression/cbmc-from-CVS/Pointer24/main.c
@@ -3,12 +3,12 @@ char a[100];
int main()
{
char *p, *q;
-
+
q=p;
-
+
__CPROVER_assume(!__CPROVER_same_object(p, 0));
-
+
p++;
-
+
assert(!__CPROVER_same_object(p, 0));
}
diff --git a/regression/cbmc-from-CVS/Pointer25/main.c b/regression/cbmc-from-CVS/Pointer25/main.c
index 887d45ad237..b5f2ea854d7 100644
--- a/regression/cbmc-from-CVS/Pointer25/main.c
+++ b/regression/cbmc-from-CVS/Pointer25/main.c
@@ -4,15 +4,15 @@ int main()
void *p;
// from integer 0 to NULL
-
+
if(x==0)
{
p=x;
assert(p==0);
}
-
+
// the other way around
-
+
if(p==0)
{
x=p;
diff --git a/regression/cbmc-from-CVS/Pointer26/main.c b/regression/cbmc-from-CVS/Pointer26/main.c
index a87e9664fa8..ec513fbe68f 100644
--- a/regression/cbmc-from-CVS/Pointer26/main.c
+++ b/regression/cbmc-from-CVS/Pointer26/main.c
@@ -3,7 +3,7 @@ int main()
unsigned int *p=(unsigned int *)0xdeadbeef;
assert(p!=0);
- int zero;
+ int zero;
__CPROVER_assume(zero==0);
unsigned int *q=(unsigned int *)zero;
assert(q==0);
diff --git a/regression/cbmc-from-CVS/Pointer27/main.c b/regression/cbmc-from-CVS/Pointer27/main.c
index 0ba17105630..62db7615843 100644
--- a/regression/cbmc-from-CVS/Pointer27/main.c
+++ b/regression/cbmc-from-CVS/Pointer27/main.c
@@ -1,11 +1,11 @@
#include
-
+
typedef struct
{
char a;
int b;
} S1t;
-
+
int main ()
{
S1t* mem[4];
diff --git a/regression/cbmc-from-CVS/Pointer29/main.c b/regression/cbmc-from-CVS/Pointer29/main.c
index 10223c16fa3..e1b8b5e59a5 100644
--- a/regression/cbmc-from-CVS/Pointer29/main.c
+++ b/regression/cbmc-from-CVS/Pointer29/main.c
@@ -5,4 +5,3 @@ int main() {
assert(s_pdt > 1);
return 0;
}
-
diff --git a/regression/cbmc-from-CVS/Pointer3/main.c b/regression/cbmc-from-CVS/Pointer3/main.c
index 9bbb6c0b4cb..fd3181137b4 100644
--- a/regression/cbmc-from-CVS/Pointer3/main.c
+++ b/regression/cbmc-from-CVS/Pointer3/main.c
@@ -3,12 +3,12 @@ int main()
typedef int *intptr;
intptr a[10];
int x, y;
-
+
unsigned i;
__CPROVER_assume(i<10);
a[i]=&x;
a[5]=&y;
-
- assert(*(a[i])==x);
+
+ assert(*(a[i])==x);
}
diff --git a/regression/cbmc-from-CVS/Pointer31/main.c b/regression/cbmc-from-CVS/Pointer31/main.c
index 41a8ee7ca4b..36996af38fa 100644
--- a/regression/cbmc-from-CVS/Pointer31/main.c
+++ b/regression/cbmc-from-CVS/Pointer31/main.c
@@ -6,12 +6,12 @@ int global;
int main()
{
p=&global;
-
+
for(int i=0; i<10; i++)
{
*p=1;
- // this is not allowed!
+ // this is not allowed!
int local;
p=&local;
}
diff --git a/regression/cbmc-from-CVS/Pointer6/main.c b/regression/cbmc-from-CVS/Pointer6/main.c
index 7914e3c54b7..13d671fad68 100644
--- a/regression/cbmc-from-CVS/Pointer6/main.c
+++ b/regression/cbmc-from-CVS/Pointer6/main.c
@@ -10,8 +10,8 @@ int main()
int z, k, *q;
array[0].p=&k;
-
+
q=array[0].p;
-
+
z=*q;
}
diff --git a/regression/cbmc-from-CVS/Pointer7/main.c b/regression/cbmc-from-CVS/Pointer7/main.c
index 7ddb5dfb8e3..49e2de7b750 100644
--- a/regression/cbmc-from-CVS/Pointer7/main.c
+++ b/regression/cbmc-from-CVS/Pointer7/main.c
@@ -2,8 +2,8 @@ int main()
{
unsigned char u=255;
signed char *p;
-
+
p=(signed char *)&u;
-
+
assert(*p==-1);
}
diff --git a/regression/cbmc-from-CVS/Pointer_Object_Type1/main.c b/regression/cbmc-from-CVS/Pointer_Object_Type1/main.c
index 55a3b0fae29..bebd3a91cfb 100644
--- a/regression/cbmc-from-CVS/Pointer_Object_Type1/main.c
+++ b/regression/cbmc-from-CVS/Pointer_Object_Type1/main.c
@@ -6,12 +6,12 @@ int main()
int input;
void *p;
int *p2;
-
+
if(input)
p=&int_var;
else
p=&ch_var;
-
+
p2=(int *)p;
// this should fail if p points to ch_var
diff --git a/regression/cbmc-from-CVS/Same_Basename1/bar.c b/regression/cbmc-from-CVS/Same_Basename1/bar.c
index 6ca6609d3ea..3a4dbd9e1aa 100644
--- a/regression/cbmc-from-CVS/Same_Basename1/bar.c
+++ b/regression/cbmc-from-CVS/Same_Basename1/bar.c
@@ -6,4 +6,3 @@ int main()
assert(func(x));
return 0;
}
-
diff --git a/regression/cbmc-from-CVS/Same_Basename1/foo/bar.c b/regression/cbmc-from-CVS/Same_Basename1/foo/bar.c
index 82b74a5e5b9..0bb1fd170be 100644
--- a/regression/cbmc-from-CVS/Same_Basename1/foo/bar.c
+++ b/regression/cbmc-from-CVS/Same_Basename1/foo/bar.c
@@ -2,4 +2,3 @@ int func(int x)
{
return 1;
}
-
diff --git a/regression/cbmc-from-CVS/Sizeof1/main.c b/regression/cbmc-from-CVS/Sizeof1/main.c
index 0c59eb9d96a..e69fcdb7810 100644
--- a/regression/cbmc-from-CVS/Sizeof1/main.c
+++ b/regression/cbmc-from-CVS/Sizeof1/main.c
@@ -28,6 +28,6 @@ OS_EVENT OSEventTbl[10] ;
int main(void)
{
int x;
-
+
x=sizeof(OSEventTbl);
}
diff --git a/regression/cbmc-from-CVS/String_Abstraction1/main.c b/regression/cbmc-from-CVS/String_Abstraction1/main.c
index 5352ac5ce76..1800bef2e3b 100644
--- a/regression/cbmc-from-CVS/String_Abstraction1/main.c
+++ b/regression/cbmc-from-CVS/String_Abstraction1/main.c
@@ -3,15 +3,15 @@
int main()
{
char a[100], b[100], *p;
-
+
strcpy(a, "asd");
assert(strlen(a)==3);
-
+
a[2]=0;
assert(strlen(a)==2);
-
+
p=strcpy(b, a);
assert(p==b);
- assert(strlen(b)==2);
+ assert(strlen(b)==2);
assert(strlen(p)==2);
}
diff --git a/regression/cbmc-from-CVS/String_Abstraction10/main.c b/regression/cbmc-from-CVS/String_Abstraction10/main.c
index 260e750ce46..ed0c0c50d5b 100644
--- a/regression/cbmc-from-CVS/String_Abstraction10/main.c
+++ b/regression/cbmc-from-CVS/String_Abstraction10/main.c
@@ -12,10 +12,10 @@ int main()
{
strcpy(a[0], "asd");
assert(strlen(a[0])==3);
-
+
strcpy(s.x, "asdasd");
assert(strlen(s.x)==6);
-
+
s.p=s.x;
assert(strlen(s.p)==6);
}
diff --git a/regression/cbmc-from-CVS/String_Abstraction12/char-array.c b/regression/cbmc-from-CVS/String_Abstraction12/char-array.c
index 97615ebeaa7..4a751e2daf0 100644
--- a/regression/cbmc-from-CVS/String_Abstraction12/char-array.c
+++ b/regression/cbmc-from-CVS/String_Abstraction12/char-array.c
@@ -1,10 +1,9 @@
int main(int argc, char* argv[]) {
char dest[10];
-
+
__CPROVER_assert(__CPROVER_buffer_size(dest) == 10, "CBMC failed to track char array size");
dest[9] = '\0';
__CPROVER_assert(__CPROVER_is_zero_string(dest), "CBMC failed to track char array (2)");
return 0;
}
-
diff --git a/regression/cbmc-from-CVS/String_Abstraction13/constant.c b/regression/cbmc-from-CVS/String_Abstraction13/constant.c
index 8c8af8be8c3..c8da924d263 100644
--- a/regression/cbmc-from-CVS/String_Abstraction13/constant.c
+++ b/regression/cbmc-from-CVS/String_Abstraction13/constant.c
@@ -13,4 +13,3 @@ int main() {
assert(__CPROVER_is_zero_string(x));
return 0;
}
-
diff --git a/regression/cbmc-from-CVS/String_Abstraction14/pass-in-implicit.c b/regression/cbmc-from-CVS/String_Abstraction14/pass-in-implicit.c
index af6ef9a84b6..b62283af641 100644
--- a/regression/cbmc-from-CVS/String_Abstraction14/pass-in-implicit.c
+++ b/regression/cbmc-from-CVS/String_Abstraction14/pass-in-implicit.c
@@ -1,7 +1,7 @@
void * malloc(unsigned);
void use_str(char * s) {
- assert(__CPROVER_is_zero_string(s));
+ assert(__CPROVER_is_zero_string(s));
}
int main(int argc, char* argv[]) {
diff --git a/regression/cbmc-from-CVS/String_Abstraction15/pass-in.c b/regression/cbmc-from-CVS/String_Abstraction15/pass-in.c
index 73a56b79aab..4972c1f6768 100644
--- a/regression/cbmc-from-CVS/String_Abstraction15/pass-in.c
+++ b/regression/cbmc-from-CVS/String_Abstraction15/pass-in.c
@@ -1,7 +1,7 @@
void * malloc(unsigned);
void use_str(char * s) {
- assert(__CPROVER_is_zero_string(s));
+ assert(__CPROVER_is_zero_string(s));
}
int main(int argc, char* argv[]) {
diff --git a/regression/cbmc-from-CVS/String_Abstraction16/ptr-arith.c b/regression/cbmc-from-CVS/String_Abstraction16/ptr-arith.c
index ce3aa49697f..372723a35c9 100644
--- a/regression/cbmc-from-CVS/String_Abstraction16/ptr-arith.c
+++ b/regression/cbmc-from-CVS/String_Abstraction16/ptr-arith.c
@@ -10,7 +10,6 @@ int main(int argc, char* argv[]) {
name=strcpy(name, "abcdefghi");
name=strcpy(name+5-1, "xxxxx");
assert(__CPROVER_is_zero_string(name));
-
+
return 0;
}
-
diff --git a/regression/cbmc-from-CVS/String_Abstraction17/strcpy-no-decl.c b/regression/cbmc-from-CVS/String_Abstraction17/strcpy-no-decl.c
index e122165e7b2..1b4863e7d6e 100644
--- a/regression/cbmc-from-CVS/String_Abstraction17/strcpy-no-decl.c
+++ b/regression/cbmc-from-CVS/String_Abstraction17/strcpy-no-decl.c
@@ -3,7 +3,7 @@ void * malloc(unsigned);
char * make_str() {
unsigned short len;
char * str;
-
+
__CPROVER_assume(len > 0);
str = malloc(len);
__CPROVER_assume(__CPROVER_buffer_size(str) == len);
@@ -25,4 +25,3 @@ int main(int argc, char* argv[]) {
return 0;
}
-
diff --git a/regression/cbmc-from-CVS/String_Abstraction18/strcpy.c b/regression/cbmc-from-CVS/String_Abstraction18/strcpy.c
index 6b39c131091..c74e9fea4e5 100644
--- a/regression/cbmc-from-CVS/String_Abstraction18/strcpy.c
+++ b/regression/cbmc-from-CVS/String_Abstraction18/strcpy.c
@@ -5,7 +5,7 @@ void * malloc(unsigned);
char * make_str() {
unsigned short len;
char * str;
-
+
__CPROVER_assume(len > 0);
str = malloc(len);
__CPROVER_assume(__CPROVER_buffer_size(str) == len);
@@ -28,4 +28,3 @@ int main(int argc, char* argv[]) {
return 0;
}
-
diff --git a/regression/cbmc-from-CVS/String_Abstraction2/main.c b/regression/cbmc-from-CVS/String_Abstraction2/main.c
index c6187aac31c..41c52122cf9 100644
--- a/regression/cbmc-from-CVS/String_Abstraction2/main.c
+++ b/regression/cbmc-from-CVS/String_Abstraction2/main.c
@@ -5,15 +5,15 @@ int main()
{
char a[100], b[100], *p;
unsigned int i;
-
+
i=strlen("asdasd");
-
+
strcpy(a, "asd");
strcpy(b, "asd");
-
+
p=i?a:b;
-
+
i=strlen(p);
-
+
assert(i==3);
}
diff --git a/regression/cbmc-from-CVS/String_Abstraction21/strcpy2.c b/regression/cbmc-from-CVS/String_Abstraction21/strcpy2.c
index f9d4739325e..77fa5db3fa0 100644
--- a/regression/cbmc-from-CVS/String_Abstraction21/strcpy2.c
+++ b/regression/cbmc-from-CVS/String_Abstraction21/strcpy2.c
@@ -5,7 +5,7 @@ void * malloc(unsigned);
char * make_str() {
unsigned short len;
char * str;
-
+
__CPROVER_assume(len > 0);
str = malloc(len);
__CPROVER_assume(__CPROVER_buffer_size(str) == len);
@@ -29,10 +29,9 @@ int main(int argc, char* argv[]) {
strcpy(dest, name);
assert(__CPROVER_is_zero_string(dest));
-
+
strcpy(dest2, name);
assert(__CPROVER_is_zero_string(dest2));
return 0;
}
-
diff --git a/regression/cbmc-from-CVS/String_Abstraction3/main.c b/regression/cbmc-from-CVS/String_Abstraction3/main.c
index df69d92fc4f..626df8e3800 100644
--- a/regression/cbmc-from-CVS/String_Abstraction3/main.c
+++ b/regression/cbmc-from-CVS/String_Abstraction3/main.c
@@ -7,7 +7,7 @@ int main()
strcpy(a, "asdasd\000");
assert(strlen(a+1)==5);
-
+
p=a+1;
assert(strlen(p)==5);
diff --git a/regression/cbmc-from-CVS/String_Abstraction5/main.c b/regression/cbmc-from-CVS/String_Abstraction5/main.c
index 1df1c4fb92f..ce43ab835ac 100644
--- a/regression/cbmc-from-CVS/String_Abstraction5/main.c
+++ b/regression/cbmc-from-CVS/String_Abstraction5/main.c
@@ -17,7 +17,7 @@ int main()
// this sould work
if(idata=1;
- p->next=malloc( sizeof(struct mylist ) );
+ p->next=malloc( sizeof(struct mylist ) );
p->next->data=2;
- p->next->next=malloc( sizeof(struct mylist ) );
+ p->next->next=malloc( sizeof(struct mylist ) );
p->next->next->data=3;
- p->next->next->next=malloc( sizeof(struct mylist ) );
+ p->next->next->next=malloc( sizeof(struct mylist ) );
p->next->next->next->data=4;
-
+
assert(p->next->next->data==3);
return 0;
diff --git a/regression/cbmc-from-CVS/Struct_Pointer3/main.c b/regression/cbmc-from-CVS/Struct_Pointer3/main.c
index c5f2185a4e7..14d8b17961c 100644
--- a/regression/cbmc-from-CVS/Struct_Pointer3/main.c
+++ b/regression/cbmc-from-CVS/Struct_Pointer3/main.c
@@ -5,7 +5,7 @@ struct listt
};
typedef struct listt listt;
-
+
int main ()
{
listt el0, el1, *ppp1, *ppp2;
diff --git a/regression/cbmc-from-CVS/Struct_Pointer_Array1/main2.c b/regression/cbmc-from-CVS/Struct_Pointer_Array1/main2.c
index a1297770dfe..70165b406f3 100644
--- a/regression/cbmc-from-CVS/Struct_Pointer_Array1/main2.c
+++ b/regression/cbmc-from-CVS/Struct_Pointer_Array1/main2.c
@@ -8,7 +8,7 @@ StructTag *TagTbl[2];
int main() {
unsigned int i;
assume(i<2);
-
+
if(TagTbl[i] != NULL)
TagTbl[i]->field = 1;
}
diff --git a/regression/cbmc-from-CVS/Unbounded_Array1/main.c b/regression/cbmc-from-CVS/Unbounded_Array1/main.c
index 624ef1c18df..675d8af2c26 100644
--- a/regression/cbmc-from-CVS/Unbounded_Array1/main.c
+++ b/regression/cbmc-from-CVS/Unbounded_Array1/main.c
@@ -1,12 +1,12 @@
int main() {
unsigned int n, i, j, ai, aj;
int a[n];
-
+
__CPROVER_assume(n>10 && n<10000000);
-
+
__CPROVER_assume(i10 && n<100000);
-
+
if(x)
a[0]=1;
a[1]=2;
- assert(a[0]==1 || !x);
+ assert(a[0]==1 || !x);
}
diff --git a/regression/cbmc-from-CVS/Unbounded_Array5/main.c b/regression/cbmc-from-CVS/Unbounded_Array5/main.c
index aebfa1e3a94..c6071a177cb 100644
--- a/regression/cbmc-from-CVS/Unbounded_Array5/main.c
+++ b/regression/cbmc-from-CVS/Unbounded_Array5/main.c
@@ -3,7 +3,7 @@ int mem[__CPROVER_constant_infinity_uint];
int main()
{
int i, j, mem_j;
-
+
mem[0] = 0;
mem[1] = 1;
@@ -12,7 +12,7 @@ int main()
assert(mem_j == 1);
mem[i] = mem[mem_j];
-
+
unsigned xxxi=mem[i];
unsigned xxx1=mem[1];
diff --git a/regression/cbmc-from-CVS/extern3/main.c b/regression/cbmc-from-CVS/extern3/main.c
index fbf9d26241d..2e253b18aa0 100644
--- a/regression/cbmc-from-CVS/extern3/main.c
+++ b/regression/cbmc-from-CVS/extern3/main.c
@@ -15,12 +15,12 @@ int f() {
return x;
}
}
-
+
int main()
{
int ret;
ret=f();
-
+
assert(ret==5);
}
diff --git a/regression/cbmc-from-CVS/extern4/main.c b/regression/cbmc-from-CVS/extern4/main.c
index fc468d3b243..6ef05a8e4fa 100644
--- a/regression/cbmc-from-CVS/extern4/main.c
+++ b/regression/cbmc-from-CVS/extern4/main.c
@@ -5,20 +5,20 @@ void f()
int j;
j=11;
-
+
assert(i==1);
-
+
i=10;
}
int main()
{
extern int i;
-
+
i=1;
-
+
f();
-
+
assert(i==10);
}
diff --git a/regression/cbmc-from-CVS/return2/tcas_v23_523.c b/regression/cbmc-from-CVS/return2/tcas_v23_523.c
index 4504d9c4dd4..d3398ec3a54 100644
--- a/regression/cbmc-from-CVS/return2/tcas_v23_523.c
+++ b/regression/cbmc-from-CVS/return2/tcas_v23_523.c
@@ -85,7 +85,7 @@ bool Non_Crossing_Biased_Climb()
result = !(Own_Below_Threat()) || ((Own_Below_Threat()) && (!(Down_Separation >= ALIM())));
}
else
- {
+ {
result = Own_Above_Threat() && (Cur_Vertical_Sep >= MINSEP) && (Up_Separation >= ALIM());
}
return result;
@@ -128,9 +128,9 @@ int alt_sep_test()
enabled = High_Confidence && (Own_Tracked_Alt_Rate <= OLEV) && (Cur_Vertical_Sep > MAXALTDIFF);
tcas_equipped = Other_Capability == TCAS_TA;
intent_not_known = Two_of_Three_Reports_Valid && Other_RAC == NO_INTENT;
-
+
alt_sep = UNRESOLVED;
-
+
if (enabled && ((tcas_equipped && intent_not_known) || !tcas_equipped))
{
need_upward_RA = Non_Crossing_Biased_Climb() && Own_Below_Threat();
@@ -147,7 +147,7 @@ int alt_sep_test()
else
alt_sep = UNRESOLVED;
}
-
+
return alt_sep;
}
@@ -155,17 +155,17 @@ main(int argc, char*argv[])
{
initialize();
- Cur_Vertical_Sep = 860;
- High_Confidence = 1;
- Two_of_Three_Reports_Valid = 1;
- Own_Tracked_Alt = 618;
- Own_Tracked_Alt_Rate = 329;
- Other_Tracked_Alt = 574;
- Alt_Layer_Value = 4;
- Up_Separation = 893;
- Down_Separation = 914;
- Other_RAC = 0;
- Other_Capability = 2;
- Climb_Inhibit = 0;
+ Cur_Vertical_Sep = 860;
+ High_Confidence = 1;
+ Two_of_Three_Reports_Valid = 1;
+ Own_Tracked_Alt = 618;
+ Own_Tracked_Alt_Rate = 329;
+ Other_Tracked_Alt = 574;
+ Alt_Layer_Value = 4;
+ Up_Separation = 893;
+ Down_Separation = 914;
+ Other_RAC = 0;
+ Other_Capability = 2;
+ Climb_Inhibit = 0;
assert(alt_sep_test()==0);
}
diff --git a/regression/cbmc-incr-oneloop/alarm1/main.c b/regression/cbmc-incr-oneloop/alarm1/main.c
index 4896a14f3c2..4c485d71988 100644
--- a/regression/cbmc-incr-oneloop/alarm1/main.c
+++ b/regression/cbmc-incr-oneloop/alarm1/main.c
@@ -116,7 +116,7 @@ void Alarm_system_compute(t_Alarm_system_io *_io_, t_Alarm_system_state *_state_
} else {
if (_io_->VehLocked == 0) {
_state_->InitSystem_OPEN = FALSE;
- _state_->VehicleOpen_OPEN = TRUE; //possible BUG
+ _state_->VehicleOpen_OPEN = TRUE; //possible BUG
} else {
/* Perform during and on-event actions of state InitSystem */
_io_->AlarmArmed = TO_BOOL(1);
@@ -379,11 +379,11 @@ t_Alarm_system_io havocIO() {
int main() {
int k=0;
- t_Alarm_system_state _state_;
- t_Alarm_system_state _state_old;
+ t_Alarm_system_state _state_;
+ t_Alarm_system_state _state_old;
t_Alarm_system_io _io_;
Alarm_system_init(&_io_,&_state_);
- while(1) {
+ while(1) {
_state_old = _state_;
_io_ = havocIO();
Alarm_system_compute(&_io_,&_state_);
@@ -394,4 +394,3 @@ int main() {
}
return 0;
}
-
diff --git a/regression/cbmc-incr-oneloop/alarm2/main.c b/regression/cbmc-incr-oneloop/alarm2/main.c
index 952c8f698a3..c5b62d3037e 100644
--- a/regression/cbmc-incr-oneloop/alarm2/main.c
+++ b/regression/cbmc-incr-oneloop/alarm2/main.c
@@ -116,7 +116,7 @@ void Alarm_system_compute(t_Alarm_system_io *_io_, t_Alarm_system_state *_state_
} else {
if (_io_->VehLocked == 0) {
_state_->InitSystem_OPEN = FALSE;
- _state_->VehicleOpen_OPEN = TRUE; //possible BUG
+ _state_->VehicleOpen_OPEN = TRUE; //possible BUG
} else {
/* Perform during and on-event actions of state InitSystem */
_io_->AlarmArmed = TO_BOOL(1);
@@ -379,11 +379,11 @@ t_Alarm_system_io havocIO() {
int main() {
int k=0;
- t_Alarm_system_state _state_;
- t_Alarm_system_state _state_old;
+ t_Alarm_system_state _state_;
+ t_Alarm_system_state _state_old;
t_Alarm_system_io _io_;
Alarm_system_init(&_io_,&_state_);
- while(1) {
+ while(1) {
_state_old = _state_;
_io_ = havocIO();
Alarm_system_compute(&_io_,&_state_);
@@ -394,4 +394,3 @@ int main() {
}
return 0;
}
-
diff --git a/regression/cbmc-incr-oneloop/alarm3/main.c b/regression/cbmc-incr-oneloop/alarm3/main.c
index 420f0c33e8e..1df007abbc7 100644
--- a/regression/cbmc-incr-oneloop/alarm3/main.c
+++ b/regression/cbmc-incr-oneloop/alarm3/main.c
@@ -116,7 +116,7 @@ void Alarm_system_compute(t_Alarm_system_io *_io_, t_Alarm_system_state *_state_
} else {
if (_io_->VehLocked == 0) {
_state_->InitSystem_OPEN = FALSE;
- _state_->VehicleOpen_OPEN = TRUE; //possible BUG
+ _state_->VehicleOpen_OPEN = TRUE; //possible BUG
} else {
/* Perform during and on-event actions of state InitSystem */
_io_->AlarmArmed = TO_BOOL(1);
@@ -379,11 +379,11 @@ t_Alarm_system_io havocIO() {
int main() {
int k=0;
- t_Alarm_system_state _state_;
- t_Alarm_system_state _state_old;
+ t_Alarm_system_state _state_;
+ t_Alarm_system_state _state_old;
t_Alarm_system_io _io_;
Alarm_system_init(&_io_,&_state_);
- while(1) {
+ while(1) {
_state_old = _state_;
_io_ = havocIO();
Alarm_system_compute(&_io_,&_state_);
@@ -394,4 +394,3 @@ int main() {
}
return 0;
}
-
diff --git a/regression/cbmc-incr-oneloop/assertion-after-loop1/main.c b/regression/cbmc-incr-oneloop/assertion-after-loop1/main.c
index b23bea554a4..115c392b84e 100644
--- a/regression/cbmc-incr-oneloop/assertion-after-loop1/main.c
+++ b/regression/cbmc-incr-oneloop/assertion-after-loop1/main.c
@@ -3,7 +3,7 @@ int main()
{
int x = nondet_int();
__CPROVER_assume(0<=x && x<=1);
- while(x<4) {
+ while(x<4) {
x=x+1;
}
assert(x<4);
diff --git a/regression/cbmc-incr-oneloop/cruise1/main.c b/regression/cbmc-incr-oneloop/cruise1/main.c
index 8318e62fd5b..436b0f029b9 100644
--- a/regression/cbmc-incr-oneloop/cruise1/main.c
+++ b/regression/cbmc-incr-oneloop/cruise1/main.c
@@ -5,7 +5,7 @@
/* modelled after */
/* Robert Bosch GmbH: Bosch Automotive Handbook. Bentley (2007) */
/* if you reuse this code, please cite also */
-/* Peter Schrammel, Tom Melham, Daniel Kroening. Chaining Test Cases for
+/* Peter Schrammel, Tom Melham, Daniel Kroening. Chaining Test Cases for
Reactive System Testing. In Testing Software and Systems
LNCS Volume 8254, 2013, pp 133-148 */
/*******************************************************************************/
@@ -27,7 +27,7 @@ typedef struct state {
#define I_BRAKE 5
typedef struct input {
- int signal;
+ int signal;
} t_input;
void init(t_state *s) {
@@ -48,7 +48,7 @@ void compute(t_input* i, t_state *s) {
}
else if((s->mode==0) && (s->speed==0) && (s->button==1)) {
if((i->signal==I_GAS)||(i->signal==I_ACC)) {s->speed=1; s->mode=1; }
- else if(i->signal==I_BUTTON) s->button=0;
+ else if(i->signal==I_BUTTON) s->button=0;
}
else if((s->mode==1) && (s->speed==1) && (s->button==1)) {
if(i->signal==I_GAS) { s->speed=2; s->mode=2; }
@@ -64,12 +64,12 @@ void compute(t_input* i, t_state *s) {
else if(i->signal==I_BUTTON) { s->mode=0; s->button=0; }
}
else if((s->mode==0) && (s->speed==2) && (s->button==0)) {
- if((i->signal==I_BRAKE)||(i->signal==I_DEC)) s->speed=1;
- else if(i->signal==I_BUTTON) s->button=1;
+ if((i->signal==I_BRAKE)||(i->signal==I_DEC)) s->speed=1;
+ else if(i->signal==I_BUTTON) s->button=1;
}
else if((s->mode==0) && (s->speed==2) && (s->button==1)) {
if((i->signal==I_BRAKE)||(i->signal==I_DEC)) { s->speed=1; s->mode=1; }
- else if(i->signal==I_BUTTON) s->button=0;
+ else if(i->signal==I_BUTTON) s->button=0;
}
}
diff --git a/regression/cbmc-incr-oneloop/cruise2/main.c b/regression/cbmc-incr-oneloop/cruise2/main.c
index 42b49addaa2..26d397c06eb 100644
--- a/regression/cbmc-incr-oneloop/cruise2/main.c
+++ b/regression/cbmc-incr-oneloop/cruise2/main.c
@@ -5,7 +5,7 @@
/* modelled after */
/* Robert Bosch GmbH: Bosch Automotive Handbook. Bentley (2007) */
/* if you reuse this code, please cite also */
-/* Peter Schrammel, Tom Melham, Daniel Kroening. Chaining Test Cases for
+/* Peter Schrammel, Tom Melham, Daniel Kroening. Chaining Test Cases for
Reactive System Testing. In Testing Software and Systems
LNCS Volume 8254, 2013, pp 133-148 */
/*******************************************************************************/
@@ -27,7 +27,7 @@ typedef struct state {
#define I_BRAKE 5
typedef struct input {
- int signal;
+ int signal;
} t_input;
void init(t_state *s) {
@@ -48,7 +48,7 @@ void compute(t_input* i, t_state *s) {
}
else if((s->mode==0) && (s->speed==0) && (s->button==1)) {
if((i->signal==I_GAS)||(i->signal==I_ACC)) {s->speed=1; s->mode=1; }
- else if(i->signal==I_BUTTON) s->button=0;
+ else if(i->signal==I_BUTTON) s->button=0;
}
else if((s->mode==1) && (s->speed==1) && (s->button==1)) {
if(i->signal==I_GAS) { s->speed=2; s->mode=2; }
@@ -64,12 +64,12 @@ void compute(t_input* i, t_state *s) {
else if(i->signal==I_BUTTON) { s->mode=0; s->button=0; }
}
else if((s->mode==0) && (s->speed==2) && (s->button==0)) {
- if((i->signal==I_BRAKE)||(i->signal==I_DEC)) s->speed=1;
- else if(i->signal==I_BUTTON) s->button=1;
+ if((i->signal==I_BRAKE)||(i->signal==I_DEC)) s->speed=1;
+ else if(i->signal==I_BUTTON) s->button=1;
}
else if((s->mode==0) && (s->speed==2) && (s->button==1)) {
if((i->signal==I_BRAKE)||(i->signal==I_DEC)) { s->speed=1; s->mode=1; }
- else if(i->signal==I_BUTTON) s->button=0;
+ else if(i->signal==I_BUTTON) s->button=0;
}
}
diff --git a/regression/cbmc-incr-oneloop/induction1/main.c b/regression/cbmc-incr-oneloop/induction1/main.c
index 63f82e856e5..2cc849ab513 100644
--- a/regression/cbmc-incr-oneloop/induction1/main.c
+++ b/regression/cbmc-incr-oneloop/induction1/main.c
@@ -3,13 +3,13 @@
int main()
{
signed x,y;
- while(1)
+ while(1)
{
__CPROVER_assume(x>=10);
signed t = x;
- if((long)x+y<=INT_MAX)
+ if((long)x+y<=INT_MAX)
x = x+y;
y = t;
- assert(x>=10);
+ assert(x>=10);
}
}
diff --git a/regression/cbmc-incr-oneloop/simplifier1/main.c b/regression/cbmc-incr-oneloop/simplifier1/main.c
index ece5871b540..fe64405ac9f 100644
--- a/regression/cbmc-incr-oneloop/simplifier1/main.c
+++ b/regression/cbmc-incr-oneloop/simplifier1/main.c
@@ -6,9 +6,9 @@ int main()
__CPROVER_assume(0<=y && y<=1);
while(1) {
switch(x) {
- case 0 :
+ case 0 :
if(y<=2) {
- if(nondet()) x=1;
+ if(nondet()) x=1;
else y++;
}
else x=2;
diff --git a/regression/cbmc-incr-oneloop/unwind-forever1/main.c b/regression/cbmc-incr-oneloop/unwind-forever1/main.c
index ae0667f8d43..874425968ef 100644
--- a/regression/cbmc-incr-oneloop/unwind-forever1/main.c
+++ b/regression/cbmc-incr-oneloop/unwind-forever1/main.c
@@ -4,7 +4,7 @@ int main()
int x = nondet_int();
__CPROVER_assume(0<=x && x<=1);
//no error within loop => will unwind forever if no loop bound is given
- while(x<4) {
+ while(x<4) {
x=x+1;
}
assert(x<4);
diff --git a/regression/cbmc-incr/Ackermann02_false1/main.c b/regression/cbmc-incr/Ackermann02_false1/main.c
index ddeb622e3e1..ebf7929c123 100644
--- a/regression/cbmc-incr/Ackermann02_false1/main.c
+++ b/regression/cbmc-incr/Ackermann02_false1/main.c
@@ -1,10 +1,10 @@
/*
* Implementation the Ackermann function.
* http://en.wikipedia.org/wiki/Ackermann_function
- *
+ *
* Author: Matthias Heizmann
* Date: 2013-07-13
- *
+ *
*/
extern int __VERIFIER_nondet_int(void);
@@ -27,7 +27,7 @@ int main() {
if (m < 2 || result >= 4) {
return 0;
} else {
- ERROR:
+ ERROR:
goto ERROR;
}
}
diff --git a/regression/cbmc-incr/Makefile b/regression/cbmc-incr/Makefile
index 39b586a364c..965ce493fc5 100644
--- a/regression/cbmc-incr/Makefile
+++ b/regression/cbmc-incr/Makefile
@@ -1,6 +1,6 @@
default: tests.log
-PARAM = --incremental --magic-numbers
+PARAM = --incremental --magic-numbers
# --refine --slice-formula
test:
diff --git a/regression/cbmc-incr/MultCommutative_true1/main.c b/regression/cbmc-incr/MultCommutative_true1/main.c
index e99ad8e6b61..746820e3b49 100644
--- a/regression/cbmc-incr/MultCommutative_true1/main.c
+++ b/regression/cbmc-incr/MultCommutative_true1/main.c
@@ -1,10 +1,10 @@
/*
* Recursive implementation multiplication by repeated addition
* Check that this multiplication is commutative
- *
+ *
* Author: Jan Leike
* Date: 2013-07-17
- *
+ *
*/
extern int __VERIFIER_nondet_int(void);
diff --git a/regression/cbmc-incr/alarm1/main.c b/regression/cbmc-incr/alarm1/main.c
index 4896a14f3c2..4c485d71988 100644
--- a/regression/cbmc-incr/alarm1/main.c
+++ b/regression/cbmc-incr/alarm1/main.c
@@ -116,7 +116,7 @@ void Alarm_system_compute(t_Alarm_system_io *_io_, t_Alarm_system_state *_state_
} else {
if (_io_->VehLocked == 0) {
_state_->InitSystem_OPEN = FALSE;
- _state_->VehicleOpen_OPEN = TRUE; //possible BUG
+ _state_->VehicleOpen_OPEN = TRUE; //possible BUG
} else {
/* Perform during and on-event actions of state InitSystem */
_io_->AlarmArmed = TO_BOOL(1);
@@ -379,11 +379,11 @@ t_Alarm_system_io havocIO() {
int main() {
int k=0;
- t_Alarm_system_state _state_;
- t_Alarm_system_state _state_old;
+ t_Alarm_system_state _state_;
+ t_Alarm_system_state _state_old;
t_Alarm_system_io _io_;
Alarm_system_init(&_io_,&_state_);
- while(1) {
+ while(1) {
_state_old = _state_;
_io_ = havocIO();
Alarm_system_compute(&_io_,&_state_);
@@ -394,4 +394,3 @@ int main() {
}
return 0;
}
-
diff --git a/regression/cbmc-incr/alarm2/main.c b/regression/cbmc-incr/alarm2/main.c
index 952c8f698a3..c5b62d3037e 100644
--- a/regression/cbmc-incr/alarm2/main.c
+++ b/regression/cbmc-incr/alarm2/main.c
@@ -116,7 +116,7 @@ void Alarm_system_compute(t_Alarm_system_io *_io_, t_Alarm_system_state *_state_
} else {
if (_io_->VehLocked == 0) {
_state_->InitSystem_OPEN = FALSE;
- _state_->VehicleOpen_OPEN = TRUE; //possible BUG
+ _state_->VehicleOpen_OPEN = TRUE; //possible BUG
} else {
/* Perform during and on-event actions of state InitSystem */
_io_->AlarmArmed = TO_BOOL(1);
@@ -379,11 +379,11 @@ t_Alarm_system_io havocIO() {
int main() {
int k=0;
- t_Alarm_system_state _state_;
- t_Alarm_system_state _state_old;
+ t_Alarm_system_state _state_;
+ t_Alarm_system_state _state_old;
t_Alarm_system_io _io_;
Alarm_system_init(&_io_,&_state_);
- while(1) {
+ while(1) {
_state_old = _state_;
_io_ = havocIO();
Alarm_system_compute(&_io_,&_state_);
@@ -394,4 +394,3 @@ int main() {
}
return 0;
}
-
diff --git a/regression/cbmc-incr/alarm3/main.c b/regression/cbmc-incr/alarm3/main.c
index 420f0c33e8e..1df007abbc7 100644
--- a/regression/cbmc-incr/alarm3/main.c
+++ b/regression/cbmc-incr/alarm3/main.c
@@ -116,7 +116,7 @@ void Alarm_system_compute(t_Alarm_system_io *_io_, t_Alarm_system_state *_state_
} else {
if (_io_->VehLocked == 0) {
_state_->InitSystem_OPEN = FALSE;
- _state_->VehicleOpen_OPEN = TRUE; //possible BUG
+ _state_->VehicleOpen_OPEN = TRUE; //possible BUG
} else {
/* Perform during and on-event actions of state InitSystem */
_io_->AlarmArmed = TO_BOOL(1);
@@ -379,11 +379,11 @@ t_Alarm_system_io havocIO() {
int main() {
int k=0;
- t_Alarm_system_state _state_;
- t_Alarm_system_state _state_old;
+ t_Alarm_system_state _state_;
+ t_Alarm_system_state _state_old;
t_Alarm_system_io _io_;
Alarm_system_init(&_io_,&_state_);
- while(1) {
+ while(1) {
_state_old = _state_;
_io_ = havocIO();
Alarm_system_compute(&_io_,&_state_);
@@ -394,4 +394,3 @@ int main() {
}
return 0;
}
-
diff --git a/regression/cbmc-incr/arrays3/test.desc b/regression/cbmc-incr/arrays3/test.desc
index 62af57c7d63..e811d53f304 100644
--- a/regression/cbmc-incr/arrays3/test.desc
+++ b/regression/cbmc-incr/arrays3/test.desc
@@ -1,6 +1,6 @@
CORE
main.c
---no-unwinding-assertions
+--no-unwinding-assertions
^EXIT=0$
^SIGNAL=0$
^VERIFICATION SUCCESSFUL$
diff --git a/regression/cbmc-incr/arrays4/test.desc b/regression/cbmc-incr/arrays4/test.desc
index 62af57c7d63..e811d53f304 100644
--- a/regression/cbmc-incr/arrays4/test.desc
+++ b/regression/cbmc-incr/arrays4/test.desc
@@ -1,6 +1,6 @@
CORE
main.c
---no-unwinding-assertions
+--no-unwinding-assertions
^EXIT=0$
^SIGNAL=0$
^VERIFICATION SUCCESSFUL$
diff --git a/regression/cbmc-incr/assertion-after-loop1/main.c b/regression/cbmc-incr/assertion-after-loop1/main.c
index b23bea554a4..115c392b84e 100644
--- a/regression/cbmc-incr/assertion-after-loop1/main.c
+++ b/regression/cbmc-incr/assertion-after-loop1/main.c
@@ -3,7 +3,7 @@ int main()
{
int x = nondet_int();
__CPROVER_assume(0<=x && x<=1);
- while(x<4) {
+ while(x<4) {
x=x+1;
}
assert(x<4);
diff --git a/regression/cbmc-incr/cruise1/main.c b/regression/cbmc-incr/cruise1/main.c
index 8318e62fd5b..436b0f029b9 100644
--- a/regression/cbmc-incr/cruise1/main.c
+++ b/regression/cbmc-incr/cruise1/main.c
@@ -5,7 +5,7 @@
/* modelled after */
/* Robert Bosch GmbH: Bosch Automotive Handbook. Bentley (2007) */
/* if you reuse this code, please cite also */
-/* Peter Schrammel, Tom Melham, Daniel Kroening. Chaining Test Cases for
+/* Peter Schrammel, Tom Melham, Daniel Kroening. Chaining Test Cases for
Reactive System Testing. In Testing Software and Systems
LNCS Volume 8254, 2013, pp 133-148 */
/*******************************************************************************/
@@ -27,7 +27,7 @@ typedef struct state {
#define I_BRAKE 5
typedef struct input {
- int signal;
+ int signal;
} t_input;
void init(t_state *s) {
@@ -48,7 +48,7 @@ void compute(t_input* i, t_state *s) {
}
else if((s->mode==0) && (s->speed==0) && (s->button==1)) {
if((i->signal==I_GAS)||(i->signal==I_ACC)) {s->speed=1; s->mode=1; }
- else if(i->signal==I_BUTTON) s->button=0;
+ else if(i->signal==I_BUTTON) s->button=0;
}
else if((s->mode==1) && (s->speed==1) && (s->button==1)) {
if(i->signal==I_GAS) { s->speed=2; s->mode=2; }
@@ -64,12 +64,12 @@ void compute(t_input* i, t_state *s) {
else if(i->signal==I_BUTTON) { s->mode=0; s->button=0; }
}
else if((s->mode==0) && (s->speed==2) && (s->button==0)) {
- if((i->signal==I_BRAKE)||(i->signal==I_DEC)) s->speed=1;
- else if(i->signal==I_BUTTON) s->button=1;
+ if((i->signal==I_BRAKE)||(i->signal==I_DEC)) s->speed=1;
+ else if(i->signal==I_BUTTON) s->button=1;
}
else if((s->mode==0) && (s->speed==2) && (s->button==1)) {
if((i->signal==I_BRAKE)||(i->signal==I_DEC)) { s->speed=1; s->mode=1; }
- else if(i->signal==I_BUTTON) s->button=0;
+ else if(i->signal==I_BUTTON) s->button=0;
}
}
diff --git a/regression/cbmc-incr/cruise2/main.c b/regression/cbmc-incr/cruise2/main.c
index 42b49addaa2..26d397c06eb 100644
--- a/regression/cbmc-incr/cruise2/main.c
+++ b/regression/cbmc-incr/cruise2/main.c
@@ -5,7 +5,7 @@
/* modelled after */
/* Robert Bosch GmbH: Bosch Automotive Handbook. Bentley (2007) */
/* if you reuse this code, please cite also */
-/* Peter Schrammel, Tom Melham, Daniel Kroening. Chaining Test Cases for
+/* Peter Schrammel, Tom Melham, Daniel Kroening. Chaining Test Cases for
Reactive System Testing. In Testing Software and Systems
LNCS Volume 8254, 2013, pp 133-148 */
/*******************************************************************************/
@@ -27,7 +27,7 @@ typedef struct state {
#define I_BRAKE 5
typedef struct input {
- int signal;
+ int signal;
} t_input;
void init(t_state *s) {
@@ -48,7 +48,7 @@ void compute(t_input* i, t_state *s) {
}
else if((s->mode==0) && (s->speed==0) && (s->button==1)) {
if((i->signal==I_GAS)||(i->signal==I_ACC)) {s->speed=1; s->mode=1; }
- else if(i->signal==I_BUTTON) s->button=0;
+ else if(i->signal==I_BUTTON) s->button=0;
}
else if((s->mode==1) && (s->speed==1) && (s->button==1)) {
if(i->signal==I_GAS) { s->speed=2; s->mode=2; }
@@ -64,12 +64,12 @@ void compute(t_input* i, t_state *s) {
else if(i->signal==I_BUTTON) { s->mode=0; s->button=0; }
}
else if((s->mode==0) && (s->speed==2) && (s->button==0)) {
- if((i->signal==I_BRAKE)||(i->signal==I_DEC)) s->speed=1;
- else if(i->signal==I_BUTTON) s->button=1;
+ if((i->signal==I_BRAKE)||(i->signal==I_DEC)) s->speed=1;
+ else if(i->signal==I_BUTTON) s->button=1;
}
else if((s->mode==0) && (s->speed==2) && (s->button==1)) {
if((i->signal==I_BRAKE)||(i->signal==I_DEC)) { s->speed=1; s->mode=1; }
- else if(i->signal==I_BUTTON) s->button=0;
+ else if(i->signal==I_BUTTON) s->button=0;
}
}
diff --git a/regression/cbmc-incr/email_spec27_product31_false1/main.c b/regression/cbmc-incr/email_spec27_product31_false1/main.c
index 89a30992c6e..4b3f0c100eb 100644
--- a/regression/cbmc-incr/email_spec27_product31_false1/main.c
+++ b/regression/cbmc-incr/email_spec27_product31_false1/main.c
@@ -143,8 +143,8 @@ void chuckKeyAddRjh(void) ;
#line 61
void rjhEnableForwarding(void) ;
#line 18 "Test.c"
-void setup_bob__wrappee__Base(int bob___0 )
-{
+void setup_bob__wrappee__Base(int bob___0 )
+{
{
{
@@ -156,8 +156,8 @@ void setup_bob__wrappee__Base(int bob___0 )
}
}
#line 23 "Test.c"
-void setup_bob(int bob___0 )
-{
+void setup_bob(int bob___0 )
+{
{
{
@@ -171,8 +171,8 @@ void setup_bob(int bob___0 )
}
}
#line 33 "Test.c"
-void setup_rjh__wrappee__Base(int rjh___0 )
-{
+void setup_rjh__wrappee__Base(int rjh___0 )
+{
{
{
@@ -184,8 +184,8 @@ void setup_rjh__wrappee__Base(int rjh___0 )
}
}
#line 40 "Test.c"
-void setup_rjh(int rjh___0 )
-{
+void setup_rjh(int rjh___0 )
+{
{
{
@@ -199,8 +199,8 @@ void setup_rjh(int rjh___0 )
}
}
#line 50 "Test.c"
-void setup_chuck__wrappee__Base(int chuck___0 )
-{
+void setup_chuck__wrappee__Base(int chuck___0 )
+{
{
{
@@ -212,8 +212,8 @@ void setup_chuck__wrappee__Base(int chuck___0 )
}
}
#line 57 "Test.c"
-void setup_chuck(int chuck___0 )
-{
+void setup_chuck(int chuck___0 )
+{
{
{
@@ -227,7 +227,7 @@ void setup_chuck(int chuck___0 )
}
}
#line 69 "Test.c"
-void bobToRjh(void)
+void bobToRjh(void)
{ int tmp ;
int tmp___0 ;
int tmp___1 ;
@@ -259,8 +259,8 @@ void bobToRjh(void)
}
}
#line 81 "Test.c"
-void rjhToBob(void)
-{
+void rjhToBob(void)
+{
{
{
@@ -275,7 +275,7 @@ void rjhToBob(void)
}
#line 88 "Test.c"
#line 95 "Test.c"
-void setup(void)
+void setup(void)
{ char const * __restrict __cil_tmp1 ;
char const * __restrict __cil_tmp2 ;
char const * __restrict __cil_tmp3 ;
@@ -312,7 +312,7 @@ void setup(void)
}
}
#line 112 "Test.c"
-int main(void)
+int main(void)
{ int retValue_acc ;
int tmp ;
@@ -341,7 +341,7 @@ int main(void)
}
}
#line 125 "Test.c"
-void bobKeyAdd(void)
+void bobKeyAdd(void)
{ int tmp ;
int tmp___0 ;
char const * __restrict __cil_tmp3 ;
@@ -375,8 +375,8 @@ void bobKeyAdd(void)
}
}
#line 137 "Test.c"
-void rjhKeyAdd(void)
-{
+void rjhKeyAdd(void)
+{
{
{
@@ -392,8 +392,8 @@ void rjhKeyAdd(void)
}
}
#line 146 "Test.c"
-void rjhKeyAddChuck(void)
-{
+void rjhKeyAddChuck(void)
+{
{
{
@@ -409,8 +409,8 @@ void rjhKeyAddChuck(void)
}
}
#line 156 "Test.c"
-void bobKeyAddChuck(void)
-{
+void bobKeyAddChuck(void)
+{
{
{
@@ -426,8 +426,8 @@ void bobKeyAddChuck(void)
}
}
#line 165 "Test.c"
-void chuckKeyAdd(void)
-{
+void chuckKeyAdd(void)
+{
{
{
@@ -443,8 +443,8 @@ void chuckKeyAdd(void)
}
}
#line 174 "Test.c"
-void chuckKeyAddRjh(void)
-{
+void chuckKeyAddRjh(void)
+{
{
{
@@ -460,8 +460,8 @@ void chuckKeyAddRjh(void)
}
}
#line 183 "Test.c"
-void rjhDeletePrivateKey(void)
-{
+void rjhDeletePrivateKey(void)
+{
{
{
@@ -473,8 +473,8 @@ void rjhDeletePrivateKey(void)
}
}
#line 190 "Test.c"
-void bobKeyChange(void)
-{
+void bobKeyChange(void)
+{
{
{
@@ -486,8 +486,8 @@ void bobKeyChange(void)
}
}
#line 197 "Test.c"
-void rjhKeyChange(void)
-{
+void rjhKeyChange(void)
+{
{
{
@@ -499,8 +499,8 @@ void rjhKeyChange(void)
}
}
#line 204 "Test.c"
-void rjhEnableForwarding(void)
-{
+void rjhEnableForwarding(void)
+{
{
{
@@ -516,7 +516,7 @@ void rjhEnableForwarding(void)
#line 41 "featureselect.h"
int select_one(void) ;
#line 8 "featureselect.c"
-int select_one(void)
+int select_one(void)
{ int retValue_acc ;
int choice = __VERIFIER_nondet_int();
@@ -530,8 +530,8 @@ int select_one(void)
}
}
#line 14 "featureselect.c"
-void select_features(void)
-{
+void select_features(void)
+{
{
#line 115 "featureselect.c"
@@ -539,8 +539,8 @@ void select_features(void)
}
}
#line 20 "featureselect.c"
-void select_helpers(void)
-{
+void select_helpers(void)
+{
{
#line 133 "featureselect.c"
@@ -548,7 +548,7 @@ void select_helpers(void)
}
}
#line 25 "featureselect.c"
-int valid_product(void)
+int valid_product(void)
{ int retValue_acc ;
{
@@ -607,7 +607,7 @@ void setEmailIsSignatureVerified(int handle , int value ) ;
#line 5 "EmailLib.c"
int __ste_Email_counter = 0;
#line 7 "EmailLib.c"
-int initEmail(void)
+int initEmail(void)
{ int retValue_acc ;
{
@@ -634,7 +634,7 @@ int __ste_email_id0 = 0;
#line 17 "EmailLib.c"
int __ste_email_id1 = 0;
#line 19 "EmailLib.c"
-int getEmailId(int handle )
+int getEmailId(int handle )
{ int retValue_acc ;
{
@@ -663,8 +663,8 @@ int getEmailId(int handle )
}
}
#line 29 "EmailLib.c"
-void setEmailId(int handle , int value )
-{
+void setEmailId(int handle , int value )
+{
{
#line 35
@@ -689,7 +689,7 @@ int __ste_email_from0 = 0;
#line 39 "EmailLib.c"
int __ste_email_from1 = 0;
#line 41 "EmailLib.c"
-int getEmailFrom(int handle )
+int getEmailFrom(int handle )
{ int retValue_acc ;
{
@@ -718,8 +718,8 @@ int getEmailFrom(int handle )
}
}
#line 51 "EmailLib.c"
-void setEmailFrom(int handle , int value )
-{
+void setEmailFrom(int handle , int value )
+{
{
#line 57
@@ -744,7 +744,7 @@ int __ste_email_to0 = 0;
#line 61 "EmailLib.c"
int __ste_email_to1 = 0;
#line 63 "EmailLib.c"
-int getEmailTo(int handle )
+int getEmailTo(int handle )
{ int retValue_acc ;
{
@@ -773,8 +773,8 @@ int getEmailTo(int handle )
}
}
#line 73 "EmailLib.c"
-void setEmailTo(int handle , int value )
-{
+void setEmailTo(int handle , int value )
+{
{
#line 79
@@ -799,7 +799,7 @@ char *__ste_email_subject0 ;
#line 83 "EmailLib.c"
char *__ste_email_subject1 ;
#line 85 "EmailLib.c"
-char *getEmailSubject(int handle )
+char *getEmailSubject(int handle )
{ char *retValue_acc ;
void *__cil_tmp3 ;
@@ -831,8 +831,8 @@ char *getEmailSubject(int handle )
}
}
#line 95 "EmailLib.c"
-void setEmailSubject(int handle , char *value )
-{
+void setEmailSubject(int handle , char *value )
+{
{
#line 101
@@ -857,7 +857,7 @@ char *__ste_email_body0 = (char *)0;
#line 105 "EmailLib.c"
char *__ste_email_body1 = (char *)0;
#line 107 "EmailLib.c"
-char *getEmailBody(int handle )
+char *getEmailBody(int handle )
{ char *retValue_acc ;
void *__cil_tmp3 ;
@@ -889,8 +889,8 @@ char *getEmailBody(int handle )
}
}
#line 117 "EmailLib.c"
-void setEmailBody(int handle , char *value )
-{
+void setEmailBody(int handle , char *value )
+{
{
#line 123
@@ -915,7 +915,7 @@ int __ste_email_isEncrypted0 = 0;
#line 127 "EmailLib.c"
int __ste_email_isEncrypted1 = 0;
#line 129 "EmailLib.c"
-int isEncrypted(int handle )
+int isEncrypted(int handle )
{ int retValue_acc ;
{
@@ -944,8 +944,8 @@ int isEncrypted(int handle )
}
}
#line 139 "EmailLib.c"
-void setEmailIsEncrypted(int handle , int value )
-{
+void setEmailIsEncrypted(int handle , int value )
+{
{
#line 145
@@ -970,7 +970,7 @@ int __ste_email_encryptionKey0 = 0;
#line 149 "EmailLib.c"
int __ste_email_encryptionKey1 = 0;
#line 151 "EmailLib.c"
-int getEmailEncryptionKey(int handle )
+int getEmailEncryptionKey(int handle )
{ int retValue_acc ;
{
@@ -999,8 +999,8 @@ int getEmailEncryptionKey(int handle )
}
}
#line 161 "EmailLib.c"
-void setEmailEncryptionKey(int handle , int value )
-{
+void setEmailEncryptionKey(int handle , int value )
+{
{
#line 167
@@ -1025,7 +1025,7 @@ int __ste_email_isSigned0 = 0;
#line 171 "EmailLib.c"
int __ste_email_isSigned1 = 0;
#line 173 "EmailLib.c"
-int isSigned(int handle )
+int isSigned(int handle )
{ int retValue_acc ;
{
@@ -1054,8 +1054,8 @@ int isSigned(int handle )
}
}
#line 183 "EmailLib.c"
-void setEmailIsSigned(int handle , int value )
-{
+void setEmailIsSigned(int handle , int value )
+{
{
#line 189
@@ -1080,7 +1080,7 @@ int __ste_email_signKey0 = 0;
#line 193 "EmailLib.c"
int __ste_email_signKey1 = 0;
#line 195 "EmailLib.c"
-int getEmailSignKey(int handle )
+int getEmailSignKey(int handle )
{ int retValue_acc ;
{
@@ -1109,8 +1109,8 @@ int getEmailSignKey(int handle )
}
}
#line 205 "EmailLib.c"
-void setEmailSignKey(int handle , int value )
-{
+void setEmailSignKey(int handle , int value )
+{
{
#line 211
@@ -1135,7 +1135,7 @@ int __ste_email_isSignatureVerified0 ;
#line 215 "EmailLib.c"
int __ste_email_isSignatureVerified1 ;
#line 217 "EmailLib.c"
-int isVerified(int handle )
+int isVerified(int handle )
{ int retValue_acc ;
{
@@ -1164,8 +1164,8 @@ int isVerified(int handle )
}
}
#line 227 "EmailLib.c"
-void setEmailIsSignatureVerified(int handle , int value )
-{
+void setEmailIsSignatureVerified(int handle , int value )
+{
{
#line 233
@@ -1230,7 +1230,7 @@ int findClientAddressBookAlias(int handle , int userid ) ;
#line 5 "ClientLib.c"
int __ste_Client_counter = 0;
#line 7 "ClientLib.c"
-int initClient(void)
+int initClient(void)
{ int retValue_acc ;
{
@@ -1259,7 +1259,7 @@ char *__ste_client_name1 = (char *)0;
#line 19 "ClientLib.c"
char *__ste_client_name2 = (char *)0;
#line 22 "ClientLib.c"
-char *getClientName(int handle )
+char *getClientName(int handle )
{ char *retValue_acc ;
void *__cil_tmp3 ;
@@ -1299,8 +1299,8 @@ char *getClientName(int handle )
}
}
#line 34 "ClientLib.c"
-void setClientName(int handle , char *value )
-{
+void setClientName(int handle , char *value )
+{
{
#line 42
@@ -1335,7 +1335,7 @@ int __ste_client_outbuffer2 = 0;
#line 50 "ClientLib.c"
int __ste_client_outbuffer3 = 0;
#line 53 "ClientLib.c"
-int getClientOutbuffer(int handle )
+int getClientOutbuffer(int handle )
{ int retValue_acc ;
{
@@ -1372,8 +1372,8 @@ int getClientOutbuffer(int handle )
}
}
#line 65 "ClientLib.c"
-void setClientOutbuffer(int handle , int value )
-{
+void setClientOutbuffer(int handle , int value )
+{
{
#line 73
@@ -1406,7 +1406,7 @@ int __ste_ClientAddressBook_size1 = 0;
#line 81 "ClientLib.c"
int __ste_ClientAddressBook_size2 = 0;
#line 84 "ClientLib.c"
-int getClientAddressBookSize(int handle )
+int getClientAddressBookSize(int handle )
{ int retValue_acc ;
{
@@ -1443,8 +1443,8 @@ int getClientAddressBookSize(int handle )
}
}
#line 96 "ClientLib.c"
-void setClientAddressBookSize(int handle , int value )
-{
+void setClientAddressBookSize(int handle , int value )
+{
{
#line 104
@@ -1471,7 +1471,7 @@ void setClientAddressBookSize(int handle , int value )
}
}
#line 106 "ClientLib.c"
-int createClientAddressBookEntry(int handle )
+int createClientAddressBookEntry(int handle )
{ int retValue_acc ;
int size ;
int tmp ;
@@ -1525,7 +1525,7 @@ int __ste_Client_AddressBook2_Alias1 = 0;
#line 131 "ClientLib.c"
int __ste_Client_AddressBook2_Alias2 = 0;
#line 134 "ClientLib.c"
-int getClientAddressBookAlias(int handle , int index )
+int getClientAddressBookAlias(int handle , int index )
{ int retValue_acc ;
{
@@ -1634,7 +1634,7 @@ int getClientAddressBookAlias(int handle , int index )
}
}
#line 171 "ClientLib.c"
-int findClientAddressBookAlias(int handle , int userid )
+int findClientAddressBookAlias(int handle , int userid )
{ int retValue_acc ;
{
@@ -1743,8 +1743,8 @@ int findClientAddressBookAlias(int handle , int userid )
}
}
#line 208 "ClientLib.c"
-void setClientAddressBookAlias(int handle , int index , int value )
-{
+void setClientAddressBookAlias(int handle , int index , int value )
+{
{
#line 234
@@ -1840,7 +1840,7 @@ int __ste_Client_AddressBook2_Address1 = 0;
#line 252 "ClientLib.c"
int __ste_Client_AddressBook2_Address2 = 0;
#line 255 "ClientLib.c"
-int getClientAddressBookAddress(int handle , int index )
+int getClientAddressBookAddress(int handle , int index )
{ int retValue_acc ;
{
@@ -1949,8 +1949,8 @@ int getClientAddressBookAddress(int handle , int index )
}
}
#line 291 "ClientLib.c"
-void setClientAddressBookAddress(int handle , int index , int value )
-{
+void setClientAddressBookAddress(int handle , int index , int value )
+{
{
#line 317
@@ -2034,7 +2034,7 @@ int __ste_client_autoResponse1 = 0;
#line 323 "ClientLib.c"
int __ste_client_autoResponse2 = 0;
#line 326 "ClientLib.c"
-int getClientAutoResponse(int handle )
+int getClientAutoResponse(int handle )
{ int retValue_acc ;
{
@@ -2071,8 +2071,8 @@ int getClientAutoResponse(int handle )
}
}
#line 338 "ClientLib.c"
-void setClientAutoResponse(int handle , int value )
-{
+void setClientAutoResponse(int handle , int value )
+{
{
#line 346
@@ -2105,7 +2105,7 @@ int __ste_client_privateKey1 = 0;
#line 352 "ClientLib.c"
int __ste_client_privateKey2 = 0;
#line 355 "ClientLib.c"
-int getClientPrivateKey(int handle )
+int getClientPrivateKey(int handle )
{ int retValue_acc ;
{
@@ -2142,8 +2142,8 @@ int getClientPrivateKey(int handle )
}
}
#line 367 "ClientLib.c"
-void setClientPrivateKey(int handle , int value )
-{
+void setClientPrivateKey(int handle , int value )
+{
{
#line 375
@@ -2176,7 +2176,7 @@ int __ste_ClientKeyring_size1 = 0;
#line 381 "ClientLib.c"
int __ste_ClientKeyring_size2 = 0;
#line 384 "ClientLib.c"
-int getClientKeyringSize(int handle )
+int getClientKeyringSize(int handle )
{ int retValue_acc ;
{
@@ -2213,8 +2213,8 @@ int getClientKeyringSize(int handle )
}
}
#line 396 "ClientLib.c"
-void setClientKeyringSize(int handle , int value )
-{
+void setClientKeyringSize(int handle , int value )
+{
{
#line 404
@@ -2241,7 +2241,7 @@ void setClientKeyringSize(int handle , int value )
}
}
#line 406 "ClientLib.c"
-int createClientKeyringEntry(int handle )
+int createClientKeyringEntry(int handle )
{ int retValue_acc ;
int size ;
int tmp ;
@@ -2295,7 +2295,7 @@ int __ste_Client_Keyring2_User1 = 0;
#line 430 "ClientLib.c"
int __ste_Client_Keyring2_User2 = 0;
#line 433 "ClientLib.c"
-int getClientKeyringUser(int handle , int index )
+int getClientKeyringUser(int handle , int index )
{ int retValue_acc ;
{
@@ -2380,8 +2380,8 @@ int getClientKeyringUser(int handle , int index )
}
}
#line 473 "ClientLib.c"
-void setClientKeyringUser(int handle , int index , int value )
-{
+void setClientKeyringUser(int handle , int index , int value )
+{
{
#line 499
@@ -2459,7 +2459,7 @@ int __ste_Client_Keyring2_PublicKey1 = 0;
#line 517 "ClientLib.c"
int __ste_Client_Keyring2_PublicKey2 = 0;
#line 520 "ClientLib.c"
-int getClientKeyringPublicKey(int handle , int index )
+int getClientKeyringPublicKey(int handle , int index )
{ int retValue_acc ;
{
@@ -2544,7 +2544,7 @@ int getClientKeyringPublicKey(int handle , int index )
}
}
#line 557 "ClientLib.c"
-int findPublicKey(int handle , int userid )
+int findPublicKey(int handle , int userid )
{ int retValue_acc ;
{
@@ -2629,8 +2629,8 @@ int findPublicKey(int handle , int userid )
}
}
#line 595 "ClientLib.c"
-void setClientKeyringPublicKey(int handle , int index , int value )
-{
+void setClientKeyringPublicKey(int handle , int index , int value )
+{
{
#line 621
@@ -2698,7 +2698,7 @@ int __ste_client_forwardReceiver2 = 0;
#line 629 "ClientLib.c"
int __ste_client_forwardReceiver3 = 0;
#line 631 "ClientLib.c"
-int getClientForwardReceiver(int handle )
+int getClientForwardReceiver(int handle )
{ int retValue_acc ;
{
@@ -2735,8 +2735,8 @@ int getClientForwardReceiver(int handle )
}
}
#line 643 "ClientLib.c"
-void setClientForwardReceiver(int handle , int value )
-{
+void setClientForwardReceiver(int handle , int value )
+{
{
#line 651
@@ -2769,7 +2769,7 @@ int __ste_client_idCounter1 = 0;
#line 657 "ClientLib.c"
int __ste_client_idCounter2 = 0;
#line 660 "ClientLib.c"
-int getClientId(int handle )
+int getClientId(int handle )
{ int retValue_acc ;
{
@@ -2806,8 +2806,8 @@ int getClientId(int handle )
}
}
#line 672 "ClientLib.c"
-void setClientId(int handle , int value )
-{
+void setClientId(int handle , int value )
+{
{
#line 680
@@ -2836,7 +2836,7 @@ void setClientId(int handle , int value )
#line 1 "scenario.o"
#pragma merger(0,"scenario.i","")
#line 1 "scenario.c"
-void test(void)
+void test(void)
{ int op1 ;
int op2 ;
int op3 ;
@@ -2916,7 +2916,7 @@ void test(void)
goto _L___8;
}
} else {
- _L___8: /* CIL Label */
+ _L___8: /* CIL Label */
#line 19
if (! op2) {
{
@@ -2931,7 +2931,7 @@ void test(void)
goto _L___7;
}
} else {
- _L___7: /* CIL Label */
+ _L___7: /* CIL Label */
#line 22
if (! op3) {
{
@@ -2950,7 +2950,7 @@ void test(void)
goto _L___6;
}
} else {
- _L___6: /* CIL Label */
+ _L___6: /* CIL Label */
#line 26
if (! op4) {
{
@@ -2969,7 +2969,7 @@ void test(void)
goto _L___5;
}
} else {
- _L___5: /* CIL Label */
+ _L___5: /* CIL Label */
#line 30
if (! op5) {
{
@@ -2988,7 +2988,7 @@ void test(void)
goto _L___4;
}
} else {
- _L___4: /* CIL Label */
+ _L___4: /* CIL Label */
#line 34
if (! op6) {
{
@@ -3007,7 +3007,7 @@ void test(void)
goto _L___3;
}
} else {
- _L___3: /* CIL Label */
+ _L___3: /* CIL Label */
#line 38
if (! op7) {
{
@@ -3026,7 +3026,7 @@ void test(void)
goto _L___2;
}
} else {
- _L___2: /* CIL Label */
+ _L___2: /* CIL Label */
#line 42
if (! op8) {
{
@@ -3041,7 +3041,7 @@ void test(void)
goto _L___1;
}
} else {
- _L___1: /* CIL Label */
+ _L___1: /* CIL Label */
#line 45
if (! op9) {
{
@@ -3060,7 +3060,7 @@ void test(void)
goto _L___0;
}
} else {
- _L___0: /* CIL Label */
+ _L___0: /* CIL Label */
#line 49
if (! op10) {
{
@@ -3079,7 +3079,7 @@ void test(void)
goto _L;
}
} else {
- _L: /* CIL Label */
+ _L: /* CIL Label */
#line 53
if (! op11) {
{
@@ -3126,7 +3126,7 @@ void test(void)
#line 4 "wsllib.h"
void __automaton_fail(void) ;
#line 12 "VerifyForward_spec.c"
-__inline void __utac_acc__VerifyForward_spec__1(int client , int msg )
+__inline void __utac_acc__VerifyForward_spec__1(int client , int msg )
{ int pubkey ;
int tmp ;
int tmp___0 ;
@@ -3179,7 +3179,7 @@ extern __attribute__((__nothrow__)) void free(void *__ptr ) ;
#line 32 "libacc.c"
void __utac__exception__cf_handler_set(void *exception , int (*cflow_func)(int ,
int ) ,
- int val )
+ int val )
{ struct __UTAC__EXCEPTION *excep ;
struct __UTAC__CFLOW_FUNC *cf ;
void *tmp ;
@@ -3245,7 +3245,7 @@ void __utac__exception__cf_handler_set(void *exception , int (*cflow_func)(int
}
}
#line 44 "libacc.c"
-void __utac__exception__cf_handler_free(void *exception )
+void __utac__exception__cf_handler_free(void *exception )
{ struct __UTAC__EXCEPTION *excep ;
struct __UTAC__CFLOW_FUNC *cf ;
struct __UTAC__CFLOW_FUNC *tmp ;
@@ -3324,7 +3324,7 @@ void __utac__exception__cf_handler_free(void *exception )
}
}
#line 59 "libacc.c"
-void __utac__exception__cf_handler_reset(void *exception )
+void __utac__exception__cf_handler_reset(void *exception )
{ struct __UTAC__EXCEPTION *excep ;
struct __UTAC__CFLOW_FUNC *cf ;
unsigned long __cil_tmp5 ;
@@ -3412,7 +3412,7 @@ void *__utac__error_stack_mgt(void *env , int mode , int count ) ;
#line 80 "libacc.c"
static struct __ACC__ERR *head = (struct __ACC__ERR *)0;
#line 79 "libacc.c"
-void *__utac__error_stack_mgt(void *env , int mode , int count )
+void *__utac__error_stack_mgt(void *env , int mode , int count )
{ void *retValue_acc ;
struct __ACC__ERR *new ;
void *tmp ;
@@ -3564,7 +3564,7 @@ void *__utac__error_stack_mgt(void *env , int mode , int count )
}
}
#line 122 "libacc.c"
-void *__utac__get_this_arg(int i , struct JoinPoint *this )
+void *__utac__get_this_arg(int i , struct JoinPoint *this )
{ void *retValue_acc ;
unsigned long __cil_tmp4 ;
unsigned long __cil_tmp5 ;
@@ -3628,7 +3628,7 @@ void *__utac__get_this_arg(int i , struct JoinPoint *this )
}
}
#line 129 "libacc.c"
-char const *__utac__get_this_argtype(int i , struct JoinPoint *this )
+char const *__utac__get_this_argtype(int i , struct JoinPoint *this )
{ char const *retValue_acc ;
unsigned long __cil_tmp4 ;
unsigned long __cil_tmp5 ;
@@ -3696,7 +3696,7 @@ char const *__utac__get_this_argtype(int i , struct JoinPoint *this )
#line 1 "Util.h"
int prompt(char *msg ) ;
#line 9 "Util.c"
-int prompt(char *msg )
+int prompt(char *msg )
{ int retValue_acc ;
int retval ;
char const * __restrict __cil_tmp4 ;
@@ -3749,7 +3749,7 @@ int queued_message ;
#line 12 "Client.c"
int queued_client ;
#line 18 "Client.c"
-void mail(int client , int msg )
+void mail(int client , int msg )
{ int tmp ;
{
@@ -3766,7 +3766,7 @@ void mail(int client , int msg )
}
}
#line 27 "Client.c"
-void outgoing__wrappee__Keys(int client , int msg )
+void outgoing__wrappee__Keys(int client , int msg )
{ int tmp ;
{
@@ -3783,7 +3783,7 @@ void outgoing__wrappee__Keys(int client , int msg )
}
}
#line 33 "Client.c"
-void outgoing__wrappee__Encrypt(int client , int msg )
+void outgoing__wrappee__Encrypt(int client , int msg )
{ int receiver ;
int tmp ;
int pubkey ;
@@ -3820,8 +3820,8 @@ void outgoing__wrappee__Encrypt(int client , int msg )
}
}
#line 51 "Client.c"
-void outgoing(int client , int msg )
-{
+void outgoing(int client , int msg )
+{
{
{
@@ -3835,7 +3835,7 @@ void outgoing(int client , int msg )
}
}
#line 60 "Client.c"
-void deliver(int client , int msg )
+void deliver(int client , int msg )
{ int __utac__ad__arg1 ;
int __utac__ad__arg2 ;
@@ -3855,8 +3855,8 @@ void deliver(int client , int msg )
}
}
#line 68 "Client.c"
-void incoming__wrappee__Sign(int client , int msg )
-{
+void incoming__wrappee__Sign(int client , int msg )
+{
{
{
@@ -3868,7 +3868,7 @@ void incoming__wrappee__Sign(int client , int msg )
}
}
#line 75 "Client.c"
-void incoming__wrappee__Forward(int client , int msg )
+void incoming__wrappee__Forward(int client , int msg )
{ int fwreceiver ;
int tmp ;
@@ -3897,8 +3897,8 @@ void incoming__wrappee__Forward(int client , int msg )
}
}
#line 89 "Client.c"
-void incoming__wrappee__Verify(int client , int msg )
-{
+void incoming__wrappee__Verify(int client , int msg )
+{
{
{
@@ -3912,7 +3912,7 @@ void incoming__wrappee__Verify(int client , int msg )
}
}
#line 96 "Client.c"
-void incoming(int client , int msg )
+void incoming(int client , int msg )
{ int privkey ;
int tmp ;
int tmp___0 ;
@@ -3966,7 +3966,7 @@ void incoming(int client , int msg )
}
}
#line 115 "Client.c"
-int createClient(char *name )
+int createClient(char *name )
{ int retValue_acc ;
int client ;
int tmp ;
@@ -3987,7 +3987,7 @@ int createClient(char *name )
}
}
#line 123 "Client.c"
-void sendEmail(int sender , int receiver )
+void sendEmail(int sender , int receiver )
{ int email ;
int tmp ;
@@ -4005,8 +4005,8 @@ void sendEmail(int sender , int receiver )
}
}
#line 133 "Client.c"
-void queue(int client , int msg )
-{
+void queue(int client , int msg )
+{
{
#line 134
@@ -4020,7 +4020,7 @@ void queue(int client , int msg )
}
}
#line 142 "Client.c"
-int is_queue_empty(void)
+int is_queue_empty(void)
{ int retValue_acc ;
{
@@ -4033,7 +4033,7 @@ int is_queue_empty(void)
}
}
#line 149 "Client.c"
-int get_queued_client(void)
+int get_queued_client(void)
{ int retValue_acc ;
{
@@ -4046,7 +4046,7 @@ int get_queued_client(void)
}
}
#line 156 "Client.c"
-int get_queued_email(void)
+int get_queued_email(void)
{ int retValue_acc ;
{
@@ -4059,7 +4059,7 @@ int get_queued_email(void)
}
}
#line 162 "Client.c"
-int isKeyPairValid(int publicKey , int privateKey )
+int isKeyPairValid(int publicKey , int privateKey )
{ int retValue_acc ;
char const * __restrict __cil_tmp4 ;
@@ -4096,8 +4096,8 @@ int isKeyPairValid(int publicKey , int privateKey )
}
}
#line 172 "Client.c"
-void generateKeyPair(int client , int seed )
-{
+void generateKeyPair(int client , int seed )
+{
{
{
@@ -4109,7 +4109,7 @@ void generateKeyPair(int client , int seed )
}
}
#line 178 "Client.c"
-void sign(int client , int msg )
+void sign(int client , int msg )
{ int privkey ;
int tmp ;
@@ -4138,8 +4138,8 @@ void sign(int client , int msg )
}
}
#line 188 "Client.c"
-void forward(int client , int msg )
-{
+void forward(int client , int msg )
+{
{
{
@@ -4155,7 +4155,7 @@ void forward(int client , int msg )
}
}
#line 197 "Client.c"
-void verify(int client , int msg )
+void verify(int client , int msg )
{ int tmp ;
int tmp___0 ;
int pubkey ;
@@ -4221,8 +4221,8 @@ void verify(int client , int msg )
#line 1 "wsllib_check.o"
#pragma merger(0,"wsllib_check.i","")
#line 3 "wsllib_check.c"
-void __automaton_fail(void)
-{
+void __automaton_fail(void)
+{
{
goto ERROR;
@@ -4236,7 +4236,7 @@ void __automaton_fail(void)
#line 15 "Email.h"
int cloneEmail(int msg ) ;
#line 9 "Email.c"
-void printMail__wrappee__Keys(int msg )
+void printMail__wrappee__Keys(int msg )
{ int tmp ;
int tmp___0 ;
int tmp___1 ;
@@ -4278,7 +4278,7 @@ void printMail__wrappee__Keys(int msg )
}
}
#line 17 "Email.c"
-void printMail__wrappee__Encrypt(int msg )
+void printMail__wrappee__Encrypt(int msg )
{ int tmp ;
int tmp___0 ;
char const * __restrict __cil_tmp4 ;
@@ -4306,7 +4306,7 @@ void printMail__wrappee__Encrypt(int msg )
}
}
#line 26 "Email.c"
-void printMail__wrappee__Forward(int msg )
+void printMail__wrappee__Forward(int msg )
{ int tmp ;
int tmp___0 ;
char const * __restrict __cil_tmp4 ;
@@ -4334,7 +4334,7 @@ void printMail__wrappee__Forward(int msg )
}
}
#line 33 "Email.c"
-void printMail(int msg )
+void printMail(int msg )
{ int tmp ;
char const * __restrict __cil_tmp3 ;
@@ -4354,7 +4354,7 @@ void printMail(int msg )
}
}
#line 41 "Email.c"
-int isReadable__wrappee__Keys(int msg )
+int isReadable__wrappee__Keys(int msg )
{ int retValue_acc ;
{
@@ -4367,7 +4367,7 @@ int isReadable__wrappee__Keys(int msg )
}
}
#line 49 "Email.c"
-int isReadable(int msg )
+int isReadable(int msg )
{ int retValue_acc ;
int tmp ;
@@ -4395,7 +4395,7 @@ int isReadable(int msg )
}
}
#line 57 "Email.c"
-int cloneEmail(int msg )
+int cloneEmail(int msg )
{ int retValue_acc ;
{
@@ -4408,7 +4408,7 @@ int cloneEmail(int msg )
}
}
#line 62 "Email.c"
-int createEmail(int from , int to )
+int createEmail(int from , int to )
{ int retValue_acc ;
int msg ;
diff --git a/regression/cbmc-incr/induction1/main.c b/regression/cbmc-incr/induction1/main.c
index 63f82e856e5..2cc849ab513 100644
--- a/regression/cbmc-incr/induction1/main.c
+++ b/regression/cbmc-incr/induction1/main.c
@@ -3,13 +3,13 @@
int main()
{
signed x,y;
- while(1)
+ while(1)
{
__CPROVER_assume(x>=10);
signed t = x;
- if((long)x+y<=INT_MAX)
+ if((long)x+y<=INT_MAX)
x = x+y;
y = t;
- assert(x>=10);
+ assert(x>=10);
}
}
diff --git a/regression/cbmc-incr/moreloops1/main.c b/regression/cbmc-incr/moreloops1/main.c
index ff2941653fa..b2a49d88527 100644
--- a/regression/cbmc-incr/moreloops1/main.c
+++ b/regression/cbmc-incr/moreloops1/main.c
@@ -3,11 +3,11 @@ int main()
{
int x = nondet_int();
__CPROVER_assume(0<=x && x<=1);
- while(x<4)
+ while(x<4)
{
x=x+1;
}
- while(x<10)
+ while(x<10)
{
x=x+1;
assert(x<10);
diff --git a/regression/cbmc-incr/simplifier1/main.c b/regression/cbmc-incr/simplifier1/main.c
index ece5871b540..fe64405ac9f 100644
--- a/regression/cbmc-incr/simplifier1/main.c
+++ b/regression/cbmc-incr/simplifier1/main.c
@@ -6,9 +6,9 @@ int main()
__CPROVER_assume(0<=y && y<=1);
while(1) {
switch(x) {
- case 0 :
+ case 0 :
if(y<=2) {
- if(nondet()) x=1;
+ if(nondet()) x=1;
else y++;
}
else x=2;
diff --git a/regression/cbmc-incr/unwind-not-forever1/main.c b/regression/cbmc-incr/unwind-not-forever1/main.c
index ae0667f8d43..874425968ef 100644
--- a/regression/cbmc-incr/unwind-not-forever1/main.c
+++ b/regression/cbmc-incr/unwind-not-forever1/main.c
@@ -4,7 +4,7 @@ int main()
int x = nondet_int();
__CPROVER_assume(0<=x && x<=1);
//no error within loop => will unwind forever if no loop bound is given
- while(x<4) {
+ while(x<4) {
x=x+1;
}
assert(x<4);
diff --git a/regression/cbmc-with-incr/ASHR1/main.c b/regression/cbmc-with-incr/ASHR1/main.c
index 1963700949a..a99bf808e8f 100644
--- a/regression/cbmc-with-incr/ASHR1/main.c
+++ b/regression/cbmc-with-incr/ASHR1/main.c
@@ -6,16 +6,16 @@ int main()
x>>=1;
assert(x==-2);
assert(y==-2);
-
+
// should also work with mixed types
assert(((-2)>>1u)==-1);
- // more arithmetic shifts for negative numbers
+ // more arithmetic shifts for negative numbers
x=-1;
- x=x>>1;
+ x=x>>1;
assert(x==-1);
-
+
x=-10;
x=x>>10;
- assert(x==-1);
+ assert(x==-1);
}
diff --git a/regression/cbmc-with-incr/Address_of1/main.c b/regression/cbmc-with-incr/Address_of1/main.c
index cbb4756b046..f5fcb9c5f9f 100644
--- a/regression/cbmc-with-incr/Address_of1/main.c
+++ b/regression/cbmc-with-incr/Address_of1/main.c
@@ -5,29 +5,29 @@ int main()
{
int some_int=20;
int *p;
-
+
// Compound literals are l-values, so their address
// can be taken.
p=(int []){ 1, 2, 3, some_int };
-
+
assert(p[0]==1);
assert(p[1]==2);
assert(p[2]==3);
assert(p[3]==20);
-
+
struct S { int x, y; } *q;
-
+
q=&(struct S){ .x=1 };
-
+
assert(q->x==1);
assert(q->y==0);
-
+
const char *sptr="asd";
assert(sptr[0]=='a');
assert(sptr[1]=='s');
assert(sptr[2]=='d');
assert(sptr[3]==0);
-
+
const wchar_t *wsptr;
wsptr=L"asd";
assert(wsptr[0]=='a');
diff --git a/regression/cbmc-with-incr/Anonymous_Struct2/main.c b/regression/cbmc-with-incr/Anonymous_Struct2/main.c
index 9e4edd76b1b..ddfbe74bec6 100644
--- a/regression/cbmc-with-incr/Anonymous_Struct2/main.c
+++ b/regression/cbmc-with-incr/Anonymous_Struct2/main.c
@@ -29,7 +29,7 @@ struct S_struct
union U_union {
int x, y;
};
-
+
int z;
} s;
@@ -40,7 +40,7 @@ int main()
s.x=1;
s.y=2;
s.z=3;
-
+
assert(s2.y==1);
assert(s2.z==1);
}
diff --git a/regression/cbmc-with-incr/Anonymous_Struct3/main.c b/regression/cbmc-with-incr/Anonymous_Struct3/main.c
index 8121e124e8d..f33d614045c 100644
--- a/regression/cbmc-with-incr/Anonymous_Struct3/main.c
+++ b/regression/cbmc-with-incr/Anonymous_Struct3/main.c
@@ -5,11 +5,11 @@ typedef union my_U {
unsigned : 1;
unsigned f1 : 1;
};
- char raw;
+ char raw;
} fields_t;
fields_t x;
-
+
int main()
{
x.f1 = 1;
diff --git a/regression/cbmc-with-incr/Array_Initialization1/main.c b/regression/cbmc-with-incr/Array_Initialization1/main.c
index db867b00d99..a9d976cf6f7 100644
--- a/regression/cbmc-with-incr/Array_Initialization1/main.c
+++ b/regression/cbmc-with-incr/Array_Initialization1/main.c
@@ -20,11 +20,10 @@ int main()
// both must be complete
sizeof(abc1);
sizeof(abc2);
-
+
assert(string_array[0][0][0]=='1');
assert(string_array[0][0][1]=='2');
assert(string_array[0][0][2]=='3');
assert(string_array[0][0][3]=='4');
assert(string_array[0][0][4]==0);
}
-
diff --git a/regression/cbmc-with-incr/Array_Initialization3/main.c b/regression/cbmc-with-incr/Array_Initialization3/main.c
index 5cfe8b93eb9..f9dc6e270f8 100644
--- a/regression/cbmc-with-incr/Array_Initialization3/main.c
+++ b/regression/cbmc-with-incr/Array_Initialization3/main.c
@@ -22,16 +22,16 @@ int main(void)
{
assert(array1[0][1]==2);
assert(array1[1][0]==3); // returned false in this case
-
+
assert(array2[0]==0);
assert(array2[1]==10);
assert(array2[10]==100);
assert(sizeof(array2)==sizeof(int)*11);
-
+
assert(sizeof(array3)==sizeof(int)*8);
-
+
assert(sizeof(array7)==sizeof(int)*2);
assert(sizeof(array8)==sizeof(int)*3);
-
+
return 0;
}
diff --git a/regression/cbmc-with-incr/Assumption1/main.c b/regression/cbmc-with-incr/Assumption1/main.c
index 25c8d4472f8..dfd9db4e67d 100644
--- a/regression/cbmc-with-incr/Assumption1/main.c
+++ b/regression/cbmc-with-incr/Assumption1/main.c
@@ -1,7 +1,7 @@
int main()
{
int x;
-
+
__CPROVER_assume(x>=0);
assert(x!=-1);
@@ -10,4 +10,3 @@ int main()
__CPROVER_assume(x==1);
assert(x==1); // passes
}
-
diff --git a/regression/cbmc-with-incr/BV_Arithmetic2/main.c b/regression/cbmc-with-incr/BV_Arithmetic2/main.c
index b9cdf2cdce4..86c3911b20c 100644
--- a/regression/cbmc-with-incr/BV_Arithmetic2/main.c
+++ b/regression/cbmc-with-incr/BV_Arithmetic2/main.c
@@ -16,6 +16,6 @@ int main()
r0=test_bit_parity(699050);
assert(r0==0);
- r1=test_bit_parity(699050+1);
+ r1=test_bit_parity(699050+1);
assert(r1==1);
}
diff --git a/regression/cbmc-with-incr/BV_Arithmetic4/main.c b/regression/cbmc-with-incr/BV_Arithmetic4/main.c
index 3321bcb90d7..3499cd5f66b 100644
--- a/regression/cbmc-with-incr/BV_Arithmetic4/main.c
+++ b/regression/cbmc-with-incr/BV_Arithmetic4/main.c
@@ -8,14 +8,14 @@ int test_extend2(int x, unsigned width)
x = bit | (~mask & x);
mask <<= 1;
bit <<= 1;
- }
+ }
return x;
}
int main()
{
int r;
-
+
r=test_extend2(4, 3);
assert(r==-4);
}
diff --git a/regression/cbmc-with-incr/BV_Arithmetic5/main.c b/regression/cbmc-with-incr/BV_Arithmetic5/main.c
index 130e7f1014d..bc013cc1a75 100644
--- a/regression/cbmc-with-incr/BV_Arithmetic5/main.c
+++ b/regression/cbmc-with-incr/BV_Arithmetic5/main.c
@@ -1,7 +1,7 @@
unsigned int test_log2(unsigned int v)
{
unsigned c = 0; // c will be lg(v)
- while (v >>= 1)
+ while (v >>= 1)
{
c++;
}
@@ -11,7 +11,7 @@ unsigned int test_log2(unsigned int v)
int main()
{
int r;
-
+
r=test_log2(128);
assert(r==7);
}
diff --git a/regression/cbmc-with-incr/BV_Arithmetic6/main.c b/regression/cbmc-with-incr/BV_Arithmetic6/main.c
index 19af0c6b425..d971a119fd0 100644
--- a/regression/cbmc-with-incr/BV_Arithmetic6/main.c
+++ b/regression/cbmc-with-incr/BV_Arithmetic6/main.c
@@ -2,7 +2,7 @@ int main()
{
{
unsigned i, j, k, l;
-
+
j=k;
i=j/2;
l=j>>1;
@@ -13,7 +13,7 @@ int main()
l=j&1;
assert(i==l);
}
-
+
{
signed int i, j, k, l;
@@ -28,6 +28,6 @@ int main()
i=j%2;
l=j&1;
assert(i==l);
-
+
}
}
diff --git a/regression/cbmc-with-incr/Bitfields1/main.c b/regression/cbmc-with-incr/Bitfields1/main.c
index b05c2df095b..7ab19426ca3 100644
--- a/regression/cbmc-with-incr/Bitfields1/main.c
+++ b/regression/cbmc-with-incr/Bitfields1/main.c
@@ -15,45 +15,45 @@ struct bft {
// an anonymous bitfield
signed int :2;
-
+
// with typedef
INT x:1;
-
+
// made of sizeof
unsigned int abc: sizeof(int);
// enums are integers!
INTEL_CACHE_TYPE Type : 5;
-
+
// and good as field sizes
INTEL_CACHE_TYPE Field2 : IntelCacheTrace;
};
int main() {
struct bft bf;
-
+
assert(bf.a<=7);
assert(bf.b<=1);
assert(bf.c<=1);
-
+
bf.a&=0;
assert(bf.a==0);
-
+
bf.a+=9;
assert(bf.a==1);
-
+
bf.a<<=1;
assert(bf.a==2);
-
+
bf.a>>=1;
assert(bf.a==1);
-
+
bf.d=2;
assert(bf.d==1);
-
+
// assignments have the underlying type
assert(sizeof(bf.d=1)==sizeof(_Bool));
assert(sizeof(bf.a+=1)==sizeof(unsigned));
-
+
bf.Type=IntelCacheTrace;
}
diff --git a/regression/cbmc-with-incr/Bitfields2/main.c b/regression/cbmc-with-incr/Bitfields2/main.c
index 946cb66ba04..4322e6aa4f9 100644
--- a/regression/cbmc-with-incr/Bitfields2/main.c
+++ b/regression/cbmc-with-incr/Bitfields2/main.c
@@ -23,7 +23,7 @@ struct S0 {
int64_t f2;
uint32_t f3;
// skipped over during initialization
- signed : 0;
+ signed : 0;
volatile int16_t f4;
volatile uint32_t f5;
int32_t f6;
@@ -46,4 +46,3 @@ int main()
return 0;
}
-
diff --git a/regression/cbmc-with-incr/Bool1/main.c b/regression/cbmc-with-incr/Bool1/main.c
index 90db3177189..4949781de4e 100644
--- a/regression/cbmc-with-incr/Bool1/main.c
+++ b/regression/cbmc-with-incr/Bool1/main.c
@@ -2,18 +2,18 @@
int main() {
_Bool b1, b2, b3;
-
+
b1=0;
b1++;
assert(b1);
-
+
b2=1;
b2+=10;
assert(b2);
-
+
b3=b1+b2;
assert(b3==1);
-
+
// a struct of _Bool
struct
{
@@ -22,13 +22,13 @@ int main() {
} s;
assert(sizeof(s)==4);
-
+
s.f1=2;
assert(s.f1==1);
-
+
s.f4=1;
assert(s.f4);
-
+
*((unsigned char *)(&s.f2))=1;
assert(s.f2);
}
diff --git a/regression/cbmc-with-incr/Bool4/main.c b/regression/cbmc-with-incr/Bool4/main.c
index e7d572ecc9c..4055cbf8d29 100644
--- a/regression/cbmc-with-incr/Bool4/main.c
+++ b/regression/cbmc-with-incr/Bool4/main.c
@@ -6,7 +6,7 @@ int main() {
b1=1;
b1 ^= (_Bool)1;
assert(!b1);
-
+
b1=1;
b2=1;
b1 ^= b2;
diff --git a/regression/cbmc-with-incr/Boolean_Guards1/main.c b/regression/cbmc-with-incr/Boolean_Guards1/main.c
index 6050ff6ef44..14f125ab4ad 100644
--- a/regression/cbmc-with-incr/Boolean_Guards1/main.c
+++ b/regression/cbmc-with-incr/Boolean_Guards1/main.c
@@ -3,7 +3,7 @@ int main() {
int i;
int a[100];
- // this is guaranteed not to be a buffer overflow
+ // this is guaranteed not to be a buffer overflow
if(x<100 && a[x])
{
i++;
diff --git a/regression/cbmc-with-incr/Computed-Goto1/main.c b/regression/cbmc-with-incr/Computed-Goto1/main.c
index efc34053a10..c31ed412069 100644
--- a/regression/cbmc-with-incr/Computed-Goto1/main.c
+++ b/regression/cbmc-with-incr/Computed-Goto1/main.c
@@ -2,17 +2,17 @@ int main()
{
void *table[]={ &&l0, &&l1, &&l2 };
int in, out;
-
+
if(in>=0 && in<=2)
{
goto *(table[in]);
l0: out=0; goto result;
-
+
l1: out=1; goto result;
-
+
l2: out=2; goto result;
-
+
result:
assert(in==out);
}
diff --git a/regression/cbmc-with-incr/Division1/main.c b/regression/cbmc-with-incr/Division1/main.c
index bc0e1159868..67488d6027d 100644
--- a/regression/cbmc-with-incr/Division1/main.c
+++ b/regression/cbmc-with-incr/Division1/main.c
@@ -4,7 +4,7 @@ int main()
{
int k1 = 5 / 2;
assert(k1 == 2);
-
+
int k2 = -5 / 2;
assert(k2 == -2);
diff --git a/regression/cbmc-with-incr/Division2/main.c b/regression/cbmc-with-incr/Division2/main.c
index 1da2d810afb..12a4acb209d 100644
--- a/regression/cbmc-with-incr/Division2/main.c
+++ b/regression/cbmc-with-incr/Division2/main.c
@@ -3,7 +3,7 @@ _Bool nondet_bool();
void main()
{
int i=2, j;
-
+
if(nondet_bool())
i++;
diff --git a/regression/cbmc-with-incr/Endianness1/main.c b/regression/cbmc-with-incr/Endianness1/main.c
index 403825cec59..3bcfbfd4037 100644
--- a/regression/cbmc-with-incr/Endianness1/main.c
+++ b/regression/cbmc-with-incr/Endianness1/main.c
@@ -3,7 +3,7 @@ int main()
unsigned int u=1;
unsigned char *p;
unsigned char x, y;
-
+
p=(unsigned char *)&u;
x=*p;
diff --git a/regression/cbmc-with-incr/Endianness2/main.c b/regression/cbmc-with-incr/Endianness2/main.c
index 283067502a0..16545374193 100644
--- a/regression/cbmc-with-incr/Endianness2/main.c
+++ b/regression/cbmc-with-incr/Endianness2/main.c
@@ -3,7 +3,7 @@ int main()
unsigned int u=1;
unsigned char *p;
unsigned char x, y;
-
+
p=(unsigned char *)&u;
x=*p;
diff --git a/regression/cbmc-with-incr/Endianness3/main.c b/regression/cbmc-with-incr/Endianness3/main.c
index 7b2e8682fb2..8ea2b5600eb 100644
--- a/regression/cbmc-with-incr/Endianness3/main.c
+++ b/regression/cbmc-with-incr/Endianness3/main.c
@@ -2,13 +2,13 @@ int main()
{
unsigned int x;
unsigned char *p;
-
+
x=0xffff;
-
+
p=(unsigned char *)&x;
-
+
*p=1;
- // assumes little endian
+ // assumes little endian
assert(x==0xff01);
}
diff --git a/regression/cbmc-with-incr/Endianness4/main.c b/regression/cbmc-with-incr/Endianness4/main.c
index c38bc507b28..85a22d3ffe9 100644
--- a/regression/cbmc-with-incr/Endianness4/main.c
+++ b/regression/cbmc-with-incr/Endianness4/main.c
@@ -7,6 +7,5 @@ void main()
*(cp+i) = 0;
// should work with any endianness
- assert(x==0);
+ assert(x==0);
}
-
diff --git a/regression/cbmc-with-incr/Endianness5/main.c b/regression/cbmc-with-incr/Endianness5/main.c
index 83b6368dc6f..925f4c06044 100644
--- a/regression/cbmc-with-incr/Endianness5/main.c
+++ b/regression/cbmc-with-incr/Endianness5/main.c
@@ -5,8 +5,8 @@ unsigned short shortTmp;
int main()
{
ptrUShort = (unsigned short*)(®b[12]);
- shortTmp= *ptrUShort;
+ shortTmp= *ptrUShort;
// should pass
- *ptrUShort = 1234;
+ *ptrUShort = 1234;
}
diff --git a/regression/cbmc-with-incr/Endianness6/main.c b/regression/cbmc-with-incr/Endianness6/main.c
index 1ffe35d380a..1f1085cb3ff 100644
--- a/regression/cbmc-with-incr/Endianness6/main.c
+++ b/regression/cbmc-with-incr/Endianness6/main.c
@@ -4,21 +4,21 @@ int main()
{
int *i_p;
char c_array[10];
-
+
i_p=(int *)c_array;
*i_p=0x01020304;
-
+
// big-endian
assert(c_array[0]==1 &&
c_array[1]==2 &&
c_array[2]==3 &&
c_array[3]==4);
-
+
char *c_p;
int i=0x01020304;
-
+
c_p=(char *)&i;
-
+
// big-endian
assert(c_p[0]==1 &&
c_p[1]==2 &&
diff --git a/regression/cbmc-with-incr/Error_Label1/main.c b/regression/cbmc-with-incr/Error_Label1/main.c
index 5104837ed3e..78d8a1b45fa 100644
--- a/regression/cbmc-with-incr/Error_Label1/main.c
+++ b/regression/cbmc-with-incr/Error_Label1/main.c
@@ -2,7 +2,7 @@ int main()
{
int i;
- // this should fail
+ // this should fail
goto ERROR;
return 0;
diff --git a/regression/cbmc-with-incr/Error_Label2/main.c b/regression/cbmc-with-incr/Error_Label2/main.c
index 5104837ed3e..78d8a1b45fa 100644
--- a/regression/cbmc-with-incr/Error_Label2/main.c
+++ b/regression/cbmc-with-incr/Error_Label2/main.c
@@ -2,7 +2,7 @@ int main()
{
int i;
- // this should fail
+ // this should fail
goto ERROR;
return 0;
diff --git a/regression/cbmc-with-incr/Exceptions1/main.c b/regression/cbmc-with-incr/Exceptions1/main.c
index c0308a84ff7..87ee3d50d40 100644
--- a/regression/cbmc-with-incr/Exceptions1/main.c
+++ b/regression/cbmc-with-incr/Exceptions1/main.c
@@ -10,7 +10,7 @@ void test_try_finally1()
{
global=2;
}
-
+
assert(global==2);
}
@@ -26,7 +26,7 @@ void helper()
{
global=3;
}
-
+
assert(global==2);
}
@@ -46,7 +46,7 @@ void test_try_catch1()
{
global=2;
}
-
+
assert(global==1);
}
@@ -62,7 +62,7 @@ void test_try_catch2()
{
global=3;
}
-
+
assert(global==3);
}
@@ -73,4 +73,3 @@ int main()
test_try_catch1();
test_try_catch2();
}
-
diff --git a/regression/cbmc-with-incr/Fixedbv1/main.c b/regression/cbmc-with-incr/Fixedbv1/main.c
index 7c3e6cf6e43..2b94133e7a6 100644
--- a/regression/cbmc-with-incr/Fixedbv1/main.c
+++ b/regression/cbmc-with-incr/Fixedbv1/main.c
@@ -1,16 +1,16 @@
int main() {
double x;
int y;
-
- x=2;
+
+ x=2;
x-=0.6;
y=x; // this yields 1.4, which is cut off
-
+
assert(y==1);
- x=2;
+ x=2;
x-=0.4;
y=x; // this yields 1.6, which is cut off, too!
-
+
assert(y==1);
}
diff --git a/regression/cbmc-with-incr/Fixedbv4/main.c b/regression/cbmc-with-incr/Fixedbv4/main.c
index 91f499140cf..c04fa2bfc21 100644
--- a/regression/cbmc-with-incr/Fixedbv4/main.c
+++ b/regression/cbmc-with-incr/Fixedbv4/main.c
@@ -1,14 +1,14 @@
int main()
{
double f;
-
+
// addition
assert(100.0+10==110);
assert(0+f==f);
assert(f+0==f);
assert(100+0.5==100.5);
assert(0.0+0.0+f==f);
-
+
// subtraction
assert(100.0-10==90);
assert(0-f==-f);
@@ -37,7 +37,7 @@ int main()
assert(100.0/0.5==200);
assert(0/1.0==0);
assert(f/1.0==f);
-
+
// conversion
assert(((double)(float)100)==100.0);
assert(((unsigned int)100.0)==100.0);
@@ -47,7 +47,7 @@ int main()
assert((int)0.49==0);
assert((int)-1.5==-1);
assert((int)-10.49==-10);
-
+
// relations
assert(1.0<2.5);
assert(1.0<=2.5);
diff --git a/regression/cbmc-with-incr/Fixedbv5/main.c b/regression/cbmc-with-incr/Fixedbv5/main.c
index fa62a78e408..f35749769ef 100644
--- a/regression/cbmc-with-incr/Fixedbv5/main.c
+++ b/regression/cbmc-with-incr/Fixedbv5/main.c
@@ -1,7 +1,7 @@
int main()
{
float a, b;
-
+
__CPROVER_assume(a==1 || a==0.5 || a==2 || a==3 || a==0.1);
b=a;
a/=2;
diff --git a/regression/cbmc-with-incr/Fixedbv6/main.c b/regression/cbmc-with-incr/Fixedbv6/main.c
index f45c35f0444..f72d72c6975 100644
--- a/regression/cbmc-with-incr/Fixedbv6/main.c
+++ b/regression/cbmc-with-incr/Fixedbv6/main.c
@@ -18,8 +18,8 @@ int main()
assert(1.0<=2.0);
assert(!(-1.0<=-2.0));
assert(2.0>=1.0);
- assert(!(-2.0>=-1.0));
-
+ assert(!(-2.0>=-1.0));
+
// variables
float a, b, _a=a, _b=b;
__CPROVER_assume(a==1 && b==2);
@@ -41,5 +41,5 @@ int main()
assert(a<=b);
assert(!(-a<=-b));
assert(b>=a);
- assert(!(-b>=-a));
+ assert(!(-b>=-a));
}
diff --git a/regression/cbmc-with-incr/Fixedbv7/main.c b/regression/cbmc-with-incr/Fixedbv7/main.c
index 91f499140cf..c04fa2bfc21 100644
--- a/regression/cbmc-with-incr/Fixedbv7/main.c
+++ b/regression/cbmc-with-incr/Fixedbv7/main.c
@@ -1,14 +1,14 @@
int main()
{
double f;
-
+
// addition
assert(100.0+10==110);
assert(0+f==f);
assert(f+0==f);
assert(100+0.5==100.5);
assert(0.0+0.0+f==f);
-
+
// subtraction
assert(100.0-10==90);
assert(0-f==-f);
@@ -37,7 +37,7 @@ int main()
assert(100.0/0.5==200);
assert(0/1.0==0);
assert(f/1.0==f);
-
+
// conversion
assert(((double)(float)100)==100.0);
assert(((unsigned int)100.0)==100.0);
@@ -47,7 +47,7 @@ int main()
assert((int)0.49==0);
assert((int)-1.5==-1);
assert((int)-10.49==-10);
-
+
// relations
assert(1.0<2.5);
assert(1.0<=2.5);
diff --git a/regression/cbmc-with-incr/Float-Rounding2/main.c b/regression/cbmc-with-incr/Float-Rounding2/main.c
index b751938aa7c..4e5ff6403e4 100644
--- a/regression/cbmc-with-incr/Float-Rounding2/main.c
+++ b/regression/cbmc-with-incr/Float-Rounding2/main.c
@@ -1,6 +1,6 @@
// Visual Studio needs to be 2013 onwards
#if defined(_MSC_VER) && !defined(__CYGWIN__) && _MSC_VER < 1800
-
+
// see http://www.johndcook.com/math_h.html
int main()
@@ -8,7 +8,7 @@ int main()
}
#else
-
+
#include
#include
@@ -18,7 +18,7 @@ int main()
fesetround(FE_DOWNWARD);
assert(fegetround()==FE_DOWNWARD);
#endif
-
+
#ifdef FE_TONEAREST
fesetround(FE_TONEAREST);
assert(fegetround()==FE_TONEAREST);
diff --git a/regression/cbmc-with-incr/Float-div1/main.c b/regression/cbmc-with-incr/Float-div1/main.c
index 63f8512a7c2..49ee7110797 100644
--- a/regression/cbmc-with-incr/Float-div1/main.c
+++ b/regression/cbmc-with-incr/Float-div1/main.c
@@ -23,7 +23,7 @@ void simplifiedInductiveStepHunt (float nextState)
// Implies nextState == 0x1p+124f;
__CPROVER_assume((0x1.fffffep+123f < nextState) && (nextState < 0x1.000002p+124f));
-
+
float oneAfter = (target / nextState);
// Is true and correctly proven by constant evaluation
diff --git a/regression/cbmc-with-incr/Float-flags-no-simp1/main.c b/regression/cbmc-with-incr/Float-flags-no-simp1/main.c
index d2f0833acc3..b41b115b6b9 100644
--- a/regression/cbmc-with-incr/Float-flags-no-simp1/main.c
+++ b/regression/cbmc-with-incr/Float-flags-no-simp1/main.c
@@ -9,7 +9,7 @@ int main()
#ifndef _MSC_VER
// first check constants
-
+
assert(isnormal(FLT_MAX));
assert(isinf(HUGE_VAL));
assert(isinf(HUGE_VALF));
diff --git a/regression/cbmc-with-incr/Float-flags-simp1/main.c b/regression/cbmc-with-incr/Float-flags-simp1/main.c
index d2f0833acc3..b41b115b6b9 100644
--- a/regression/cbmc-with-incr/Float-flags-simp1/main.c
+++ b/regression/cbmc-with-incr/Float-flags-simp1/main.c
@@ -9,7 +9,7 @@ int main()
#ifndef _MSC_VER
// first check constants
-
+
assert(isnormal(FLT_MAX));
assert(isinf(HUGE_VAL));
assert(isinf(HUGE_VALF));
diff --git a/regression/cbmc-with-incr/Float-no-simp1/main.c b/regression/cbmc-with-incr/Float-no-simp1/main.c
index de6091c82d2..e606d7b9d23 100644
--- a/regression/cbmc-with-incr/Float-no-simp1/main.c
+++ b/regression/cbmc-with-incr/Float-no-simp1/main.c
@@ -2,7 +2,7 @@ int main()
{
unsigned int i, j;
double d;
-
+
i=100.0;
d=i;
j=d;
diff --git a/regression/cbmc-with-incr/Float-no-simp2/main.c b/regression/cbmc-with-incr/Float-no-simp2/main.c
index 4fe132c1229..4914f3863ab 100644
--- a/regression/cbmc-with-incr/Float-no-simp2/main.c
+++ b/regression/cbmc-with-incr/Float-no-simp2/main.c
@@ -5,14 +5,14 @@ int main()
__CPROVER_assume(!__CPROVER_isnand(f2));
__CPROVER_assume(__CPROVER_isfinited(f2));
f=f2;
-
+
// addition
assert(100.0+10==110);
assert(0+f==f);
// assert(f+0==f);
assert(100+0.5==100.5);
// assert(0.0+0.0+f==f);
-
+
// subtraction
assert(100.0-10==90);
// assert(0-f==-f);
@@ -41,7 +41,7 @@ int main()
assert(100.0/0.5==200);
assert(0/1.0==0);
assert(f/1.0==f);
-
+
// conversion
assert(((double)(float)100)==100.0);
assert(((unsigned int)100.0)==100.0);
@@ -51,7 +51,7 @@ int main()
assert((int)0.49==0);
assert((int)-1.5==-1);
assert((int)-10.49==-10);
-
+
// relations
assert(1.0<2.5);
assert(1.0<=2.5);
diff --git a/regression/cbmc-with-incr/Float-no-simp5/main.c b/regression/cbmc-with-incr/Float-no-simp5/main.c
index ea2b8456667..7f4b1ed44a7 100644
--- a/regression/cbmc-with-incr/Float-no-simp5/main.c
+++ b/regression/cbmc-with-incr/Float-no-simp5/main.c
@@ -6,10 +6,9 @@ int main()
double f;
long long unsigned int i; // needs to have 64 bits
} au, bu;
-
+
au.f = a;
bu.f = b;
-
+
assert((au.i == bu.i) == __CPROVER_equal(a, b));
}
-
diff --git a/regression/cbmc-with-incr/Float-no-simp8/main.c b/regression/cbmc-with-incr/Float-no-simp8/main.c
index a9234d20fbe..c75d7e231ac 100644
--- a/regression/cbmc-with-incr/Float-no-simp8/main.c
+++ b/regression/cbmc-with-incr/Float-no-simp8/main.c
@@ -9,7 +9,7 @@ int main (int argc, char **argv) {
float result = f + g;
assert(result == target);
-
+
#ifndef _MSC_VER
assert(signbit(result) == signbit(target));
#endif
diff --git a/regression/cbmc-with-incr/Float-no-simp9/main.c b/regression/cbmc-with-incr/Float-no-simp9/main.c
index 73253a909e8..9303a39d989 100644
--- a/regression/cbmc-with-incr/Float-no-simp9/main.c
+++ b/regression/cbmc-with-incr/Float-no-simp9/main.c
@@ -15,7 +15,7 @@ void testAdd (int mode, double f, double g, int sign) {
assert(f_plus_g == 0.0);
assert(g_plus_f == 0.0);
-
+
assert(signbit(f_plus_g) == sign);
assert(signbit(g_plus_f) == sign);
#endif
diff --git a/regression/cbmc-with-incr/Float1/main.c b/regression/cbmc-with-incr/Float1/main.c
index 886c6c17684..b4d8dedca6d 100644
--- a/regression/cbmc-with-incr/Float1/main.c
+++ b/regression/cbmc-with-incr/Float1/main.c
@@ -1,17 +1,17 @@
int main() {
double x;
int y;
-
- x=2;
+
+ x=2;
x-=0.6;
y=x; // this yields 1.4, which is cut off
-
+
assert(y==1);
- x=2;
+ x=2;
x-=0.4;
y=x; // this yields 1.6, which is cut off, too!
// This is what the standard says!
-
+
assert(y==1);
}
diff --git a/regression/cbmc-with-incr/Float11/main.c b/regression/cbmc-with-incr/Float11/main.c
index 7514a3f37cb..f2e8b9e373d 100644
--- a/regression/cbmc-with-incr/Float11/main.c
+++ b/regression/cbmc-with-incr/Float11/main.c
@@ -31,7 +31,7 @@ int main()
assert(0<1);
assert(1>-0);
assert(-0<1);
-
+
assert(!(0.999f<0.0f));
assert(!(-0.999f>-0.0f));
assert(!(0.999f<=0.0f));
diff --git a/regression/cbmc-with-incr/Float12/main.c b/regression/cbmc-with-incr/Float12/main.c
index a835646d1bf..3b88b9d576f 100644
--- a/regression/cbmc-with-incr/Float12/main.c
+++ b/regression/cbmc-with-incr/Float12/main.c
@@ -5,7 +5,7 @@ int main()
unsigned char x;
d=f;
-
+
if(f==x)
assert(d==x);
}
diff --git a/regression/cbmc-with-incr/Float14/main.c b/regression/cbmc-with-incr/Float14/main.c
index b3de7013b6e..bafe611b05a 100644
--- a/regression/cbmc-with-incr/Float14/main.c
+++ b/regression/cbmc-with-incr/Float14/main.c
@@ -1,14 +1,14 @@
int main()
{
float temp;
-
+
temp = 1.8e307f + 1.5e50f; // should produce overflow -> +infinity (according to standard)
assert(__CPROVER_isinff(temp));
-
+
float x;
-
+
x=temp-temp;
-
+
// should be +inf
assert(__CPROVER_isinff(temp));
}
diff --git a/regression/cbmc-with-incr/Float18/main.c b/regression/cbmc-with-incr/Float18/main.c
index 4f09b5429c2..4997219cd05 100644
--- a/regression/cbmc-with-incr/Float18/main.c
+++ b/regression/cbmc-with-incr/Float18/main.c
@@ -1,4 +1,4 @@
-#define _USE_MATH_DEFINES
+#define _USE_MATH_DEFINES
#include
int main()
@@ -16,5 +16,3 @@ int main()
assert( n < 11 );
}
-
-
diff --git a/regression/cbmc-with-incr/Float2/main.c b/regression/cbmc-with-incr/Float2/main.c
index 1d41086f57a..9d9c877ea83 100644
--- a/regression/cbmc-with-incr/Float2/main.c
+++ b/regression/cbmc-with-incr/Float2/main.c
@@ -11,7 +11,7 @@ main()
b=1.250;
assert(b==1.25);
-
+
// with exponent
a=0.5e2;
assert(a==50);
diff --git a/regression/cbmc-with-incr/Float20/main.c b/regression/cbmc-with-incr/Float20/main.c
index b730f0d4f18..5b1c69fe151 100644
--- a/regression/cbmc-with-incr/Float20/main.c
+++ b/regression/cbmc-with-incr/Float20/main.c
@@ -53,4 +53,3 @@ int main (void) {
return 1;
}
-
diff --git a/regression/cbmc-with-incr/Float21/main.c b/regression/cbmc-with-incr/Float21/main.c
index 883e066cdfc..6eeda852be1 100644
--- a/regression/cbmc-with-incr/Float21/main.c
+++ b/regression/cbmc-with-incr/Float21/main.c
@@ -20,7 +20,7 @@ int main (void)
float smallestNormalFloat = 0x1.0p-126f;
float largestSubnormalFloat = 0x1.fffffcp-127f;
-
+
double v = 0x1.FFFFFFp-127;
float f;
@@ -59,7 +59,7 @@ int main (void)
f = nondet_float();
__CPROVER_assume(fpclassify(f) == FP_SUBNORMAL);
assert( ((float)((double)f)) == f );
-
+
#endif
return 0;
diff --git a/regression/cbmc-with-incr/Float4/main.c b/regression/cbmc-with-incr/Float4/main.c
index 08ff0cf255d..4b3fd112caa 100644
--- a/regression/cbmc-with-incr/Float4/main.c
+++ b/regression/cbmc-with-incr/Float4/main.c
@@ -5,14 +5,14 @@ int main()
__CPROVER_assume(!__CPROVER_isnand(f2));
__CPROVER_assume(!__CPROVER_isinfd(f2));
f=f2;
-
+
// addition
assert(100.0+10==110);
assert(0+f==f);
assert(f+0==f);
assert(100+0.5==100.5);
assert(0.0+0.0+f==f);
-
+
// subtraction
assert(100.0-10==90);
assert(0-f==-f);
@@ -41,7 +41,7 @@ int main()
assert(100.0/0.5==200);
assert(0/1.0==0);
assert(f/1.0==f);
-
+
// conversion
assert(((double)(float)100)==100.0);
assert(((unsigned int)100.0)==100.0);
@@ -51,7 +51,7 @@ int main()
assert((int)0.49==0);
assert((int)-1.5==-1);
assert((int)-10.49==-10);
-
+
// relations
assert(1.0<2.5);
assert(1.0<=2.5);
diff --git a/regression/cbmc-with-incr/Float5/main.c b/regression/cbmc-with-incr/Float5/main.c
index fa62a78e408..f35749769ef 100644
--- a/regression/cbmc-with-incr/Float5/main.c
+++ b/regression/cbmc-with-incr/Float5/main.c
@@ -1,7 +1,7 @@
int main()
{
float a, b;
-
+
__CPROVER_assume(a==1 || a==0.5 || a==2 || a==3 || a==0.1);
b=a;
a/=2;
diff --git a/regression/cbmc-with-incr/Float6/main.c b/regression/cbmc-with-incr/Float6/main.c
index f45c35f0444..f72d72c6975 100644
--- a/regression/cbmc-with-incr/Float6/main.c
+++ b/regression/cbmc-with-incr/Float6/main.c
@@ -18,8 +18,8 @@ int main()
assert(1.0<=2.0);
assert(!(-1.0<=-2.0));
assert(2.0>=1.0);
- assert(!(-2.0>=-1.0));
-
+ assert(!(-2.0>=-1.0));
+
// variables
float a, b, _a=a, _b=b;
__CPROVER_assume(a==1 && b==2);
@@ -41,5 +41,5 @@ int main()
assert(a<=b);
assert(!(-a<=-b));
assert(b>=a);
- assert(!(-b>=-a));
+ assert(!(-b>=-a));
}
diff --git a/regression/cbmc-with-incr/Float7/main.c b/regression/cbmc-with-incr/Float7/main.c
index 33f2923c7a7..fccaa083374 100644
--- a/regression/cbmc-with-incr/Float7/main.c
+++ b/regression/cbmc-with-incr/Float7/main.c
@@ -2,11 +2,11 @@ int main()
{
unsigned int i;
i=0;
-
+
float *p;
p=(float *)&i;
-
+
float f=*p;
-
+
assert(f==0.0);
}
diff --git a/regression/cbmc-with-incr/Float_lib1/main.c b/regression/cbmc-with-incr/Float_lib1/main.c
index 35dd4ba6302..c344517d28d 100644
--- a/regression/cbmc-with-incr/Float_lib1/main.c
+++ b/regression/cbmc-with-incr/Float_lib1/main.c
@@ -7,7 +7,7 @@ int main() {
// Visual Studio needs to be 2013 onwards
#if defined(_MSC_VER) && !defined(__CYGWIN__) && _MSC_VER < 1800
-
+
// see http://www.johndcook.com/math_h.html
#else
diff --git a/regression/cbmc-with-incr/Free1/main.c b/regression/cbmc-with-incr/Free1/main.c
index f0f8c52117c..cd80759f9c6 100644
--- a/regression/cbmc-with-incr/Free1/main.c
+++ b/regression/cbmc-with-incr/Free1/main.c
@@ -7,7 +7,7 @@ int main()
int *q=p;
int i, x;
i=x;
-
+
if(i==4711) free(q);
// should fail if i==4711
diff --git a/regression/cbmc-with-incr/Free2/main.c b/regression/cbmc-with-incr/Free2/main.c
index 82ccf142962..f8d838d773a 100644
--- a/regression/cbmc-with-incr/Free2/main.c
+++ b/regression/cbmc-with-incr/Free2/main.c
@@ -7,7 +7,7 @@ int main()
int x;
int i, y;
i=y;
-
+
if(i==4711) p=&x;
// should fail if i==4711
diff --git a/regression/cbmc-with-incr/Free3/main.c b/regression/cbmc-with-incr/Free3/main.c
index 2328c7e5314..c85322e7813 100644
--- a/regression/cbmc-with-incr/Free3/main.c
+++ b/regression/cbmc-with-incr/Free3/main.c
@@ -10,6 +10,6 @@ int main()
free(p);
- // well, a double-free
+ // well, a double-free
free(p);
}
diff --git a/regression/cbmc-with-incr/Free4/main.c b/regression/cbmc-with-incr/Free4/main.c
index 3696af892b6..610c694580b 100644
--- a/regression/cbmc-with-incr/Free4/main.c
+++ b/regression/cbmc-with-incr/Free4/main.c
@@ -8,11 +8,11 @@ void my_free(int *q)
int main()
{
int *p=malloc(sizeof(int));
-
+
*p=2;
-
+
my_free(p);
- // should fail
+ // should fail
*p=3;
}
diff --git a/regression/cbmc-with-incr/Function-KnR1/main.c b/regression/cbmc-with-incr/Function-KnR1/main.c
index 01cf0604fd7..2281ad04731 100644
--- a/regression/cbmc-with-incr/Function-KnR1/main.c
+++ b/regression/cbmc-with-incr/Function-KnR1/main.c
@@ -31,7 +31,6 @@ const char *msg;
main()
{
struct X x;
-
+
assert(f(0, 0, x, 0)==10);
}
-
diff --git a/regression/cbmc-with-incr/Function10/main.c b/regression/cbmc-with-incr/Function10/main.c
index a2c68510c6c..e80f816272b 100644
--- a/regression/cbmc-with-incr/Function10/main.c
+++ b/regression/cbmc-with-incr/Function10/main.c
@@ -26,7 +26,7 @@ int main()
{
int *p;
my_f1(p);
-
+
other_func1(1, whatnot);
assert(global==2);
}
diff --git a/regression/cbmc-with-incr/Function13/main.c b/regression/cbmc-with-incr/Function13/main.c
index aeaf224a5eb..8a90d748bb1 100644
--- a/regression/cbmc-with-incr/Function13/main.c
+++ b/regression/cbmc-with-incr/Function13/main.c
@@ -5,7 +5,7 @@ void f1()
// goes into global name space!
extern int i;
assert(i==1);
-
+
// and might have an incomplete type
extern struct unknown_tag some_struct;
extern char some_array[];
diff --git a/regression/cbmc-with-incr/Function4/main.c b/regression/cbmc-with-incr/Function4/main.c
index 3873c30a2ee..dfdd644b79b 100644
--- a/regression/cbmc-with-incr/Function4/main.c
+++ b/regression/cbmc-with-incr/Function4/main.c
@@ -19,6 +19,6 @@ int main()
st.x = f1();
x = nondet_int();
st.x = x;
-
+
return 0;
}
diff --git a/regression/cbmc-with-incr/Function6/main.c b/regression/cbmc-with-incr/Function6/main.c
index 865fda826a8..0d1fc7933aa 100644
--- a/regression/cbmc-with-incr/Function6/main.c
+++ b/regression/cbmc-with-incr/Function6/main.c
@@ -3,7 +3,7 @@ int global;
void f()
{
void g();
-
+
g();
}
diff --git a/regression/cbmc-with-incr/Function8/main.c b/regression/cbmc-with-incr/Function8/main.c
index defb9b63c32..69c292e3f9c 100644
--- a/regression/cbmc-with-incr/Function8/main.c
+++ b/regression/cbmc-with-incr/Function8/main.c
@@ -21,7 +21,7 @@ int main()
{
foo();
- bar();
+ bar();
return 0;
}
diff --git a/regression/cbmc-with-incr/Function9/main.c b/regression/cbmc-with-incr/Function9/main.c
index f5000b3c0d1..03ad71720cd 100644
--- a/regression/cbmc-with-incr/Function9/main.c
+++ b/regression/cbmc-with-incr/Function9/main.c
@@ -27,7 +27,7 @@ int main()
foo();
g=1;
- bar();
+ bar();
return 0;
}
diff --git a/regression/cbmc-with-incr/Function_Eval_Order1/main.c b/regression/cbmc-with-incr/Function_Eval_Order1/main.c
index 814ff8d6a1c..0b0e230c995 100644
--- a/regression/cbmc-with-incr/Function_Eval_Order1/main.c
+++ b/regression/cbmc-with-incr/Function_Eval_Order1/main.c
@@ -25,4 +25,3 @@ int main (void) {
return 1;
}
-
diff --git a/regression/cbmc-with-incr/Function_Eval_Order2/main.c b/regression/cbmc-with-incr/Function_Eval_Order2/main.c
index df3de56eb90..04926a3ab15 100644
--- a/regression/cbmc-with-incr/Function_Eval_Order2/main.c
+++ b/regression/cbmc-with-incr/Function_Eval_Order2/main.c
@@ -25,4 +25,3 @@ int main (void) {
return 1;
}
-
diff --git a/regression/cbmc-with-incr/Function_Pointer10/main.c b/regression/cbmc-with-incr/Function_Pointer10/main.c
index 42d20ff6639..e974ca00403 100644
--- a/regression/cbmc-with-incr/Function_Pointer10/main.c
+++ b/regression/cbmc-with-incr/Function_Pointer10/main.c
@@ -20,12 +20,12 @@ void test2()
{
char a=5;
int (*fun) (int, int);
-
+
if(a)
fun = func;
else
fun = func2;
-
+
int b=(*fun) (a, a);
}
diff --git a/regression/cbmc-with-incr/Function_Pointer11/main.c b/regression/cbmc-with-incr/Function_Pointer11/main.c
index a3c896d1015..0e6be48b479 100644
--- a/regression/cbmc-with-incr/Function_Pointer11/main.c
+++ b/regression/cbmc-with-incr/Function_Pointer11/main.c
@@ -17,4 +17,4 @@ int main(int argc, char **argv)
// should be fine, and pass without warning
f(x);
-}
+}
diff --git a/regression/cbmc-with-incr/Function_Pointer13/main.c b/regression/cbmc-with-incr/Function_Pointer13/main.c
index 52a68f23f4c..a3bac9430b3 100644
--- a/regression/cbmc-with-incr/Function_Pointer13/main.c
+++ b/regression/cbmc-with-incr/Function_Pointer13/main.c
@@ -33,4 +33,3 @@ value=fptr(value); //value should be 16 after this
assert(value == 16);
}
-
diff --git a/regression/cbmc-with-incr/Function_Pointer14/main.c b/regression/cbmc-with-incr/Function_Pointer14/main.c
index 9c244af439d..ee74abfad03 100644
--- a/regression/cbmc-with-incr/Function_Pointer14/main.c
+++ b/regression/cbmc-with-incr/Function_Pointer14/main.c
@@ -7,7 +7,7 @@ void dll_create_generic(void (*insert_fnc)())
insert_fnc(&my_global);
}
-void dll_insert_master(int *a)
+void dll_insert_master(int *a)
{
*a=123;
}
@@ -16,6 +16,6 @@ int main()
{
dll_create_generic(dll_insert_master);
assert(my_global==123);
-
+
return 0;
}
diff --git a/regression/cbmc-with-incr/Function_Pointer15/main.c b/regression/cbmc-with-incr/Function_Pointer15/main.c
index 28cf42db770..5006540d4f5 100644
--- a/regression/cbmc-with-incr/Function_Pointer15/main.c
+++ b/regression/cbmc-with-incr/Function_Pointer15/main.c
@@ -6,7 +6,7 @@ void dll_create_generic(void (*insert_fnc)())
insert_fnc(&x);
}
-void dll_insert_master(int *a)
+void dll_insert_master(int *a)
{
assert(0);
}
@@ -16,4 +16,3 @@ int main()
dll_create_generic(dll_insert_master);
return 0;
}
-
diff --git a/regression/cbmc-with-incr/Function_Pointer2/main.c b/regression/cbmc-with-incr/Function_Pointer2/main.c
index 8062f3c7724..ee419e426d9 100644
--- a/regression/cbmc-with-incr/Function_Pointer2/main.c
+++ b/regression/cbmc-with-incr/Function_Pointer2/main.c
@@ -14,10 +14,10 @@ int main()
{
void (*p)(int);
__CPROVER_bool c;
-
+
p=c?f:g;
-
+
p(1);
-
+
assert(global==c);
}
diff --git a/regression/cbmc-with-incr/Function_Pointer4/main.c b/regression/cbmc-with-incr/Function_Pointer4/main.c
index 4422b736e58..8a58e610618 100644
--- a/regression/cbmc-with-incr/Function_Pointer4/main.c
+++ b/regression/cbmc-with-incr/Function_Pointer4/main.c
@@ -11,9 +11,9 @@ int main(void)
{
struct device devices[1];
int x;
-
+
devices[0].func = one;
-
+
x=(* devices[0].func)();
assert(x == 1);
}
diff --git a/regression/cbmc-with-incr/Function_Pointer6/main.c b/regression/cbmc-with-incr/Function_Pointer6/main.c
index b1e8efeee88..78c7c2339ea 100644
--- a/regression/cbmc-with-incr/Function_Pointer6/main.c
+++ b/regression/cbmc-with-incr/Function_Pointer6/main.c
@@ -23,9 +23,9 @@ int main(void)
ps->func = x?ten:twenty;
ppp=ps->func;
-
+
y=ps->func();
-
+
assert(y==10 || y==20);
return 0;
diff --git a/regression/cbmc-with-incr/Function_Pointer7/main.c b/regression/cbmc-with-incr/Function_Pointer7/main.c
index 23c452ad61e..71f6c25d373 100644
--- a/regression/cbmc-with-incr/Function_Pointer7/main.c
+++ b/regression/cbmc-with-incr/Function_Pointer7/main.c
@@ -16,13 +16,13 @@ int my_open(int a)
struct file_ops fops = { .open = my_open };
int main(void)
-{
+{
struct dev tmp[4];
devs = &tmp;
-
+
(devs+0)->ops = &fops; // does not work
-
+
assert(10 == (* devs[0].ops->open)(10));
return 0;
diff --git a/regression/cbmc-with-incr/Function_Pointer8/main.c b/regression/cbmc-with-incr/Function_Pointer8/main.c
index 59603b43549..ff7dee40e91 100644
--- a/regression/cbmc-with-incr/Function_Pointer8/main.c
+++ b/regression/cbmc-with-incr/Function_Pointer8/main.c
@@ -26,7 +26,7 @@ void func1(int a)
void run_irq_handler()
{
- (* ihandler.handler)(10);
+ (* ihandler.handler)(10);
}
void run_timer()
@@ -37,7 +37,7 @@ void run_timer()
int main()
{
ihandler.handler = func1;
-
+
run_irq_handler();
run_timer();
}
diff --git a/regression/cbmc-with-incr/Global_Initialization1/main.c b/regression/cbmc-with-incr/Global_Initialization1/main.c
index f4ee15e1150..0ce23881c94 100644
--- a/regression/cbmc-with-incr/Global_Initialization1/main.c
+++ b/regression/cbmc-with-incr/Global_Initialization1/main.c
@@ -22,6 +22,6 @@ int main()
assert(x == 123);
assert(y == 0);
assert(b[0]=='a');
- assert(some_func()==0);
+ assert(some_func()==0);
assert(p==&y);
}
diff --git a/regression/cbmc-with-incr/Global_Initialization2/main.c b/regression/cbmc-with-incr/Global_Initialization2/main.c
index 0a058acc2fc..0353ee2e015 100644
--- a/regression/cbmc-with-incr/Global_Initialization2/main.c
+++ b/regression/cbmc-with-incr/Global_Initialization2/main.c
@@ -22,4 +22,3 @@ int main()
return 0;
}
-
diff --git a/regression/cbmc-with-incr/Initialization1/main.c b/regression/cbmc-with-incr/Initialization1/main.c
index 9e1f0d3c91b..7da12521ad5 100644
--- a/regression/cbmc-with-incr/Initialization1/main.c
+++ b/regression/cbmc-with-incr/Initialization1/main.c
@@ -2,10 +2,9 @@ int main()
{
char a;
char b = a = 'a';
-
+
assert(a=='a');
assert(b=='a');
int i=(long int)&i;
}
-
diff --git a/regression/cbmc-with-incr/Initialization3/main.c b/regression/cbmc-with-incr/Initialization3/main.c
index 8ed9ef44325..7df573913aa 100644
--- a/regression/cbmc-with-incr/Initialization3/main.c
+++ b/regression/cbmc-with-incr/Initialization3/main.c
@@ -28,4 +28,3 @@ int main()
Split(&t);
return 0;
}
-
diff --git a/regression/cbmc-with-incr/Initialization7/main.c b/regression/cbmc-with-incr/Initialization7/main.c
index 92cad8f2221..435d2aba3a6 100644
--- a/regression/cbmc-with-incr/Initialization7/main.c
+++ b/regression/cbmc-with-incr/Initialization7/main.c
@@ -15,4 +15,3 @@ int main()
__CPROVER_assert(x==42, "");
return 0;
}
-
diff --git a/regression/cbmc-with-incr/Linking1/main.c b/regression/cbmc-with-incr/Linking1/main.c
index 127290cffaa..248db3436c8 100644
--- a/regression/cbmc-with-incr/Linking1/main.c
+++ b/regression/cbmc-with-incr/Linking1/main.c
@@ -15,9 +15,9 @@ int main()
{
assert(i==1);
assert(a_struct.asd==0);
-
+
f();
-
+
assert(i==2);
assert(a_struct.asd==123);
}
diff --git a/regression/cbmc-with-incr/Linking1/test.desc b/regression/cbmc-with-incr/Linking1/test.desc
index de6f32ebf66..af20f90c655 100644
--- a/regression/cbmc-with-incr/Linking1/test.desc
+++ b/regression/cbmc-with-incr/Linking1/test.desc
@@ -1,6 +1,6 @@
CORE
main.c
-module.c
+module.c
^EXIT=0$
^SIGNAL=0$
^VERIFICATION SUCCESSFUL$
diff --git a/regression/cbmc-with-incr/Linking2/main.c b/regression/cbmc-with-incr/Linking2/main.c
index a5649307456..4a9d9634b81 100644
--- a/regression/cbmc-with-incr/Linking2/main.c
+++ b/regression/cbmc-with-incr/Linking2/main.c
@@ -21,13 +21,13 @@ int main()
{
assert(i==2);
assert(j==3);
-
+
f(); // does not change i,
// but does change j
-
+
assert(i==2);
assert(j==4);
-
+
struct my_struct xx;
assert(sizeof(xx.t_field)==1);
}
diff --git a/regression/cbmc-with-incr/Linking2/module.c b/regression/cbmc-with-incr/Linking2/module.c
index a23c19df0bc..f144ea8d4bd 100644
--- a/regression/cbmc-with-incr/Linking2/module.c
+++ b/regression/cbmc-with-incr/Linking2/module.c
@@ -9,7 +9,7 @@ typedef int t;
struct my_struct
{
t t_field;
-};
+};
// this one is local, tool!
static t i=1;
@@ -23,7 +23,7 @@ void f()
assert(j==3);
i=3;
j=4;
-
+
struct my_struct xx;
assert(sizeof(xx.t_field)==sizeof(int));
}
diff --git a/regression/cbmc-with-incr/Linking2/test.desc b/regression/cbmc-with-incr/Linking2/test.desc
index de6f32ebf66..af20f90c655 100644
--- a/regression/cbmc-with-incr/Linking2/test.desc
+++ b/regression/cbmc-with-incr/Linking2/test.desc
@@ -1,6 +1,6 @@
CORE
main.c
-module.c
+module.c
^EXIT=0$
^SIGNAL=0$
^VERIFICATION SUCCESSFUL$
diff --git a/regression/cbmc-with-incr/Local_out_of_scope1/main.c b/regression/cbmc-with-incr/Local_out_of_scope1/main.c
index 596f6c3238a..04554ab6c6d 100644
--- a/regression/cbmc-with-incr/Local_out_of_scope1/main.c
+++ b/regression/cbmc-with-incr/Local_out_of_scope1/main.c
@@ -2,16 +2,16 @@ int main()
{
int *p, *q;
int x, y, z;
-
+
p=&x;
q=p;
-
+
if(z)
{
int l;
q=&l;
}
- // this should fail, as *p is dead if z is true
+ // this should fail, as *p is dead if z is true
y=*q;
}
diff --git a/regression/cbmc-with-incr/Malloc13/main.c b/regression/cbmc-with-incr/Malloc13/main.c
index b069e222a31..d8ee44f2ffc 100644
--- a/regression/cbmc-with-incr/Malloc13/main.c
+++ b/regression/cbmc-with-incr/Malloc13/main.c
@@ -8,4 +8,3 @@ int main(int argc, char* argv[]) {
assert(__CPROVER_buffer_size(str) == len);
return 0;
}
-
diff --git a/regression/cbmc-with-incr/Malloc15/main.c b/regression/cbmc-with-incr/Malloc15/main.c
index 4654735e247..0a09bfac95b 100644
--- a/regression/cbmc-with-incr/Malloc15/main.c
+++ b/regression/cbmc-with-incr/Malloc15/main.c
@@ -7,7 +7,7 @@ int main()
p = malloc(sizeof(int));
unsigned int r = p;
if (r != 0)
- *p = 1;
+ *p = 1;
if (p != 0)
__CPROVER_assert (*p == 1, "malloc");
diff --git a/regression/cbmc-with-incr/Malloc16/main.c b/regression/cbmc-with-incr/Malloc16/main.c
index e64276e5e87..675b577f6ec 100644
--- a/regression/cbmc-with-incr/Malloc16/main.c
+++ b/regression/cbmc-with-incr/Malloc16/main.c
@@ -12,7 +12,7 @@ int main()
tmp = malloc(sizeof(int));
dev = (int*)tmp;
-
+
void *r = (void*)0;
unsigned int q = r;
unsigned int p = dev;
diff --git a/regression/cbmc-with-incr/Malloc17/main.c b/regression/cbmc-with-incr/Malloc17/main.c
index 6cac57c95de..bf13b054b2e 100644
--- a/regression/cbmc-with-incr/Malloc17/main.c
+++ b/regression/cbmc-with-incr/Malloc17/main.c
@@ -68,4 +68,3 @@ int main()
return 0;
}
-
diff --git a/regression/cbmc-with-incr/Malloc18/main.c b/regression/cbmc-with-incr/Malloc18/main.c
index 4fcef7d9908..dc8d60bac01 100644
--- a/regression/cbmc-with-incr/Malloc18/main.c
+++ b/regression/cbmc-with-incr/Malloc18/main.c
@@ -24,4 +24,3 @@ int main()
return 0;
}
-
diff --git a/regression/cbmc-with-incr/Malloc19/main.c b/regression/cbmc-with-incr/Malloc19/main.c
index df4ba61a870..6d5d041c541 100644
--- a/regression/cbmc-with-incr/Malloc19/main.c
+++ b/regression/cbmc-with-incr/Malloc19/main.c
@@ -42,4 +42,3 @@ int main()
return 0;
}
-
diff --git a/regression/cbmc-with-incr/Malloc20/main.c b/regression/cbmc-with-incr/Malloc20/main.c
index ac76cc22367..728819c6a50 100644
--- a/regression/cbmc-with-incr/Malloc20/main.c
+++ b/regression/cbmc-with-incr/Malloc20/main.c
@@ -22,7 +22,7 @@ nettle_buffer_init(struct nettle_buffer *buffer)
int nettle_buffer_grow(struct nettle_buffer *buffer, size_t length)
{
if (buffer->condition) return 0; // Uncommenting this line fixes the bug.
-
+
size_t alloc = buffer->alloc * 2 + length + 100; // Replcing alloc size by a constant fixes the bug.
//size_t alloc = 103;
uint8_t *p = (uint8_t *) malloc(alloc);
@@ -49,5 +49,3 @@ int main(void)
__CPROVER_assert(buffer.contents[1] == 'o', "buffer.contents[1] == 'o'");
__CPROVER_assert(buffer.contents[2] == 'o', "buffer.contents[2] == 'o'");
}
-
-
diff --git a/regression/cbmc-with-incr/Memmove1/main.c b/regression/cbmc-with-incr/Memmove1/main.c
index ff0cdae7c3a..ecd39ff0d4c 100644
--- a/regression/cbmc-with-incr/Memmove1/main.c
+++ b/regression/cbmc-with-incr/Memmove1/main.c
@@ -43,4 +43,3 @@ int main(int argc, char * argv[]) {
assert(a[0]==-2147483600);
return 0;
}
-
diff --git a/regression/cbmc-with-incr/Mod1/main.c b/regression/cbmc-with-incr/Mod1/main.c
index 6fde263722d..31b3000a530 100644
--- a/regression/cbmc-with-incr/Mod1/main.c
+++ b/regression/cbmc-with-incr/Mod1/main.c
@@ -1,8 +1,8 @@
int main()
{
int x, y;
-
- x=y;
+
+ x=y;
x%=10;
assert(x!=-1); // should fail
}
diff --git a/regression/cbmc-with-incr/Mod2/main.c b/regression/cbmc-with-incr/Mod2/main.c
index 53b1ef269b8..13c715cb409 100644
--- a/regression/cbmc-with-incr/Mod2/main.c
+++ b/regression/cbmc-with-incr/Mod2/main.c
@@ -1,6 +1,6 @@
#include
-static int
+static int
(safe_mod_func_int32_t_s_s)(int si1, int si2 )
{
return
@@ -21,7 +21,7 @@ int main()
a=1;
b=-2;
#endif
- int x=safe_mod_func_int32_t_s_s(a, b);
+ int x=safe_mod_func_int32_t_s_s(a, b);
assert(x==1);
return 0;
}
diff --git a/regression/cbmc-with-incr/Multi_Dimensional_Array1/main.c b/regression/cbmc-with-incr/Multi_Dimensional_Array1/main.c
index eac543d4d8a..f814686bb94 100644
--- a/regression/cbmc-with-incr/Multi_Dimensional_Array1/main.c
+++ b/regression/cbmc-with-incr/Multi_Dimensional_Array1/main.c
@@ -9,11 +9,11 @@ int main()
p=a[9];
assert(p==a[0]+9*4);
-
+
*p=10;
assert(a[9][0]==10);
- p++;
+ p++;
*p=20;
assert(a[9][1]==20);
diff --git a/regression/cbmc-with-incr/Multi_Dimensional_Array3/main.c b/regression/cbmc-with-incr/Multi_Dimensional_Array3/main.c
index 607582a629f..3daa9f6d331 100644
--- a/regression/cbmc-with-incr/Multi_Dimensional_Array3/main.c
+++ b/regression/cbmc-with-incr/Multi_Dimensional_Array3/main.c
@@ -8,7 +8,7 @@ int main()
{
// this checks whether the alias analysis can
// track pointers in multi-dimensional arrays
-
+
iptr array[3][3]={{&x,0,0},{&y,0,0},{&z,0,0}};
unsigned int a, b;
@@ -17,12 +17,12 @@ int main()
__CPROVER_assume (a < 3 && b < 3);
array[a][b] = &z;
-
+
iptr p;
p=array[a][b];
*p=1;
-
+
assert(z==1);
}
/* end of case 2 */
diff --git a/regression/cbmc-with-incr/Multi_Dimensional_Array4/main.c b/regression/cbmc-with-incr/Multi_Dimensional_Array4/main.c
index b07bdf3281d..e7ef2680438 100644
--- a/regression/cbmc-with-incr/Multi_Dimensional_Array4/main.c
+++ b/regression/cbmc-with-incr/Multi_Dimensional_Array4/main.c
@@ -1,26 +1,26 @@
void f(void * s1, void *s2)
-{
- char *us1 = (char*) s1;
- char *us2 = (char*) s2;
-
+{
+ char *us1 = (char*) s1;
+ char *us2 = (char*) s2;
+
char us10=us1[0];
char us20=us2[0];
char us11=us1[1];
char us21=us2[1];
- assert(us10=='a');
- assert(us11=='b');
+ assert(us10=='a');
+ assert(us11=='b');
assert(us20=='g');
assert(us21=='b');
-}
+}
int main()
-{
- char a[2][2];
- a[0][0] = 'a';
- a[0][1] = 'b';
- a[1][0] = 'g';
- a[1][1] = 'b';
-
+{
+ char a[2][2];
+ a[0][0] = 'a';
+ a[0][1] = 'b';
+ a[1][0] = 'g';
+ a[1][1] = 'b';
+
f(&a[0], &a[1]);
-}
+}
diff --git a/regression/cbmc-with-incr/Multi_Dimensional_Array5/main.c b/regression/cbmc-with-incr/Multi_Dimensional_Array5/main.c
index 1d18c81a803..a54a3657ce2 100644
--- a/regression/cbmc-with-incr/Multi_Dimensional_Array5/main.c
+++ b/regression/cbmc-with-incr/Multi_Dimensional_Array5/main.c
@@ -17,4 +17,3 @@ int main ()
func_79(*(&(g_374[0][0])));
return 0;
}
-
diff --git a/regression/cbmc-with-incr/Negation1/main.c b/regression/cbmc-with-incr/Negation1/main.c
index facd2bcf91a..9e02cef5d9e 100644
--- a/regression/cbmc-with-incr/Negation1/main.c
+++ b/regression/cbmc-with-incr/Negation1/main.c
@@ -5,11 +5,11 @@ int main()
test=0;
test=~test;
assert(test==-1);
-
+
test=0;
test=!test;
assert(test==1);
-
+
test=100;
test=!test;
assert(test==0);
diff --git a/regression/cbmc-with-incr/Negation2/main.c b/regression/cbmc-with-incr/Negation2/main.c
index 16971d58e32..33435a12435 100644
--- a/regression/cbmc-with-incr/Negation2/main.c
+++ b/regression/cbmc-with-incr/Negation2/main.c
@@ -12,4 +12,3 @@ int main()
{
f00(0);
}
-
diff --git a/regression/cbmc-with-incr/Overflow_Addition1/main.c b/regression/cbmc-with-incr/Overflow_Addition1/main.c
index 3d1288d0db3..706ee880796 100644
--- a/regression/cbmc-with-incr/Overflow_Addition1/main.c
+++ b/regression/cbmc-with-incr/Overflow_Addition1/main.c
@@ -1,7 +1,7 @@
int main() {
signed int i, j;
-
+
i=j;
-
+
i++;
}
diff --git a/regression/cbmc-with-incr/Overflow_Multiplication1/falsealarm.c b/regression/cbmc-with-incr/Overflow_Multiplication1/falsealarm.c
index 2ed10b653cb..c2f8173d8e1 100644
--- a/regression/cbmc-with-incr/Overflow_Multiplication1/falsealarm.c
+++ b/regression/cbmc-with-incr/Overflow_Multiplication1/falsealarm.c
@@ -6,7 +6,7 @@ void main()
x=_x;
y=_y;
-
+
if((-4681 < y) && (y < 4681) && (x < 32767) &&
(-32767 < x) && ((7*y*y -1) == x*x))
{ y=1/x; }
diff --git a/regression/cbmc-with-incr/Pointer_Arithmetic1/main.c b/regression/cbmc-with-incr/Pointer_Arithmetic1/main.c
index c31c0e7cc06..a882ca30700 100644
--- a/regression/cbmc-with-incr/Pointer_Arithmetic1/main.c
+++ b/regression/cbmc-with-incr/Pointer_Arithmetic1/main.c
@@ -7,6 +7,6 @@ int main()
p+=30;
diff=(char *)p-(char *)array;
-
+
assert(diff==30*sizeof(int));
}
diff --git a/regression/cbmc-with-incr/Pointer_Arithmetic11/main.c b/regression/cbmc-with-incr/Pointer_Arithmetic11/main.c
index 96849c12ab1..c1b2df18592 100644
--- a/regression/cbmc-with-incr/Pointer_Arithmetic11/main.c
+++ b/regression/cbmc-with-incr/Pointer_Arithmetic11/main.c
@@ -4,9 +4,9 @@ int main()
int data=0;
char *p=(char *)&data;
i=ii;
-
+
__CPROVER_assume(i>=0 && i<4);
-
+
p[i]++;
if(i==0)
diff --git a/regression/cbmc-with-incr/Pointer_Arithmetic12/main.c b/regression/cbmc-with-incr/Pointer_Arithmetic12/main.c
index 3363b3c5440..6177b6f4f6f 100644
--- a/regression/cbmc-with-incr/Pointer_Arithmetic12/main.c
+++ b/regression/cbmc-with-incr/Pointer_Arithmetic12/main.c
@@ -132,4 +132,3 @@ int main()
L_0x416_2: esp+=0x4;
L_0x417_0: return 0;
}
-
diff --git a/regression/cbmc-with-incr/Pointer_Arithmetic13/main.c b/regression/cbmc-with-incr/Pointer_Arithmetic13/main.c
index 4643b378877..a7063318bfc 100644
--- a/regression/cbmc-with-incr/Pointer_Arithmetic13/main.c
+++ b/regression/cbmc-with-incr/Pointer_Arithmetic13/main.c
@@ -19,4 +19,3 @@ int main() {
return 0;
}
-
diff --git a/regression/cbmc-with-incr/Pointer_Arithmetic2/main.c b/regression/cbmc-with-incr/Pointer_Arithmetic2/main.c
index 5fbe8956e3e..b7b9c687eef 100644
--- a/regression/cbmc-with-incr/Pointer_Arithmetic2/main.c
+++ b/regression/cbmc-with-incr/Pointer_Arithmetic2/main.c
@@ -9,8 +9,8 @@ int main()
q=(char *)p;
q+=30*sizeof(int);
p=(int *)q;
-
+
*p=1;
-
+
assert(my_array[30]==1);
}
diff --git a/regression/cbmc-with-incr/Pointer_Arithmetic3/main.c b/regression/cbmc-with-incr/Pointer_Arithmetic3/main.c
index 86554c90f47..3d5ce10e214 100644
--- a/regression/cbmc-with-incr/Pointer_Arithmetic3/main.c
+++ b/regression/cbmc-with-incr/Pointer_Arithmetic3/main.c
@@ -1,10 +1,10 @@
-int nums[2];
-int *p;
+int nums[2];
+int *p;
-int main() {
- nums[1] = 1;
- p = &nums[0];
- p++;
+int main() {
+ nums[1] = 1;
+ p = &nums[0];
+ p++;
- assert(*p == 1);
-}
+ assert(*p == 1);
+}
diff --git a/regression/cbmc-with-incr/Pointer_Arithmetic5/main.c b/regression/cbmc-with-incr/Pointer_Arithmetic5/main.c
index 2bf0f10c353..a0fcc55be56 100644
--- a/regression/cbmc-with-incr/Pointer_Arithmetic5/main.c
+++ b/regression/cbmc-with-incr/Pointer_Arithmetic5/main.c
@@ -7,6 +7,6 @@ void f()
x=1;
px++;
- // now out of bounds
+ // now out of bounds
y=*px;
}
diff --git a/regression/cbmc-with-incr/Pointer_Arithmetic6/main.c b/regression/cbmc-with-incr/Pointer_Arithmetic6/main.c
index 263202f72e3..3ef83b5aed6 100644
--- a/regression/cbmc-with-incr/Pointer_Arithmetic6/main.c
+++ b/regression/cbmc-with-incr/Pointer_Arithmetic6/main.c
@@ -2,10 +2,10 @@ int main()
{
int a[10];
int x;
-
+
a[1]=1000;
-
+
x=*(a+1);
-
+
assert(x==1000);
}
diff --git a/regression/cbmc-with-incr/Pointer_Arithmetic7/main.c b/regression/cbmc-with-incr/Pointer_Arithmetic7/main.c
index 82e918f9d54..cc1da6e6ee0 100644
--- a/regression/cbmc-with-incr/Pointer_Arithmetic7/main.c
+++ b/regression/cbmc-with-incr/Pointer_Arithmetic7/main.c
@@ -3,7 +3,7 @@ void f(char *p)
p[1]=1;
}
-int main ()
+int main ()
{
char dummy[10];
f(dummy);
diff --git a/regression/cbmc-with-incr/Pointer_array1/main.c b/regression/cbmc-with-incr/Pointer_array1/main.c
index 07a389cac31..b676f18294a 100644
--- a/regression/cbmc-with-incr/Pointer_array1/main.c
+++ b/regression/cbmc-with-incr/Pointer_array1/main.c
@@ -10,4 +10,3 @@ void main() {
__cil_tmp24 = &(disk->disk_name);
assert(__cil_tmp24!=0);
}
-
diff --git a/regression/cbmc-with-incr/Pointer_array2/main.c b/regression/cbmc-with-incr/Pointer_array2/main.c
index 07a389cac31..b676f18294a 100644
--- a/regression/cbmc-with-incr/Pointer_array2/main.c
+++ b/regression/cbmc-with-incr/Pointer_array2/main.c
@@ -10,4 +10,3 @@ void main() {
__cil_tmp24 = &(disk->disk_name);
assert(__cil_tmp24!=0);
}
-
diff --git a/regression/cbmc-with-incr/Pointer_byte_extract1/main.c b/regression/cbmc-with-incr/Pointer_byte_extract1/main.c
index ccb81bfc051..318d5c150f7 100644
--- a/regression/cbmc-with-incr/Pointer_byte_extract1/main.c
+++ b/regression/cbmc-with-incr/Pointer_byte_extract1/main.c
@@ -71,4 +71,3 @@ int main()
return 0;
}
-
diff --git a/regression/cbmc-with-incr/Pointer_byte_extract3/main.c b/regression/cbmc-with-incr/Pointer_byte_extract3/main.c
index 3be1a638faf..328a2b939a1 100644
--- a/regression/cbmc-with-incr/Pointer_byte_extract3/main.c
+++ b/regression/cbmc-with-incr/Pointer_byte_extract3/main.c
@@ -24,4 +24,3 @@ int main()
return 0;
}
-
diff --git a/regression/cbmc-with-incr/Pointer_byte_extract5/main.c b/regression/cbmc-with-incr/Pointer_byte_extract5/main.c
index e2d109fb7bd..b720d9ad132 100644
--- a/regression/cbmc-with-incr/Pointer_byte_extract5/main.c
+++ b/regression/cbmc-with-incr/Pointer_byte_extract5/main.c
@@ -43,4 +43,3 @@ int main()
return 0;
}
-
diff --git a/regression/cbmc-with-incr/Pointer_byte_extract6/main.c b/regression/cbmc-with-incr/Pointer_byte_extract6/main.c
index 79c7d634d39..324a980695f 100644
--- a/regression/cbmc-with-incr/Pointer_byte_extract6/main.c
+++ b/regression/cbmc-with-incr/Pointer_byte_extract6/main.c
@@ -11,13 +11,13 @@ int main()
{
int f;
};
-
+
assert(*(unsigned long long int *)&long_long_int==1);
assert(*(unsigned int *)&signed_int==1);
assert(((struct some *)&signed_int)->f==1);
assert(*(int *)&a_float==1065353216);
assert(*(long long int *)&a_double==4607182418800017408l);
-
+
// other direction
signed_int=1065353216;
assert(*(float *)&signed_int==1.0f);
diff --git a/regression/cbmc-with-incr/Pointer_byte_extract7/main.c b/regression/cbmc-with-incr/Pointer_byte_extract7/main.c
index 3be1a638faf..328a2b939a1 100644
--- a/regression/cbmc-with-incr/Pointer_byte_extract7/main.c
+++ b/regression/cbmc-with-incr/Pointer_byte_extract7/main.c
@@ -24,4 +24,3 @@ int main()
return 0;
}
-
diff --git a/regression/cbmc-with-incr/Pointer_byte_extract8/main.c b/regression/cbmc-with-incr/Pointer_byte_extract8/main.c
index 499ab12fc2b..2266e0f4ef4 100644
--- a/regression/cbmc-with-incr/Pointer_byte_extract8/main.c
+++ b/regression/cbmc-with-incr/Pointer_byte_extract8/main.c
@@ -38,4 +38,3 @@ int main()
return 0;
}
-
diff --git a/regression/cbmc-with-incr/Promotion1/main.c b/regression/cbmc-with-incr/Promotion1/main.c
index 6664d445f9f..8e127502edb 100644
--- a/regression/cbmc-with-incr/Promotion1/main.c
+++ b/regression/cbmc-with-incr/Promotion1/main.c
@@ -16,11 +16,11 @@ int main()
// signed int if int is bigger!
unsigned char a2=1;
signed char b2=-1;
-
+
if(sizeof(char)b2);
else
- assert(a29 || c[i]==i});
- return 0;
+ return 0;
}
diff --git a/regression/cbmc-with-incr/Recursion2/main.c b/regression/cbmc-with-incr/Recursion2/main.c
index 0501acc9683..1866f780a0e 100644
--- a/regression/cbmc-with-incr/Recursion2/main.c
+++ b/regression/cbmc-with-incr/Recursion2/main.c
@@ -7,7 +7,7 @@ void f(unsigned int counter) {
int main() {
unsigned int x;
__CPROVER_assume(x<=10);
-
+
f(x);
}
diff --git a/regression/cbmc-with-incr/Recursion5/main.c b/regression/cbmc-with-incr/Recursion5/main.c
index 26eb98f243f..4b7762123e0 100644
--- a/regression/cbmc-with-incr/Recursion5/main.c
+++ b/regression/cbmc-with-incr/Recursion5/main.c
@@ -19,4 +19,3 @@ int main()
return 0;
}
-
diff --git a/regression/cbmc-with-incr/Sideeffects1/main.c b/regression/cbmc-with-incr/Sideeffects1/main.c
index 87b83b50dc7..6c51baf23d9 100644
--- a/regression/cbmc-with-incr/Sideeffects1/main.c
+++ b/regression/cbmc-with-incr/Sideeffects1/main.c
@@ -1,12 +1,12 @@
int main(void)
{
int x, y;
-
+
x=100;
-
+
y=x/=2;
assert(x==50);
-
+
y=x*=3;
assert(x==150);
diff --git a/regression/cbmc-with-incr/Sideeffects2/main.c b/regression/cbmc-with-incr/Sideeffects2/main.c
index 46990fc8a94..1efa8b74737 100644
--- a/regression/cbmc-with-incr/Sideeffects2/main.c
+++ b/regression/cbmc-with-incr/Sideeffects2/main.c
@@ -17,7 +17,7 @@ int main()
z=2;
x=(f0() || (z==1));
assert(x);
-
+
z=2;
x=(f0() && (z=3));
assert(z==1);
@@ -25,8 +25,8 @@ int main()
z=2;
x=(f1() || (z=3));
assert(z==1);
-
+
z=2;
x=(f1() && (z=3));
- assert(z==3);
+ assert(z==3);
}
diff --git a/regression/cbmc-with-incr/Sideeffects3/main.c b/regression/cbmc-with-incr/Sideeffects3/main.c
index 7b032a3602d..5c49106b99c 100644
--- a/regression/cbmc-with-incr/Sideeffects3/main.c
+++ b/regression/cbmc-with-incr/Sideeffects3/main.c
@@ -10,9 +10,9 @@ int x, y, z;
int main()
{
#ifdef _WIN32
-
+
// Visual Studio won't even parse most of these
-
+
#else
// a side effect inside an array type
@@ -39,14 +39,14 @@ int main()
int return_value=my_f(++x);
assert(x==2);
assert(return_value==2);
-
+
// using a pointer
x=1;
int *p=&x;
y=++(*p);
assert(y==2);
assert(x==2);
-
+
// in a struct
x=1;
struct struct_type
@@ -60,7 +60,7 @@ int main()
// this is evaluated when the type is defined, not later
x++;
assert(sizeof(struct struct_type)==sizeof(int)*2+sizeof(int));
-
+
// only happens once
x=1;
y=1;
@@ -73,27 +73,27 @@ int main()
assert(sizeof(v1)==sizeof(int)*2*1);
assert(sizeof(v2)==sizeof(int)*2*2);
assert(sizeof(v3)==sizeof(int)*2*3);
-
+
// inside a typecast (struct)
x=1;
(struct { int a[x++]; } *)0;
assert(x==2);
-
+
// inside a typecast (function pointer)
x=1;
(int (*)(int a[x++]))0; // This is ignored by gcc! Haha!
assert(x==1);
-
+
// inside sizeof
x=1;
assert(sizeof(struct { int a[x++]; })==sizeof(int));
assert(x==2);
-
+
// multi-dimensional
x=y=1;
typedef int my_array1[x][y];
x++;
assert(sizeof(my_array1)==sizeof(int));
-
+
#endif
}
diff --git a/regression/cbmc-with-incr/Sideeffects4/main.c b/regression/cbmc-with-incr/Sideeffects4/main.c
index d2a16b49fe2..39c91b96734 100644
--- a/regression/cbmc-with-incr/Sideeffects4/main.c
+++ b/regression/cbmc-with-incr/Sideeffects4/main.c
@@ -11,10 +11,10 @@ _Bool my_f()
int main()
{
// side-effect in ?:
- glob=0;
- result=glob?1:my_f();
+ glob=0;
+ result=glob?1:my_f();
assert(result==0);
-
+
// side-effect in ||
glob=0;
result=glob||my_f();
@@ -24,9 +24,9 @@ int main()
glob=0;
result=glob||(0+my_f());
assert(result==0);
-
+
// another variant of this
- int r, c=1;
+ int r, c=1;
r=c?(c=0, 10):20;
assert(c==0 && r==10);
}
diff --git a/regression/cbmc-with-incr/Sideeffects6/main.c b/regression/cbmc-with-incr/Sideeffects6/main.c
index 4175688e79f..db94ea1c047 100644
--- a/regression/cbmc-with-incr/Sideeffects6/main.c
+++ b/regression/cbmc-with-incr/Sideeffects6/main.c
@@ -4,6 +4,6 @@ int main()
// we should be able to find this division by zero
(void)(c?x/y:z);
-
+
return 0;
}
diff --git a/regression/cbmc-with-incr/String1/main.c b/regression/cbmc-with-incr/String1/main.c
index 448d45864fe..3b64fd0028c 100644
--- a/regression/cbmc-with-incr/String1/main.c
+++ b/regression/cbmc-with-incr/String1/main.c
@@ -10,18 +10,18 @@ int main()
{
assert(s[1]=='b');
assert(s[4]==0);
-
+
// write to s
s[0]='x';
-
+
assert(p[2]=='c');
-
+
p=s;
// write to p
p[1]='y';
-
- assert(s[1]=='y');
+
+ assert(s[1]=='y');
{
const char local_string[]="asd123";
@@ -40,15 +40,15 @@ int main()
#else
typedef __typeof__(L'X') wide_char_type;
#endif
-
+
unsigned width=sizeof(wide_char_type);
- #ifdef _WIN32
+ #ifdef _WIN32
assert(width==2);
#else
assert(width==4);
#endif
-
+
assert(sizeof(L"12" "34")==5*width);
assert(sizeof("12" L"34")==5*width);
diff --git a/regression/cbmc-with-incr/String2/main.c b/regression/cbmc-with-incr/String2/main.c
index a1a32fa5e73..5c8bfcb93da 100644
--- a/regression/cbmc-with-incr/String2/main.c
+++ b/regression/cbmc-with-incr/String2/main.c
@@ -5,6 +5,6 @@ int main()
int input;
char ch;
- /* should result in bounds violation */
+ /* should result in bounds violation */
ch=p[input];
}
diff --git a/regression/cbmc-with-incr/String5/main.c b/regression/cbmc-with-incr/String5/main.c
index 851d482bb5e..e81ef607f7e 100644
--- a/regression/cbmc-with-incr/String5/main.c
+++ b/regression/cbmc-with-incr/String5/main.c
@@ -14,4 +14,3 @@ int main()
assert(l==6);
}
-
diff --git a/regression/cbmc-with-incr/String6/main.c b/regression/cbmc-with-incr/String6/main.c
index cbe0887795c..9b165a6796a 100644
--- a/regression/cbmc-with-incr/String6/main.c
+++ b/regression/cbmc-with-incr/String6/main.c
@@ -1,13 +1,13 @@
#include
-#include
+#include
void free(void *);
int main()
{
- char str[500]="Hello";
+ char str[500]="Hello";
assert(strcmp(str, "Hello")==0);
- assert(strncmp(str, "Hello", 5)==0);
+ assert(strncmp(str, "Hello", 5)==0);
assert(strcasecmp(str, "HELLO")==0);
assert(strncasecmp(str, "HELLO", 5)==0);
assert(strcmp(str, "\xff")<0);
diff --git a/regression/cbmc-with-incr/String7/main.c b/regression/cbmc-with-incr/String7/main.c
index 1785408b9e6..7bfacd1c12e 100644
--- a/regression/cbmc-with-incr/String7/main.c
+++ b/regression/cbmc-with-incr/String7/main.c
@@ -1,8 +1,8 @@
-struct S {
+struct S {
char *Operator;
};
-const struct S b1006_props = {
+const struct S b1006_props = {
.Operator = "OR"
};
diff --git a/regression/cbmc-with-incr/String_Literal1/main.c b/regression/cbmc-with-incr/String_Literal1/main.c
index c7384ba6aed..0185fdf91b2 100644
--- a/regression/cbmc-with-incr/String_Literal1/main.c
+++ b/regression/cbmc-with-incr/String_Literal1/main.c
@@ -11,16 +11,16 @@ int main()
assert("\""[0]=='"');
assert("\%"[0]=='%');
assert("\n"[0]==10);
-
+
// spliced to avoid hex ambiguity
assert("\x5" "five"[0]==0x5);
// spliced accoss multiple lines
const char some_string[]=
- "\x5"
+ "\x5"
#pragma whatnot
"five";
-
+
assert(some_string[0]==0x5);
// wide strings
@@ -40,16 +40,16 @@ int main()
assert(euro_sign[3]==0);
assert(sizeof(euro_sign)==4);
- // the following is C++ and C99
+ // the following is C++ and C99
const wchar_t wide_amount[]=L"\u20AC123,00"; //€123,00
assert(wide_amount[0]==0x20ac);
assert(wide_amount[1]=='1');
-
+
// C11 unicode string literals
assert(sizeof(u8""[0])==sizeof(char));
assert(sizeof(u""[0])==2);
assert(sizeof(U""[0])==4);
-
+
// generic wide string, OS-dependent
assert(sizeof(L""[0])==sizeof(wchar_t));
}
diff --git a/regression/cbmc-with-incr/Struct_Bytewise1/struct_bytewise.c b/regression/cbmc-with-incr/Struct_Bytewise1/struct_bytewise.c
index b5482988e8a..431372d1374 100644
--- a/regression/cbmc-with-incr/Struct_Bytewise1/struct_bytewise.c
+++ b/regression/cbmc-with-incr/Struct_Bytewise1/struct_bytewise.c
@@ -30,7 +30,7 @@ void CopyBuffer(unsigned char *src) {
arrayTmp[i] = src[i];
}
}
-
+
int main()
{
logAppl.a=1;
@@ -60,4 +60,3 @@ int main()
assert(arrayTmp[7]==1);
#endif
}
-
diff --git a/regression/cbmc-with-incr/Struct_Initialization1/main.c b/regression/cbmc-with-incr/Struct_Initialization1/main.c
index 7065af7690e..f89d06d08e3 100644
--- a/regression/cbmc-with-incr/Struct_Initialization1/main.c
+++ b/regression/cbmc-with-incr/Struct_Initialization1/main.c
@@ -40,7 +40,7 @@ int main() {
assert(S1.f==0);
assert(S1.g==2);
assert(S1.p==0);
-
+
assert(S2.s1.a==1);
assert(S2.s1.b==2);
assert(S2.s2.a==3);
diff --git a/regression/cbmc-with-incr/Struct_Initialization10/main.c b/regression/cbmc-with-incr/Struct_Initialization10/main.c
index 30168dbeac4..130936a138c 100644
--- a/regression/cbmc-with-incr/Struct_Initialization10/main.c
+++ b/regression/cbmc-with-incr/Struct_Initialization10/main.c
@@ -1,8 +1,8 @@
typedef unsigned blue;
-
+
typedef struct { unsigned blue; } ar_t;
typedef struct { ar_t ar; } format_t;
-
+
int main () {
// note that 'blue' is a type-token
format_t data = { .ar.blue = 1 };
diff --git a/regression/cbmc-with-incr/Struct_Initialization2/main.c b/regression/cbmc-with-incr/Struct_Initialization2/main.c
index bafcdc9b388..9a04c7fd804 100644
--- a/regression/cbmc-with-incr/Struct_Initialization2/main.c
+++ b/regression/cbmc-with-incr/Struct_Initialization2/main.c
@@ -16,7 +16,7 @@ int main()
assert(str_array[1].b==4);
int x;
-
+
// this also exists (GCC)
str_array[0] = (struct teststr){ .a=1, .c=x };
assert(str_array[0].a==1);
diff --git a/regression/cbmc-with-incr/Struct_Initialization3/main.c b/regression/cbmc-with-incr/Struct_Initialization3/main.c
index c5b4814d117..6152b8442bf 100644
--- a/regression/cbmc-with-incr/Struct_Initialization3/main.c
+++ b/regression/cbmc-with-incr/Struct_Initialization3/main.c
@@ -2,7 +2,7 @@ typedef struct
{
int a;
} S;
-
+
int main(void)
{
S s;
diff --git a/regression/cbmc-with-incr/Struct_Initialization5/main.c b/regression/cbmc-with-incr/Struct_Initialization5/main.c
index 47a662328ae..455c9e107c0 100644
--- a/regression/cbmc-with-incr/Struct_Initialization5/main.c
+++ b/regression/cbmc-with-incr/Struct_Initialization5/main.c
@@ -10,7 +10,7 @@ int main()
{
struct X foo1;
struct Y foo2;
-
+
foo2=(struct Y){ foo1 };
assert(foo2.x.y==foo1.y);
diff --git a/regression/cbmc-with-incr/Struct_Initialization6/main.c b/regression/cbmc-with-incr/Struct_Initialization6/main.c
index a7a7ebde9f4..6e069783f54 100644
--- a/regression/cbmc-with-incr/Struct_Initialization6/main.c
+++ b/regression/cbmc-with-incr/Struct_Initialization6/main.c
@@ -6,7 +6,7 @@ struct X
{
int z;
} f [3];
-
+
int g, h;
} foo = { .g=200, .f[1].z=100 };
@@ -30,7 +30,7 @@ int main()
assert(z.a3==30);
assert(z.a4==40);
assert(z.a5==0);
-
+
assert(enable[0]==1);
assert(enable[30]==2);
assert(enable[31]==3);
diff --git a/regression/cbmc-with-incr/Struct_Initialization7/main.c b/regression/cbmc-with-incr/Struct_Initialization7/main.c
index c9ffb6434c3..08498f9b46c 100644
--- a/regression/cbmc-with-incr/Struct_Initialization7/main.c
+++ b/regression/cbmc-with-incr/Struct_Initialization7/main.c
@@ -6,14 +6,14 @@ struct X
{
int a, b, c;
} y;
-
+
int z;
};
int main()
{
struct X x={ 1, 2 };
-
+
assert(x.y.a==1);
assert(x.z==2);
}
diff --git a/regression/cbmc-with-incr/Struct_Padding1/main.c b/regression/cbmc-with-incr/Struct_Padding1/main.c
index 0412e6de630..5dd960bd6c4 100644
--- a/regression/cbmc-with-incr/Struct_Padding1/main.c
+++ b/regression/cbmc-with-incr/Struct_Padding1/main.c
@@ -7,13 +7,13 @@ struct my_struct1
{
int i;
char ch;
-
+
struct
{
// this gets padded
int j;
};
-
+
// Bit-fields do not get padded in between,
// but fill up an integer!
unsigned bf1:1;
@@ -27,7 +27,7 @@ struct my_struct2
{
int i;
char ch[4];
-
+
// no padding needed
int j;
@@ -48,7 +48,7 @@ int main()
assert(xx1.i==1);
assert(xx1.ch==2);
assert(xx1.j==3);
-
+
// let's probe the padding
char *p=&xx1.ch;
assert(p[0]==2);
diff --git a/regression/cbmc-with-incr/Union_Initialization1/main.c b/regression/cbmc-with-incr/Union_Initialization1/main.c
index 831d7b4a2d6..8d3374b1997 100644
--- a/regression/cbmc-with-incr/Union_Initialization1/main.c
+++ b/regression/cbmc-with-incr/Union_Initialization1/main.c
@@ -18,9 +18,9 @@ union
trigger : 1,
mask : 1,
__reserved_2 : 15;
-
+
unsigned __reserved_3 : 24,
- dest : 8;
+ dest : 8;
} entry;
} u1 = { .entry.delivery_mode = 2, .entry.mask = 1 };
@@ -33,7 +33,7 @@ union
{
int d, e;
} c;
-
+
} u2 = { 1 }, u3 = { .c.e = 2 } ;
int main()
@@ -41,7 +41,7 @@ int main()
assert(u1.entry.vector==0);
assert(u1.entry.delivery_mode==2);
assert(u1.entry.mask==1);
-
+
assert(u2.a==1);
assert(u3.a==0);
assert(u3.c.e==2);
diff --git a/regression/cbmc-with-incr/Unwinding_Locality1/main.c b/regression/cbmc-with-incr/Unwinding_Locality1/main.c
index 91ac5057295..41a2fbdb017 100644
--- a/regression/cbmc-with-incr/Unwinding_Locality1/main.c
+++ b/regression/cbmc-with-incr/Unwinding_Locality1/main.c
@@ -1,17 +1,17 @@
int main() {
int i;
-
+
for(i=0; i<10; i++) {
const int a=i;
}
-
+
int array[10];
for(i=0; i<10; i++)
{
const int a;
array[i]=a;
}
-
+
// these should all be allowed to be different
assert(array[0]==array[1]);
}
diff --git a/regression/cbmc-with-incr/Variadic1/main.c b/regression/cbmc-with-incr/Variadic1/main.c
index 6040d61bba4..d634c6e90fd 100644
--- a/regression/cbmc-with-incr/Variadic1/main.c
+++ b/regression/cbmc-with-incr/Variadic1/main.c
@@ -37,4 +37,3 @@ int main (void)
return 0;
}
-
diff --git a/regression/cbmc-with-incr/Visual_Studio_Types1/main.c b/regression/cbmc-with-incr/Visual_Studio_Types1/main.c
index 138a7b7cb1b..48f37c2175f 100644
--- a/regression/cbmc-with-incr/Visual_Studio_Types1/main.c
+++ b/regression/cbmc-with-incr/Visual_Studio_Types1/main.c
@@ -12,29 +12,29 @@ int main()
assert(sizeof(i3)==4);
assert(sizeof(i4)==8);
#endif
-
+
// general types
-
+
char c;
short s;
int i;
long l;
long long ll;
-
+
assert(sizeof(c)==1);
assert(sizeof(s)==2);
assert(sizeof(i)==4);
assert(sizeof(l)==4);
assert(sizeof(ll)==8);
-
- // these constants are Visual Studio-specific
+
+ // these constants are Visual Studio-specific
#ifdef _MSC_VER
assert(sizeof(1i8)==1);
assert(sizeof(1i16)==2);
assert(sizeof(1i32)==4);
assert(sizeof(1i64)==8);
assert(sizeof(1i128)==16);
-
+
// oh, and these pointer qualifiers are Visual Studio-specific
int * __ptr32 p32;
//int * __ptr64 p64;
@@ -43,6 +43,6 @@ int main()
assert(sizeof(p32)==4);
//assert(sizeof(p64)==8);
#endif
-
+
assert(sizeof(void *)==4);
}
diff --git a/regression/cbmc-with-incr/Visual_Studio_Types2/main.c b/regression/cbmc-with-incr/Visual_Studio_Types2/main.c
index 3daa245332e..921143e24a6 100644
--- a/regression/cbmc-with-incr/Visual_Studio_Types2/main.c
+++ b/regression/cbmc-with-incr/Visual_Studio_Types2/main.c
@@ -5,12 +5,12 @@ int main()
int i;
long l;
long long ll;
-
+
assert(sizeof(s)==2);
assert(sizeof(i)==4);
assert(sizeof(l)==4);
assert(sizeof(ll)==8);
-
+
// oh, and these pointer qualifiers are MS-specific
#ifdef _MSC_VER
int * __ptr32 p32;
@@ -20,6 +20,6 @@ int main()
assert(sizeof(p32)==4);
assert(sizeof(p64)==8);
#endif
-
+
assert(sizeof(void *)==8);
}
diff --git a/regression/cbmc-with-incr/Volatile1/main.c b/regression/cbmc-with-incr/Volatile1/main.c
index 383e71c59d7..84ac4837d1e 100644
--- a/regression/cbmc-with-incr/Volatile1/main.c
+++ b/regression/cbmc-with-incr/Volatile1/main.c
@@ -3,4 +3,3 @@ int main() {
if (!x)
assert(!x);
}
-
diff --git a/regression/cbmc-with-incr/Zero_Initialization1/main.c b/regression/cbmc-with-incr/Zero_Initialization1/main.c
index a051d31258c..e179f017d0c 100644
--- a/regression/cbmc-with-incr/Zero_Initialization1/main.c
+++ b/regression/cbmc-with-incr/Zero_Initialization1/main.c
@@ -8,7 +8,7 @@ union U my_u;
union U
{
- int some;
+ int some;
};
struct S my_s;
diff --git a/regression/cbmc-with-incr/__func__1/main.c b/regression/cbmc-with-incr/__func__1/main.c
index 93870e6abad..f87717d5a1a 100644
--- a/regression/cbmc-with-incr/__func__1/main.c
+++ b/regression/cbmc-with-incr/__func__1/main.c
@@ -1,13 +1,13 @@
int main()
{
char ch0, ch1, ch2, ch3, ch4;
-
+
ch0=__func__[0];
ch1=__func__[1];
ch2=__func__[2];
ch3=__func__[3];
ch4=__func__[4];
-
+
assert(ch0=='m');
assert(ch1=='a');
assert(ch2=='i');
diff --git a/regression/cbmc-with-incr/abs1/main.c b/regression/cbmc-with-incr/abs1/main.c
index bea310ae957..e3e149726a1 100644
--- a/regression/cbmc-with-incr/abs1/main.c
+++ b/regression/cbmc-with-incr/abs1/main.c
@@ -10,17 +10,17 @@ int main()
{
int my_i, iabs;
double my_d, dabs;
-
+
assert(abs(-1)==1);
assert(abs(1)==1);
assert(fabs(1.0)==1);
assert(fabs(-1.0)==1);
-
+
iabs=(my_i<0)?-my_i:my_i;
assert(abs(my_i)==iabs);
__CPROVER_assume(!isnan(my_d));
-
+
dabs=(my_d<0)?-my_d:my_d;
assert(fabs(my_d)==dabs);
}
diff --git a/regression/cbmc-with-incr/atomic_section_seq1/main.c b/regression/cbmc-with-incr/atomic_section_seq1/main.c
index 630056854c3..0e223b6b658 100644
--- a/regression/cbmc-with-incr/atomic_section_seq1/main.c
+++ b/regression/cbmc-with-incr/atomic_section_seq1/main.c
@@ -372,4 +372,3 @@ signed int main(void)
ethoc_open(&netdev);
return 0;
}
-
diff --git a/regression/cbmc-with-incr/char1/main.c b/regression/cbmc-with-incr/char1/main.c
index dd90a6a764a..7e0fe699d7a 100644
--- a/regression/cbmc-with-incr/char1/main.c
+++ b/regression/cbmc-with-incr/char1/main.c
@@ -7,7 +7,7 @@ int main()
#error _CHAR_UNSIGNED should be set
#endif
#endif
-
+
#ifdef __GNUC__
#ifndef __CHAR_UNSIGNED__
#error __CHAR_UNSIGNED__ should be set
diff --git a/regression/cbmc-with-incr/character_handling1/main.c b/regression/cbmc-with-incr/character_handling1/main.c
index f0ae7f185da..ca5a1067d94 100644
--- a/regression/cbmc-with-incr/character_handling1/main.c
+++ b/regression/cbmc-with-incr/character_handling1/main.c
@@ -1,16 +1,16 @@
-int isalnum(int c);
-int isalpha(int c);
-int isblank(int c);
-int iscntrl(int c);
-int isdigit(int c);
-int isgraph(int c);
-int islower(int c);
-int isprint(int c);
-int ispunct(int c);
-int isspace(int c);
-int isupper(int c);
-int isxdigit(int c);
-int tolower(int c);
+int isalnum(int c);
+int isalpha(int c);
+int isblank(int c);
+int iscntrl(int c);
+int isdigit(int c);
+int isgraph(int c);
+int islower(int c);
+int isprint(int c);
+int ispunct(int c);
+int isspace(int c);
+int isupper(int c);
+int isxdigit(int c);
+int tolower(int c);
int toupper(int c);
int main()
@@ -22,7 +22,7 @@ int main()
assert(!isalnum(' '));
assert(!isalnum('.'));
assert(!isalnum(0));
-
+
assert(isalpha('a'));
assert(!isalpha('1'));
assert(isalpha('A'));
@@ -30,7 +30,7 @@ int main()
assert(!isalpha(' '));
assert(!isalpha('.'));
assert(!isalpha(0));
-
+
assert(!isblank('a'));
assert(!isblank('1'));
assert(!isblank('A'));
@@ -38,7 +38,7 @@ int main()
assert(isblank(' '));
assert(!isblank('.'));
assert(!isblank(0));
-
+
assert(!iscntrl('a'));
assert(!iscntrl('1'));
assert(!iscntrl('A'));
@@ -46,7 +46,7 @@ int main()
assert(!iscntrl(' '));
assert(!iscntrl('.'));
assert(iscntrl(0));
-
+
assert(!isdigit('a'));
assert(isdigit('1'));
assert(!isdigit('A'));
@@ -54,7 +54,7 @@ int main()
assert(!isdigit(' '));
assert(!isdigit('.'));
assert(!isdigit(0));
-
+
assert(islower('a'));
assert(!islower('1'));
assert(!islower('A'));
@@ -62,7 +62,7 @@ int main()
assert(!islower(' '));
assert(!islower('.'));
assert(!islower(0));
-
+
assert(!isupper('a'));
assert(!isupper('1'));
assert(isupper('A'));
@@ -70,7 +70,7 @@ int main()
assert(!isupper(' '));
assert(!isupper('.'));
assert(!isupper(0));
-
+
assert(!isspace('a'));
assert(!isspace('1'));
assert(!isspace('A'));
@@ -78,7 +78,7 @@ int main()
assert(isspace(' '));
assert(!isspace('.'));
assert(!isspace(0));
-
+
assert(tolower('a')=='a');
assert(tolower('1')=='1');
assert(tolower('A')=='a');
@@ -86,7 +86,7 @@ int main()
assert(tolower(' ')==' ');
assert(tolower('.')=='.');
assert(tolower(0)==0);
-
+
assert(toupper('a')=='A');
assert(toupper('1')=='1');
assert(toupper('A')=='A');
@@ -94,5 +94,5 @@ int main()
assert(toupper(' ')==' ');
assert(toupper('.')=='.');
assert(toupper(0)==0);
-
+
}
diff --git a/regression/cbmc-with-incr/complex1/main.c b/regression/cbmc-with-incr/complex1/main.c
index aebdad77108..72695b5edf9 100644
--- a/regression/cbmc-with-incr/complex1/main.c
+++ b/regression/cbmc-with-incr/complex1/main.c
@@ -8,15 +8,15 @@ int main()
c=1.0i+2;
assert(__real__ c == 2);
- assert(__imag__ c == 1);
-
+ assert(__imag__ c == 1);
+
_Complex double d;
assert(sizeof(c)==sizeof(d));
-
+
_Complex signed char char_complex, char_complex2;
-
+
char_complex=0x3i-2;
-
+
assert(sizeof(d)==sizeof(c));
assert(sizeof(char_complex)==sizeof(signed char)*2);
@@ -26,37 +26,37 @@ int main()
assert(((signed char *)&char_complex)[0]==-2);
assert(((signed char *)&char_complex)[1]==3);
#endif
-
+
assert(__real__ char_complex == -2);
assert(__imag__ char_complex == 3);
-
+
// the precedence of __imag__ is higher than that of +
assert((__imag__ 1.0i + 1.0i) == 1.0i + 1.0);
-
+
// complex conjugate
char_complex2 = ~ char_complex;
-
+
// __real__ something is an lvalue!
- __real__ char_complex = 100;
+ __real__ char_complex = 100;
assert(__real__ char_complex == 100);
assert(__imag__ char_complex == 3);
- // can be incremented
+ // can be incremented
char_complex++;
assert(__real__ char_complex == 101);
assert(__imag__ char_complex == 3);
-
+
// also separately
(__real__ char_complex)++;
- assert(__real__ char_complex == 102);
+ assert(__real__ char_complex == 102);
assert(__imag__ char_complex == 3);
-
+
// casts to reals produce the real part
- assert((int) char_complex == 102);
-
+ assert((int) char_complex == 102);
+
#else
-
- // Visual studio doesn't have it
+
+ // Visual studio doesn't have it
#endif
}
diff --git a/regression/cbmc-with-incr/compound_literal1/main.c b/regression/cbmc-with-incr/compound_literal1/main.c
index 82d65125ab1..fb9374523f0 100644
--- a/regression/cbmc-with-incr/compound_literal1/main.c
+++ b/regression/cbmc-with-incr/compound_literal1/main.c
@@ -16,15 +16,15 @@ int main()
assert(((float[2]) {2.7, 3.1})[1]==3.1f);
assert(((struct POINT) {0, 1}).y==1);
assert(((union U) {1.4}).f==1.4f);
-
+
// Address can be taken, lifetime is that of the
// containing block.
int *p=&(int){ 42 };
assert(*p==42);
-
+
// and modified
*p=43;
assert(*p==43);
-
+
return 0;
}
diff --git a/regression/cbmc-with-incr/const_ptr1/main.c b/regression/cbmc-with-incr/const_ptr1/main.c
index d0a109c690d..fb235940af3 100644
--- a/regression/cbmc-with-incr/const_ptr1/main.c
+++ b/regression/cbmc-with-incr/const_ptr1/main.c
@@ -15,13 +15,13 @@ int main()
// to a constant pointer to pointers to constant-chars
const char * const *p2;
p2=my_array;
-
+
const char *p3;
char ch;
-
+
p3=*p2;
-
+
ch=*p3;
-
+
assert(ch=='x');
}
diff --git a/regression/cbmc-with-incr/enum1/main.c b/regression/cbmc-with-incr/enum1/main.c
index 74d940ea1d0..ed76336f860 100644
--- a/regression/cbmc-with-incr/enum1/main.c
+++ b/regression/cbmc-with-incr/enum1/main.c
@@ -11,13 +11,13 @@ int array[E5];
int main()
{
int integer;
-
+
a=E2;
assert(a==1);
-
+
assert(E4==4);
assert(sizeof(array)==sizeof(int)*5);
-
+
integer=a;
assert(integer==1);
}
diff --git a/regression/cbmc-with-incr/enum3/main.c b/regression/cbmc-with-incr/enum3/main.c
index 44d6a512bd0..256b046cb6a 100644
--- a/regression/cbmc-with-incr/enum3/main.c
+++ b/regression/cbmc-with-incr/enum3/main.c
@@ -9,4 +9,4 @@ int main(void)
assert(token==Cx);
return 1;
-}
+}
diff --git a/regression/cbmc-with-incr/enum4/main.c b/regression/cbmc-with-incr/enum4/main.c
index 682347573c1..27c717a3591 100644
--- a/regression/cbmc-with-incr/enum4/main.c
+++ b/regression/cbmc-with-incr/enum4/main.c
@@ -14,4 +14,3 @@ int main()
void *(___args[1]) = {&_event_arg};
execute(___args);
}
-
diff --git a/regression/cbmc-with-incr/equality_through_array3/main.c b/regression/cbmc-with-incr/equality_through_array3/main.c
index e9768e552c0..9e94a5eba95 100644
--- a/regression/cbmc-with-incr/equality_through_array3/main.c
+++ b/regression/cbmc-with-incr/equality_through_array3/main.c
@@ -26,4 +26,3 @@ void main ()
return 1;
}
-
diff --git a/regression/cbmc-with-incr/equality_through_array4/main.c b/regression/cbmc-with-incr/equality_through_array4/main.c
index 72b3c671827..06fe628b50a 100644
--- a/regression/cbmc-with-incr/equality_through_array4/main.c
+++ b/regression/cbmc-with-incr/equality_through_array4/main.c
@@ -21,4 +21,3 @@ int main (void) {
return 1;
}
-
diff --git a/regression/cbmc-with-incr/equality_through_array5/main.c b/regression/cbmc-with-incr/equality_through_array5/main.c
index f148f2f7fef..41102922960 100644
--- a/regression/cbmc-with-incr/equality_through_array5/main.c
+++ b/regression/cbmc-with-incr/equality_through_array5/main.c
@@ -22,4 +22,3 @@ int main (void) {
return 1;
}
-
diff --git a/regression/cbmc-with-incr/equality_through_struct1/main.c b/regression/cbmc-with-incr/equality_through_struct1/main.c
index 02394abb3e2..5b78b7af31d 100644
--- a/regression/cbmc-with-incr/equality_through_struct1/main.c
+++ b/regression/cbmc-with-incr/equality_through_struct1/main.c
@@ -20,4 +20,3 @@ int main (void)
return 1;
}
-
diff --git a/regression/cbmc-with-incr/equality_through_struct_containing_arrays1/main.c b/regression/cbmc-with-incr/equality_through_struct_containing_arrays1/main.c
index 33893d5de03..4b88e22f3b9 100644
--- a/regression/cbmc-with-incr/equality_through_struct_containing_arrays1/main.c
+++ b/regression/cbmc-with-incr/equality_through_struct_containing_arrays1/main.c
@@ -41,4 +41,3 @@ int main (void)
return 1;
}
-
diff --git a/regression/cbmc-with-incr/equality_through_struct_containing_arrays2/main.c b/regression/cbmc-with-incr/equality_through_struct_containing_arrays2/main.c
index d6dd912406f..a10f7cf2ec4 100644
--- a/regression/cbmc-with-incr/equality_through_struct_containing_arrays2/main.c
+++ b/regression/cbmc-with-incr/equality_through_struct_containing_arrays2/main.c
@@ -46,4 +46,3 @@ int main (void)
return 1;
}
-
diff --git a/regression/cbmc-with-incr/exit1/main.c b/regression/cbmc-with-incr/exit1/main.c
index 0661315487b..c403cc204f0 100644
--- a/regression/cbmc-with-incr/exit1/main.c
+++ b/regression/cbmc-with-incr/exit1/main.c
@@ -2,7 +2,7 @@ void exit(int status);
int main() {
int x;
-
+
if(x==10)
exit(1);
diff --git a/regression/cbmc-with-incr/extern_initialization1/file2.c b/regression/cbmc-with-incr/extern_initialization1/file2.c
index 579cd194cb1..430d09c7316 100644
--- a/regression/cbmc-with-incr/extern_initialization1/file2.c
+++ b/regression/cbmc-with-incr/extern_initialization1/file2.c
@@ -1,2 +1 @@
extern int some_int;
-
diff --git a/regression/cbmc-with-incr/extern_initialization2/file2.c b/regression/cbmc-with-incr/extern_initialization2/file2.c
index 894a5c09d13..f0bd0cbd8d1 100644
--- a/regression/cbmc-with-incr/extern_initialization2/file2.c
+++ b/regression/cbmc-with-incr/extern_initialization2/file2.c
@@ -4,4 +4,3 @@ extern int some_int;
int some_int;
extern int some_int;
-
diff --git a/regression/cbmc-with-incr/for-break1/main.c b/regression/cbmc-with-incr/for-break1/main.c
index 88c5344cb36..c6fe8f78046 100644
--- a/regression/cbmc-with-incr/for-break1/main.c
+++ b/regression/cbmc-with-incr/for-break1/main.c
@@ -9,6 +9,6 @@ int main()
b=1;
}
-
+
assert(a==b);
}
diff --git a/regression/cbmc-with-incr/for1/main.c b/regression/cbmc-with-incr/for1/main.c
index 1a650444570..d3448117650 100644
--- a/regression/cbmc-with-incr/for1/main.c
+++ b/regression/cbmc-with-incr/for1/main.c
@@ -1,13 +1,13 @@
int main() {
int i=0;
-
+
for(;;)
{
i++;
if(i==30) break;
}
-
+
assert(i==30);
return 0;
diff --git a/regression/cbmc-with-incr/gcc_conditional_expr1/main.c b/regression/cbmc-with-incr/gcc_conditional_expr1/main.c
index 53c43ce675c..5f6f46bbba4 100644
--- a/regression/cbmc-with-incr/gcc_conditional_expr1/main.c
+++ b/regression/cbmc-with-incr/gcc_conditional_expr1/main.c
@@ -3,15 +3,15 @@ int g, k;
int main()
{
int r1, r2;
-
+
r1= (g++) ? : 2;
-
+
assert(r1==2);
assert(g==1);
r2= (g++) ? : (k++);
-
+
assert(r2==1);
- assert(g==2);
+ assert(g==2);
assert(k==0);
}
diff --git a/regression/cbmc-with-incr/gcc_local_label1/main.c b/regression/cbmc-with-incr/gcc_local_label1/main.c
index 2bdea2be2d3..d9263aa3740 100644
--- a/regression/cbmc-with-incr/gcc_local_label1/main.c
+++ b/regression/cbmc-with-incr/gcc_local_label1/main.c
@@ -8,14 +8,14 @@ void other_f()
#ifdef __GNUC__
here:;
x++;
-
+
{
__label__ here, there;
-
+
goto here; // not jumping up, but down!
here:; // this would usually fail
-
+
assert(0);
}
#else
@@ -28,4 +28,3 @@ int main()
{
other_f();
}
-
diff --git a/regression/cbmc-with-incr/gcc_statement_expression1/main.c b/regression/cbmc-with-incr/gcc_statement_expression1/main.c
index 539e53e4170..843323e4308 100644
--- a/regression/cbmc-with-incr/gcc_statement_expression1/main.c
+++ b/regression/cbmc-with-incr/gcc_statement_expression1/main.c
@@ -3,20 +3,20 @@ int main()
int x;
int y;
- // as a side-effect
+ // as a side-effect
({ x=1; x;});
-
+
assert(x==1);
-
+
x= ({ y=1; 2; });
assert(x==2);
assert(y==1);
-
+
// inside an initializer: a needs to be visible
// before doing the initializer
int a=({ int b=(long int)&a; b; });
-
+
return 0;
}
diff --git a/regression/cbmc-with-incr/gcc_statement_expression2/main.c b/regression/cbmc-with-incr/gcc_statement_expression2/main.c
index a36b68191b8..c1bfc88eaa1 100644
--- a/regression/cbmc-with-incr/gcc_statement_expression2/main.c
+++ b/regression/cbmc-with-incr/gcc_statement_expression2/main.c
@@ -8,7 +8,7 @@ int f()
int main()
{
int i;
-
+
int x = ({f();});
assert(x==1);
@@ -20,7 +20,7 @@ int main()
int z = ({ i=1; i++; });
assert(z==1);
assert(i==2);
-
+
// same at top level
({ i=1; i++; });
assert(i==2);
diff --git a/regression/cbmc-with-incr/gcc_vector1/main.c b/regression/cbmc-with-incr/gcc_vector1/main.c
index 81ee89d5bfa..69121e20234 100644
--- a/regression/cbmc-with-incr/gcc_vector1/main.c
+++ b/regression/cbmc-with-incr/gcc_vector1/main.c
@@ -17,7 +17,7 @@ int main()
assert(sizeof(v4si)==16);
vector_u x, y, z;
-
+
z.v=x.v+y.v;
assert(z.members[0]==x.members[0]+y.members[0]);
@@ -45,7 +45,7 @@ int main()
assert(z.members[1]==~x.members[1]);
assert(z.members[2]==~x.members[2]);
assert(z.members[3]==~x.members[3]);
-
+
// build vector with typecast
z.v=(v4si){ 0, 1, 2, 3 };
assert(z.members[0]==0 && z.members[1]==1 && z.members[2]==2 && z.members[3]==3);
@@ -54,14 +54,14 @@ int main()
v4si some_vector={ 10, 11, 12, 13 };
z.v=some_vector;
assert(z.members[0]==10 && z.members[1]==11 && z.members[2]==12 && z.members[3]==13);
-
+
// same from one
v4si other_vector={ 0 };
z.v=other_vector;
// an array of vectors
v4si image[] = { other_vector };
-
+
assert(z.members[1]==0);
}
diff --git a/regression/cbmc-with-incr/gcc_vector2/main.c b/regression/cbmc-with-incr/gcc_vector2/main.c
index 89d2a9d9961..c35987af7c8 100644
--- a/regression/cbmc-with-incr/gcc_vector2/main.c
+++ b/regression/cbmc-with-incr/gcc_vector2/main.c
@@ -30,7 +30,7 @@ int main()
assert(((int*) &a)[i]==((int*) &b)[i]);
assert(((int*) &b)[i]==b[i]);
}
-
+
#endif
return 0;
diff --git a/regression/cbmc-with-incr/goto1/main.c b/regression/cbmc-with-incr/goto1/main.c
index ceb93ebe0cb..1eaf79a78d0 100644
--- a/regression/cbmc-with-incr/goto1/main.c
+++ b/regression/cbmc-with-incr/goto1/main.c
@@ -1,14 +1,14 @@
int main()
{
int i, j;
-
+
if(i)
goto l;
-
+
if(j)
goto l;
-
+
assert(!i && !j);
-
- l:;
+
+ l:;
}
diff --git a/regression/cbmc-with-incr/goto2/main.c b/regression/cbmc-with-incr/goto2/main.c
index 320c107fb8e..26219e65fe3 100644
--- a/regression/cbmc-with-incr/goto2/main.c
+++ b/regression/cbmc-with-incr/goto2/main.c
@@ -8,8 +8,8 @@ int main()
goto l;
i=2;
-
- l:;
-
+
+ l:;
+
assert(i==1 || !j);
}
diff --git a/regression/cbmc-with-incr/goto3/main.c b/regression/cbmc-with-incr/goto3/main.c
index 19d27206bd8..985725bc086 100644
--- a/regression/cbmc-with-incr/goto3/main.c
+++ b/regression/cbmc-with-incr/goto3/main.c
@@ -1,15 +1,15 @@
int main()
{
int i;
-
+
i=0;
loop:
assert(i<10);
i++;
-
+
if(i<10)
goto loop;
-
+
assert(i==10);
}
diff --git a/regression/cbmc-with-incr/if2/main.c b/regression/cbmc-with-incr/if2/main.c
index 94ba1071143..bec127110bc 100644
--- a/regression/cbmc-with-incr/if2/main.c
+++ b/regression/cbmc-with-incr/if2/main.c
@@ -3,10 +3,10 @@ int nondet_int();
int main()
{
int i, j, k;
-
+
i=nondet_int();
k=nondet_int();
-
+
if(i)
{
}
diff --git a/regression/cbmc-with-incr/if3/main.c b/regression/cbmc-with-incr/if3/main.c
index 08c20e43bf0..be1474285e1 100644
--- a/regression/cbmc-with-incr/if3/main.c
+++ b/regression/cbmc-with-incr/if3/main.c
@@ -1,11 +1,11 @@
int main()
{
goto ERROR;
-
+
if(0) {
ERROR:
assert(0);
}
-
+
return 0;
}
diff --git a/regression/cbmc-with-incr/if4/main.c b/regression/cbmc-with-incr/if4/main.c
index 1a67c7ebbbd..e109c21dbd5 100644
--- a/regression/cbmc-with-incr/if4/main.c
+++ b/regression/cbmc-with-incr/if4/main.c
@@ -3,10 +3,10 @@ int main()
int x;
__CPROVER_assume(x==1);
-
+
if(x==2)
x++;
-
+
// this should pass
assert(x==1);
}
diff --git a/regression/cbmc-with-incr/inline1/header.h b/regression/cbmc-with-incr/inline1/header.h
index c18b4ee55a3..3aea02623ce 100644
--- a/regression/cbmc-with-incr/inline1/header.h
+++ b/regression/cbmc-with-incr/inline1/header.h
@@ -6,4 +6,3 @@ static inline void f()
{
x=1;
}
-
diff --git a/regression/cbmc-with-incr/int-to-float2/main.c b/regression/cbmc-with-incr/int-to-float2/main.c
index ae817fabf69..5c095d2849e 100644
--- a/regression/cbmc-with-incr/int-to-float2/main.c
+++ b/regression/cbmc-with-incr/int-to-float2/main.c
@@ -44,7 +44,7 @@ int main(void)
assert(castWithRounding(FE_DOWNWARD,x) == low);
assert(castWithRounding(FE_DOWNWARD,-x) == -high);
#endif
-
+
assert(castWithRounding(FE_TOWARDZERO,x) == low);
assert(castWithRounding(FE_TOWARDZERO,-x) == -low);
#endif
diff --git a/regression/cbmc-with-incr/locations1/main.c b/regression/cbmc-with-incr/locations1/main.c
index 3b59c036d56..163cb1d5e74 100644
--- a/regression/cbmc-with-incr/locations1/main.c
+++ b/regression/cbmc-with-incr/locations1/main.c
@@ -35,4 +35,3 @@ int8_t StateMachines_testFlightAnalyzer(void) {
int main() {}
-
diff --git a/regression/cbmc-with-incr/noop1/main.c b/regression/cbmc-with-incr/noop1/main.c
index a24eb909bb1..5341fb34ad1 100644
--- a/regression/cbmc-with-incr/noop1/main.c
+++ b/regression/cbmc-with-incr/noop1/main.c
@@ -10,6 +10,6 @@ int main()
{
// http://msdn.microsoft.com/en-us/library/s6btaxcs%28v=vs.80%29.aspx
// the arguments of __noop are _not_ evaluated
-
+
__noop(some_function());
}
diff --git a/regression/cbmc-with-incr/offsetof1/main.c b/regression/cbmc-with-incr/offsetof1/main.c
index bc6d6db14e9..392747e1aca 100644
--- a/regression/cbmc-with-incr/offsetof1/main.c
+++ b/regression/cbmc-with-incr/offsetof1/main.c
@@ -5,7 +5,7 @@ struct S
int i;
char ch;
int j; // this gets aligned
-
+
struct Ssub
{
int x, y;
@@ -42,10 +42,10 @@ int main(void)
assert((long int)&((struct S *)0)->array==16+4);
assert((long int)&((struct S *)0)->array[1]==16+12);
assert((long int)&((struct S *)0)->array[1].y==16+12+4);
-
+
// these are _constants_!
- #ifdef __GNUC__
+ #ifdef __GNUC__
enum { E1 = __builtin_offsetof(struct S, ch) };
#endif
diff --git a/regression/cbmc-with-incr/pipe1/main.c b/regression/cbmc-with-incr/pipe1/main.c
index 17d282c945d..7bfb9f80f1d 100644
--- a/regression/cbmc-with-incr/pipe1/main.c
+++ b/regression/cbmc-with-incr/pipe1/main.c
@@ -13,7 +13,7 @@ int main()
#ifdef _WIN32
int ret=_pipe(filedesc, 1000, O_BINARY);
- #else
+ #else
int ret=pipe(filedesc);
#endif
diff --git a/regression/cbmc-with-incr/return5/main.c b/regression/cbmc-with-incr/return5/main.c
index 40f889b7978..ca143df9e00 100644
--- a/regression/cbmc-with-incr/return5/main.c
+++ b/regression/cbmc-with-incr/return5/main.c
@@ -39,6 +39,6 @@ int main()
res1 = f1(a);
assert(res0 == res1); /* <-- should fail */
-
+
return 0;
}
diff --git a/regression/cbmc-with-incr/struct4/main.c b/regression/cbmc-with-incr/struct4/main.c
index c6f4dd7e2bd..6406255b45e 100644
--- a/regression/cbmc-with-incr/struct4/main.c
+++ b/regression/cbmc-with-incr/struct4/main.c
@@ -2,7 +2,7 @@
#ifdef PRINT
#include
-void assert(int cond)
+void assert(int cond)
{ if(!cond) printf("assert failed!\n"); }
#endif
diff --git a/regression/cbmc-with-incr/struct6/main.c b/regression/cbmc-with-incr/struct6/main.c
index 4bf4e892fb2..c83aeeff695 100644
--- a/regression/cbmc-with-incr/struct6/main.c
+++ b/regression/cbmc-with-incr/struct6/main.c
@@ -10,7 +10,7 @@ struct S
int main()
{
struct S *p=malloc(sizeof(struct S)+10);
-
+
p->x=1;
p->a[0]=3;
p->a[9]=3;
diff --git a/regression/cbmc-with-incr/struct7/main.c b/regression/cbmc-with-incr/struct7/main.c
index b9983f37509..45c5798a48e 100644
--- a/regression/cbmc-with-incr/struct7/main.c
+++ b/regression/cbmc-with-incr/struct7/main.c
@@ -7,7 +7,7 @@ struct my_struct
void f(int *p)
{
int diff;
-
+
diff=p-&s.array[0];
// should pass
@@ -19,7 +19,7 @@ int main()
int ind, x;
ind=x;
int *p=&s.array[ind];
-
+
if(ind>=0 && ind<=9)
f(p);
}
diff --git a/regression/cbmc-with-incr/struct8/main.c b/regression/cbmc-with-incr/struct8/main.c
index b16d954ec30..c8e65e7bcd0 100644
--- a/regression/cbmc-with-incr/struct8/main.c
+++ b/regression/cbmc-with-incr/struct8/main.c
@@ -6,11 +6,11 @@ struct X
int main()
{
int aa, bb, cc;
-
+
struct X foo;
-
+
foo=(struct X) { aa, bb, cc };
-
+
assert(foo.a==aa);
assert(foo.b==bb);
assert(foo.c==cc);
diff --git a/regression/cbmc-with-incr/switch1/main.c b/regression/cbmc-with-incr/switch1/main.c
index 197e17d7b16..cb69400a25d 100644
--- a/regression/cbmc-with-incr/switch1/main.c
+++ b/regression/cbmc-with-incr/switch1/main.c
@@ -1,7 +1,7 @@
int main()
{
int i;
-
+
switch(i)
{
case 0:
@@ -12,7 +12,7 @@ int main()
case 2:
assert(i==2);
break;
-
+
default:
assert(i!=0 && i!=1 && i!=2);
}
diff --git a/regression/cbmc-with-incr/switch2/main.c b/regression/cbmc-with-incr/switch2/main.c
index 173e5a7a3d7..41d8afa789d 100644
--- a/regression/cbmc-with-incr/switch2/main.c
+++ b/regression/cbmc-with-incr/switch2/main.c
@@ -6,7 +6,7 @@ int f(int j)
{
case 3:
return 4;
-
+
default:
return 5;
}
@@ -15,15 +15,15 @@ int f(int j)
int main()
{
int i;
-
+
__CPROVER_assume(i==3 || i==4);
-
+
switch(f(i))
{
case 4:
assert(i==3);
break;
-
+
case 5:
assert(i==4);
break;
diff --git a/regression/cbmc-with-incr/switch3/main.c b/regression/cbmc-with-incr/switch3/main.c
index c6e393d45ba..3fd83d24c23 100644
--- a/regression/cbmc-with-incr/switch3/main.c
+++ b/regression/cbmc-with-incr/switch3/main.c
@@ -3,15 +3,15 @@ char nondet_char();
int main()
{
char ch=nondet_char();
-
+
switch(ch)
{
case 'P':
case 'p':
assert(ch==80 || ch==112);
break;
-
+
default:
- assert(ch!=80 && ch!=112);
+ assert(ch!=80 && ch!=112);
}
}
diff --git a/regression/cbmc-with-incr/switch4/main.c b/regression/cbmc-with-incr/switch4/main.c
index ed69fa3c776..b2337cbce06 100644
--- a/regression/cbmc-with-incr/switch4/main.c
+++ b/regression/cbmc-with-incr/switch4/main.c
@@ -6,7 +6,7 @@ main()
{
case 0:
goto end;
-
+
default:
x = 0;
}
diff --git a/regression/cbmc-with-incr/switch5/main.c b/regression/cbmc-with-incr/switch5/main.c
index 89222d1bcfb..17db2cd5ad2 100644
--- a/regression/cbmc-with-incr/switch5/main.c
+++ b/regression/cbmc-with-incr/switch5/main.c
@@ -1,13 +1,13 @@
int main()
{
unsigned int i, j;
-
+
switch(i)
{
case 10:
j=10;
break;
-
+
default:;
j=i+1;
}
diff --git a/regression/cbmc-with-incr/switch6/main.c b/regression/cbmc-with-incr/switch6/main.c
index e61cc2775a4..7e9e73261e5 100644
--- a/regression/cbmc-with-incr/switch6/main.c
+++ b/regression/cbmc-with-incr/switch6/main.c
@@ -5,14 +5,14 @@ enum { ASD1, ASD2 } e;
int main()
{
const char *p;
-
+
e=ASD1;
-
+
p=({ const char *tmp;
switch(e) { case ASD1: tmp="abc"; } tmp; });
- assert(p[0]=='a');
- assert(p[1]=='b');
- assert(p[2]=='c');
+ assert(p[0]=='a');
+ assert(p[1]=='b');
+ assert(p[2]=='c');
assert(p[3]==0);
}
diff --git a/regression/cbmc-with-incr/union1/main.c b/regression/cbmc-with-incr/union1/main.c
index a78135bff1f..0b0dc8a8a26 100644
--- a/regression/cbmc-with-incr/union1/main.c
+++ b/regression/cbmc-with-incr/union1/main.c
@@ -5,18 +5,18 @@ union u_type
};
// rest of my_U should be zero
-union u_type my_U = { .ch = 1 };
+union u_type my_U = { .ch = 1 };
int main()
{
// little and big endian case, assuming sizeof(int)==4
- assert(my_U.i==1 || my_U.i==0x01000000);
+ assert(my_U.i==1 || my_U.i==0x01000000);
union u_type u;
-
+
u.i=1;
assert(u.i==1);
-
+
u.ch=2;
assert(u.ch==2);
}
diff --git a/regression/cbmc-with-incr/union3/main.c b/regression/cbmc-with-incr/union3/main.c
index e50ee188af5..205989d0e9c 100644
--- a/regression/cbmc-with-incr/union3/main.c
+++ b/regression/cbmc-with-incr/union3/main.c
@@ -9,7 +9,7 @@ int main(void)
{
int x;
assert(my_func(x)==x);
-
+
// this is yet another gcc extension
union my_U
{
@@ -17,10 +17,10 @@ int main(void)
char ch;
float f;
} union_object;
-
+
float some_float=1.5;
-
+
union_object=(union my_U)some_float;
-
+
assert(union_object.f==1.5);
-}
+}
diff --git a/regression/cbmc-with-incr/union5/main.c b/regression/cbmc-with-incr/union5/main.c
index c1cdd66560f..908ebba3297 100644
--- a/regression/cbmc-with-incr/union5/main.c
+++ b/regression/cbmc-with-incr/union5/main.c
@@ -7,7 +7,7 @@ union u_type
int main()
{
// rest of my_U should be non-deterministic
- union u_type my_U = { .ch = 1 };
+ union u_type my_U = { .ch = 1 };
// should fail
assert(my_U.i==1);
diff --git a/regression/cbmc-with-incr/va_list1/main.c b/regression/cbmc-with-incr/va_list1/main.c
index 6a5c0a625a2..4748baf01ab 100644
--- a/regression/cbmc-with-incr/va_list1/main.c
+++ b/regression/cbmc-with-incr/va_list1/main.c
@@ -6,15 +6,15 @@ int my_f(int x, ...)
{
__builtin_va_list list;
__builtin_va_start(list, x);
-
+
int value;
unsigned i;
-
+
for(i=0; i>=1;
assert(x==-2);
assert(y==-2);
-
+
// should also work with mixed types
assert(((-2)>>1u)==-1);
- // more arithmetic shifts for negative numbers
+ // more arithmetic shifts for negative numbers
x=-1;
- x=x>>1;
+ x=x>>1;
assert(x==-1);
-
+
x=-10;
x=x>>10;
- assert(x==-1);
+ assert(x==-1);
}
diff --git a/regression/cbmc/Address_of1/main.c b/regression/cbmc/Address_of1/main.c
index cbb4756b046..f5fcb9c5f9f 100644
--- a/regression/cbmc/Address_of1/main.c
+++ b/regression/cbmc/Address_of1/main.c
@@ -5,29 +5,29 @@ int main()
{
int some_int=20;
int *p;
-
+
// Compound literals are l-values, so their address
// can be taken.
p=(int []){ 1, 2, 3, some_int };
-
+
assert(p[0]==1);
assert(p[1]==2);
assert(p[2]==3);
assert(p[3]==20);
-
+
struct S { int x, y; } *q;
-
+
q=&(struct S){ .x=1 };
-
+
assert(q->x==1);
assert(q->y==0);
-
+
const char *sptr="asd";
assert(sptr[0]=='a');
assert(sptr[1]=='s');
assert(sptr[2]=='d');
assert(sptr[3]==0);
-
+
const wchar_t *wsptr;
wsptr=L"asd";
assert(wsptr[0]=='a');
diff --git a/regression/cbmc/Anonymous_Struct2/main.c b/regression/cbmc/Anonymous_Struct2/main.c
index 8396c4ecf38..ac80b39f43c 100644
--- a/regression/cbmc/Anonymous_Struct2/main.c
+++ b/regression/cbmc/Anonymous_Struct2/main.c
@@ -32,7 +32,7 @@ struct S_struct
union U_union {
int x, y;
};
-
+
int z;
} s;
@@ -43,7 +43,7 @@ int main()
s.x=1;
s.y=2;
s.z=3;
-
+
assert(s2.y==1);
assert(s2.z==1);
}
diff --git a/regression/cbmc/Anonymous_Struct3/main.c b/regression/cbmc/Anonymous_Struct3/main.c
index 2bd6ccc4cfd..4179acb303c 100644
--- a/regression/cbmc/Anonymous_Struct3/main.c
+++ b/regression/cbmc/Anonymous_Struct3/main.c
@@ -7,11 +7,11 @@ typedef union my_U {
unsigned : 1;
unsigned f1 : 1;
};
- char raw;
+ char raw;
} fields_t;
fields_t x;
-
+
int main()
{
unsigned word=1;
diff --git a/regression/cbmc/Array_Initialization1/main.c b/regression/cbmc/Array_Initialization1/main.c
index db867b00d99..a9d976cf6f7 100644
--- a/regression/cbmc/Array_Initialization1/main.c
+++ b/regression/cbmc/Array_Initialization1/main.c
@@ -20,11 +20,10 @@ int main()
// both must be complete
sizeof(abc1);
sizeof(abc2);
-
+
assert(string_array[0][0][0]=='1');
assert(string_array[0][0][1]=='2');
assert(string_array[0][0][2]=='3');
assert(string_array[0][0][3]=='4');
assert(string_array[0][0][4]==0);
}
-
diff --git a/regression/cbmc/Array_Initialization3/main.c b/regression/cbmc/Array_Initialization3/main.c
index 5cfe8b93eb9..f9dc6e270f8 100644
--- a/regression/cbmc/Array_Initialization3/main.c
+++ b/regression/cbmc/Array_Initialization3/main.c
@@ -22,16 +22,16 @@ int main(void)
{
assert(array1[0][1]==2);
assert(array1[1][0]==3); // returned false in this case
-
+
assert(array2[0]==0);
assert(array2[1]==10);
assert(array2[10]==100);
assert(sizeof(array2)==sizeof(int)*11);
-
+
assert(sizeof(array3)==sizeof(int)*8);
-
+
assert(sizeof(array7)==sizeof(int)*2);
assert(sizeof(array8)==sizeof(int)*3);
-
+
return 0;
}
diff --git a/regression/cbmc/Assumption1/main.c b/regression/cbmc/Assumption1/main.c
index 25c8d4472f8..dfd9db4e67d 100644
--- a/regression/cbmc/Assumption1/main.c
+++ b/regression/cbmc/Assumption1/main.c
@@ -1,7 +1,7 @@
int main()
{
int x;
-
+
__CPROVER_assume(x>=0);
assert(x!=-1);
@@ -10,4 +10,3 @@ int main()
__CPROVER_assume(x==1);
assert(x==1); // passes
}
-
diff --git a/regression/cbmc/BV_Arithmetic2/main.c b/regression/cbmc/BV_Arithmetic2/main.c
index b9cdf2cdce4..86c3911b20c 100644
--- a/regression/cbmc/BV_Arithmetic2/main.c
+++ b/regression/cbmc/BV_Arithmetic2/main.c
@@ -16,6 +16,6 @@ int main()
r0=test_bit_parity(699050);
assert(r0==0);
- r1=test_bit_parity(699050+1);
+ r1=test_bit_parity(699050+1);
assert(r1==1);
}
diff --git a/regression/cbmc/BV_Arithmetic4/main.c b/regression/cbmc/BV_Arithmetic4/main.c
index d5dde5769a2..36f03a6778d 100644
--- a/regression/cbmc/BV_Arithmetic4/main.c
+++ b/regression/cbmc/BV_Arithmetic4/main.c
@@ -10,14 +10,14 @@ int test_extend2(int x, unsigned width)
x = bit | (~mask & x);
mask <<= 1;
bit <<= 1;
- }
+ }
return x;
}
int main()
{
int r;
-
+
r=test_extend2(4, 3);
assert(r==-4);
}
diff --git a/regression/cbmc/BV_Arithmetic5/main.c b/regression/cbmc/BV_Arithmetic5/main.c
index 130e7f1014d..bc013cc1a75 100644
--- a/regression/cbmc/BV_Arithmetic5/main.c
+++ b/regression/cbmc/BV_Arithmetic5/main.c
@@ -1,7 +1,7 @@
unsigned int test_log2(unsigned int v)
{
unsigned c = 0; // c will be lg(v)
- while (v >>= 1)
+ while (v >>= 1)
{
c++;
}
@@ -11,7 +11,7 @@ unsigned int test_log2(unsigned int v)
int main()
{
int r;
-
+
r=test_log2(128);
assert(r==7);
}
diff --git a/regression/cbmc/BV_Arithmetic6/main.c b/regression/cbmc/BV_Arithmetic6/main.c
index 19af0c6b425..d971a119fd0 100644
--- a/regression/cbmc/BV_Arithmetic6/main.c
+++ b/regression/cbmc/BV_Arithmetic6/main.c
@@ -2,7 +2,7 @@ int main()
{
{
unsigned i, j, k, l;
-
+
j=k;
i=j/2;
l=j>>1;
@@ -13,7 +13,7 @@ int main()
l=j&1;
assert(i==l);
}
-
+
{
signed int i, j, k, l;
@@ -28,6 +28,6 @@ int main()
i=j%2;
l=j&1;
assert(i==l);
-
+
}
}
diff --git a/regression/cbmc/Bitfields1/main.c b/regression/cbmc/Bitfields1/main.c
index b05c2df095b..7ab19426ca3 100644
--- a/regression/cbmc/Bitfields1/main.c
+++ b/regression/cbmc/Bitfields1/main.c
@@ -15,45 +15,45 @@ struct bft {
// an anonymous bitfield
signed int :2;
-
+
// with typedef
INT x:1;
-
+
// made of sizeof
unsigned int abc: sizeof(int);
// enums are integers!
INTEL_CACHE_TYPE Type : 5;
-
+
// and good as field sizes
INTEL_CACHE_TYPE Field2 : IntelCacheTrace;
};
int main() {
struct bft bf;
-
+
assert(bf.a<=7);
assert(bf.b<=1);
assert(bf.c<=1);
-
+
bf.a&=0;
assert(bf.a==0);
-
+
bf.a+=9;
assert(bf.a==1);
-
+
bf.a<<=1;
assert(bf.a==2);
-
+
bf.a>>=1;
assert(bf.a==1);
-
+
bf.d=2;
assert(bf.d==1);
-
+
// assignments have the underlying type
assert(sizeof(bf.d=1)==sizeof(_Bool));
assert(sizeof(bf.a+=1)==sizeof(unsigned));
-
+
bf.Type=IntelCacheTrace;
}
diff --git a/regression/cbmc/Bitfields2/main.c b/regression/cbmc/Bitfields2/main.c
index 946cb66ba04..4322e6aa4f9 100644
--- a/regression/cbmc/Bitfields2/main.c
+++ b/regression/cbmc/Bitfields2/main.c
@@ -23,7 +23,7 @@ struct S0 {
int64_t f2;
uint32_t f3;
// skipped over during initialization
- signed : 0;
+ signed : 0;
volatile int16_t f4;
volatile uint32_t f5;
int32_t f6;
@@ -46,4 +46,3 @@ int main()
return 0;
}
-
diff --git a/regression/cbmc/Bool1/main.c b/regression/cbmc/Bool1/main.c
index 90db3177189..4949781de4e 100644
--- a/regression/cbmc/Bool1/main.c
+++ b/regression/cbmc/Bool1/main.c
@@ -2,18 +2,18 @@
int main() {
_Bool b1, b2, b3;
-
+
b1=0;
b1++;
assert(b1);
-
+
b2=1;
b2+=10;
assert(b2);
-
+
b3=b1+b2;
assert(b3==1);
-
+
// a struct of _Bool
struct
{
@@ -22,13 +22,13 @@ int main() {
} s;
assert(sizeof(s)==4);
-
+
s.f1=2;
assert(s.f1==1);
-
+
s.f4=1;
assert(s.f4);
-
+
*((unsigned char *)(&s.f2))=1;
assert(s.f2);
}
diff --git a/regression/cbmc/Bool4/main.c b/regression/cbmc/Bool4/main.c
index e7d572ecc9c..4055cbf8d29 100644
--- a/regression/cbmc/Bool4/main.c
+++ b/regression/cbmc/Bool4/main.c
@@ -6,7 +6,7 @@ int main() {
b1=1;
b1 ^= (_Bool)1;
assert(!b1);
-
+
b1=1;
b2=1;
b1 ^= b2;
diff --git a/regression/cbmc/Boolean_Guards1/main.c b/regression/cbmc/Boolean_Guards1/main.c
index 6050ff6ef44..14f125ab4ad 100644
--- a/regression/cbmc/Boolean_Guards1/main.c
+++ b/regression/cbmc/Boolean_Guards1/main.c
@@ -3,7 +3,7 @@ int main() {
int i;
int a[100];
- // this is guaranteed not to be a buffer overflow
+ // this is guaranteed not to be a buffer overflow
if(x<100 && a[x])
{
i++;
diff --git a/regression/cbmc/Computed-Goto1/main.c b/regression/cbmc/Computed-Goto1/main.c
index efc34053a10..c31ed412069 100644
--- a/regression/cbmc/Computed-Goto1/main.c
+++ b/regression/cbmc/Computed-Goto1/main.c
@@ -2,17 +2,17 @@ int main()
{
void *table[]={ &&l0, &&l1, &&l2 };
int in, out;
-
+
if(in>=0 && in<=2)
{
goto *(table[in]);
l0: out=0; goto result;
-
+
l1: out=1; goto result;
-
+
l2: out=2; goto result;
-
+
result:
assert(in==out);
}
diff --git a/regression/cbmc/Division1/main.c b/regression/cbmc/Division1/main.c
index bc0e1159868..67488d6027d 100644
--- a/regression/cbmc/Division1/main.c
+++ b/regression/cbmc/Division1/main.c
@@ -4,7 +4,7 @@ int main()
{
int k1 = 5 / 2;
assert(k1 == 2);
-
+
int k2 = -5 / 2;
assert(k2 == -2);
diff --git a/regression/cbmc/Division2/main.c b/regression/cbmc/Division2/main.c
index 1da2d810afb..12a4acb209d 100644
--- a/regression/cbmc/Division2/main.c
+++ b/regression/cbmc/Division2/main.c
@@ -3,7 +3,7 @@ _Bool nondet_bool();
void main()
{
int i=2, j;
-
+
if(nondet_bool())
i++;
diff --git a/regression/cbmc/Endianness1/main.c b/regression/cbmc/Endianness1/main.c
index 403825cec59..3bcfbfd4037 100644
--- a/regression/cbmc/Endianness1/main.c
+++ b/regression/cbmc/Endianness1/main.c
@@ -3,7 +3,7 @@ int main()
unsigned int u=1;
unsigned char *p;
unsigned char x, y;
-
+
p=(unsigned char *)&u;
x=*p;
diff --git a/regression/cbmc/Endianness2/main.c b/regression/cbmc/Endianness2/main.c
index 283067502a0..16545374193 100644
--- a/regression/cbmc/Endianness2/main.c
+++ b/regression/cbmc/Endianness2/main.c
@@ -3,7 +3,7 @@ int main()
unsigned int u=1;
unsigned char *p;
unsigned char x, y;
-
+
p=(unsigned char *)&u;
x=*p;
diff --git a/regression/cbmc/Endianness3/main.c b/regression/cbmc/Endianness3/main.c
index 7b2e8682fb2..8ea2b5600eb 100644
--- a/regression/cbmc/Endianness3/main.c
+++ b/regression/cbmc/Endianness3/main.c
@@ -2,13 +2,13 @@ int main()
{
unsigned int x;
unsigned char *p;
-
+
x=0xffff;
-
+
p=(unsigned char *)&x;
-
+
*p=1;
- // assumes little endian
+ // assumes little endian
assert(x==0xff01);
}
diff --git a/regression/cbmc/Endianness4/main.c b/regression/cbmc/Endianness4/main.c
index c38bc507b28..85a22d3ffe9 100644
--- a/regression/cbmc/Endianness4/main.c
+++ b/regression/cbmc/Endianness4/main.c
@@ -7,6 +7,5 @@ void main()
*(cp+i) = 0;
// should work with any endianness
- assert(x==0);
+ assert(x==0);
}
-
diff --git a/regression/cbmc/Endianness5/main.c b/regression/cbmc/Endianness5/main.c
index 83b6368dc6f..925f4c06044 100644
--- a/regression/cbmc/Endianness5/main.c
+++ b/regression/cbmc/Endianness5/main.c
@@ -5,8 +5,8 @@ unsigned short shortTmp;
int main()
{
ptrUShort = (unsigned short*)(®b[12]);
- shortTmp= *ptrUShort;
+ shortTmp= *ptrUShort;
// should pass
- *ptrUShort = 1234;
+ *ptrUShort = 1234;
}
diff --git a/regression/cbmc/Endianness6/main.c b/regression/cbmc/Endianness6/main.c
index 1ffe35d380a..1f1085cb3ff 100644
--- a/regression/cbmc/Endianness6/main.c
+++ b/regression/cbmc/Endianness6/main.c
@@ -4,21 +4,21 @@ int main()
{
int *i_p;
char c_array[10];
-
+
i_p=(int *)c_array;
*i_p=0x01020304;
-
+
// big-endian
assert(c_array[0]==1 &&
c_array[1]==2 &&
c_array[2]==3 &&
c_array[3]==4);
-
+
char *c_p;
int i=0x01020304;
-
+
c_p=(char *)&i;
-
+
// big-endian
assert(c_p[0]==1 &&
c_p[1]==2 &&
diff --git a/regression/cbmc/Error_Label1/main.c b/regression/cbmc/Error_Label1/main.c
index 5104837ed3e..78d8a1b45fa 100644
--- a/regression/cbmc/Error_Label1/main.c
+++ b/regression/cbmc/Error_Label1/main.c
@@ -2,7 +2,7 @@ int main()
{
int i;
- // this should fail
+ // this should fail
goto ERROR;
return 0;
diff --git a/regression/cbmc/Error_Label2/main.c b/regression/cbmc/Error_Label2/main.c
index 5104837ed3e..78d8a1b45fa 100644
--- a/regression/cbmc/Error_Label2/main.c
+++ b/regression/cbmc/Error_Label2/main.c
@@ -2,7 +2,7 @@ int main()
{
int i;
- // this should fail
+ // this should fail
goto ERROR;
return 0;
diff --git a/regression/cbmc/Exceptions1/main.c b/regression/cbmc/Exceptions1/main.c
index c0308a84ff7..87ee3d50d40 100644
--- a/regression/cbmc/Exceptions1/main.c
+++ b/regression/cbmc/Exceptions1/main.c
@@ -10,7 +10,7 @@ void test_try_finally1()
{
global=2;
}
-
+
assert(global==2);
}
@@ -26,7 +26,7 @@ void helper()
{
global=3;
}
-
+
assert(global==2);
}
@@ -46,7 +46,7 @@ void test_try_catch1()
{
global=2;
}
-
+
assert(global==1);
}
@@ -62,7 +62,7 @@ void test_try_catch2()
{
global=3;
}
-
+
assert(global==3);
}
@@ -73,4 +73,3 @@ int main()
test_try_catch1();
test_try_catch2();
}
-
diff --git a/regression/cbmc/Fixedbv1/main.c b/regression/cbmc/Fixedbv1/main.c
index 7c3e6cf6e43..2b94133e7a6 100644
--- a/regression/cbmc/Fixedbv1/main.c
+++ b/regression/cbmc/Fixedbv1/main.c
@@ -1,16 +1,16 @@
int main() {
double x;
int y;
-
- x=2;
+
+ x=2;
x-=0.6;
y=x; // this yields 1.4, which is cut off
-
+
assert(y==1);
- x=2;
+ x=2;
x-=0.4;
y=x; // this yields 1.6, which is cut off, too!
-
+
assert(y==1);
}
diff --git a/regression/cbmc/Fixedbv4/main.c b/regression/cbmc/Fixedbv4/main.c
index 91f499140cf..c04fa2bfc21 100644
--- a/regression/cbmc/Fixedbv4/main.c
+++ b/regression/cbmc/Fixedbv4/main.c
@@ -1,14 +1,14 @@
int main()
{
double f;
-
+
// addition
assert(100.0+10==110);
assert(0+f==f);
assert(f+0==f);
assert(100+0.5==100.5);
assert(0.0+0.0+f==f);
-
+
// subtraction
assert(100.0-10==90);
assert(0-f==-f);
@@ -37,7 +37,7 @@ int main()
assert(100.0/0.5==200);
assert(0/1.0==0);
assert(f/1.0==f);
-
+
// conversion
assert(((double)(float)100)==100.0);
assert(((unsigned int)100.0)==100.0);
@@ -47,7 +47,7 @@ int main()
assert((int)0.49==0);
assert((int)-1.5==-1);
assert((int)-10.49==-10);
-
+
// relations
assert(1.0<2.5);
assert(1.0<=2.5);
diff --git a/regression/cbmc/Fixedbv5/main.c b/regression/cbmc/Fixedbv5/main.c
index fa62a78e408..f35749769ef 100644
--- a/regression/cbmc/Fixedbv5/main.c
+++ b/regression/cbmc/Fixedbv5/main.c
@@ -1,7 +1,7 @@
int main()
{
float a, b;
-
+
__CPROVER_assume(a==1 || a==0.5 || a==2 || a==3 || a==0.1);
b=a;
a/=2;
diff --git a/regression/cbmc/Fixedbv6/main.c b/regression/cbmc/Fixedbv6/main.c
index f45c35f0444..f72d72c6975 100644
--- a/regression/cbmc/Fixedbv6/main.c
+++ b/regression/cbmc/Fixedbv6/main.c
@@ -18,8 +18,8 @@ int main()
assert(1.0<=2.0);
assert(!(-1.0<=-2.0));
assert(2.0>=1.0);
- assert(!(-2.0>=-1.0));
-
+ assert(!(-2.0>=-1.0));
+
// variables
float a, b, _a=a, _b=b;
__CPROVER_assume(a==1 && b==2);
@@ -41,5 +41,5 @@ int main()
assert(a<=b);
assert(!(-a<=-b));
assert(b>=a);
- assert(!(-b>=-a));
+ assert(!(-b>=-a));
}
diff --git a/regression/cbmc/Fixedbv7/main.c b/regression/cbmc/Fixedbv7/main.c
index 91f499140cf..c04fa2bfc21 100644
--- a/regression/cbmc/Fixedbv7/main.c
+++ b/regression/cbmc/Fixedbv7/main.c
@@ -1,14 +1,14 @@
int main()
{
double f;
-
+
// addition
assert(100.0+10==110);
assert(0+f==f);
assert(f+0==f);
assert(100+0.5==100.5);
assert(0.0+0.0+f==f);
-
+
// subtraction
assert(100.0-10==90);
assert(0-f==-f);
@@ -37,7 +37,7 @@ int main()
assert(100.0/0.5==200);
assert(0/1.0==0);
assert(f/1.0==f);
-
+
// conversion
assert(((double)(float)100)==100.0);
assert(((unsigned int)100.0)==100.0);
@@ -47,7 +47,7 @@ int main()
assert((int)0.49==0);
assert((int)-1.5==-1);
assert((int)-10.49==-10);
-
+
// relations
assert(1.0<2.5);
assert(1.0<=2.5);
diff --git a/regression/cbmc/Float-Rounding2/main.c b/regression/cbmc/Float-Rounding2/main.c
index b751938aa7c..4e5ff6403e4 100644
--- a/regression/cbmc/Float-Rounding2/main.c
+++ b/regression/cbmc/Float-Rounding2/main.c
@@ -1,6 +1,6 @@
// Visual Studio needs to be 2013 onwards
#if defined(_MSC_VER) && !defined(__CYGWIN__) && _MSC_VER < 1800
-
+
// see http://www.johndcook.com/math_h.html
int main()
@@ -8,7 +8,7 @@ int main()
}
#else
-
+
#include
#include
@@ -18,7 +18,7 @@ int main()
fesetround(FE_DOWNWARD);
assert(fegetround()==FE_DOWNWARD);
#endif
-
+
#ifdef FE_TONEAREST
fesetround(FE_TONEAREST);
assert(fegetround()==FE_TONEAREST);
diff --git a/regression/cbmc/Float-data-dependent-rounding/main.c b/regression/cbmc/Float-data-dependent-rounding/main.c
index 495bb5fad84..44f8457a90e 100644
--- a/regression/cbmc/Float-data-dependent-rounding/main.c
+++ b/regression/cbmc/Float-data-dependent-rounding/main.c
@@ -10,7 +10,7 @@
int main (void) {
#if defined(_MSC_VER) && _MSC_VER < 1800
#else
-
+
#ifdef FE_UPWARD
#ifdef FW_DOWNWARD
float f;
@@ -33,7 +33,7 @@ int main (void) {
}
#endif
#endif
-
+
#endif
return 1;
diff --git a/regression/cbmc/Float-div1/main.c b/regression/cbmc/Float-div1/main.c
index 63f8512a7c2..49ee7110797 100644
--- a/regression/cbmc/Float-div1/main.c
+++ b/regression/cbmc/Float-div1/main.c
@@ -23,7 +23,7 @@ void simplifiedInductiveStepHunt (float nextState)
// Implies nextState == 0x1p+124f;
__CPROVER_assume((0x1.fffffep+123f < nextState) && (nextState < 0x1.000002p+124f));
-
+
float oneAfter = (target / nextState);
// Is true and correctly proven by constant evaluation
diff --git a/regression/cbmc/Float-flags-no-simp1/main.c b/regression/cbmc/Float-flags-no-simp1/main.c
index d2f0833acc3..b41b115b6b9 100644
--- a/regression/cbmc/Float-flags-no-simp1/main.c
+++ b/regression/cbmc/Float-flags-no-simp1/main.c
@@ -9,7 +9,7 @@ int main()
#ifndef _MSC_VER
// first check constants
-
+
assert(isnormal(FLT_MAX));
assert(isinf(HUGE_VAL));
assert(isinf(HUGE_VALF));
diff --git a/regression/cbmc/Float-flags-simp1/main.c b/regression/cbmc/Float-flags-simp1/main.c
index d2f0833acc3..b41b115b6b9 100644
--- a/regression/cbmc/Float-flags-simp1/main.c
+++ b/regression/cbmc/Float-flags-simp1/main.c
@@ -9,7 +9,7 @@ int main()
#ifndef _MSC_VER
// first check constants
-
+
assert(isnormal(FLT_MAX));
assert(isinf(HUGE_VAL));
assert(isinf(HUGE_VALF));
diff --git a/regression/cbmc/Float-no-simp1/main.c b/regression/cbmc/Float-no-simp1/main.c
index de6091c82d2..e606d7b9d23 100644
--- a/regression/cbmc/Float-no-simp1/main.c
+++ b/regression/cbmc/Float-no-simp1/main.c
@@ -2,7 +2,7 @@ int main()
{
unsigned int i, j;
double d;
-
+
i=100.0;
d=i;
j=d;
diff --git a/regression/cbmc/Float-no-simp2/main.c b/regression/cbmc/Float-no-simp2/main.c
index 4fe132c1229..4914f3863ab 100644
--- a/regression/cbmc/Float-no-simp2/main.c
+++ b/regression/cbmc/Float-no-simp2/main.c
@@ -5,14 +5,14 @@ int main()
__CPROVER_assume(!__CPROVER_isnand(f2));
__CPROVER_assume(__CPROVER_isfinited(f2));
f=f2;
-
+
// addition
assert(100.0+10==110);
assert(0+f==f);
// assert(f+0==f);
assert(100+0.5==100.5);
// assert(0.0+0.0+f==f);
-
+
// subtraction
assert(100.0-10==90);
// assert(0-f==-f);
@@ -41,7 +41,7 @@ int main()
assert(100.0/0.5==200);
assert(0/1.0==0);
assert(f/1.0==f);
-
+
// conversion
assert(((double)(float)100)==100.0);
assert(((unsigned int)100.0)==100.0);
@@ -51,7 +51,7 @@ int main()
assert((int)0.49==0);
assert((int)-1.5==-1);
assert((int)-10.49==-10);
-
+
// relations
assert(1.0<2.5);
assert(1.0<=2.5);
diff --git a/regression/cbmc/Float-no-simp5/main.c b/regression/cbmc/Float-no-simp5/main.c
index ea2b8456667..7f4b1ed44a7 100644
--- a/regression/cbmc/Float-no-simp5/main.c
+++ b/regression/cbmc/Float-no-simp5/main.c
@@ -6,10 +6,9 @@ int main()
double f;
long long unsigned int i; // needs to have 64 bits
} au, bu;
-
+
au.f = a;
bu.f = b;
-
+
assert((au.i == bu.i) == __CPROVER_equal(a, b));
}
-
diff --git a/regression/cbmc/Float-no-simp8/main.c b/regression/cbmc/Float-no-simp8/main.c
index a9234d20fbe..c75d7e231ac 100644
--- a/regression/cbmc/Float-no-simp8/main.c
+++ b/regression/cbmc/Float-no-simp8/main.c
@@ -9,7 +9,7 @@ int main (int argc, char **argv) {
float result = f + g;
assert(result == target);
-
+
#ifndef _MSC_VER
assert(signbit(result) == signbit(target));
#endif
diff --git a/regression/cbmc/Float-no-simp9/main.c b/regression/cbmc/Float-no-simp9/main.c
index 73253a909e8..9303a39d989 100644
--- a/regression/cbmc/Float-no-simp9/main.c
+++ b/regression/cbmc/Float-no-simp9/main.c
@@ -15,7 +15,7 @@ void testAdd (int mode, double f, double g, int sign) {
assert(f_plus_g == 0.0);
assert(g_plus_f == 0.0);
-
+
assert(signbit(f_plus_g) == sign);
assert(signbit(g_plus_f) == sign);
#endif
diff --git a/regression/cbmc/Float1/main.c b/regression/cbmc/Float1/main.c
index 886c6c17684..b4d8dedca6d 100644
--- a/regression/cbmc/Float1/main.c
+++ b/regression/cbmc/Float1/main.c
@@ -1,17 +1,17 @@
int main() {
double x;
int y;
-
- x=2;
+
+ x=2;
x-=0.6;
y=x; // this yields 1.4, which is cut off
-
+
assert(y==1);
- x=2;
+ x=2;
x-=0.4;
y=x; // this yields 1.6, which is cut off, too!
// This is what the standard says!
-
+
assert(y==1);
}
diff --git a/regression/cbmc/Float11/main.c b/regression/cbmc/Float11/main.c
index 7514a3f37cb..f2e8b9e373d 100644
--- a/regression/cbmc/Float11/main.c
+++ b/regression/cbmc/Float11/main.c
@@ -31,7 +31,7 @@ int main()
assert(0<1);
assert(1>-0);
assert(-0<1);
-
+
assert(!(0.999f<0.0f));
assert(!(-0.999f>-0.0f));
assert(!(0.999f<=0.0f));
diff --git a/regression/cbmc/Float12/main.c b/regression/cbmc/Float12/main.c
index a835646d1bf..3b88b9d576f 100644
--- a/regression/cbmc/Float12/main.c
+++ b/regression/cbmc/Float12/main.c
@@ -5,7 +5,7 @@ int main()
unsigned char x;
d=f;
-
+
if(f==x)
assert(d==x);
}
diff --git a/regression/cbmc/Float14/main.c b/regression/cbmc/Float14/main.c
index b3de7013b6e..bafe611b05a 100644
--- a/regression/cbmc/Float14/main.c
+++ b/regression/cbmc/Float14/main.c
@@ -1,14 +1,14 @@
int main()
{
float temp;
-
+
temp = 1.8e307f + 1.5e50f; // should produce overflow -> +infinity (according to standard)
assert(__CPROVER_isinff(temp));
-
+
float x;
-
+
x=temp-temp;
-
+
// should be +inf
assert(__CPROVER_isinff(temp));
}
diff --git a/regression/cbmc/Float18/main.c b/regression/cbmc/Float18/main.c
index 4f09b5429c2..4997219cd05 100644
--- a/regression/cbmc/Float18/main.c
+++ b/regression/cbmc/Float18/main.c
@@ -1,4 +1,4 @@
-#define _USE_MATH_DEFINES
+#define _USE_MATH_DEFINES
#include
int main()
@@ -16,5 +16,3 @@ int main()
assert( n < 11 );
}
-
-
diff --git a/regression/cbmc/Float2/main.c b/regression/cbmc/Float2/main.c
index 1d41086f57a..9d9c877ea83 100644
--- a/regression/cbmc/Float2/main.c
+++ b/regression/cbmc/Float2/main.c
@@ -11,7 +11,7 @@ main()
b=1.250;
assert(b==1.25);
-
+
// with exponent
a=0.5e2;
assert(a==50);
diff --git a/regression/cbmc/Float20/main.c b/regression/cbmc/Float20/main.c
index b730f0d4f18..5b1c69fe151 100644
--- a/regression/cbmc/Float20/main.c
+++ b/regression/cbmc/Float20/main.c
@@ -53,4 +53,3 @@ int main (void) {
return 1;
}
-
diff --git a/regression/cbmc/Float21/main.c b/regression/cbmc/Float21/main.c
index 883e066cdfc..6eeda852be1 100644
--- a/regression/cbmc/Float21/main.c
+++ b/regression/cbmc/Float21/main.c
@@ -20,7 +20,7 @@ int main (void)
float smallestNormalFloat = 0x1.0p-126f;
float largestSubnormalFloat = 0x1.fffffcp-127f;
-
+
double v = 0x1.FFFFFFp-127;
float f;
@@ -59,7 +59,7 @@ int main (void)
f = nondet_float();
__CPROVER_assume(fpclassify(f) == FP_SUBNORMAL);
assert( ((float)((double)f)) == f );
-
+
#endif
return 0;
diff --git a/regression/cbmc/Float4/main.c b/regression/cbmc/Float4/main.c
index 08ff0cf255d..4b3fd112caa 100644
--- a/regression/cbmc/Float4/main.c
+++ b/regression/cbmc/Float4/main.c
@@ -5,14 +5,14 @@ int main()
__CPROVER_assume(!__CPROVER_isnand(f2));
__CPROVER_assume(!__CPROVER_isinfd(f2));
f=f2;
-
+
// addition
assert(100.0+10==110);
assert(0+f==f);
assert(f+0==f);
assert(100+0.5==100.5);
assert(0.0+0.0+f==f);
-
+
// subtraction
assert(100.0-10==90);
assert(0-f==-f);
@@ -41,7 +41,7 @@ int main()
assert(100.0/0.5==200);
assert(0/1.0==0);
assert(f/1.0==f);
-
+
// conversion
assert(((double)(float)100)==100.0);
assert(((unsigned int)100.0)==100.0);
@@ -51,7 +51,7 @@ int main()
assert((int)0.49==0);
assert((int)-1.5==-1);
assert((int)-10.49==-10);
-
+
// relations
assert(1.0<2.5);
assert(1.0<=2.5);
diff --git a/regression/cbmc/Float5/main.c b/regression/cbmc/Float5/main.c
index fa62a78e408..f35749769ef 100644
--- a/regression/cbmc/Float5/main.c
+++ b/regression/cbmc/Float5/main.c
@@ -1,7 +1,7 @@
int main()
{
float a, b;
-
+
__CPROVER_assume(a==1 || a==0.5 || a==2 || a==3 || a==0.1);
b=a;
a/=2;
diff --git a/regression/cbmc/Float6/main.c b/regression/cbmc/Float6/main.c
index f45c35f0444..f72d72c6975 100644
--- a/regression/cbmc/Float6/main.c
+++ b/regression/cbmc/Float6/main.c
@@ -18,8 +18,8 @@ int main()
assert(1.0<=2.0);
assert(!(-1.0<=-2.0));
assert(2.0>=1.0);
- assert(!(-2.0>=-1.0));
-
+ assert(!(-2.0>=-1.0));
+
// variables
float a, b, _a=a, _b=b;
__CPROVER_assume(a==1 && b==2);
@@ -41,5 +41,5 @@ int main()
assert(a<=b);
assert(!(-a<=-b));
assert(b>=a);
- assert(!(-b>=-a));
+ assert(!(-b>=-a));
}
diff --git a/regression/cbmc/Float7/main.c b/regression/cbmc/Float7/main.c
index 33f2923c7a7..fccaa083374 100644
--- a/regression/cbmc/Float7/main.c
+++ b/regression/cbmc/Float7/main.c
@@ -2,11 +2,11 @@ int main()
{
unsigned int i;
i=0;
-
+
float *p;
p=(float *)&i;
-
+
float f=*p;
-
+
assert(f==0.0);
}
diff --git a/regression/cbmc/Float_lib1/main.c b/regression/cbmc/Float_lib1/main.c
index 35dd4ba6302..c344517d28d 100644
--- a/regression/cbmc/Float_lib1/main.c
+++ b/regression/cbmc/Float_lib1/main.c
@@ -7,7 +7,7 @@ int main() {
// Visual Studio needs to be 2013 onwards
#if defined(_MSC_VER) && !defined(__CYGWIN__) && _MSC_VER < 1800
-
+
// see http://www.johndcook.com/math_h.html
#else
diff --git a/regression/cbmc/Free1/main.c b/regression/cbmc/Free1/main.c
index ef23ab68a1a..0d6eb009f64 100644
--- a/regression/cbmc/Free1/main.c
+++ b/regression/cbmc/Free1/main.c
@@ -7,7 +7,7 @@ int main()
int *q=p;
int i, x;
i=x;
-
+
if(i==4711) free(q);
// should fail if i==4711
diff --git a/regression/cbmc/Free2/main.c b/regression/cbmc/Free2/main.c
index 82ccf142962..f8d838d773a 100644
--- a/regression/cbmc/Free2/main.c
+++ b/regression/cbmc/Free2/main.c
@@ -7,7 +7,7 @@ int main()
int x;
int i, y;
i=y;
-
+
if(i==4711) p=&x;
// should fail if i==4711
diff --git a/regression/cbmc/Free3/main.c b/regression/cbmc/Free3/main.c
index 2328c7e5314..c85322e7813 100644
--- a/regression/cbmc/Free3/main.c
+++ b/regression/cbmc/Free3/main.c
@@ -10,6 +10,6 @@ int main()
free(p);
- // well, a double-free
+ // well, a double-free
free(p);
}
diff --git a/regression/cbmc/Free4/main.c b/regression/cbmc/Free4/main.c
index 3696af892b6..610c694580b 100644
--- a/regression/cbmc/Free4/main.c
+++ b/regression/cbmc/Free4/main.c
@@ -8,11 +8,11 @@ void my_free(int *q)
int main()
{
int *p=malloc(sizeof(int));
-
+
*p=2;
-
+
my_free(p);
- // should fail
+ // should fail
*p=3;
}
diff --git a/regression/cbmc/Function-KnR1/main.c b/regression/cbmc/Function-KnR1/main.c
index 01cf0604fd7..2281ad04731 100644
--- a/regression/cbmc/Function-KnR1/main.c
+++ b/regression/cbmc/Function-KnR1/main.c
@@ -31,7 +31,6 @@ const char *msg;
main()
{
struct X x;
-
+
assert(f(0, 0, x, 0)==10);
}
-
diff --git a/regression/cbmc/Function10/main.c b/regression/cbmc/Function10/main.c
index a2c68510c6c..e80f816272b 100644
--- a/regression/cbmc/Function10/main.c
+++ b/regression/cbmc/Function10/main.c
@@ -26,7 +26,7 @@ int main()
{
int *p;
my_f1(p);
-
+
other_func1(1, whatnot);
assert(global==2);
}
diff --git a/regression/cbmc/Function13/main.c b/regression/cbmc/Function13/main.c
index aeaf224a5eb..8a90d748bb1 100644
--- a/regression/cbmc/Function13/main.c
+++ b/regression/cbmc/Function13/main.c
@@ -5,7 +5,7 @@ void f1()
// goes into global name space!
extern int i;
assert(i==1);
-
+
// and might have an incomplete type
extern struct unknown_tag some_struct;
extern char some_array[];
diff --git a/regression/cbmc/Function4/main.c b/regression/cbmc/Function4/main.c
index 3873c30a2ee..dfdd644b79b 100644
--- a/regression/cbmc/Function4/main.c
+++ b/regression/cbmc/Function4/main.c
@@ -19,6 +19,6 @@ int main()
st.x = f1();
x = nondet_int();
st.x = x;
-
+
return 0;
}
diff --git a/regression/cbmc/Function6/main.c b/regression/cbmc/Function6/main.c
index 865fda826a8..0d1fc7933aa 100644
--- a/regression/cbmc/Function6/main.c
+++ b/regression/cbmc/Function6/main.c
@@ -3,7 +3,7 @@ int global;
void f()
{
void g();
-
+
g();
}
diff --git a/regression/cbmc/Function8/main.c b/regression/cbmc/Function8/main.c
index defb9b63c32..69c292e3f9c 100644
--- a/regression/cbmc/Function8/main.c
+++ b/regression/cbmc/Function8/main.c
@@ -21,7 +21,7 @@ int main()
{
foo();
- bar();
+ bar();
return 0;
}
diff --git a/regression/cbmc/Function9/main.c b/regression/cbmc/Function9/main.c
index f5000b3c0d1..03ad71720cd 100644
--- a/regression/cbmc/Function9/main.c
+++ b/regression/cbmc/Function9/main.c
@@ -27,7 +27,7 @@ int main()
foo();
g=1;
- bar();
+ bar();
return 0;
}
diff --git a/regression/cbmc/Function_Eval_Order1/main.c b/regression/cbmc/Function_Eval_Order1/main.c
index 814ff8d6a1c..0b0e230c995 100644
--- a/regression/cbmc/Function_Eval_Order1/main.c
+++ b/regression/cbmc/Function_Eval_Order1/main.c
@@ -25,4 +25,3 @@ int main (void) {
return 1;
}
-
diff --git a/regression/cbmc/Function_Eval_Order2/main.c b/regression/cbmc/Function_Eval_Order2/main.c
index df3de56eb90..04926a3ab15 100644
--- a/regression/cbmc/Function_Eval_Order2/main.c
+++ b/regression/cbmc/Function_Eval_Order2/main.c
@@ -25,4 +25,3 @@ int main (void) {
return 1;
}
-
diff --git a/regression/cbmc/Function_Pointer10/main.c b/regression/cbmc/Function_Pointer10/main.c
index 42d20ff6639..e974ca00403 100644
--- a/regression/cbmc/Function_Pointer10/main.c
+++ b/regression/cbmc/Function_Pointer10/main.c
@@ -20,12 +20,12 @@ void test2()
{
char a=5;
int (*fun) (int, int);
-
+
if(a)
fun = func;
else
fun = func2;
-
+
int b=(*fun) (a, a);
}
diff --git a/regression/cbmc/Function_Pointer11/main.c b/regression/cbmc/Function_Pointer11/main.c
index a3c896d1015..0e6be48b479 100644
--- a/regression/cbmc/Function_Pointer11/main.c
+++ b/regression/cbmc/Function_Pointer11/main.c
@@ -17,4 +17,4 @@ int main(int argc, char **argv)
// should be fine, and pass without warning
f(x);
-}
+}
diff --git a/regression/cbmc/Function_Pointer13/main.c b/regression/cbmc/Function_Pointer13/main.c
index 52a68f23f4c..a3bac9430b3 100644
--- a/regression/cbmc/Function_Pointer13/main.c
+++ b/regression/cbmc/Function_Pointer13/main.c
@@ -33,4 +33,3 @@ value=fptr(value); //value should be 16 after this
assert(value == 16);
}
-
diff --git a/regression/cbmc/Function_Pointer14/main.c b/regression/cbmc/Function_Pointer14/main.c
index 9c244af439d..ee74abfad03 100644
--- a/regression/cbmc/Function_Pointer14/main.c
+++ b/regression/cbmc/Function_Pointer14/main.c
@@ -7,7 +7,7 @@ void dll_create_generic(void (*insert_fnc)())
insert_fnc(&my_global);
}
-void dll_insert_master(int *a)
+void dll_insert_master(int *a)
{
*a=123;
}
@@ -16,6 +16,6 @@ int main()
{
dll_create_generic(dll_insert_master);
assert(my_global==123);
-
+
return 0;
}
diff --git a/regression/cbmc/Function_Pointer15/main.c b/regression/cbmc/Function_Pointer15/main.c
index 28cf42db770..5006540d4f5 100644
--- a/regression/cbmc/Function_Pointer15/main.c
+++ b/regression/cbmc/Function_Pointer15/main.c
@@ -6,7 +6,7 @@ void dll_create_generic(void (*insert_fnc)())
insert_fnc(&x);
}
-void dll_insert_master(int *a)
+void dll_insert_master(int *a)
{
assert(0);
}
@@ -16,4 +16,3 @@ int main()
dll_create_generic(dll_insert_master);
return 0;
}
-
diff --git a/regression/cbmc/Function_Pointer2/main.c b/regression/cbmc/Function_Pointer2/main.c
index 8062f3c7724..ee419e426d9 100644
--- a/regression/cbmc/Function_Pointer2/main.c
+++ b/regression/cbmc/Function_Pointer2/main.c
@@ -14,10 +14,10 @@ int main()
{
void (*p)(int);
__CPROVER_bool c;
-
+
p=c?f:g;
-
+
p(1);
-
+
assert(global==c);
}
diff --git a/regression/cbmc/Function_Pointer4/main.c b/regression/cbmc/Function_Pointer4/main.c
index 4422b736e58..8a58e610618 100644
--- a/regression/cbmc/Function_Pointer4/main.c
+++ b/regression/cbmc/Function_Pointer4/main.c
@@ -11,9 +11,9 @@ int main(void)
{
struct device devices[1];
int x;
-
+
devices[0].func = one;
-
+
x=(* devices[0].func)();
assert(x == 1);
}
diff --git a/regression/cbmc/Function_Pointer6/main.c b/regression/cbmc/Function_Pointer6/main.c
index c4f09bdc874..afb9a644d97 100644
--- a/regression/cbmc/Function_Pointer6/main.c
+++ b/regression/cbmc/Function_Pointer6/main.c
@@ -23,9 +23,9 @@ int main(void)
ps->func = x?ten:twenty;
ppp=ps->func;
-
+
y=ps->func();
-
+
assert(y==10 || y==20);
return 0;
diff --git a/regression/cbmc/Function_Pointer7/main.c b/regression/cbmc/Function_Pointer7/main.c
index 82817cc64b8..44caa240988 100644
--- a/regression/cbmc/Function_Pointer7/main.c
+++ b/regression/cbmc/Function_Pointer7/main.c
@@ -18,13 +18,13 @@ int my_open(int a)
struct file_ops fops = { .open = my_open };
int main(void)
-{
+{
struct dev tmp[4];
devs = &tmp;
-
+
(devs+0)->ops = &fops; // does not work
-
+
assert(10 == (* devs[0].ops->open)(10));
return 0;
diff --git a/regression/cbmc/Function_Pointer8/main.c b/regression/cbmc/Function_Pointer8/main.c
index 59603b43549..ff7dee40e91 100644
--- a/regression/cbmc/Function_Pointer8/main.c
+++ b/regression/cbmc/Function_Pointer8/main.c
@@ -26,7 +26,7 @@ void func1(int a)
void run_irq_handler()
{
- (* ihandler.handler)(10);
+ (* ihandler.handler)(10);
}
void run_timer()
@@ -37,7 +37,7 @@ void run_timer()
int main()
{
ihandler.handler = func1;
-
+
run_irq_handler();
run_timer();
}
diff --git a/regression/cbmc/Global_Initialization1/main.c b/regression/cbmc/Global_Initialization1/main.c
index f4ee15e1150..0ce23881c94 100644
--- a/regression/cbmc/Global_Initialization1/main.c
+++ b/regression/cbmc/Global_Initialization1/main.c
@@ -22,6 +22,6 @@ int main()
assert(x == 123);
assert(y == 0);
assert(b[0]=='a');
- assert(some_func()==0);
+ assert(some_func()==0);
assert(p==&y);
}
diff --git a/regression/cbmc/Global_Initialization2/main.c b/regression/cbmc/Global_Initialization2/main.c
index 0a058acc2fc..0353ee2e015 100644
--- a/regression/cbmc/Global_Initialization2/main.c
+++ b/regression/cbmc/Global_Initialization2/main.c
@@ -22,4 +22,3 @@ int main()
return 0;
}
-
diff --git a/regression/cbmc/Initialization1/main.c b/regression/cbmc/Initialization1/main.c
index 9e1f0d3c91b..7da12521ad5 100644
--- a/regression/cbmc/Initialization1/main.c
+++ b/regression/cbmc/Initialization1/main.c
@@ -2,10 +2,9 @@ int main()
{
char a;
char b = a = 'a';
-
+
assert(a=='a');
assert(b=='a');
int i=(long int)&i;
}
-
diff --git a/regression/cbmc/Initialization3/main.c b/regression/cbmc/Initialization3/main.c
index 8ed9ef44325..7df573913aa 100644
--- a/regression/cbmc/Initialization3/main.c
+++ b/regression/cbmc/Initialization3/main.c
@@ -28,4 +28,3 @@ int main()
Split(&t);
return 0;
}
-
diff --git a/regression/cbmc/Initialization7/main.c b/regression/cbmc/Initialization7/main.c
index 059d2109ffe..32c9ab62337 100644
--- a/regression/cbmc/Initialization7/main.c
+++ b/regression/cbmc/Initialization7/main.c
@@ -20,4 +20,3 @@ int main()
return 0;
}
-
diff --git a/regression/cbmc/Linking1/main.c b/regression/cbmc/Linking1/main.c
index 127290cffaa..248db3436c8 100644
--- a/regression/cbmc/Linking1/main.c
+++ b/regression/cbmc/Linking1/main.c
@@ -15,9 +15,9 @@ int main()
{
assert(i==1);
assert(a_struct.asd==0);
-
+
f();
-
+
assert(i==2);
assert(a_struct.asd==123);
}
diff --git a/regression/cbmc/Linking1/test.desc b/regression/cbmc/Linking1/test.desc
index de6f32ebf66..af20f90c655 100644
--- a/regression/cbmc/Linking1/test.desc
+++ b/regression/cbmc/Linking1/test.desc
@@ -1,6 +1,6 @@
CORE
main.c
-module.c
+module.c
^EXIT=0$
^SIGNAL=0$
^VERIFICATION SUCCESSFUL$
diff --git a/regression/cbmc/Linking2/main.c b/regression/cbmc/Linking2/main.c
index a5649307456..4a9d9634b81 100644
--- a/regression/cbmc/Linking2/main.c
+++ b/regression/cbmc/Linking2/main.c
@@ -21,13 +21,13 @@ int main()
{
assert(i==2);
assert(j==3);
-
+
f(); // does not change i,
// but does change j
-
+
assert(i==2);
assert(j==4);
-
+
struct my_struct xx;
assert(sizeof(xx.t_field)==1);
}
diff --git a/regression/cbmc/Linking2/module.c b/regression/cbmc/Linking2/module.c
index a23c19df0bc..f144ea8d4bd 100644
--- a/regression/cbmc/Linking2/module.c
+++ b/regression/cbmc/Linking2/module.c
@@ -9,7 +9,7 @@ typedef int t;
struct my_struct
{
t t_field;
-};
+};
// this one is local, tool!
static t i=1;
@@ -23,7 +23,7 @@ void f()
assert(j==3);
i=3;
j=4;
-
+
struct my_struct xx;
assert(sizeof(xx.t_field)==sizeof(int));
}
diff --git a/regression/cbmc/Linking2/test.desc b/regression/cbmc/Linking2/test.desc
index de6f32ebf66..af20f90c655 100644
--- a/regression/cbmc/Linking2/test.desc
+++ b/regression/cbmc/Linking2/test.desc
@@ -1,6 +1,6 @@
CORE
main.c
-module.c
+module.c
^EXIT=0$
^SIGNAL=0$
^VERIFICATION SUCCESSFUL$
diff --git a/regression/cbmc/Linking5/link2.c b/regression/cbmc/Linking5/link2.c
index c06a326ee75..30114125c0f 100644
--- a/regression/cbmc/Linking5/link2.c
+++ b/regression/cbmc/Linking5/link2.c
@@ -3,4 +3,3 @@ int tbl2[2];
void main()
{
}
-
diff --git a/regression/cbmc/Local_out_of_scope1/main.c b/regression/cbmc/Local_out_of_scope1/main.c
index 596f6c3238a..04554ab6c6d 100644
--- a/regression/cbmc/Local_out_of_scope1/main.c
+++ b/regression/cbmc/Local_out_of_scope1/main.c
@@ -2,16 +2,16 @@ int main()
{
int *p, *q;
int x, y, z;
-
+
p=&x;
q=p;
-
+
if(z)
{
int l;
q=&l;
}
- // this should fail, as *p is dead if z is true
+ // this should fail, as *p is dead if z is true
y=*q;
}
diff --git a/regression/cbmc/Malloc13/main.c b/regression/cbmc/Malloc13/main.c
index 633629f0862..0c39afb2cca 100644
--- a/regression/cbmc/Malloc13/main.c
+++ b/regression/cbmc/Malloc13/main.c
@@ -8,4 +8,3 @@ int main(int argc, char* argv[]) {
__CPROVER_assert(__CPROVER_buffer_size(str) == len, "buffer size ok");
return 0;
}
-
diff --git a/regression/cbmc/Malloc15/main.c b/regression/cbmc/Malloc15/main.c
index 4654735e247..0a09bfac95b 100644
--- a/regression/cbmc/Malloc15/main.c
+++ b/regression/cbmc/Malloc15/main.c
@@ -7,7 +7,7 @@ int main()
p = malloc(sizeof(int));
unsigned int r = p;
if (r != 0)
- *p = 1;
+ *p = 1;
if (p != 0)
__CPROVER_assert (*p == 1, "malloc");
diff --git a/regression/cbmc/Malloc16/main.c b/regression/cbmc/Malloc16/main.c
index e64276e5e87..675b577f6ec 100644
--- a/regression/cbmc/Malloc16/main.c
+++ b/regression/cbmc/Malloc16/main.c
@@ -12,7 +12,7 @@ int main()
tmp = malloc(sizeof(int));
dev = (int*)tmp;
-
+
void *r = (void*)0;
unsigned int q = r;
unsigned int p = dev;
diff --git a/regression/cbmc/Malloc17/main.c b/regression/cbmc/Malloc17/main.c
index 6cac57c95de..bf13b054b2e 100644
--- a/regression/cbmc/Malloc17/main.c
+++ b/regression/cbmc/Malloc17/main.c
@@ -68,4 +68,3 @@ int main()
return 0;
}
-
diff --git a/regression/cbmc/Malloc18/main.c b/regression/cbmc/Malloc18/main.c
index 7111f8e5f52..047ada2b009 100644
--- a/regression/cbmc/Malloc18/main.c
+++ b/regression/cbmc/Malloc18/main.c
@@ -23,4 +23,3 @@ int main()
return 0;
}
-
diff --git a/regression/cbmc/Malloc19/main.c b/regression/cbmc/Malloc19/main.c
index df4ba61a870..6d5d041c541 100644
--- a/regression/cbmc/Malloc19/main.c
+++ b/regression/cbmc/Malloc19/main.c
@@ -42,4 +42,3 @@ int main()
return 0;
}
-
diff --git a/regression/cbmc/Malloc20/main.c b/regression/cbmc/Malloc20/main.c
index ac76cc22367..728819c6a50 100644
--- a/regression/cbmc/Malloc20/main.c
+++ b/regression/cbmc/Malloc20/main.c
@@ -22,7 +22,7 @@ nettle_buffer_init(struct nettle_buffer *buffer)
int nettle_buffer_grow(struct nettle_buffer *buffer, size_t length)
{
if (buffer->condition) return 0; // Uncommenting this line fixes the bug.
-
+
size_t alloc = buffer->alloc * 2 + length + 100; // Replcing alloc size by a constant fixes the bug.
//size_t alloc = 103;
uint8_t *p = (uint8_t *) malloc(alloc);
@@ -49,5 +49,3 @@ int main(void)
__CPROVER_assert(buffer.contents[1] == 'o', "buffer.contents[1] == 'o'");
__CPROVER_assert(buffer.contents[2] == 'o', "buffer.contents[2] == 'o'");
}
-
-
diff --git a/regression/cbmc/Malloc21/main.c b/regression/cbmc/Malloc21/main.c
index 0c0bb561e5e..5db374c940d 100644
--- a/regression/cbmc/Malloc21/main.c
+++ b/regression/cbmc/Malloc21/main.c
@@ -21,14 +21,12 @@ int main(void)
if (!(v1 <= 0)) {
len = __VERIFIER_nondet_int();
__CPROVER_assume(len > 0);
- data = malloc(len * sizeof(int));
+ data = malloc(len * sizeof(int));
}
data[0] = 0;
- int tmp = data[0];
+ int tmp = data[0];
assert(tmp == 0);
return 0;
}
-
-
diff --git a/regression/cbmc/Malloc22/main.c b/regression/cbmc/Malloc22/main.c
index ff2eb949b69..10420360ed1 100644
--- a/regression/cbmc/Malloc22/main.c
+++ b/regression/cbmc/Malloc22/main.c
@@ -19,4 +19,3 @@ int main() {
return 0;
}
-
diff --git a/regression/cbmc/Memmove1/main.c b/regression/cbmc/Memmove1/main.c
index ff0cdae7c3a..ecd39ff0d4c 100644
--- a/regression/cbmc/Memmove1/main.c
+++ b/regression/cbmc/Memmove1/main.c
@@ -43,4 +43,3 @@ int main(int argc, char * argv[]) {
assert(a[0]==-2147483600);
return 0;
}
-
diff --git a/regression/cbmc/Mod1/main.c b/regression/cbmc/Mod1/main.c
index 6fde263722d..31b3000a530 100644
--- a/regression/cbmc/Mod1/main.c
+++ b/regression/cbmc/Mod1/main.c
@@ -1,8 +1,8 @@
int main()
{
int x, y;
-
- x=y;
+
+ x=y;
x%=10;
assert(x!=-1); // should fail
}
diff --git a/regression/cbmc/Mod2/main.c b/regression/cbmc/Mod2/main.c
index 53b1ef269b8..13c715cb409 100644
--- a/regression/cbmc/Mod2/main.c
+++ b/regression/cbmc/Mod2/main.c
@@ -1,6 +1,6 @@
#include
-static int
+static int
(safe_mod_func_int32_t_s_s)(int si1, int si2 )
{
return
@@ -21,7 +21,7 @@ int main()
a=1;
b=-2;
#endif
- int x=safe_mod_func_int32_t_s_s(a, b);
+ int x=safe_mod_func_int32_t_s_s(a, b);
assert(x==1);
return 0;
}
diff --git a/regression/cbmc/Multi_Dimensional_Array1/main.c b/regression/cbmc/Multi_Dimensional_Array1/main.c
index eac543d4d8a..f814686bb94 100644
--- a/regression/cbmc/Multi_Dimensional_Array1/main.c
+++ b/regression/cbmc/Multi_Dimensional_Array1/main.c
@@ -9,11 +9,11 @@ int main()
p=a[9];
assert(p==a[0]+9*4);
-
+
*p=10;
assert(a[9][0]==10);
- p++;
+ p++;
*p=20;
assert(a[9][1]==20);
diff --git a/regression/cbmc/Multi_Dimensional_Array3/main.c b/regression/cbmc/Multi_Dimensional_Array3/main.c
index 607582a629f..3daa9f6d331 100644
--- a/regression/cbmc/Multi_Dimensional_Array3/main.c
+++ b/regression/cbmc/Multi_Dimensional_Array3/main.c
@@ -8,7 +8,7 @@ int main()
{
// this checks whether the alias analysis can
// track pointers in multi-dimensional arrays
-
+
iptr array[3][3]={{&x,0,0},{&y,0,0},{&z,0,0}};
unsigned int a, b;
@@ -17,12 +17,12 @@ int main()
__CPROVER_assume (a < 3 && b < 3);
array[a][b] = &z;
-
+
iptr p;
p=array[a][b];
*p=1;
-
+
assert(z==1);
}
/* end of case 2 */
diff --git a/regression/cbmc/Multi_Dimensional_Array4/main.c b/regression/cbmc/Multi_Dimensional_Array4/main.c
index b07bdf3281d..e7ef2680438 100644
--- a/regression/cbmc/Multi_Dimensional_Array4/main.c
+++ b/regression/cbmc/Multi_Dimensional_Array4/main.c
@@ -1,26 +1,26 @@
void f(void * s1, void *s2)
-{
- char *us1 = (char*) s1;
- char *us2 = (char*) s2;
-
+{
+ char *us1 = (char*) s1;
+ char *us2 = (char*) s2;
+
char us10=us1[0];
char us20=us2[0];
char us11=us1[1];
char us21=us2[1];
- assert(us10=='a');
- assert(us11=='b');
+ assert(us10=='a');
+ assert(us11=='b');
assert(us20=='g');
assert(us21=='b');
-}
+}
int main()
-{
- char a[2][2];
- a[0][0] = 'a';
- a[0][1] = 'b';
- a[1][0] = 'g';
- a[1][1] = 'b';
-
+{
+ char a[2][2];
+ a[0][0] = 'a';
+ a[0][1] = 'b';
+ a[1][0] = 'g';
+ a[1][1] = 'b';
+
f(&a[0], &a[1]);
-}
+}
diff --git a/regression/cbmc/Multi_Dimensional_Array5/main.c b/regression/cbmc/Multi_Dimensional_Array5/main.c
index 1d18c81a803..a54a3657ce2 100644
--- a/regression/cbmc/Multi_Dimensional_Array5/main.c
+++ b/regression/cbmc/Multi_Dimensional_Array5/main.c
@@ -17,4 +17,3 @@ int main ()
func_79(*(&(g_374[0][0])));
return 0;
}
-
diff --git a/regression/cbmc/Multiple_Properties1/main.c b/regression/cbmc/Multiple_Properties1/main.c
index 633ee3adb15..5d5a109776b 100644
--- a/regression/cbmc/Multiple_Properties1/main.c
+++ b/regression/cbmc/Multiple_Properties1/main.c
@@ -2,13 +2,13 @@ int main () {
int x, y;
__CPROVER_assume(x>=100 && y<=1000 & x>y+2);
x--;
- assert(x>y);
+ assert(x>y);
x--;
- assert(x>y);
+ assert(x>y);
x--;
- assert(x>y);
+ assert(x>y);
y=0;
- assert(x>y);
+ assert(x>y);
return 0;
}
diff --git a/regression/cbmc/Negation1/main.c b/regression/cbmc/Negation1/main.c
index facd2bcf91a..9e02cef5d9e 100644
--- a/regression/cbmc/Negation1/main.c
+++ b/regression/cbmc/Negation1/main.c
@@ -5,11 +5,11 @@ int main()
test=0;
test=~test;
assert(test==-1);
-
+
test=0;
test=!test;
assert(test==1);
-
+
test=100;
test=!test;
assert(test==0);
diff --git a/regression/cbmc/Negation2/main.c b/regression/cbmc/Negation2/main.c
index 16971d58e32..33435a12435 100644
--- a/regression/cbmc/Negation2/main.c
+++ b/regression/cbmc/Negation2/main.c
@@ -12,4 +12,3 @@ int main()
{
f00(0);
}
-
diff --git a/regression/cbmc/Overflow_Addition1/main.c b/regression/cbmc/Overflow_Addition1/main.c
index 3d1288d0db3..706ee880796 100644
--- a/regression/cbmc/Overflow_Addition1/main.c
+++ b/regression/cbmc/Overflow_Addition1/main.c
@@ -1,7 +1,7 @@
int main() {
signed int i, j;
-
+
i=j;
-
+
i++;
}
diff --git a/regression/cbmc/Overflow_Multiplication1/falsealarm.c b/regression/cbmc/Overflow_Multiplication1/falsealarm.c
index 2ed10b653cb..c2f8173d8e1 100644
--- a/regression/cbmc/Overflow_Multiplication1/falsealarm.c
+++ b/regression/cbmc/Overflow_Multiplication1/falsealarm.c
@@ -6,7 +6,7 @@ void main()
x=_x;
y=_y;
-
+
if((-4681 < y) && (y < 4681) && (x < 32767) &&
(-32767 < x) && ((7*y*y -1) == x*x))
{ y=1/x; }
diff --git a/regression/cbmc/Overflow_Subtraction1/main.c b/regression/cbmc/Overflow_Subtraction1/main.c
index 010f26c229f..5765eccf3f9 100644
--- a/regression/cbmc/Overflow_Subtraction1/main.c
+++ b/regression/cbmc/Overflow_Subtraction1/main.c
@@ -3,14 +3,14 @@
int main()
{
int a, b, neg;
-
+
// this should not overflow, even not for a=INT_MIN
b=a-a;
-
+
// this should also not overflow as long as pos<0
if(neg<0)
b=neg-INT_MIN;
-
+
int x, y, z;
x = INT_MIN+1;
diff --git a/regression/cbmc/Pointer_Arithmetic1/main.c b/regression/cbmc/Pointer_Arithmetic1/main.c
index c31c0e7cc06..a882ca30700 100644
--- a/regression/cbmc/Pointer_Arithmetic1/main.c
+++ b/regression/cbmc/Pointer_Arithmetic1/main.c
@@ -7,6 +7,6 @@ int main()
p+=30;
diff=(char *)p-(char *)array;
-
+
assert(diff==30*sizeof(int));
}
diff --git a/regression/cbmc/Pointer_Arithmetic11/main.c b/regression/cbmc/Pointer_Arithmetic11/main.c
index 96849c12ab1..c1b2df18592 100644
--- a/regression/cbmc/Pointer_Arithmetic11/main.c
+++ b/regression/cbmc/Pointer_Arithmetic11/main.c
@@ -4,9 +4,9 @@ int main()
int data=0;
char *p=(char *)&data;
i=ii;
-
+
__CPROVER_assume(i>=0 && i<4);
-
+
p[i]++;
if(i==0)
diff --git a/regression/cbmc/Pointer_Arithmetic12/main.c b/regression/cbmc/Pointer_Arithmetic12/main.c
index 3363b3c5440..6177b6f4f6f 100644
--- a/regression/cbmc/Pointer_Arithmetic12/main.c
+++ b/regression/cbmc/Pointer_Arithmetic12/main.c
@@ -132,4 +132,3 @@ int main()
L_0x416_2: esp+=0x4;
L_0x417_0: return 0;
}
-
diff --git a/regression/cbmc/Pointer_Arithmetic13/main.c b/regression/cbmc/Pointer_Arithmetic13/main.c
index 4643b378877..a7063318bfc 100644
--- a/regression/cbmc/Pointer_Arithmetic13/main.c
+++ b/regression/cbmc/Pointer_Arithmetic13/main.c
@@ -19,4 +19,3 @@ int main() {
return 0;
}
-
diff --git a/regression/cbmc/Pointer_Arithmetic2/main.c b/regression/cbmc/Pointer_Arithmetic2/main.c
index 5fbe8956e3e..b7b9c687eef 100644
--- a/regression/cbmc/Pointer_Arithmetic2/main.c
+++ b/regression/cbmc/Pointer_Arithmetic2/main.c
@@ -9,8 +9,8 @@ int main()
q=(char *)p;
q+=30*sizeof(int);
p=(int *)q;
-
+
*p=1;
-
+
assert(my_array[30]==1);
}
diff --git a/regression/cbmc/Pointer_Arithmetic3/main.c b/regression/cbmc/Pointer_Arithmetic3/main.c
index 86554c90f47..3d5ce10e214 100644
--- a/regression/cbmc/Pointer_Arithmetic3/main.c
+++ b/regression/cbmc/Pointer_Arithmetic3/main.c
@@ -1,10 +1,10 @@
-int nums[2];
-int *p;
+int nums[2];
+int *p;
-int main() {
- nums[1] = 1;
- p = &nums[0];
- p++;
+int main() {
+ nums[1] = 1;
+ p = &nums[0];
+ p++;
- assert(*p == 1);
-}
+ assert(*p == 1);
+}
diff --git a/regression/cbmc/Pointer_Arithmetic5/main.c b/regression/cbmc/Pointer_Arithmetic5/main.c
index 2bf0f10c353..a0fcc55be56 100644
--- a/regression/cbmc/Pointer_Arithmetic5/main.c
+++ b/regression/cbmc/Pointer_Arithmetic5/main.c
@@ -7,6 +7,6 @@ void f()
x=1;
px++;
- // now out of bounds
+ // now out of bounds
y=*px;
}
diff --git a/regression/cbmc/Pointer_Arithmetic6/main.c b/regression/cbmc/Pointer_Arithmetic6/main.c
index 263202f72e3..3ef83b5aed6 100644
--- a/regression/cbmc/Pointer_Arithmetic6/main.c
+++ b/regression/cbmc/Pointer_Arithmetic6/main.c
@@ -2,10 +2,10 @@ int main()
{
int a[10];
int x;
-
+
a[1]=1000;
-
+
x=*(a+1);
-
+
assert(x==1000);
}
diff --git a/regression/cbmc/Pointer_Arithmetic7/main.c b/regression/cbmc/Pointer_Arithmetic7/main.c
index 82e918f9d54..cc1da6e6ee0 100644
--- a/regression/cbmc/Pointer_Arithmetic7/main.c
+++ b/regression/cbmc/Pointer_Arithmetic7/main.c
@@ -3,7 +3,7 @@ void f(char *p)
p[1]=1;
}
-int main ()
+int main ()
{
char dummy[10];
f(dummy);
diff --git a/regression/cbmc/Pointer_array1/main.c b/regression/cbmc/Pointer_array1/main.c
index 07a389cac31..b676f18294a 100644
--- a/regression/cbmc/Pointer_array1/main.c
+++ b/regression/cbmc/Pointer_array1/main.c
@@ -10,4 +10,3 @@ void main() {
__cil_tmp24 = &(disk->disk_name);
assert(__cil_tmp24!=0);
}
-
diff --git a/regression/cbmc/Pointer_array2/main.c b/regression/cbmc/Pointer_array2/main.c
index 854fbd946a9..8de99a513e2 100644
--- a/regression/cbmc/Pointer_array2/main.c
+++ b/regression/cbmc/Pointer_array2/main.c
@@ -13,4 +13,3 @@ int main() {
assert(__cil_tmp24!=0);
return 0;
}
-
diff --git a/regression/cbmc/Pointer_array5/main.c b/regression/cbmc/Pointer_array5/main.c
index b0fb00e5c61..b8893782411 100644
--- a/regression/cbmc/Pointer_array5/main.c
+++ b/regression/cbmc/Pointer_array5/main.c
@@ -18,7 +18,7 @@ int main() {
array_init[2] = &a2;
void **local_array=(void**)array_init;
-
+
int *address=(int *)local_array[0];
assert(address==&a0);
}
diff --git a/regression/cbmc/Pointer_array6/main.c b/regression/cbmc/Pointer_array6/main.c
index 0ce086787f9..6cad47cd7b2 100644
--- a/regression/cbmc/Pointer_array6/main.c
+++ b/regression/cbmc/Pointer_array6/main.c
@@ -14,14 +14,14 @@ int main() {
// mis-align that pointer!
char * char_ptr = (char *) array_init;
char_ptr++;
-
+
int local_var;
int **array2=(int**)char_ptr;
-
+
// write
array2[0]=&local_var;
-
+
// check
int value=*array2[0];
diff --git a/regression/cbmc/Pointer_byte_extract1/main.c b/regression/cbmc/Pointer_byte_extract1/main.c
index ccb81bfc051..318d5c150f7 100644
--- a/regression/cbmc/Pointer_byte_extract1/main.c
+++ b/regression/cbmc/Pointer_byte_extract1/main.c
@@ -71,4 +71,3 @@ int main()
return 0;
}
-
diff --git a/regression/cbmc/Pointer_byte_extract3/main.c b/regression/cbmc/Pointer_byte_extract3/main.c
index 3be1a638faf..328a2b939a1 100644
--- a/regression/cbmc/Pointer_byte_extract3/main.c
+++ b/regression/cbmc/Pointer_byte_extract3/main.c
@@ -24,4 +24,3 @@ int main()
return 0;
}
-
diff --git a/regression/cbmc/Pointer_byte_extract5/main.c b/regression/cbmc/Pointer_byte_extract5/main.c
index e2d109fb7bd..b720d9ad132 100644
--- a/regression/cbmc/Pointer_byte_extract5/main.c
+++ b/regression/cbmc/Pointer_byte_extract5/main.c
@@ -43,4 +43,3 @@ int main()
return 0;
}
-
diff --git a/regression/cbmc/Pointer_byte_extract6/main.c b/regression/cbmc/Pointer_byte_extract6/main.c
index 79c7d634d39..324a980695f 100644
--- a/regression/cbmc/Pointer_byte_extract6/main.c
+++ b/regression/cbmc/Pointer_byte_extract6/main.c
@@ -11,13 +11,13 @@ int main()
{
int f;
};
-
+
assert(*(unsigned long long int *)&long_long_int==1);
assert(*(unsigned int *)&signed_int==1);
assert(((struct some *)&signed_int)->f==1);
assert(*(int *)&a_float==1065353216);
assert(*(long long int *)&a_double==4607182418800017408l);
-
+
// other direction
signed_int=1065353216;
assert(*(float *)&signed_int==1.0f);
diff --git a/regression/cbmc/Pointer_byte_extract7/main.c b/regression/cbmc/Pointer_byte_extract7/main.c
index 3be1a638faf..328a2b939a1 100644
--- a/regression/cbmc/Pointer_byte_extract7/main.c
+++ b/regression/cbmc/Pointer_byte_extract7/main.c
@@ -24,4 +24,3 @@ int main()
return 0;
}
-
diff --git a/regression/cbmc/Pointer_byte_extract8/main.c b/regression/cbmc/Pointer_byte_extract8/main.c
index 499ab12fc2b..2266e0f4ef4 100644
--- a/regression/cbmc/Pointer_byte_extract8/main.c
+++ b/regression/cbmc/Pointer_byte_extract8/main.c
@@ -38,4 +38,3 @@ int main()
return 0;
}
-
diff --git a/regression/cbmc/Promotion1/main.c b/regression/cbmc/Promotion1/main.c
index 6664d445f9f..8e127502edb 100644
--- a/regression/cbmc/Promotion1/main.c
+++ b/regression/cbmc/Promotion1/main.c
@@ -16,11 +16,11 @@ int main()
// signed int if int is bigger!
unsigned char a2=1;
signed char b2=-1;
-
+
if(sizeof(char)b2);
else
- assert(a2=0 && i<2) ==> (!__CPROVER_forall{int j; (j>=0 && j<2) ==> c[i][j]>=1 && c[i][j]<=10}) }, "NotForall-NotForall: successful");
- return 0;
+ return 0;
}
diff --git a/regression/cbmc/Quantifiers-assignment/main.c b/regression/cbmc/Quantifiers-assignment/main.c
index 02b3318d789..3d1efd43bd2 100644
--- a/regression/cbmc/Quantifiers-assignment/main.c
+++ b/regression/cbmc/Quantifiers-assignment/main.c
@@ -14,5 +14,5 @@ int main()
assert(z1);
assert(z2);
- return 0;
+ return 0;
}
diff --git a/regression/cbmc/Quantifiers-copy/main.c b/regression/cbmc/Quantifiers-copy/main.c
index d25cf714b74..d939227149f 100644
--- a/regression/cbmc/Quantifiers-copy/main.c
+++ b/regression/cbmc/Quantifiers-copy/main.c
@@ -2,7 +2,7 @@ int main()
{
int a[5];
int b[5];
-
+
a[0]=0;
a[1]=1;
a[2]=2;
@@ -16,5 +16,5 @@ int main()
assert(b[2]==2);
assert(b[3]==3);
assert(b[4]==4);
- return 0;
+ return 0;
}
diff --git a/regression/cbmc/Quantifiers-if/main.c b/regression/cbmc/Quantifiers-if/main.c
index 998c57e1bce..f8c0bb33f9d 100644
--- a/regression/cbmc/Quantifiers-if/main.c
+++ b/regression/cbmc/Quantifiers-if/main.c
@@ -19,5 +19,5 @@ int main()
if(__CPROVER_exists { int i; (i>=0 && i<2) ==> a[i]>=5 && a[i]<=10 })
__CPROVER_assert(0, "success 2");
- return 0;
+ return 0;
}
diff --git a/regression/cbmc/Quantifiers-initialisation/main.c b/regression/cbmc/Quantifiers-initialisation/main.c
index bdbcecafb5c..99eaa53de95 100644
--- a/regression/cbmc/Quantifiers-initialisation/main.c
+++ b/regression/cbmc/Quantifiers-initialisation/main.c
@@ -1,7 +1,7 @@
int main()
{
int a[5];
-
+
__CPROVER_assume(__CPROVER_forall { int i; (i>=0 && i<5) ==> a[i]==i+1});
assert(a[0]==1);
@@ -9,5 +9,5 @@ int main()
assert(a[2]==3);
assert(a[3]==4);
assert(a[4]==5);
- return 0;
+ return 0;
}
diff --git a/regression/cbmc/Quantifiers-initialisation2/main.c b/regression/cbmc/Quantifiers-initialisation2/main.c
index 26db7982f27..c4996c3b485 100644
--- a/regression/cbmc/Quantifiers-initialisation2/main.c
+++ b/regression/cbmc/Quantifiers-initialisation2/main.c
@@ -14,5 +14,5 @@ int main()
assert(a[2]>a[3]);
__CPROVER_assert(__CPROVER_forall {unsigned i; (i>=1 && i<10) ==> c[i-1]<=c[i]}, "forall c[]");
assert(c[3]>=c[1]);
- return 0;
+ return 0;
}
diff --git a/regression/cbmc/Quantifiers-invalid-var-range/main.c b/regression/cbmc/Quantifiers-invalid-var-range/main.c
index 6dde23d384d..5bcb3d7c535 100644
--- a/regression/cbmc/Quantifiers-invalid-var-range/main.c
+++ b/regression/cbmc/Quantifiers-invalid-var-range/main.c
@@ -6,5 +6,5 @@ int main()
assert(a[0][0]==10||a[0][1]==10||a[0][2]==10);
- return 0;
+ return 0;
}
diff --git a/regression/cbmc/Quantifiers-not-exists/main.c b/regression/cbmc/Quantifiers-not-exists/main.c
index adb76cbbee8..d19124f4548 100644
--- a/regression/cbmc/Quantifiers-not-exists/main.c
+++ b/regression/cbmc/Quantifiers-not-exists/main.c
@@ -26,5 +26,5 @@ int main()
assert( ((d[1][0]<1||d[1][0]>10) || (d[1][1]<1||d[1][1]>10)) );
- return 0;
+ return 0;
}
diff --git a/regression/cbmc/Quantifiers-not/main.c b/regression/cbmc/Quantifiers-not/main.c
index 10a4b5944c1..e5759bd8d22 100644
--- a/regression/cbmc/Quantifiers-not/main.c
+++ b/regression/cbmc/Quantifiers-not/main.c
@@ -19,5 +19,5 @@ int main()
if(!__CPROVER_exists { int i; (i>=0 && i<2) ==> a[i]>=5 && a[i]<=10 })
__CPROVER_assert(0, "failure 2");
- return 0;
+ return 0;
}
diff --git a/regression/cbmc/Quantifiers-two-dimension-array/main.c b/regression/cbmc/Quantifiers-two-dimension-array/main.c
index a389a3af3ad..b0be6e32f7a 100644
--- a/regression/cbmc/Quantifiers-two-dimension-array/main.c
+++ b/regression/cbmc/Quantifiers-two-dimension-array/main.c
@@ -2,7 +2,7 @@ int main()
{
int a[2][2];
int b[2][2];
-
+
__CPROVER_assume(__CPROVER_forall { int i; (i>=0 && i<2) ==> (__CPROVER_forall{int j; (j>=0 && j<2) ==> a[i][j]==i+j}) });
__CPROVER_assume(__CPROVER_exists { int i; (i>=0 && i<2) ==> (__CPROVER_exists{int j; (j>=0 && j<2) ==> b[i][j]==i+j+1}) });
@@ -11,5 +11,5 @@ int main()
assert(a[1][0]==1);
assert(a[1][1]==2);
assert(b[0][0]==1 || b[0][1]==2 || b[1][0]==2 || b[1][1]==3);
- return 0;
+ return 0;
}
diff --git a/regression/cbmc/Quantifiers-type/main.c b/regression/cbmc/Quantifiers-type/main.c
index 89ca37731bc..33d6e48305b 100644
--- a/regression/cbmc/Quantifiers-type/main.c
+++ b/regression/cbmc/Quantifiers-type/main.c
@@ -9,5 +9,5 @@ int main()
assert(a[0]==10 && a[1]==10);
assert(b[0]==10 && b[1]==10);
- return 0;
+ return 0;
}
diff --git a/regression/cbmc/Quantifiers1/main.c b/regression/cbmc/Quantifiers1/main.c
index 822b9df578b..19b2fa9a47c 100644
--- a/regression/cbmc/Quantifiers1/main.c
+++ b/regression/cbmc/Quantifiers1/main.c
@@ -16,5 +16,5 @@ int main()
c[i]=i;
assert(__CPROVER_forall {unsigned i; i>9 || c[i]==i});
- return 0;
+ return 0;
}
diff --git a/regression/cbmc/Recursion2/main.c b/regression/cbmc/Recursion2/main.c
index 0501acc9683..1866f780a0e 100644
--- a/regression/cbmc/Recursion2/main.c
+++ b/regression/cbmc/Recursion2/main.c
@@ -7,7 +7,7 @@ void f(unsigned int counter) {
int main() {
unsigned int x;
__CPROVER_assume(x<=10);
-
+
f(x);
}
diff --git a/regression/cbmc/Recursion5/main.c b/regression/cbmc/Recursion5/main.c
index 135e39ea14f..6bfd92e4c83 100644
--- a/regression/cbmc/Recursion5/main.c
+++ b/regression/cbmc/Recursion5/main.c
@@ -19,4 +19,3 @@ int main()
return 0;
}
-
diff --git a/regression/cbmc/Sideeffects1/main.c b/regression/cbmc/Sideeffects1/main.c
index 87b83b50dc7..6c51baf23d9 100644
--- a/regression/cbmc/Sideeffects1/main.c
+++ b/regression/cbmc/Sideeffects1/main.c
@@ -1,12 +1,12 @@
int main(void)
{
int x, y;
-
+
x=100;
-
+
y=x/=2;
assert(x==50);
-
+
y=x*=3;
assert(x==150);
diff --git a/regression/cbmc/Sideeffects2/main.c b/regression/cbmc/Sideeffects2/main.c
index 46990fc8a94..1efa8b74737 100644
--- a/regression/cbmc/Sideeffects2/main.c
+++ b/regression/cbmc/Sideeffects2/main.c
@@ -17,7 +17,7 @@ int main()
z=2;
x=(f0() || (z==1));
assert(x);
-
+
z=2;
x=(f0() && (z=3));
assert(z==1);
@@ -25,8 +25,8 @@ int main()
z=2;
x=(f1() || (z=3));
assert(z==1);
-
+
z=2;
x=(f1() && (z=3));
- assert(z==3);
+ assert(z==3);
}
diff --git a/regression/cbmc/Sideeffects3/main.c b/regression/cbmc/Sideeffects3/main.c
index 7b032a3602d..5c49106b99c 100644
--- a/regression/cbmc/Sideeffects3/main.c
+++ b/regression/cbmc/Sideeffects3/main.c
@@ -10,9 +10,9 @@ int x, y, z;
int main()
{
#ifdef _WIN32
-
+
// Visual Studio won't even parse most of these
-
+
#else
// a side effect inside an array type
@@ -39,14 +39,14 @@ int main()
int return_value=my_f(++x);
assert(x==2);
assert(return_value==2);
-
+
// using a pointer
x=1;
int *p=&x;
y=++(*p);
assert(y==2);
assert(x==2);
-
+
// in a struct
x=1;
struct struct_type
@@ -60,7 +60,7 @@ int main()
// this is evaluated when the type is defined, not later
x++;
assert(sizeof(struct struct_type)==sizeof(int)*2+sizeof(int));
-
+
// only happens once
x=1;
y=1;
@@ -73,27 +73,27 @@ int main()
assert(sizeof(v1)==sizeof(int)*2*1);
assert(sizeof(v2)==sizeof(int)*2*2);
assert(sizeof(v3)==sizeof(int)*2*3);
-
+
// inside a typecast (struct)
x=1;
(struct { int a[x++]; } *)0;
assert(x==2);
-
+
// inside a typecast (function pointer)
x=1;
(int (*)(int a[x++]))0; // This is ignored by gcc! Haha!
assert(x==1);
-
+
// inside sizeof
x=1;
assert(sizeof(struct { int a[x++]; })==sizeof(int));
assert(x==2);
-
+
// multi-dimensional
x=y=1;
typedef int my_array1[x][y];
x++;
assert(sizeof(my_array1)==sizeof(int));
-
+
#endif
}
diff --git a/regression/cbmc/Sideeffects4/main.c b/regression/cbmc/Sideeffects4/main.c
index d2a16b49fe2..39c91b96734 100644
--- a/regression/cbmc/Sideeffects4/main.c
+++ b/regression/cbmc/Sideeffects4/main.c
@@ -11,10 +11,10 @@ _Bool my_f()
int main()
{
// side-effect in ?:
- glob=0;
- result=glob?1:my_f();
+ glob=0;
+ result=glob?1:my_f();
assert(result==0);
-
+
// side-effect in ||
glob=0;
result=glob||my_f();
@@ -24,9 +24,9 @@ int main()
glob=0;
result=glob||(0+my_f());
assert(result==0);
-
+
// another variant of this
- int r, c=1;
+ int r, c=1;
r=c?(c=0, 10):20;
assert(c==0 && r==10);
}
diff --git a/regression/cbmc/Sideeffects6/main.c b/regression/cbmc/Sideeffects6/main.c
index 4175688e79f..db94ea1c047 100644
--- a/regression/cbmc/Sideeffects6/main.c
+++ b/regression/cbmc/Sideeffects6/main.c
@@ -4,6 +4,6 @@ int main()
// we should be able to find this division by zero
(void)(c?x/y:z);
-
+
return 0;
}
diff --git a/regression/cbmc/String1/main.c b/regression/cbmc/String1/main.c
index 448d45864fe..3b64fd0028c 100644
--- a/regression/cbmc/String1/main.c
+++ b/regression/cbmc/String1/main.c
@@ -10,18 +10,18 @@ int main()
{
assert(s[1]=='b');
assert(s[4]==0);
-
+
// write to s
s[0]='x';
-
+
assert(p[2]=='c');
-
+
p=s;
// write to p
p[1]='y';
-
- assert(s[1]=='y');
+
+ assert(s[1]=='y');
{
const char local_string[]="asd123";
@@ -40,15 +40,15 @@ int main()
#else
typedef __typeof__(L'X') wide_char_type;
#endif
-
+
unsigned width=sizeof(wide_char_type);
- #ifdef _WIN32
+ #ifdef _WIN32
assert(width==2);
#else
assert(width==4);
#endif
-
+
assert(sizeof(L"12" "34")==5*width);
assert(sizeof("12" L"34")==5*width);
diff --git a/regression/cbmc/String2/main.c b/regression/cbmc/String2/main.c
index a1a32fa5e73..5c8bfcb93da 100644
--- a/regression/cbmc/String2/main.c
+++ b/regression/cbmc/String2/main.c
@@ -5,6 +5,6 @@ int main()
int input;
char ch;
- /* should result in bounds violation */
+ /* should result in bounds violation */
ch=p[input];
}
diff --git a/regression/cbmc/String5/main.c b/regression/cbmc/String5/main.c
index 851d482bb5e..e81ef607f7e 100644
--- a/regression/cbmc/String5/main.c
+++ b/regression/cbmc/String5/main.c
@@ -14,4 +14,3 @@ int main()
assert(l==6);
}
-
diff --git a/regression/cbmc/String6/main.c b/regression/cbmc/String6/main.c
index cbe0887795c..9b165a6796a 100644
--- a/regression/cbmc/String6/main.c
+++ b/regression/cbmc/String6/main.c
@@ -1,13 +1,13 @@
#include
-#include
+#include
void free(void *);
int main()
{
- char str[500]="Hello";
+ char str[500]="Hello";
assert(strcmp(str, "Hello")==0);
- assert(strncmp(str, "Hello", 5)==0);
+ assert(strncmp(str, "Hello", 5)==0);
assert(strcasecmp(str, "HELLO")==0);
assert(strncasecmp(str, "HELLO", 5)==0);
assert(strcmp(str, "\xff")<0);
diff --git a/regression/cbmc/String7/main.c b/regression/cbmc/String7/main.c
index 1785408b9e6..7bfacd1c12e 100644
--- a/regression/cbmc/String7/main.c
+++ b/regression/cbmc/String7/main.c
@@ -1,8 +1,8 @@
-struct S {
+struct S {
char *Operator;
};
-const struct S b1006_props = {
+const struct S b1006_props = {
.Operator = "OR"
};
diff --git a/regression/cbmc/String_Literal1/main.c b/regression/cbmc/String_Literal1/main.c
index c7384ba6aed..0185fdf91b2 100644
--- a/regression/cbmc/String_Literal1/main.c
+++ b/regression/cbmc/String_Literal1/main.c
@@ -11,16 +11,16 @@ int main()
assert("\""[0]=='"');
assert("\%"[0]=='%');
assert("\n"[0]==10);
-
+
// spliced to avoid hex ambiguity
assert("\x5" "five"[0]==0x5);
// spliced accoss multiple lines
const char some_string[]=
- "\x5"
+ "\x5"
#pragma whatnot
"five";
-
+
assert(some_string[0]==0x5);
// wide strings
@@ -40,16 +40,16 @@ int main()
assert(euro_sign[3]==0);
assert(sizeof(euro_sign)==4);
- // the following is C++ and C99
+ // the following is C++ and C99
const wchar_t wide_amount[]=L"\u20AC123,00"; //€123,00
assert(wide_amount[0]==0x20ac);
assert(wide_amount[1]=='1');
-
+
// C11 unicode string literals
assert(sizeof(u8""[0])==sizeof(char));
assert(sizeof(u""[0])==2);
assert(sizeof(U""[0])==4);
-
+
// generic wide string, OS-dependent
assert(sizeof(L""[0])==sizeof(wchar_t));
}
diff --git a/regression/cbmc/Struct_Bytewise1/struct_bytewise.c b/regression/cbmc/Struct_Bytewise1/struct_bytewise.c
index b5482988e8a..431372d1374 100644
--- a/regression/cbmc/Struct_Bytewise1/struct_bytewise.c
+++ b/regression/cbmc/Struct_Bytewise1/struct_bytewise.c
@@ -30,7 +30,7 @@ void CopyBuffer(unsigned char *src) {
arrayTmp[i] = src[i];
}
}
-
+
int main()
{
logAppl.a=1;
@@ -60,4 +60,3 @@ int main()
assert(arrayTmp[7]==1);
#endif
}
-
diff --git a/regression/cbmc/Struct_Initialization1/main.c b/regression/cbmc/Struct_Initialization1/main.c
index 7065af7690e..f89d06d08e3 100644
--- a/regression/cbmc/Struct_Initialization1/main.c
+++ b/regression/cbmc/Struct_Initialization1/main.c
@@ -40,7 +40,7 @@ int main() {
assert(S1.f==0);
assert(S1.g==2);
assert(S1.p==0);
-
+
assert(S2.s1.a==1);
assert(S2.s1.b==2);
assert(S2.s2.a==3);
diff --git a/regression/cbmc/Struct_Initialization10/main.c b/regression/cbmc/Struct_Initialization10/main.c
index 30168dbeac4..130936a138c 100644
--- a/regression/cbmc/Struct_Initialization10/main.c
+++ b/regression/cbmc/Struct_Initialization10/main.c
@@ -1,8 +1,8 @@
typedef unsigned blue;
-
+
typedef struct { unsigned blue; } ar_t;
typedef struct { ar_t ar; } format_t;
-
+
int main () {
// note that 'blue' is a type-token
format_t data = { .ar.blue = 1 };
diff --git a/regression/cbmc/Struct_Initialization2/main.c b/regression/cbmc/Struct_Initialization2/main.c
index bafcdc9b388..9a04c7fd804 100644
--- a/regression/cbmc/Struct_Initialization2/main.c
+++ b/regression/cbmc/Struct_Initialization2/main.c
@@ -16,7 +16,7 @@ int main()
assert(str_array[1].b==4);
int x;
-
+
// this also exists (GCC)
str_array[0] = (struct teststr){ .a=1, .c=x };
assert(str_array[0].a==1);
diff --git a/regression/cbmc/Struct_Initialization3/main.c b/regression/cbmc/Struct_Initialization3/main.c
index c5b4814d117..6152b8442bf 100644
--- a/regression/cbmc/Struct_Initialization3/main.c
+++ b/regression/cbmc/Struct_Initialization3/main.c
@@ -2,7 +2,7 @@ typedef struct
{
int a;
} S;
-
+
int main(void)
{
S s;
diff --git a/regression/cbmc/Struct_Initialization5/main.c b/regression/cbmc/Struct_Initialization5/main.c
index 47a662328ae..455c9e107c0 100644
--- a/regression/cbmc/Struct_Initialization5/main.c
+++ b/regression/cbmc/Struct_Initialization5/main.c
@@ -10,7 +10,7 @@ int main()
{
struct X foo1;
struct Y foo2;
-
+
foo2=(struct Y){ foo1 };
assert(foo2.x.y==foo1.y);
diff --git a/regression/cbmc/Struct_Initialization6/main.c b/regression/cbmc/Struct_Initialization6/main.c
index a7a7ebde9f4..6e069783f54 100644
--- a/regression/cbmc/Struct_Initialization6/main.c
+++ b/regression/cbmc/Struct_Initialization6/main.c
@@ -6,7 +6,7 @@ struct X
{
int z;
} f [3];
-
+
int g, h;
} foo = { .g=200, .f[1].z=100 };
@@ -30,7 +30,7 @@ int main()
assert(z.a3==30);
assert(z.a4==40);
assert(z.a5==0);
-
+
assert(enable[0]==1);
assert(enable[30]==2);
assert(enable[31]==3);
diff --git a/regression/cbmc/Struct_Initialization7/main.c b/regression/cbmc/Struct_Initialization7/main.c
index c9ffb6434c3..08498f9b46c 100644
--- a/regression/cbmc/Struct_Initialization7/main.c
+++ b/regression/cbmc/Struct_Initialization7/main.c
@@ -6,14 +6,14 @@ struct X
{
int a, b, c;
} y;
-
+
int z;
};
int main()
{
struct X x={ 1, 2 };
-
+
assert(x.y.a==1);
assert(x.z==2);
}
diff --git a/regression/cbmc/Struct_Padding1/main.c b/regression/cbmc/Struct_Padding1/main.c
index 0412e6de630..5dd960bd6c4 100644
--- a/regression/cbmc/Struct_Padding1/main.c
+++ b/regression/cbmc/Struct_Padding1/main.c
@@ -7,13 +7,13 @@ struct my_struct1
{
int i;
char ch;
-
+
struct
{
// this gets padded
int j;
};
-
+
// Bit-fields do not get padded in between,
// but fill up an integer!
unsigned bf1:1;
@@ -27,7 +27,7 @@ struct my_struct2
{
int i;
char ch[4];
-
+
// no padding needed
int j;
@@ -48,7 +48,7 @@ int main()
assert(xx1.i==1);
assert(xx1.ch==2);
assert(xx1.j==3);
-
+
// let's probe the padding
char *p=&xx1.ch;
assert(p[0]==2);
diff --git a/regression/cbmc/Union_Initialization1/main.c b/regression/cbmc/Union_Initialization1/main.c
index 831d7b4a2d6..8d3374b1997 100644
--- a/regression/cbmc/Union_Initialization1/main.c
+++ b/regression/cbmc/Union_Initialization1/main.c
@@ -18,9 +18,9 @@ union
trigger : 1,
mask : 1,
__reserved_2 : 15;
-
+
unsigned __reserved_3 : 24,
- dest : 8;
+ dest : 8;
} entry;
} u1 = { .entry.delivery_mode = 2, .entry.mask = 1 };
@@ -33,7 +33,7 @@ union
{
int d, e;
} c;
-
+
} u2 = { 1 }, u3 = { .c.e = 2 } ;
int main()
@@ -41,7 +41,7 @@ int main()
assert(u1.entry.vector==0);
assert(u1.entry.delivery_mode==2);
assert(u1.entry.mask==1);
-
+
assert(u2.a==1);
assert(u3.a==0);
assert(u3.c.e==2);
diff --git a/regression/cbmc/Unwinding_Locality1/main.c b/regression/cbmc/Unwinding_Locality1/main.c
index 91ac5057295..41a2fbdb017 100644
--- a/regression/cbmc/Unwinding_Locality1/main.c
+++ b/regression/cbmc/Unwinding_Locality1/main.c
@@ -1,17 +1,17 @@
int main() {
int i;
-
+
for(i=0; i<10; i++) {
const int a=i;
}
-
+
int array[10];
for(i=0; i<10; i++)
{
const int a;
array[i]=a;
}
-
+
// these should all be allowed to be different
assert(array[0]==array[1]);
}
diff --git a/regression/cbmc/Variadic1/main.c b/regression/cbmc/Variadic1/main.c
index 6040d61bba4..d634c6e90fd 100644
--- a/regression/cbmc/Variadic1/main.c
+++ b/regression/cbmc/Variadic1/main.c
@@ -37,4 +37,3 @@ int main (void)
return 0;
}
-
diff --git a/regression/cbmc/Visual_Studio_Types1/main.c b/regression/cbmc/Visual_Studio_Types1/main.c
index 138a7b7cb1b..48f37c2175f 100644
--- a/regression/cbmc/Visual_Studio_Types1/main.c
+++ b/regression/cbmc/Visual_Studio_Types1/main.c
@@ -12,29 +12,29 @@ int main()
assert(sizeof(i3)==4);
assert(sizeof(i4)==8);
#endif
-
+
// general types
-
+
char c;
short s;
int i;
long l;
long long ll;
-
+
assert(sizeof(c)==1);
assert(sizeof(s)==2);
assert(sizeof(i)==4);
assert(sizeof(l)==4);
assert(sizeof(ll)==8);
-
- // these constants are Visual Studio-specific
+
+ // these constants are Visual Studio-specific
#ifdef _MSC_VER
assert(sizeof(1i8)==1);
assert(sizeof(1i16)==2);
assert(sizeof(1i32)==4);
assert(sizeof(1i64)==8);
assert(sizeof(1i128)==16);
-
+
// oh, and these pointer qualifiers are Visual Studio-specific
int * __ptr32 p32;
//int * __ptr64 p64;
@@ -43,6 +43,6 @@ int main()
assert(sizeof(p32)==4);
//assert(sizeof(p64)==8);
#endif
-
+
assert(sizeof(void *)==4);
}
diff --git a/regression/cbmc/Visual_Studio_Types2/main.c b/regression/cbmc/Visual_Studio_Types2/main.c
index 3daa245332e..921143e24a6 100644
--- a/regression/cbmc/Visual_Studio_Types2/main.c
+++ b/regression/cbmc/Visual_Studio_Types2/main.c
@@ -5,12 +5,12 @@ int main()
int i;
long l;
long long ll;
-
+
assert(sizeof(s)==2);
assert(sizeof(i)==4);
assert(sizeof(l)==4);
assert(sizeof(ll)==8);
-
+
// oh, and these pointer qualifiers are MS-specific
#ifdef _MSC_VER
int * __ptr32 p32;
@@ -20,6 +20,6 @@ int main()
assert(sizeof(p32)==4);
assert(sizeof(p64)==8);
#endif
-
+
assert(sizeof(void *)==8);
}
diff --git a/regression/cbmc/Volatile1/main.c b/regression/cbmc/Volatile1/main.c
index 383e71c59d7..84ac4837d1e 100644
--- a/regression/cbmc/Volatile1/main.c
+++ b/regression/cbmc/Volatile1/main.c
@@ -3,4 +3,3 @@ int main() {
if (!x)
assert(!x);
}
-
diff --git a/regression/cbmc/Zero_Initialization1/main.c b/regression/cbmc/Zero_Initialization1/main.c
index a051d31258c..e179f017d0c 100644
--- a/regression/cbmc/Zero_Initialization1/main.c
+++ b/regression/cbmc/Zero_Initialization1/main.c
@@ -8,7 +8,7 @@ union U my_u;
union U
{
- int some;
+ int some;
};
struct S my_s;
diff --git a/regression/cbmc/__func__1/main.c b/regression/cbmc/__func__1/main.c
index 93870e6abad..f87717d5a1a 100644
--- a/regression/cbmc/__func__1/main.c
+++ b/regression/cbmc/__func__1/main.c
@@ -1,13 +1,13 @@
int main()
{
char ch0, ch1, ch2, ch3, ch4;
-
+
ch0=__func__[0];
ch1=__func__[1];
ch2=__func__[2];
ch3=__func__[3];
ch4=__func__[4];
-
+
assert(ch0=='m');
assert(ch1=='a');
assert(ch2=='i');
diff --git a/regression/cbmc/abs1/main.c b/regression/cbmc/abs1/main.c
index bea310ae957..e3e149726a1 100644
--- a/regression/cbmc/abs1/main.c
+++ b/regression/cbmc/abs1/main.c
@@ -10,17 +10,17 @@ int main()
{
int my_i, iabs;
double my_d, dabs;
-
+
assert(abs(-1)==1);
assert(abs(1)==1);
assert(fabs(1.0)==1);
assert(fabs(-1.0)==1);
-
+
iabs=(my_i<0)?-my_i:my_i;
assert(abs(my_i)==iabs);
__CPROVER_assume(!isnan(my_d));
-
+
dabs=(my_d<0)?-my_d:my_d;
assert(fabs(my_d)==dabs);
}
diff --git a/regression/cbmc/array-tests/main.c b/regression/cbmc/array-tests/main.c
index 0f738bf6263..8a0e96753d4 100644
--- a/regression/cbmc/array-tests/main.c
+++ b/regression/cbmc/array-tests/main.c
@@ -60,25 +60,25 @@ int main (void) {
/*** Direct use ***/
// No changes
-
+
// Constant accesss : should simplify away
assert(uninitialisedGlobalArray1[31] == 0);
assert(uninitialisedGlobalArray1[23] == 0);
assert(uninitialisedGlobalArray2[37] == 0);
-
+
assert(initialisedUniform1[11] == 0);
assert(initialisedUniform2[13] == 0);
assert(initialisedUniform2[15] == 0);
assert(initialisedUniform3[17] == 1);
-
+
assert(initialisedNonUniform1[3] == 3);
assert(initialisedNonUniform1[5] == 5);
assert(initialisedNonUniform2[7] == 7);
assert(initialisedNonUniform3[9] == 6);
-
+
// Variable access
int directUseReadLocation[8]; // Non-det
-
+
if (0 <= directUseReadLocation[0] &&
directUseReadLocation[0] < 256)
assert(uninitialisedGlobalArray1[directUseReadLocation[0]] == 0);
@@ -108,7 +108,7 @@ int main (void) {
} else if (test == 1) {
-
+
/*** Constant redundant update ***/
// Updates should simplify away.
// Shouldn't require array_of to array conversion.
@@ -117,7 +117,7 @@ int main (void) {
uninitialisedGlobalArray1[23] = 0;
uninitialisedGlobalArray1[33] = 0;
uninitialisedGlobalArray2[63] = 0;
-
+
initialisedUniform1[13] = 0;
initialisedUniform2[11] = 0;
initialisedUniform2[15] = 0;
@@ -129,7 +129,7 @@ int main (void) {
// These two check write re-ordering and coalescing
initialisedNonUniform1[2] = 11;
initialisedNonUniform1[3] = 25;
-
+
initialisedNonUniform1[2] = 2;
initialisedNonUniform1[3] = 3;
initialisedNonUniform1[4] = 4;
@@ -146,15 +146,15 @@ int main (void) {
assert(initialisedUniform2[13] == 0);
assert(initialisedUniform2[15] == 0);
assert(initialisedUniform3[17] == 1);
-
+
assert(initialisedNonUniform1[3] == 3);
assert(initialisedNonUniform1[5] == 5);
assert(initialisedNonUniform2[7] == 7);
assert(initialisedNonUniform3[9] == 6);
-
+
// Variable access
int constantRedundantUpdateReadLocation[8]; // Non-det
-
+
if (0 <= constantRedundantUpdateReadLocation[0] &&
constantRedundantUpdateReadLocation[0] < 256)
assert(uninitialisedGlobalArray1[constantRedundantUpdateReadLocation[0]] == 0);
@@ -191,7 +191,7 @@ int main (void) {
uninitialisedGlobalArray1[23] = 2;
uninitialisedGlobalArray1[53] = 3;
uninitialisedGlobalArray2[62] = 4;
-
+
initialisedUniform1[12] = 1;
initialisedUniform2[10] = 1;
initialisedUniform2[15] = 1;
@@ -199,16 +199,16 @@ int main (void) {
initialisedUniform3[13] = 0;
initialisedUniform3[15] = 0;
initialisedUniform3[17] = 0;
-
+
initialisedNonUniform1[2] = -2;
initialisedNonUniform1[3] = -3;
initialisedNonUniform1[7] = -4;
initialisedNonUniform2[3] = 11;
initialisedNonUniform3[9] = 11;
initialisedNonUniform3[7] = 10;
-
-
+
+
// Constant accesss : should still simplify away
assert(uninitialisedGlobalArray1[31] == 0);
assert(uninitialisedGlobalArray1[23] == 2);
@@ -226,7 +226,7 @@ int main (void) {
// Variable access
int constantNonRedundantUpdateReadLocation[8]; // Non-det
-
+
if (0 <= constantNonRedundantUpdateReadLocation[0] &&
constantNonRedundantUpdateReadLocation[0] < 5)
assert(uninitialisedGlobalArray1[constantNonRedundantUpdateReadLocation[0]] == 0);
@@ -268,9 +268,9 @@ int main (void) {
// context-free rewriter.
// * For the non-uniform arrays some complex reasoning is needed.
// * Simplification across Phi nodes is needed as well
-
+
int redundantWriteLocation[16];
-
+
if (0 <= redundantWriteLocation[0] &&
redundantWriteLocation[0] < 256)
uninitialisedGlobalArray1[redundantWriteLocation[0]] = 0;
@@ -283,7 +283,7 @@ int main (void) {
redundantWriteLocation[2] < 256)
uninitialisedGlobalArray2[redundantWriteLocation[2]] = 0;
-
+
if (0 <= redundantWriteLocation[3] &&
redundantWriteLocation[3] < 64)
@@ -323,7 +323,7 @@ int main (void) {
// Check write coallescing and reordering
// Can re-order writes if the indexes being equal implies the
// values are equal.
-
+
initialisedNonUniform1[redundantWriteLocation[10]] = 29;
initialisedNonUniform1[redundantWriteLocation[11]] = 29;
@@ -351,8 +351,8 @@ int main (void) {
// If the array is simplified then this should simplify as well
// If not then they likely won't and thus an example of a constant
// index into a non-constant (but completely known) array.
-
-
+
+
assert(uninitialisedGlobalArray1[31] == 0);
assert(uninitialisedGlobalArray1[23] == 0);
assert(uninitialisedGlobalArray2[37] == 0);
@@ -361,16 +361,16 @@ int main (void) {
assert(initialisedUniform2[13] == 0);
assert(initialisedUniform2[15] == 0);
assert(initialisedUniform3[17] == 1);
-
+
assert(initialisedNonUniform1[3] == 3);
assert(initialisedNonUniform1[5] == 5);
assert(initialisedNonUniform2[7] == 7);
assert(initialisedNonUniform3[9] == 6);
-
+
// Variable access
int variableRedundantUpdateReadLocation[8]; // Non-det
-
+
if (0 <= variableRedundantUpdateReadLocation[0] &&
variableRedundantUpdateReadLocation[0] < 256)
assert(uninitialisedGlobalArray1[variableRedundantUpdateReadLocation[0]] == 0);
@@ -398,14 +398,14 @@ int main (void) {
variableRedundantUpdateReadLocation[7] < 16)
assert(initialisedNonUniform3[variableRedundantUpdateReadLocation[7]] == 15 - variableRedundantUpdateReadLocation[7]);
-
+
} else if (test == 4) {
/*** Variable non-redundant update ***/
// No obvious simplifications to writes
int nonRedundantWriteLocation[16];
-
+
if (0 <= nonRedundantWriteLocation[0] &&
nonRedundantWriteLocation[0] < 256 &&
nonRedundantWriteLocation[0] != 31)
@@ -421,7 +421,7 @@ int main (void) {
nonRedundantWriteLocation[2] < 256)
uninitialisedGlobalArray2[nonRedundantWriteLocation[2]] = (nonRedundantWriteLocation[2] & 0xFF);
-
+
if (0 <= nonRedundantWriteLocation[3] &&
nonRedundantWriteLocation[3] < 10)
@@ -464,7 +464,7 @@ int main (void) {
// Check write coallescing and reordering
// Can re-order writes if the indexes being equal implies the
// values are equal.
-
+
initialisedNonUniform1[nonRedundantWriteLocation[10]] = 29;
initialisedNonUniform1[nonRedundantWriteLocation[11]] = 29;
@@ -487,7 +487,7 @@ int main (void) {
initialisedNonUniform3[nonRedundantWriteLocation[15]] += 1;
}
-
+
// Constant access
// Again, constant index into a fully known but non-constant array
assert(uninitialisedGlobalArray1[31] == 0);
@@ -498,7 +498,7 @@ int main (void) {
assert((initialisedUniform2[13] & 0xE) == 0);
assert(initialisedUniform2[15] == 0);
assert(initialisedUniform3[17] == 1);
-
+
assert(initialisedNonUniform1[3] - 2 >= 0);
assert(initialisedNonUniform1[5] - 4 >= 0);
assert(initialisedNonUniform2[7] == 7);
@@ -506,7 +506,7 @@ int main (void) {
// Variable access
int variableNonRedundantUpdateReadLocation[8]; // Non-det
-
+
if (0 <= variableNonRedundantUpdateReadLocation[0] &&
variableNonRedundantUpdateReadLocation[0] < 256)
assert(uninitialisedGlobalArray1[variableNonRedundantUpdateReadLocation[0]] >= 0);
@@ -541,4 +541,3 @@ int main (void) {
return 0;
}
-
diff --git a/regression/cbmc/atomic_section_seq1/main.c b/regression/cbmc/atomic_section_seq1/main.c
index 630056854c3..0e223b6b658 100644
--- a/regression/cbmc/atomic_section_seq1/main.c
+++ b/regression/cbmc/atomic_section_seq1/main.c
@@ -372,4 +372,3 @@ signed int main(void)
ethoc_open(&netdev);
return 0;
}
-
diff --git a/regression/cbmc/big-endian-array1/main.c b/regression/cbmc/big-endian-array1/main.c
index 56fe657d9e3..71dc797caf0 100644
--- a/regression/cbmc/big-endian-array1/main.c
+++ b/regression/cbmc/big-endian-array1/main.c
@@ -23,7 +23,7 @@ int main()
__CPROVER_assert(p1==2, "p[1] matches");
__CPROVER_assert(p2==3, "p[2] matches");
__CPROVER_assert(p3==4, "p[3] matches");
-
+
unsigned short *q=(unsigned short *)array;
unsigned short q0=q[0];
__CPROVER_assert(q0==0x0102, "p[0,1] matches");
diff --git a/regression/cbmc/char1/main.c b/regression/cbmc/char1/main.c
index dd90a6a764a..7e0fe699d7a 100644
--- a/regression/cbmc/char1/main.c
+++ b/regression/cbmc/char1/main.c
@@ -7,7 +7,7 @@ int main()
#error _CHAR_UNSIGNED should be set
#endif
#endif
-
+
#ifdef __GNUC__
#ifndef __CHAR_UNSIGNED__
#error __CHAR_UNSIGNED__ should be set
diff --git a/regression/cbmc/character_handling1/main.c b/regression/cbmc/character_handling1/main.c
index f0ae7f185da..ca5a1067d94 100644
--- a/regression/cbmc/character_handling1/main.c
+++ b/regression/cbmc/character_handling1/main.c
@@ -1,16 +1,16 @@
-int isalnum(int c);
-int isalpha(int c);
-int isblank(int c);
-int iscntrl(int c);
-int isdigit(int c);
-int isgraph(int c);
-int islower(int c);
-int isprint(int c);
-int ispunct(int c);
-int isspace(int c);
-int isupper(int c);
-int isxdigit(int c);
-int tolower(int c);
+int isalnum(int c);
+int isalpha(int c);
+int isblank(int c);
+int iscntrl(int c);
+int isdigit(int c);
+int isgraph(int c);
+int islower(int c);
+int isprint(int c);
+int ispunct(int c);
+int isspace(int c);
+int isupper(int c);
+int isxdigit(int c);
+int tolower(int c);
int toupper(int c);
int main()
@@ -22,7 +22,7 @@ int main()
assert(!isalnum(' '));
assert(!isalnum('.'));
assert(!isalnum(0));
-
+
assert(isalpha('a'));
assert(!isalpha('1'));
assert(isalpha('A'));
@@ -30,7 +30,7 @@ int main()
assert(!isalpha(' '));
assert(!isalpha('.'));
assert(!isalpha(0));
-
+
assert(!isblank('a'));
assert(!isblank('1'));
assert(!isblank('A'));
@@ -38,7 +38,7 @@ int main()
assert(isblank(' '));
assert(!isblank('.'));
assert(!isblank(0));
-
+
assert(!iscntrl('a'));
assert(!iscntrl('1'));
assert(!iscntrl('A'));
@@ -46,7 +46,7 @@ int main()
assert(!iscntrl(' '));
assert(!iscntrl('.'));
assert(iscntrl(0));
-
+
assert(!isdigit('a'));
assert(isdigit('1'));
assert(!isdigit('A'));
@@ -54,7 +54,7 @@ int main()
assert(!isdigit(' '));
assert(!isdigit('.'));
assert(!isdigit(0));
-
+
assert(islower('a'));
assert(!islower('1'));
assert(!islower('A'));
@@ -62,7 +62,7 @@ int main()
assert(!islower(' '));
assert(!islower('.'));
assert(!islower(0));
-
+
assert(!isupper('a'));
assert(!isupper('1'));
assert(isupper('A'));
@@ -70,7 +70,7 @@ int main()
assert(!isupper(' '));
assert(!isupper('.'));
assert(!isupper(0));
-
+
assert(!isspace('a'));
assert(!isspace('1'));
assert(!isspace('A'));
@@ -78,7 +78,7 @@ int main()
assert(isspace(' '));
assert(!isspace('.'));
assert(!isspace(0));
-
+
assert(tolower('a')=='a');
assert(tolower('1')=='1');
assert(tolower('A')=='a');
@@ -86,7 +86,7 @@ int main()
assert(tolower(' ')==' ');
assert(tolower('.')=='.');
assert(tolower(0)==0);
-
+
assert(toupper('a')=='A');
assert(toupper('1')=='1');
assert(toupper('A')=='A');
@@ -94,5 +94,5 @@ int main()
assert(toupper(' ')==' ');
assert(toupper('.')=='.');
assert(toupper(0)==0);
-
+
}
diff --git a/regression/cbmc/complex1/main.c b/regression/cbmc/complex1/main.c
index aebdad77108..72695b5edf9 100644
--- a/regression/cbmc/complex1/main.c
+++ b/regression/cbmc/complex1/main.c
@@ -8,15 +8,15 @@ int main()
c=1.0i+2;
assert(__real__ c == 2);
- assert(__imag__ c == 1);
-
+ assert(__imag__ c == 1);
+
_Complex double d;
assert(sizeof(c)==sizeof(d));
-
+
_Complex signed char char_complex, char_complex2;
-
+
char_complex=0x3i-2;
-
+
assert(sizeof(d)==sizeof(c));
assert(sizeof(char_complex)==sizeof(signed char)*2);
@@ -26,37 +26,37 @@ int main()
assert(((signed char *)&char_complex)[0]==-2);
assert(((signed char *)&char_complex)[1]==3);
#endif
-
+
assert(__real__ char_complex == -2);
assert(__imag__ char_complex == 3);
-
+
// the precedence of __imag__ is higher than that of +
assert((__imag__ 1.0i + 1.0i) == 1.0i + 1.0);
-
+
// complex conjugate
char_complex2 = ~ char_complex;
-
+
// __real__ something is an lvalue!
- __real__ char_complex = 100;
+ __real__ char_complex = 100;
assert(__real__ char_complex == 100);
assert(__imag__ char_complex == 3);
- // can be incremented
+ // can be incremented
char_complex++;
assert(__real__ char_complex == 101);
assert(__imag__ char_complex == 3);
-
+
// also separately
(__real__ char_complex)++;
- assert(__real__ char_complex == 102);
+ assert(__real__ char_complex == 102);
assert(__imag__ char_complex == 3);
-
+
// casts to reals produce the real part
- assert((int) char_complex == 102);
-
+ assert((int) char_complex == 102);
+
#else
-
- // Visual studio doesn't have it
+
+ // Visual studio doesn't have it
#endif
}
diff --git a/regression/cbmc/compound_literal1/main.c b/regression/cbmc/compound_literal1/main.c
index 82d65125ab1..fb9374523f0 100644
--- a/regression/cbmc/compound_literal1/main.c
+++ b/regression/cbmc/compound_literal1/main.c
@@ -16,15 +16,15 @@ int main()
assert(((float[2]) {2.7, 3.1})[1]==3.1f);
assert(((struct POINT) {0, 1}).y==1);
assert(((union U) {1.4}).f==1.4f);
-
+
// Address can be taken, lifetime is that of the
// containing block.
int *p=&(int){ 42 };
assert(*p==42);
-
+
// and modified
*p=43;
assert(*p==43);
-
+
return 0;
}
diff --git a/regression/cbmc/const_ptr1/main.c b/regression/cbmc/const_ptr1/main.c
index d0a109c690d..fb235940af3 100644
--- a/regression/cbmc/const_ptr1/main.c
+++ b/regression/cbmc/const_ptr1/main.c
@@ -15,13 +15,13 @@ int main()
// to a constant pointer to pointers to constant-chars
const char * const *p2;
p2=my_array;
-
+
const char *p3;
char ch;
-
+
p3=*p2;
-
+
ch=*p3;
-
+
assert(ch=='x');
}
diff --git a/regression/cbmc/constant_folding2/main.c b/regression/cbmc/constant_folding2/main.c
index a7d2c227d44..4bcb4ed5c73 100644
--- a/regression/cbmc/constant_folding2/main.c
+++ b/regression/cbmc/constant_folding2/main.c
@@ -9,13 +9,13 @@ int main (void)
pair p;
p.x = 0;
p.y = 0;
-
+
int array[2];
array[0] = 0;
array[1] = 0;
-
+
int i=0;
-
+
while (i < p.x) i++;
while (i < array[0]) i++;
diff --git a/regression/cbmc/divide-by-one-simplify/main.c b/regression/cbmc/divide-by-one-simplify/main.c
index 4c457111406..dfe632ba932 100644
--- a/regression/cbmc/divide-by-one-simplify/main.c
+++ b/regression/cbmc/divide-by-one-simplify/main.c
@@ -4,7 +4,7 @@ int main (void) {
float f;
float g;
int i;
-
+
__CPROVER_assume(f == f); // I.E. not NaN
g = f;
diff --git a/regression/cbmc/enum1/main.c b/regression/cbmc/enum1/main.c
index 74d940ea1d0..ed76336f860 100644
--- a/regression/cbmc/enum1/main.c
+++ b/regression/cbmc/enum1/main.c
@@ -11,13 +11,13 @@ int array[E5];
int main()
{
int integer;
-
+
a=E2;
assert(a==1);
-
+
assert(E4==4);
assert(sizeof(array)==sizeof(int)*5);
-
+
integer=a;
assert(integer==1);
}
diff --git a/regression/cbmc/enum3/main.c b/regression/cbmc/enum3/main.c
index 44d6a512bd0..256b046cb6a 100644
--- a/regression/cbmc/enum3/main.c
+++ b/regression/cbmc/enum3/main.c
@@ -9,4 +9,4 @@ int main(void)
assert(token==Cx);
return 1;
-}
+}
diff --git a/regression/cbmc/enum4/main.c b/regression/cbmc/enum4/main.c
index 682347573c1..27c717a3591 100644
--- a/regression/cbmc/enum4/main.c
+++ b/regression/cbmc/enum4/main.c
@@ -14,4 +14,3 @@ int main()
void *(___args[1]) = {&_event_arg};
execute(___args);
}
-
diff --git a/regression/cbmc/enum5/main.c b/regression/cbmc/enum5/main.c
index 41f7a18c9b4..a249dfc4fba 100644
--- a/regression/cbmc/enum5/main.c
+++ b/regression/cbmc/enum5/main.c
@@ -18,4 +18,3 @@ int main()
__CPROVER_assert(0, "");
return 0;
}
-
diff --git a/regression/cbmc/equality_through_array3/main.c b/regression/cbmc/equality_through_array3/main.c
index e9768e552c0..9e94a5eba95 100644
--- a/regression/cbmc/equality_through_array3/main.c
+++ b/regression/cbmc/equality_through_array3/main.c
@@ -26,4 +26,3 @@ void main ()
return 1;
}
-
diff --git a/regression/cbmc/equality_through_array4/main.c b/regression/cbmc/equality_through_array4/main.c
index 72b3c671827..06fe628b50a 100644
--- a/regression/cbmc/equality_through_array4/main.c
+++ b/regression/cbmc/equality_through_array4/main.c
@@ -21,4 +21,3 @@ int main (void) {
return 1;
}
-
diff --git a/regression/cbmc/equality_through_array5/main.c b/regression/cbmc/equality_through_array5/main.c
index f148f2f7fef..41102922960 100644
--- a/regression/cbmc/equality_through_array5/main.c
+++ b/regression/cbmc/equality_through_array5/main.c
@@ -22,4 +22,3 @@ int main (void) {
return 1;
}
-
diff --git a/regression/cbmc/equality_through_struct1/main.c b/regression/cbmc/equality_through_struct1/main.c
index 02394abb3e2..5b78b7af31d 100644
--- a/regression/cbmc/equality_through_struct1/main.c
+++ b/regression/cbmc/equality_through_struct1/main.c
@@ -20,4 +20,3 @@ int main (void)
return 1;
}
-
diff --git a/regression/cbmc/equality_through_struct_containing_arrays1/main.c b/regression/cbmc/equality_through_struct_containing_arrays1/main.c
index 33893d5de03..4b88e22f3b9 100644
--- a/regression/cbmc/equality_through_struct_containing_arrays1/main.c
+++ b/regression/cbmc/equality_through_struct_containing_arrays1/main.c
@@ -41,4 +41,3 @@ int main (void)
return 1;
}
-
diff --git a/regression/cbmc/equality_through_struct_containing_arrays2/main.c b/regression/cbmc/equality_through_struct_containing_arrays2/main.c
index d6dd912406f..a10f7cf2ec4 100644
--- a/regression/cbmc/equality_through_struct_containing_arrays2/main.c
+++ b/regression/cbmc/equality_through_struct_containing_arrays2/main.c
@@ -46,4 +46,3 @@ int main (void)
return 1;
}
-
diff --git a/regression/cbmc/exit1/main.c b/regression/cbmc/exit1/main.c
index 0661315487b..c403cc204f0 100644
--- a/regression/cbmc/exit1/main.c
+++ b/regression/cbmc/exit1/main.c
@@ -2,7 +2,7 @@ void exit(int status);
int main() {
int x;
-
+
if(x==10)
exit(1);
diff --git a/regression/cbmc/extern_initialization1/file2.c b/regression/cbmc/extern_initialization1/file2.c
index 579cd194cb1..430d09c7316 100644
--- a/regression/cbmc/extern_initialization1/file2.c
+++ b/regression/cbmc/extern_initialization1/file2.c
@@ -1,2 +1 @@
extern int some_int;
-
diff --git a/regression/cbmc/extern_initialization2/file2.c b/regression/cbmc/extern_initialization2/file2.c
index 894a5c09d13..f0bd0cbd8d1 100644
--- a/regression/cbmc/extern_initialization2/file2.c
+++ b/regression/cbmc/extern_initialization2/file2.c
@@ -4,4 +4,3 @@ extern int some_int;
int some_int;
extern int some_int;
-
diff --git a/regression/cbmc/for-break1/main.c b/regression/cbmc/for-break1/main.c
index 88c5344cb36..c6fe8f78046 100644
--- a/regression/cbmc/for-break1/main.c
+++ b/regression/cbmc/for-break1/main.c
@@ -9,6 +9,6 @@ int main()
b=1;
}
-
+
assert(a==b);
}
diff --git a/regression/cbmc/for1/main.c b/regression/cbmc/for1/main.c
index 1a650444570..d3448117650 100644
--- a/regression/cbmc/for1/main.c
+++ b/regression/cbmc/for1/main.c
@@ -1,13 +1,13 @@
int main() {
int i=0;
-
+
for(;;)
{
i++;
if(i==30) break;
}
-
+
assert(i==30);
return 0;
diff --git a/regression/cbmc/gcc_conditional_expr1/main.c b/regression/cbmc/gcc_conditional_expr1/main.c
index 53c43ce675c..5f6f46bbba4 100644
--- a/regression/cbmc/gcc_conditional_expr1/main.c
+++ b/regression/cbmc/gcc_conditional_expr1/main.c
@@ -3,15 +3,15 @@ int g, k;
int main()
{
int r1, r2;
-
+
r1= (g++) ? : 2;
-
+
assert(r1==2);
assert(g==1);
r2= (g++) ? : (k++);
-
+
assert(r2==1);
- assert(g==2);
+ assert(g==2);
assert(k==0);
}
diff --git a/regression/cbmc/gcc_local_label1/main.c b/regression/cbmc/gcc_local_label1/main.c
index 2bdea2be2d3..d9263aa3740 100644
--- a/regression/cbmc/gcc_local_label1/main.c
+++ b/regression/cbmc/gcc_local_label1/main.c
@@ -8,14 +8,14 @@ void other_f()
#ifdef __GNUC__
here:;
x++;
-
+
{
__label__ here, there;
-
+
goto here; // not jumping up, but down!
here:; // this would usually fail
-
+
assert(0);
}
#else
@@ -28,4 +28,3 @@ int main()
{
other_f();
}
-
diff --git a/regression/cbmc/gcc_statement_expression1/main.c b/regression/cbmc/gcc_statement_expression1/main.c
index 539e53e4170..843323e4308 100644
--- a/regression/cbmc/gcc_statement_expression1/main.c
+++ b/regression/cbmc/gcc_statement_expression1/main.c
@@ -3,20 +3,20 @@ int main()
int x;
int y;
- // as a side-effect
+ // as a side-effect
({ x=1; x;});
-
+
assert(x==1);
-
+
x= ({ y=1; 2; });
assert(x==2);
assert(y==1);
-
+
// inside an initializer: a needs to be visible
// before doing the initializer
int a=({ int b=(long int)&a; b; });
-
+
return 0;
}
diff --git a/regression/cbmc/gcc_statement_expression2/main.c b/regression/cbmc/gcc_statement_expression2/main.c
index a36b68191b8..c1bfc88eaa1 100644
--- a/regression/cbmc/gcc_statement_expression2/main.c
+++ b/regression/cbmc/gcc_statement_expression2/main.c
@@ -8,7 +8,7 @@ int f()
int main()
{
int i;
-
+
int x = ({f();});
assert(x==1);
@@ -20,7 +20,7 @@ int main()
int z = ({ i=1; i++; });
assert(z==1);
assert(i==2);
-
+
// same at top level
({ i=1; i++; });
assert(i==2);
diff --git a/regression/cbmc/gcc_vector1/main.c b/regression/cbmc/gcc_vector1/main.c
index 81ee89d5bfa..69121e20234 100644
--- a/regression/cbmc/gcc_vector1/main.c
+++ b/regression/cbmc/gcc_vector1/main.c
@@ -17,7 +17,7 @@ int main()
assert(sizeof(v4si)==16);
vector_u x, y, z;
-
+
z.v=x.v+y.v;
assert(z.members[0]==x.members[0]+y.members[0]);
@@ -45,7 +45,7 @@ int main()
assert(z.members[1]==~x.members[1]);
assert(z.members[2]==~x.members[2]);
assert(z.members[3]==~x.members[3]);
-
+
// build vector with typecast
z.v=(v4si){ 0, 1, 2, 3 };
assert(z.members[0]==0 && z.members[1]==1 && z.members[2]==2 && z.members[3]==3);
@@ -54,14 +54,14 @@ int main()
v4si some_vector={ 10, 11, 12, 13 };
z.v=some_vector;
assert(z.members[0]==10 && z.members[1]==11 && z.members[2]==12 && z.members[3]==13);
-
+
// same from one
v4si other_vector={ 0 };
z.v=other_vector;
// an array of vectors
v4si image[] = { other_vector };
-
+
assert(z.members[1]==0);
}
diff --git a/regression/cbmc/gcc_vector2/main.c b/regression/cbmc/gcc_vector2/main.c
index 89d2a9d9961..c35987af7c8 100644
--- a/regression/cbmc/gcc_vector2/main.c
+++ b/regression/cbmc/gcc_vector2/main.c
@@ -30,7 +30,7 @@ int main()
assert(((int*) &a)[i]==((int*) &b)[i]);
assert(((int*) &b)[i]==b[i]);
}
-
+
#endif
return 0;
diff --git a/regression/cbmc/goto1/main.c b/regression/cbmc/goto1/main.c
index ceb93ebe0cb..1eaf79a78d0 100644
--- a/regression/cbmc/goto1/main.c
+++ b/regression/cbmc/goto1/main.c
@@ -1,14 +1,14 @@
int main()
{
int i, j;
-
+
if(i)
goto l;
-
+
if(j)
goto l;
-
+
assert(!i && !j);
-
- l:;
+
+ l:;
}
diff --git a/regression/cbmc/goto2/main.c b/regression/cbmc/goto2/main.c
index 320c107fb8e..26219e65fe3 100644
--- a/regression/cbmc/goto2/main.c
+++ b/regression/cbmc/goto2/main.c
@@ -8,8 +8,8 @@ int main()
goto l;
i=2;
-
- l:;
-
+
+ l:;
+
assert(i==1 || !j);
}
diff --git a/regression/cbmc/goto3/main.c b/regression/cbmc/goto3/main.c
index 19d27206bd8..985725bc086 100644
--- a/regression/cbmc/goto3/main.c
+++ b/regression/cbmc/goto3/main.c
@@ -1,15 +1,15 @@
int main()
{
int i;
-
+
i=0;
loop:
assert(i<10);
i++;
-
+
if(i<10)
goto loop;
-
+
assert(i==10);
}
diff --git a/regression/cbmc/if2/main.c b/regression/cbmc/if2/main.c
index 94ba1071143..bec127110bc 100644
--- a/regression/cbmc/if2/main.c
+++ b/regression/cbmc/if2/main.c
@@ -3,10 +3,10 @@ int nondet_int();
int main()
{
int i, j, k;
-
+
i=nondet_int();
k=nondet_int();
-
+
if(i)
{
}
diff --git a/regression/cbmc/if3/main.c b/regression/cbmc/if3/main.c
index 08c20e43bf0..be1474285e1 100644
--- a/regression/cbmc/if3/main.c
+++ b/regression/cbmc/if3/main.c
@@ -1,11 +1,11 @@
int main()
{
goto ERROR;
-
+
if(0) {
ERROR:
assert(0);
}
-
+
return 0;
}
diff --git a/regression/cbmc/if4/main.c b/regression/cbmc/if4/main.c
index 1a67c7ebbbd..e109c21dbd5 100644
--- a/regression/cbmc/if4/main.c
+++ b/regression/cbmc/if4/main.c
@@ -3,10 +3,10 @@ int main()
int x;
__CPROVER_assume(x==1);
-
+
if(x==2)
x++;
-
+
// this should pass
assert(x==1);
}
diff --git a/regression/cbmc/inline1/header.h b/regression/cbmc/inline1/header.h
index c18b4ee55a3..3aea02623ce 100644
--- a/regression/cbmc/inline1/header.h
+++ b/regression/cbmc/inline1/header.h
@@ -6,4 +6,3 @@ static inline void f()
{
x=1;
}
-
diff --git a/regression/cbmc/int-to-float2/main.c b/regression/cbmc/int-to-float2/main.c
index ae817fabf69..5c095d2849e 100644
--- a/regression/cbmc/int-to-float2/main.c
+++ b/regression/cbmc/int-to-float2/main.c
@@ -44,7 +44,7 @@ int main(void)
assert(castWithRounding(FE_DOWNWARD,x) == low);
assert(castWithRounding(FE_DOWNWARD,-x) == -high);
#endif
-
+
assert(castWithRounding(FE_TOWARDZERO,x) == low);
assert(castWithRounding(FE_TOWARDZERO,-x) == -low);
#endif
diff --git a/regression/cbmc/locations1/main.c b/regression/cbmc/locations1/main.c
index 3b59c036d56..163cb1d5e74 100644
--- a/regression/cbmc/locations1/main.c
+++ b/regression/cbmc/locations1/main.c
@@ -35,4 +35,3 @@ int8_t StateMachines_testFlightAnalyzer(void) {
int main() {}
-
diff --git a/regression/cbmc/noop1/main.c b/regression/cbmc/noop1/main.c
index a24eb909bb1..5341fb34ad1 100644
--- a/regression/cbmc/noop1/main.c
+++ b/regression/cbmc/noop1/main.c
@@ -10,6 +10,6 @@ int main()
{
// http://msdn.microsoft.com/en-us/library/s6btaxcs%28v=vs.80%29.aspx
// the arguments of __noop are _not_ evaluated
-
+
__noop(some_function());
}
diff --git a/regression/cbmc/null3/main.c b/regression/cbmc/null3/main.c
index 4ec274503c4..7b948c939e2 100644
--- a/regression/cbmc/null3/main.c
+++ b/regression/cbmc/null3/main.c
@@ -20,4 +20,3 @@ int main()
return 0;
}
-
diff --git a/regression/cbmc/offsetof1/main.c b/regression/cbmc/offsetof1/main.c
index bc6d6db14e9..392747e1aca 100644
--- a/regression/cbmc/offsetof1/main.c
+++ b/regression/cbmc/offsetof1/main.c
@@ -5,7 +5,7 @@ struct S
int i;
char ch;
int j; // this gets aligned
-
+
struct Ssub
{
int x, y;
@@ -42,10 +42,10 @@ int main(void)
assert((long int)&((struct S *)0)->array==16+4);
assert((long int)&((struct S *)0)->array[1]==16+12);
assert((long int)&((struct S *)0)->array[1].y==16+12+4);
-
+
// these are _constants_!
- #ifdef __GNUC__
+ #ifdef __GNUC__
enum { E1 = __builtin_offsetof(struct S, ch) };
#endif
diff --git a/regression/cbmc/pipe1/main.c b/regression/cbmc/pipe1/main.c
index 17d282c945d..7bfb9f80f1d 100644
--- a/regression/cbmc/pipe1/main.c
+++ b/regression/cbmc/pipe1/main.c
@@ -13,7 +13,7 @@ int main()
#ifdef _WIN32
int ret=_pipe(filedesc, 1000, O_BINARY);
- #else
+ #else
int ret=pipe(filedesc);
#endif
diff --git a/regression/cbmc/return5/main.c b/regression/cbmc/return5/main.c
index 40f889b7978..ca143df9e00 100644
--- a/regression/cbmc/return5/main.c
+++ b/regression/cbmc/return5/main.c
@@ -39,6 +39,6 @@ int main()
res1 = f1(a);
assert(res0 == res1); /* <-- should fail */
-
+
return 0;
}
diff --git a/regression/cbmc/scanf1/main.c b/regression/cbmc/scanf1/main.c
index 36ec6495594..55ca6a4af5f 100644
--- a/regression/cbmc/scanf1/main.c
+++ b/regression/cbmc/scanf1/main.c
@@ -12,7 +12,7 @@ int main(void)
long int li=0;
void *p=0;
char buffer[10];
-
+
__CPROVER_scanf("%c", &c);
__CPROVER_scanf("%hhd", &si);
__CPROVER_scanf("%d", &i);
@@ -34,4 +34,3 @@ int main(void)
return 0;
}
-
diff --git a/regression/cbmc/strchr1/main.c b/regression/cbmc/strchr1/main.c
index a6ad943a1ab..b7ea6a92649 100644
--- a/regression/cbmc/strchr1/main.c
+++ b/regression/cbmc/strchr1/main.c
@@ -4,7 +4,7 @@
int main() {
// "The terminating null character is considered to be part of the string."
-
+
char arr[] = { 'a', 'a', 'a', 0};
assert(strchr(arr, 0) == arr + sizeof(arr) - 1);
assert(strrchr(arr, 0) == arr + sizeof(arr) - 1);
diff --git a/regression/cbmc/struct4/main.c b/regression/cbmc/struct4/main.c
index c6f4dd7e2bd..6406255b45e 100644
--- a/regression/cbmc/struct4/main.c
+++ b/regression/cbmc/struct4/main.c
@@ -2,7 +2,7 @@
#ifdef PRINT
#include
-void assert(int cond)
+void assert(int cond)
{ if(!cond) printf("assert failed!\n"); }
#endif
diff --git a/regression/cbmc/struct6/main.c b/regression/cbmc/struct6/main.c
index 4bf4e892fb2..c83aeeff695 100644
--- a/regression/cbmc/struct6/main.c
+++ b/regression/cbmc/struct6/main.c
@@ -10,7 +10,7 @@ struct S
int main()
{
struct S *p=malloc(sizeof(struct S)+10);
-
+
p->x=1;
p->a[0]=3;
p->a[9]=3;
diff --git a/regression/cbmc/struct7/main.c b/regression/cbmc/struct7/main.c
index b9983f37509..45c5798a48e 100644
--- a/regression/cbmc/struct7/main.c
+++ b/regression/cbmc/struct7/main.c
@@ -7,7 +7,7 @@ struct my_struct
void f(int *p)
{
int diff;
-
+
diff=p-&s.array[0];
// should pass
@@ -19,7 +19,7 @@ int main()
int ind, x;
ind=x;
int *p=&s.array[ind];
-
+
if(ind>=0 && ind<=9)
f(p);
}
diff --git a/regression/cbmc/struct8/main.c b/regression/cbmc/struct8/main.c
index b16d954ec30..c8e65e7bcd0 100644
--- a/regression/cbmc/struct8/main.c
+++ b/regression/cbmc/struct8/main.c
@@ -6,11 +6,11 @@ struct X
int main()
{
int aa, bb, cc;
-
+
struct X foo;
-
+
foo=(struct X) { aa, bb, cc };
-
+
assert(foo.a==aa);
assert(foo.b==bb);
assert(foo.c==cc);
diff --git a/regression/cbmc/struct9/main.c b/regression/cbmc/struct9/main.c
index 3c16aecdaa6..acc4b459a91 100644
--- a/regression/cbmc/struct9/main.c
+++ b/regression/cbmc/struct9/main.c
@@ -9,17 +9,17 @@ struct outer_struct {
struct inner_struct inner;
};
-void foo(struct inner_struct *inner)
+void foo(struct inner_struct *inner)
{
assert(*(inner->GUARDp) != 1);
}
int main()
{
- struct outer_struct outer;
+ struct outer_struct outer;
outer.GUARD = 2;
outer.inner.GUARDp = &outer.GUARD;
-
+
foo(&outer.inner);
}
diff --git a/regression/cbmc/switch1/main.c b/regression/cbmc/switch1/main.c
index 197e17d7b16..cb69400a25d 100644
--- a/regression/cbmc/switch1/main.c
+++ b/regression/cbmc/switch1/main.c
@@ -1,7 +1,7 @@
int main()
{
int i;
-
+
switch(i)
{
case 0:
@@ -12,7 +12,7 @@ int main()
case 2:
assert(i==2);
break;
-
+
default:
assert(i!=0 && i!=1 && i!=2);
}
diff --git a/regression/cbmc/switch2/main.c b/regression/cbmc/switch2/main.c
index 173e5a7a3d7..41d8afa789d 100644
--- a/regression/cbmc/switch2/main.c
+++ b/regression/cbmc/switch2/main.c
@@ -6,7 +6,7 @@ int f(int j)
{
case 3:
return 4;
-
+
default:
return 5;
}
@@ -15,15 +15,15 @@ int f(int j)
int main()
{
int i;
-
+
__CPROVER_assume(i==3 || i==4);
-
+
switch(f(i))
{
case 4:
assert(i==3);
break;
-
+
case 5:
assert(i==4);
break;
diff --git a/regression/cbmc/switch3/main.c b/regression/cbmc/switch3/main.c
index c6e393d45ba..3fd83d24c23 100644
--- a/regression/cbmc/switch3/main.c
+++ b/regression/cbmc/switch3/main.c
@@ -3,15 +3,15 @@ char nondet_char();
int main()
{
char ch=nondet_char();
-
+
switch(ch)
{
case 'P':
case 'p':
assert(ch==80 || ch==112);
break;
-
+
default:
- assert(ch!=80 && ch!=112);
+ assert(ch!=80 && ch!=112);
}
}
diff --git a/regression/cbmc/switch4/main.c b/regression/cbmc/switch4/main.c
index ed69fa3c776..b2337cbce06 100644
--- a/regression/cbmc/switch4/main.c
+++ b/regression/cbmc/switch4/main.c
@@ -6,7 +6,7 @@ main()
{
case 0:
goto end;
-
+
default:
x = 0;
}
diff --git a/regression/cbmc/switch5/main.c b/regression/cbmc/switch5/main.c
index 89222d1bcfb..17db2cd5ad2 100644
--- a/regression/cbmc/switch5/main.c
+++ b/regression/cbmc/switch5/main.c
@@ -1,13 +1,13 @@
int main()
{
unsigned int i, j;
-
+
switch(i)
{
case 10:
j=10;
break;
-
+
default:;
j=i+1;
}
diff --git a/regression/cbmc/switch6/main.c b/regression/cbmc/switch6/main.c
index e61cc2775a4..7e9e73261e5 100644
--- a/regression/cbmc/switch6/main.c
+++ b/regression/cbmc/switch6/main.c
@@ -5,14 +5,14 @@ enum { ASD1, ASD2 } e;
int main()
{
const char *p;
-
+
e=ASD1;
-
+
p=({ const char *tmp;
switch(e) { case ASD1: tmp="abc"; } tmp; });
- assert(p[0]=='a');
- assert(p[1]=='b');
- assert(p[2]=='c');
+ assert(p[0]=='a');
+ assert(p[1]=='b');
+ assert(p[2]=='c');
assert(p[3]==0);
}
diff --git a/regression/cbmc/union1/main.c b/regression/cbmc/union1/main.c
index 1eb6fa1e55a..5680e3ceebc 100644
--- a/regression/cbmc/union1/main.c
+++ b/regression/cbmc/union1/main.c
@@ -7,18 +7,18 @@ union u_type
};
// rest of my_U should be zero
-union u_type my_U = { .ch = 1 };
+union u_type my_U = { .ch = 1 };
int main()
{
// little and big endian case, assuming sizeof(int)==4
- assert(my_U.i==1 || my_U.i==0x01000000);
+ assert(my_U.i==1 || my_U.i==0x01000000);
union u_type u;
-
+
u.i=1;
assert(u.i==1);
-
+
u.ch=2;
assert(u.ch==2);
}
diff --git a/regression/cbmc/union3/main.c b/regression/cbmc/union3/main.c
index ffef14b306a..7a255cf6ca4 100644
--- a/regression/cbmc/union3/main.c
+++ b/regression/cbmc/union3/main.c
@@ -15,21 +15,21 @@ int main(void)
#ifdef __GNUC__
int x;
assert(my_func(x)==x);
-
+
union my_U
{
int z;
char ch;
float f;
} union_object;
-
+
float some_float=1.5f;
-
+
// This is the 'union constructor', which is
// yet another gcc extension.
// Visual Studio won't do it.
union_object=(union my_U)some_float;
-
+
assert(union_object.f==1.5f);
#endif
-}
+}
diff --git a/regression/cbmc/union5/main.c b/regression/cbmc/union5/main.c
index c1cdd66560f..908ebba3297 100644
--- a/regression/cbmc/union5/main.c
+++ b/regression/cbmc/union5/main.c
@@ -7,7 +7,7 @@ union u_type
int main()
{
// rest of my_U should be non-deterministic
- union u_type my_U = { .ch = 1 };
+ union u_type my_U = { .ch = 1 };
// should fail
assert(my_U.i==1);
diff --git a/regression/cbmc/va_list1/main.c b/regression/cbmc/va_list1/main.c
index 6a5c0a625a2..4748baf01ab 100644
--- a/regression/cbmc/va_list1/main.c
+++ b/regression/cbmc/va_list1/main.c
@@ -6,15 +6,15 @@ int my_f(int x, ...)
{
__builtin_va_list list;
__builtin_va_start(list, x);
-
+
int value;
unsigned i;
-
+
for(i=0; ir == 10);
}
-
diff --git a/regression/cpp-from-CVS/Constructor2/main.cpp b/regression/cpp-from-CVS/Constructor2/main.cpp
index 0e63e9a8bdd..0dd3b7cdaf7 100644
--- a/regression/cpp-from-CVS/Constructor2/main.cpp
+++ b/regression/cpp-from-CVS/Constructor2/main.cpp
@@ -2,7 +2,7 @@ class t1
{
public:
int i;
-
+
t1();
t1(int z);
};
@@ -20,7 +20,7 @@ class t2
{
public:
int i;
-
+
t2();
t2(int z);
};
@@ -36,5 +36,5 @@ t2::t2(int z)
int main()
{
t1 instance1(5);
- assert(instance1.i==5);
+ assert(instance1.i==5);
}
diff --git a/regression/cpp-from-CVS/Constructor3/main.cpp b/regression/cpp-from-CVS/Constructor3/main.cpp
index ab73ee687e1..68403e21ef9 100644
--- a/regression/cpp-from-CVS/Constructor3/main.cpp
+++ b/regression/cpp-from-CVS/Constructor3/main.cpp
@@ -14,4 +14,3 @@ int main()
x a(5);
assert(a.i==5);
}
-
diff --git a/regression/cpp-from-CVS/Constructor4/main.cpp b/regression/cpp-from-CVS/Constructor4/main.cpp
index 79a6b894426..d099a90572d 100644
--- a/regression/cpp-from-CVS/Constructor4/main.cpp
+++ b/regression/cpp-from-CVS/Constructor4/main.cpp
@@ -1,7 +1,7 @@
struct x
{
int *q;
-
+
x();
};
diff --git a/regression/cpp-from-CVS/Constructor5/main.cpp b/regression/cpp-from-CVS/Constructor5/main.cpp
index 929c3798d23..9d90aed92a4 100644
--- a/regression/cpp-from-CVS/Constructor5/main.cpp
+++ b/regression/cpp-from-CVS/Constructor5/main.cpp
@@ -2,7 +2,7 @@ class x
{
private:
int i;
-
+
public:
x();
diff --git a/regression/cpp-from-CVS/Constructor6/main.cpp b/regression/cpp-from-CVS/Constructor6/main.cpp
index d2112af27e0..a5f9a26f7a8 100644
--- a/regression/cpp-from-CVS/Constructor6/main.cpp
+++ b/regression/cpp-from-CVS/Constructor6/main.cpp
@@ -3,7 +3,7 @@ int counter=1;
struct T
{
int z;
-
+
T();
};
diff --git a/regression/cpp-from-CVS/Constructor9/main.cpp b/regression/cpp-from-CVS/Constructor9/main.cpp
index 0bd5dd80574..0bf1f800562 100644
--- a/regression/cpp-from-CVS/Constructor9/main.cpp
+++ b/regression/cpp-from-CVS/Constructor9/main.cpp
@@ -29,7 +29,7 @@ int main()
assert(a.b_array[1].i==1);
B b_array[2];
-
+
assert(b_array[0].i==1);
assert(b_array[1].i==1);
}
diff --git a/regression/cpp-from-CVS/Conversion1/main.cpp b/regression/cpp-from-CVS/Conversion1/main.cpp
index ce1fe6952b1..586182a19c6 100644
--- a/regression/cpp-from-CVS/Conversion1/main.cpp
+++ b/regression/cpp-from-CVS/Conversion1/main.cpp
@@ -8,7 +8,7 @@ class T
T(int i, int j):x(i)
{
}
-
+
int x;
};
@@ -18,7 +18,7 @@ int main()
assert(unsigned(-1)==(unsigned)-1);
assert(bool(10));
-
+
T t=T(2, 3);
assert(t.x==2);
}
diff --git a/regression/cpp-from-CVS/Conversion10/main.cpp b/regression/cpp-from-CVS/Conversion10/main.cpp
index e2abde74775..78ebff4a465 100644
--- a/regression/cpp-from-CVS/Conversion10/main.cpp
+++ b/regression/cpp-from-CVS/Conversion10/main.cpp
@@ -1,7 +1,7 @@
struct A {};
struct B {
- explicit B(A&){}
+ explicit B(A&){}
};
void test(const B& b){};
diff --git a/regression/cpp-from-CVS/Conversion6/main.cpp b/regression/cpp-from-CVS/Conversion6/main.cpp
index c7636e73956..4feb9caeb5a 100644
--- a/regression/cpp-from-CVS/Conversion6/main.cpp
+++ b/regression/cpp-from-CVS/Conversion6/main.cpp
@@ -20,6 +20,6 @@ int main()
assert((* ((A*)&b)).i == 1); // This works fine.
int bi = func( * ((A*)&b)); // Satabs Ok.
- // cbmc error
+ // cbmc error
assert(bi == 1);
}
diff --git a/regression/cpp-from-CVS/Conversion_Operator1/main.cpp b/regression/cpp-from-CVS/Conversion_Operator1/main.cpp
index 6b6e9d69881..757506d1d64 100644
--- a/regression/cpp-from-CVS/Conversion_Operator1/main.cpp
+++ b/regression/cpp-from-CVS/Conversion_Operator1/main.cpp
@@ -17,7 +17,7 @@ int main()
int i1 = int(I1);
assert(i1==1);
-
+
Int I2(2);
int i2 = (int&)I2;
assert(i2==2);
diff --git a/regression/cpp-from-CVS/Default_Arguments1/main.cpp b/regression/cpp-from-CVS/Default_Arguments1/main.cpp
index 2e96e556430..2e3c96e423d 100644
--- a/regression/cpp-from-CVS/Default_Arguments1/main.cpp
+++ b/regression/cpp-from-CVS/Default_Arguments1/main.cpp
@@ -32,4 +32,3 @@ int main()
{
doit();
}
-
diff --git a/regression/cpp-from-CVS/Destructor1/main.cpp b/regression/cpp-from-CVS/Destructor1/main.cpp
index c3c25d8f808..205da5fe5e0 100644
--- a/regression/cpp-from-CVS/Destructor1/main.cpp
+++ b/regression/cpp-from-CVS/Destructor1/main.cpp
@@ -15,6 +15,6 @@ int main()
t1 instance1;
assert(g==1);
}
-
+
assert(g==2);
}
diff --git a/regression/cpp-from-CVS/Destructor2/main.cpp b/regression/cpp-from-CVS/Destructor2/main.cpp
index 8f0bbf2084c..8a09834a255 100644
--- a/regression/cpp-from-CVS/Destructor2/main.cpp
+++ b/regression/cpp-from-CVS/Destructor2/main.cpp
@@ -20,6 +20,6 @@ int main()
}
}
-
+
assert(g==2);
}
diff --git a/regression/cpp-from-CVS/Destructor5/main.cpp b/regression/cpp-from-CVS/Destructor5/main.cpp
index 5dde25b97e7..8a3d9bb4ff4 100644
--- a/regression/cpp-from-CVS/Destructor5/main.cpp
+++ b/regression/cpp-from-CVS/Destructor5/main.cpp
@@ -11,6 +11,6 @@ int main()
const X *p=new X;
// this is to work even though p is const, and the destructor
- // isn't.
+ // isn't.
delete p;
}
diff --git a/regression/cpp-from-CVS/Destructor_with_PtrMember/main.cpp b/regression/cpp-from-CVS/Destructor_with_PtrMember/main.cpp
index fd3ee163c29..87aeca536dc 100644
--- a/regression/cpp-from-CVS/Destructor_with_PtrMember/main.cpp
+++ b/regression/cpp-from-CVS/Destructor_with_PtrMember/main.cpp
@@ -11,18 +11,18 @@ int main() {
p=&c;
p -> ~test_class();
-
+
assert(global==1);
-
+
// The notation for explicit calls to destructors can be used regardless
// of whether the type defines a destructor. This allows you to make such
- // explicit calls without knowing if a destructor is defined for the type.
+ // explicit calls without knowing if a destructor is defined for the type.
// An explicit call to a destructor where none is defined has no effect.
typedef char TT;
-
+
TT *q;
q->~TT();
-
+
return 0;
}
diff --git a/regression/cpp-from-CVS/Exception1/main.cpp b/regression/cpp-from-CVS/Exception1/main.cpp
index 2c065c75b18..dfaf154ab20 100644
--- a/regression/cpp-from-CVS/Exception1/main.cpp
+++ b/regression/cpp-from-CVS/Exception1/main.cpp
@@ -16,7 +16,7 @@ int main()
throw (int)0;
assert(0);
}
-
+
catch(int i)
{
// yes
@@ -29,7 +29,7 @@ int main()
{
assert(0);
}
-
+
// example 2
try
@@ -37,7 +37,7 @@ int main()
throw (char)0;
assert(0);
}
-
+
catch(int i)
{
assert(0);
@@ -57,7 +57,7 @@ int main()
throw whatnot(1);
assert(0);
}
-
+
catch(int i)
{
assert(0);
diff --git a/regression/cpp-from-CVS/Friend1/main.cpp b/regression/cpp-from-CVS/Friend1/main.cpp
index eb7ef0c302e..b32e8c26ab1 100644
--- a/regression/cpp-from-CVS/Friend1/main.cpp
+++ b/regression/cpp-from-CVS/Friend1/main.cpp
@@ -10,7 +10,7 @@ class C
T x=1;
return x;
}
-
+
int base;
};
@@ -18,5 +18,5 @@ int main()
{
C c(1);
- assert(f()==1);
+ assert(f()==1);
}
diff --git a/regression/cpp-from-CVS/Friend6/main.cpp b/regression/cpp-from-CVS/Friend6/main.cpp
index 66102b3b243..b5e2148fa08 100644
--- a/regression/cpp-from-CVS/Friend6/main.cpp
+++ b/regression/cpp-from-CVS/Friend6/main.cpp
@@ -13,7 +13,7 @@ class B {
};
template
-int A::get_i(B& b){return b.i;}
+int A::get_i(B& b){return b.i;}
int main()
{
diff --git a/regression/cpp-from-CVS/Function_Arguments3/main.cpp b/regression/cpp-from-CVS/Function_Arguments3/main.cpp
index 131ced2710e..52860aae61a 100644
--- a/regression/cpp-from-CVS/Function_Arguments3/main.cpp
+++ b/regression/cpp-from-CVS/Function_Arguments3/main.cpp
@@ -25,7 +25,7 @@ int main()
{
f(0);
assert(global==10);
-
+
g((int *)0);
assert(global==20);
diff --git a/regression/cpp-from-CVS/Function_Arguments4/main.cpp b/regression/cpp-from-CVS/Function_Arguments4/main.cpp
index db9d5eca420..82555544910 100644
--- a/regression/cpp-from-CVS/Function_Arguments4/main.cpp
+++ b/regression/cpp-from-CVS/Function_Arguments4/main.cpp
@@ -12,7 +12,7 @@ struct B
B f(B b)
{
assert(i==11);
- return b;
+ return b;
}
diff --git a/regression/cpp-from-CVS/Function_Pointer1/main.cpp b/regression/cpp-from-CVS/Function_Pointer1/main.cpp
index 7dfa46f59a1..723671c5780 100644
--- a/regression/cpp-from-CVS/Function_Pointer1/main.cpp
+++ b/regression/cpp-from-CVS/Function_Pointer1/main.cpp
@@ -6,8 +6,8 @@ int f(int x)
int main()
{
int (*p)(int);
-
+
p=f;
-
+
p(1);
}
diff --git a/regression/cpp-from-CVS/Implicit_Conversion2/main.cpp b/regression/cpp-from-CVS/Implicit_Conversion2/main.cpp
index eba8dbd7463..0ab7eeeae49 100644
--- a/regression/cpp-from-CVS/Implicit_Conversion2/main.cpp
+++ b/regression/cpp-from-CVS/Implicit_Conversion2/main.cpp
@@ -7,7 +7,7 @@ char func1(const char& c)
int main()
{
assert(func1((char)10)==10);
-
+
int i(20);
assert(func1((char)i)==20);
diff --git a/regression/cpp-from-CVS/Implicit_Conversion4/main.cpp b/regression/cpp-from-CVS/Implicit_Conversion4/main.cpp
index 9a8513de779..3c97123c83e 100644
--- a/regression/cpp-from-CVS/Implicit_Conversion4/main.cpp
+++ b/regression/cpp-from-CVS/Implicit_Conversion4/main.cpp
@@ -78,5 +78,5 @@ int main()
const C& r6 = c2;
assert(func1(r6)==50);
assert(func3(r6)==50);
-
+
}
diff --git a/regression/cpp-from-CVS/Implicit_Conversion8/main.cpp b/regression/cpp-from-CVS/Implicit_Conversion8/main.cpp
index a188ed2af0b..2d8bed0470f 100644
--- a/regression/cpp-from-CVS/Implicit_Conversion8/main.cpp
+++ b/regression/cpp-from-CVS/Implicit_Conversion8/main.cpp
@@ -37,4 +37,3 @@ int main()
b_not(b1,b2);
assert(b1.b != b2.b);
}
-
diff --git a/regression/cpp-from-CVS/Implicit_Conversion9/main.cpp b/regression/cpp-from-CVS/Implicit_Conversion9/main.cpp
index f826ddbc605..39dc405df5b 100644
--- a/regression/cpp-from-CVS/Implicit_Conversion9/main.cpp
+++ b/regression/cpp-from-CVS/Implicit_Conversion9/main.cpp
@@ -13,4 +13,3 @@ int main()
{
return 0;
}
-
diff --git a/regression/cpp-from-CVS/Inheritance1/main.cpp b/regression/cpp-from-CVS/Inheritance1/main.cpp
index 6e8b77c4d3e..f7c4cccd9c5 100644
--- a/regression/cpp-from-CVS/Inheritance1/main.cpp
+++ b/regression/cpp-from-CVS/Inheritance1/main.cpp
@@ -2,7 +2,7 @@ class b
{
public:
int x;
-
+
void f();
};
diff --git a/regression/cpp-from-CVS/Inheritance2/main.cpp b/regression/cpp-from-CVS/Inheritance2/main.cpp
index bd6c4ab5865..c75d001b75e 100644
--- a/regression/cpp-from-CVS/Inheritance2/main.cpp
+++ b/regression/cpp-from-CVS/Inheritance2/main.cpp
@@ -26,9 +26,9 @@ int main()
B b;
b.i = 0;
b.B::i++;
-
+
b.A::i = 10;
-
+
b.f();
assert(b.i == 2);
assert(b.A::i == 11);
diff --git a/regression/cpp-from-CVS/Linking1/main.cpp b/regression/cpp-from-CVS/Linking1/main.cpp
index 0d70f66761e..6cd912dc4ab 100644
--- a/regression/cpp-from-CVS/Linking1/main.cpp
+++ b/regression/cpp-from-CVS/Linking1/main.cpp
@@ -5,9 +5,9 @@ extern int i;
int main()
{
assert(i==1);
-
+
T t;
t.f();
-
+
assert(i==2);
}
diff --git a/regression/cpp-from-CVS/Linking1/module.h b/regression/cpp-from-CVS/Linking1/module.h
index dd1235418b2..594df2edcb7 100644
--- a/regression/cpp-from-CVS/Linking1/module.h
+++ b/regression/cpp-from-CVS/Linking1/module.h
@@ -3,4 +3,3 @@ class T
public:
void f();
};
-
diff --git a/regression/cpp-from-CVS/Linking1/test.desc b/regression/cpp-from-CVS/Linking1/test.desc
index d7a65ef7f34..2449051ba1d 100644
--- a/regression/cpp-from-CVS/Linking1/test.desc
+++ b/regression/cpp-from-CVS/Linking1/test.desc
@@ -1,6 +1,6 @@
CORE
main.cpp
-module.cpp
+module.cpp
^EXIT=0$
^SIGNAL=0$
^VERIFICATION SUCCESSFUL$
diff --git a/regression/cpp-from-CVS/Linking2/test_link1.cpp b/regression/cpp-from-CVS/Linking2/test_link1.cpp
index 12c4ff5dcb5..0d45e4fa116 100644
--- a/regression/cpp-from-CVS/Linking2/test_link1.cpp
+++ b/regression/cpp-from-CVS/Linking2/test_link1.cpp
@@ -6,7 +6,7 @@ extern int f(void);
int main()
{
int z;
-
+
x=z;
assert(f()==z);
}
diff --git a/regression/cpp-from-CVS/Lvalue1/main.cpp b/regression/cpp-from-CVS/Lvalue1/main.cpp
index a6ed23d71e6..5c2dbcc2c30 100644
--- a/regression/cpp-from-CVS/Lvalue1/main.cpp
+++ b/regression/cpp-from-CVS/Lvalue1/main.cpp
@@ -20,7 +20,7 @@ int main()
//
// It's not clear what the best is. Should this code be rejected?
// Is the compatibility with gcc more important?
-
+
assert(factory().get_i() == 0);
-
+
}
diff --git a/regression/cpp-from-CVS/Multiple_Inheritance2/main.cpp b/regression/cpp-from-CVS/Multiple_Inheritance2/main.cpp
index ab83d1d60e9..cca4f3ce8da 100644
--- a/regression/cpp-from-CVS/Multiple_Inheritance2/main.cpp
+++ b/regression/cpp-from-CVS/Multiple_Inheritance2/main.cpp
@@ -12,4 +12,3 @@ int main()
d.i = 10;
assert(d.i == 10);
}
-
diff --git a/regression/cpp-from-CVS/Overloading_Functions2/main.cpp b/regression/cpp-from-CVS/Overloading_Functions2/main.cpp
index 9441d29ef93..2fec1d62fc3 100644
--- a/regression/cpp-from-CVS/Overloading_Functions2/main.cpp
+++ b/regression/cpp-from-CVS/Overloading_Functions2/main.cpp
@@ -15,4 +15,3 @@ int main()
C c;
assert(f1(c)==false);
}
-
diff --git a/regression/cpp-from-CVS/Overloading_Operators1/main.cpp b/regression/cpp-from-CVS/Overloading_Operators1/main.cpp
index 8f3676a9acb..1dfeeebe1f6 100644
--- a/regression/cpp-from-CVS/Overloading_Operators1/main.cpp
+++ b/regression/cpp-from-CVS/Overloading_Operators1/main.cpp
@@ -18,10 +18,10 @@ int main()
T x;
int temp;
-
+
temp=x+2;
assert(temp==2);
-
+
temp=x-3;
assert(temp==-3);
}
diff --git a/regression/cpp-from-CVS/Overloading_Operators11/main.cpp b/regression/cpp-from-CVS/Overloading_Operators11/main.cpp
index f8994077ad6..c8ab83dbe71 100644
--- a/regression/cpp-from-CVS/Overloading_Operators11/main.cpp
+++ b/regression/cpp-from-CVS/Overloading_Operators11/main.cpp
@@ -5,7 +5,7 @@ struct C {
struct A {
C c1;
-
+
A():c1(false){}
const C* operator->() const {return &c1;}
};
diff --git a/regression/cpp-from-CVS/Overloading_Operators16/main.cpp b/regression/cpp-from-CVS/Overloading_Operators16/main.cpp
index e909c927fe8..1ef26c04484 100644
--- a/regression/cpp-from-CVS/Overloading_Operators16/main.cpp
+++ b/regression/cpp-from-CVS/Overloading_Operators16/main.cpp
@@ -8,7 +8,7 @@ class module_name
operator unsigned int();
operator bool();
};
-
+
void f (module_name name) {
(const char*) name;
name .operator const char *();
diff --git a/regression/cpp-from-CVS/Overloading_Operators2/main.cpp b/regression/cpp-from-CVS/Overloading_Operators2/main.cpp
index 829e0c620a4..9e58e301bd0 100644
--- a/regression/cpp-from-CVS/Overloading_Operators2/main.cpp
+++ b/regression/cpp-from-CVS/Overloading_Operators2/main.cpp
@@ -7,19 +7,19 @@ class C
{
return base+x;
}
-
+
int operator [] (class Z &z)
{
return 0;
}
-
+
int base;
};
int main()
{
C c(1);
-
+
assert(c[0]==1);
assert(c[2]==3);
}
diff --git a/regression/cpp-from-CVS/Overloading_Operators3/main.cpp b/regression/cpp-from-CVS/Overloading_Operators3/main.cpp
index bf920e2e82d..9cbf9d66274 100644
--- a/regression/cpp-from-CVS/Overloading_Operators3/main.cpp
+++ b/regression/cpp-from-CVS/Overloading_Operators3/main.cpp
@@ -4,4 +4,3 @@ int operator[](int *p, int i);
int main()
{
}
-
diff --git a/regression/cpp-from-CVS/Overloading_Operators4/main.cpp b/regression/cpp-from-CVS/Overloading_Operators4/main.cpp
index c77d4234a4d..74851a8b218 100644
--- a/regression/cpp-from-CVS/Overloading_Operators4/main.cpp
+++ b/regression/cpp-from-CVS/Overloading_Operators4/main.cpp
@@ -6,7 +6,7 @@ struct X
int i;
int j;
-
+
bool operator == (const struct X &o)
{
return i==o.i &&
diff --git a/regression/cpp-from-CVS/Overloading_Operators5/main.cpp b/regression/cpp-from-CVS/Overloading_Operators5/main.cpp
index 241c4c289ae..5110a7aef0b 100644
--- a/regression/cpp-from-CVS/Overloading_Operators5/main.cpp
+++ b/regression/cpp-from-CVS/Overloading_Operators5/main.cpp
@@ -8,7 +8,7 @@ struct X
int i;
int j;
-
+
X &operator= (const struct X &r);
};
@@ -23,9 +23,9 @@ void doit()
X a, b;
g=1;
-
+
a=b;
-
+
assert(g==2);
}
diff --git a/regression/cpp-from-CVS/Overloading_Operators6/main.cpp b/regression/cpp-from-CVS/Overloading_Operators6/main.cpp
index c647267cf28..cd79b851225 100644
--- a/regression/cpp-from-CVS/Overloading_Operators6/main.cpp
+++ b/regression/cpp-from-CVS/Overloading_Operators6/main.cpp
@@ -2,7 +2,7 @@ struct A
{
int i;
A():i(1){}
-
+
int& operator* () {return i;}
int operator+ (int j){return i+j;}
int operator~ (){return ~i;}
@@ -18,7 +18,7 @@ struct A
assert(a[2] == *a);
assert(a == 1);
}
-
+
void func2()
{
A a;
@@ -28,7 +28,7 @@ struct A
assert((*this)[2] == *(*this));
assert((*this) == 1);
}
-
+
};
diff --git a/regression/cpp-from-CVS/Overloading_Operators9/main.cpp b/regression/cpp-from-CVS/Overloading_Operators9/main.cpp
index c37c9baed18..2ad8eac075d 100644
--- a/regression/cpp-from-CVS/Overloading_Operators9/main.cpp
+++ b/regression/cpp-from-CVS/Overloading_Operators9/main.cpp
@@ -15,7 +15,7 @@ struct B
struct A
{
- B b;
+ B b;
B& operator->()
{
return b;
diff --git a/regression/cpp-from-CVS/Pointer_Conversion3/main.cpp b/regression/cpp-from-CVS/Pointer_Conversion3/main.cpp
index fd134cb0cb2..7a39cde597d 100644
--- a/regression/cpp-from-CVS/Pointer_Conversion3/main.cpp
+++ b/regression/cpp-from-CVS/Pointer_Conversion3/main.cpp
@@ -1,6 +1,6 @@
struct A {
int i;
-
+
};
struct B
diff --git a/regression/cpp-from-CVS/Pointer_To_Member5/main.cpp b/regression/cpp-from-CVS/Pointer_To_Member5/main.cpp
index 6ed723b6761..7aa906ae1de 100644
--- a/regression/cpp-from-CVS/Pointer_To_Member5/main.cpp
+++ b/regression/cpp-from-CVS/Pointer_To_Member5/main.cpp
@@ -10,7 +10,7 @@ struct B
A* pa;
int (A::* pmethod)();
B(A* pa, int (A::* pmethod)()):pa(pa),pmethod(pmethod){}
- int eval(){return (pa->*pmethod)();}
+ int eval(){return (pa->*pmethod)();}
};
int main()
diff --git a/regression/cpp-from-CVS/Protection1/main.cpp b/regression/cpp-from-CVS/Protection1/main.cpp
index 405df7f7363..cdecf5b6c59 100644
--- a/regression/cpp-from-CVS/Protection1/main.cpp
+++ b/regression/cpp-from-CVS/Protection1/main.cpp
@@ -9,4 +9,3 @@ class A
class B: A
{
};
-
diff --git a/regression/cpp-from-CVS/Protection3/main.cpp b/regression/cpp-from-CVS/Protection3/main.cpp
index 58021fcd369..4938a6831ca 100644
--- a/regression/cpp-from-CVS/Protection3/main.cpp
+++ b/regression/cpp-from-CVS/Protection3/main.cpp
@@ -1,7 +1,7 @@
class A
{
int i;
-
+
public:
class B
{
diff --git a/regression/cpp-from-CVS/Protection4/main.cpp b/regression/cpp-from-CVS/Protection4/main.cpp
index 009f17dc3eb..08bf0c0a00a 100644
--- a/regression/cpp-from-CVS/Protection4/main.cpp
+++ b/regression/cpp-from-CVS/Protection4/main.cpp
@@ -10,4 +10,3 @@ class B: public A
void set(int i){this->i = i;}
int get() const {return i;}
};
-
diff --git a/regression/cpp-from-CVS/Protection5/main.cpp b/regression/cpp-from-CVS/Protection5/main.cpp
index 5546308060f..0922af3797d 100644
--- a/regression/cpp-from-CVS/Protection5/main.cpp
+++ b/regression/cpp-from-CVS/Protection5/main.cpp
@@ -6,7 +6,7 @@ class A
class B: A
{
-
+
};
void set_one(A& a)
diff --git a/regression/cpp-from-CVS/Protection6/main.cpp b/regression/cpp-from-CVS/Protection6/main.cpp
index b350c734a79..ae2a646f168 100644
--- a/regression/cpp-from-CVS/Protection6/main.cpp
+++ b/regression/cpp-from-CVS/Protection6/main.cpp
@@ -6,4 +6,3 @@ int main()
{
A::func();
}
-
diff --git a/regression/cpp-from-CVS/Protection7/main.cpp b/regression/cpp-from-CVS/Protection7/main.cpp
index ba752641a13..a96487a2ed3 100644
--- a/regression/cpp-from-CVS/Protection7/main.cpp
+++ b/regression/cpp-from-CVS/Protection7/main.cpp
@@ -4,12 +4,12 @@ struct A
A(){};
protected:
A(int i):i(i){};
-
+
};
struct B: A
{
- B():A(0){}
+ B():A(0){}
};
B b;
diff --git a/regression/cpp-from-CVS/Protection8/main.cpp b/regression/cpp-from-CVS/Protection8/main.cpp
index c4765594553..6db34b0320e 100644
--- a/regression/cpp-from-CVS/Protection8/main.cpp
+++ b/regression/cpp-from-CVS/Protection8/main.cpp
@@ -5,7 +5,7 @@ struct A
int get_i(){return i;}
A(int i):i(i){};
-
+
};
struct B: A
diff --git a/regression/cpp-from-CVS/Qualifier1/main.cpp b/regression/cpp-from-CVS/Qualifier1/main.cpp
index 29b6c68fb7f..674220824a9 100644
--- a/regression/cpp-from-CVS/Qualifier1/main.cpp
+++ b/regression/cpp-from-CVS/Qualifier1/main.cpp
@@ -7,6 +7,6 @@ struct B
void f()
{
A::a = 1; // ill-formed
-
+
}
};
diff --git a/regression/cpp-from-CVS/Qualifier2/main.cpp b/regression/cpp-from-CVS/Qualifier2/main.cpp
index 3da0df8490e..1fff2ce8662 100644
--- a/regression/cpp-from-CVS/Qualifier2/main.cpp
+++ b/regression/cpp-from-CVS/Qualifier2/main.cpp
@@ -20,5 +20,5 @@ int main()
assert(B::i == 2);
obj.A::i++;
assert(A::i == 1);
-
+
}
diff --git a/regression/cpp-from-CVS/Reference1/main.cpp b/regression/cpp-from-CVS/Reference1/main.cpp
index ba9f94907ee..b14812ada8f 100644
--- a/regression/cpp-from-CVS/Reference1/main.cpp
+++ b/regression/cpp-from-CVS/Reference1/main.cpp
@@ -8,15 +8,15 @@ void function(int &ref)
int main()
{
int &r=g;
-
+
r=1;
-
+
assert(g==1);
-
+
function(r);
-
+
assert(g==2);
-
+
// ?: does produce an l-value, apparently
int &s=g?r:g;
}
diff --git a/regression/cpp-from-CVS/Reference2/main.cpp b/regression/cpp-from-CVS/Reference2/main.cpp
index cbdb2304f78..69c74c1f18e 100644
--- a/regression/cpp-from-CVS/Reference2/main.cpp
+++ b/regression/cpp-from-CVS/Reference2/main.cpp
@@ -15,12 +15,12 @@ int main()
function()=2;
assert(g==2);
- {
+ {
int *p=&g;
int &r=*p;
assert(r==2);
}
-
+
{
X x;
X *p=&x;
diff --git a/regression/cpp-from-CVS/Reference6/main.cpp b/regression/cpp-from-CVS/Reference6/main.cpp
index 145b160e0b3..cb407b9bb13 100644
--- a/regression/cpp-from-CVS/Reference6/main.cpp
+++ b/regression/cpp-from-CVS/Reference6/main.cpp
@@ -1,8 +1,8 @@
class X
{
-public:
+public:
int x;
-
+
X():x(0)
{
}
@@ -20,6 +20,6 @@ int main()
y.x=10;
r()=y;
-
+
assert(g.x==10);
}
diff --git a/regression/cpp-from-CVS/Resolver5/main.cpp b/regression/cpp-from-CVS/Resolver5/main.cpp
index cb005bf98a4..f0584280047 100644
--- a/regression/cpp-from-CVS/Resolver5/main.cpp
+++ b/regression/cpp-from-CVS/Resolver5/main.cpp
@@ -13,6 +13,6 @@ int main()
obj1.i = 200;
assert(func(obj1) == 200); // Argument-dependant name lookup
-
+
return 0;
}
diff --git a/regression/cpp-from-CVS/Resolver8/main.cpp b/regression/cpp-from-CVS/Resolver8/main.cpp
index 7b2c7084afb..bff2111885a 100644
--- a/regression/cpp-from-CVS/Resolver8/main.cpp
+++ b/regression/cpp-from-CVS/Resolver8/main.cpp
@@ -11,5 +11,3 @@ int main()
{
assert(func(1));
}
-
-
diff --git a/regression/cpp-from-CVS/STL1/main.cpp b/regression/cpp-from-CVS/STL1/main.cpp
index eb0b426f7e5..065d7d250e2 100644
--- a/regression/cpp-from-CVS/STL1/main.cpp
+++ b/regression/cpp-from-CVS/STL1/main.cpp
@@ -19,24 +19,24 @@ void test_vector()
assert(*int_vector.begin()==1);
it=int_vector.begin();
assert(*it==1);
-
- int_vector.pop_back();
- int_vector.pop_back();
+
+ int_vector.pop_back();
+ int_vector.pop_back();
assert(int_vector.empty());
}
void test_list()
{
std::list int_list;
-
+
int_list.push_back(1);
int_list.push_back(2);
assert(int_list.front()==1);
assert(int_list.back()==2);
assert(*int_list.begin()==1);
-
- int_list.pop_back();
- int_list.pop_back();
+
+ int_list.pop_back();
+ int_list.pop_back();
assert(int_list.empty());
}
@@ -53,7 +53,7 @@ int main()
case 0: test_vector(); break;
case 1: test_list(); break;
case 2: test_set(); break;
-
+
default:;
}
}
diff --git a/regression/cpp-from-CVS/STL2/main.cpp b/regression/cpp-from-CVS/STL2/main.cpp
index 99dfd37f500..e382495df27 100644
--- a/regression/cpp-from-CVS/STL2/main.cpp
+++ b/regression/cpp-from-CVS/STL2/main.cpp
@@ -13,7 +13,7 @@ int main()
v.push_back(nondet_int());
vector::iterator it;
-
+
for(it = v.begin(); it != v.end(); it++)
if(*it == 10) v.erase(it);
}
diff --git a/regression/cpp-from-CVS/Static_Member1/main.cpp b/regression/cpp-from-CVS/Static_Member1/main.cpp
index 28cc8e6c020..782d57862d7 100644
--- a/regression/cpp-from-CVS/Static_Member1/main.cpp
+++ b/regression/cpp-from-CVS/Static_Member1/main.cpp
@@ -4,7 +4,7 @@ class B
static int A1;
static int A2;
static const int A3=20;
-
+
// the const ones are good as array size
int table[A3];
};
diff --git a/regression/cpp-from-CVS/Templates15/main.cpp b/regression/cpp-from-CVS/Templates15/main.cpp
index 3df15d7281e..6e925db41b7 100644
--- a/regression/cpp-from-CVS/Templates15/main.cpp
+++ b/regression/cpp-from-CVS/Templates15/main.cpp
@@ -5,4 +5,3 @@ struct A {
template
struct A;
-
diff --git a/regression/cpp-from-CVS/Templates3/main.cpp b/regression/cpp-from-CVS/Templates3/main.cpp
index 5e1ccb4c1e1..13250692098 100644
--- a/regression/cpp-from-CVS/Templates3/main.cpp
+++ b/regression/cpp-from-CVS/Templates3/main.cpp
@@ -3,7 +3,7 @@ class int_array
{
public:
int array[size];
-
+
int read(unsigned int x)
{
assert(x(3));
}
-
-
+
+
bool t;
T1():t(false) { }
};
@@ -29,7 +29,7 @@ class T1
int main()
{
T1 x;
-
+
x.g();
assert(1==x.f(1));
assert(true==x.f(true));
diff --git a/regression/cpp-from-CVS/Templates6/main.cpp b/regression/cpp-from-CVS/Templates6/main.cpp
index 383b562f6cf..48169e50a7f 100644
--- a/regression/cpp-from-CVS/Templates6/main.cpp
+++ b/regression/cpp-from-CVS/Templates6/main.cpp
@@ -34,7 +34,7 @@ int main()
assert(g==20);
{
- D d;
+ D d;
assert(g==10);
}
diff --git a/regression/cpp-from-CVS/Templates8/main.cpp b/regression/cpp-from-CVS/Templates8/main.cpp
index c1208e17b47..69d92bb3a45 100644
--- a/regression/cpp-from-CVS/Templates8/main.cpp
+++ b/regression/cpp-from-CVS/Templates8/main.cpp
@@ -9,5 +9,5 @@ struct A
int main()
{
int v = A::some_function(10);
- assert(v==10);
+ assert(v==10);
}
diff --git a/regression/cpp-from-CVS/Templates9/main.cpp b/regression/cpp-from-CVS/Templates9/main.cpp
index 801956cce23..8fd52766b70 100644
--- a/regression/cpp-from-CVS/Templates9/main.cpp
+++ b/regression/cpp-from-CVS/Templates9/main.cpp
@@ -33,7 +33,7 @@ int main()
{
A obj0; // general one
assert(obj0.a == 0);
-
+
A obj1; // specialized
assert(obj1.a == 1);
diff --git a/regression/cpp-from-CVS/Temporary2/main.cpp b/regression/cpp-from-CVS/Temporary2/main.cpp
index bd0cc8d97a9..ffeee9869c9 100644
--- a/regression/cpp-from-CVS/Temporary2/main.cpp
+++ b/regression/cpp-from-CVS/Temporary2/main.cpp
@@ -8,7 +8,7 @@ class X
X(int i):z(i)
{
}
-
+
int z;
};
diff --git a/regression/cpp-from-CVS/Typecast1/main.cpp b/regression/cpp-from-CVS/Typecast1/main.cpp
index e4da7636758..f510200b81e 100644
--- a/regression/cpp-from-CVS/Typecast1/main.cpp
+++ b/regression/cpp-from-CVS/Typecast1/main.cpp
@@ -1,6 +1,6 @@
int main()
{
const int *p;
-
+
p=(int *)0;
}
diff --git a/regression/cpp-from-CVS/Vector1/main.cpp b/regression/cpp-from-CVS/Vector1/main.cpp
index ea46937b9d5..57a16592dd9 100644
--- a/regression/cpp-from-CVS/Vector1/main.cpp
+++ b/regression/cpp-from-CVS/Vector1/main.cpp
@@ -5,7 +5,7 @@ using namespace std;
void sort(vector& c)
{
if (c.begin() == c.end()) return;
-
+
for(int i=0; i < c.size(); i++)
{
for(vector::iterator it = c.begin();
@@ -17,7 +17,7 @@ void sort(vector& c)
if(it_inc == c.end())
break;
-
+
if(it_inc < it)
{
vector::value_type tmp = * it;
@@ -43,7 +43,7 @@ int main()
{
vector::iterator it_inc = it;
it_inc++;
-
+
if(it_inc == vec.end()) break;
__CPROVER_assert(*it <= *it_inc, "sorting error");
}
diff --git a/regression/cpp-from-CVS/for1/main.cpp b/regression/cpp-from-CVS/for1/main.cpp
index b458495089e..4db76dd1179 100644
--- a/regression/cpp-from-CVS/for1/main.cpp
+++ b/regression/cpp-from-CVS/for1/main.cpp
@@ -5,5 +5,5 @@ int main()
{
assert(i<10);
}
-
+
}
diff --git a/regression/cpp-from-CVS/new1/main.cpp b/regression/cpp-from-CVS/new1/main.cpp
index e8baa923357..e0c73bb2a2a 100644
--- a/regression/cpp-from-CVS/new1/main.cpp
+++ b/regression/cpp-from-CVS/new1/main.cpp
@@ -1,22 +1,22 @@
void single_object()
{
int *p;
-
+
p=new int(2);
assert(*p==2);
-
+
delete p;
}
void array()
{
int *q;
-
+
q=new int[100];
-
+
q[50]=1;
-
+
// _must_ use delete[] here
delete[] q;
}
diff --git a/regression/cpp-from-CVS/reinterpret_cast1/test.desc b/regression/cpp-from-CVS/reinterpret_cast1/test.desc
index 8fd158f00f4..5249662e6aa 100644
--- a/regression/cpp-from-CVS/reinterpret_cast1/test.desc
+++ b/regression/cpp-from-CVS/reinterpret_cast1/test.desc
@@ -1,6 +1,6 @@
CORE
main.cpp
---little-endian
+--little-endian
^EXIT=0$
^SIGNAL=0$
^VERIFICATION SUCCESSFUL$
diff --git a/regression/cpp-from-CVS/reinterpret_cast2/main.cpp b/regression/cpp-from-CVS/reinterpret_cast2/main.cpp
index ee85ab4e50d..bfe183eeaab 100644
--- a/regression/cpp-from-CVS/reinterpret_cast2/main.cpp
+++ b/regression/cpp-from-CVS/reinterpret_cast2/main.cpp
@@ -1,15 +1,15 @@
struct A {
int* pi;
-
+
};
int main()
{
A a;
const A* cpa = &a;
-
+
int* ptr = reinterpret_cast(cpa->pi);
return 0;
-
+
}
diff --git a/regression/cpp-from-CVS/static_cast1/main.cpp b/regression/cpp-from-CVS/static_cast1/main.cpp
index 08ce2224608..0e06d85ac00 100644
--- a/regression/cpp-from-CVS/static_cast1/main.cpp
+++ b/regression/cpp-from-CVS/static_cast1/main.cpp
@@ -4,6 +4,6 @@ int main()
double xd=2.3;
int xi=static_cast(xd);
-
+
assert(xi==2);
}
diff --git a/regression/cpp-from-CVS/struct1/main.cpp b/regression/cpp-from-CVS/struct1/main.cpp
index 6cf4c695aea..780ee20fd4c 100644
--- a/regression/cpp-from-CVS/struct1/main.cpp
+++ b/regression/cpp-from-CVS/struct1/main.cpp
@@ -33,7 +33,7 @@ void f()
int main()
{
int z;
-
+
z=sizeof(struct AA);
}
diff --git a/regression/cpp-from-CVS/typecast_ambiguity3/main.cpp b/regression/cpp-from-CVS/typecast_ambiguity3/main.cpp
index 5359e2fb494..ad03e797cf4 100644
--- a/regression/cpp-from-CVS/typecast_ambiguity3/main.cpp
+++ b/regression/cpp-from-CVS/typecast_ambiguity3/main.cpp
@@ -6,7 +6,7 @@ int main()
// this is to parse as (bool(i)) & 0x1fff
// and not as bool(i&0x1fff)
-
+
assert(sizeof((bool)(i) & 0x1fff)==sizeof(int));
return 0;
diff --git a/regression/cpp-from-CVS/typename1/main.cpp b/regression/cpp-from-CVS/typename1/main.cpp
index 8afb43ca5a4..fe91f31bbc6 100644
--- a/regression/cpp-from-CVS/typename1/main.cpp
+++ b/regression/cpp-from-CVS/typename1/main.cpp
@@ -8,17 +8,17 @@ template class Y
{
public:
typename X::T g;
-
+
void f()
{
typename X::T l;
-
+
}
};
int main()
{
Y o;
-
+
o.g=1;
}
diff --git a/regression/cpp-from-CVS/typename2/main.cpp b/regression/cpp-from-CVS/typename2/main.cpp
index f826ddbc605..39dc405df5b 100644
--- a/regression/cpp-from-CVS/typename2/main.cpp
+++ b/regression/cpp-from-CVS/typename2/main.cpp
@@ -13,4 +13,3 @@ int main()
{
return 0;
}
-
diff --git a/regression/cpp-from-CVS/union1/main.cpp b/regression/cpp-from-CVS/union1/main.cpp
index f4c4ad9513a..f112a5e8653 100644
--- a/regression/cpp-from-CVS/union1/main.cpp
+++ b/regression/cpp-from-CVS/union1/main.cpp
@@ -6,7 +6,7 @@ int main()
union
{
int a;
- char b;
+ char b;
};
a = 'z';
diff --git a/regression/cpp-from-CVS/virtual1/main.cpp b/regression/cpp-from-CVS/virtual1/main.cpp
index e3f77dedd47..540af426a25 100644
--- a/regression/cpp-from-CVS/virtual1/main.cpp
+++ b/regression/cpp-from-CVS/virtual1/main.cpp
@@ -7,9 +7,9 @@ class A
{
g=1;
}
-
+
int mA;
-
+
A();
};
@@ -30,7 +30,7 @@ class B: public A
g=2;
mB=3;
}
-
+
int mB;
};
@@ -38,11 +38,11 @@ int main()
{
B b;
A *p;
-
+
p=&b;
-
+
p->f();
-
+
assert(g==2);
assert(b.mB==3);
}
diff --git a/regression/cpp-from-CVS/virtual13/main.cpp b/regression/cpp-from-CVS/virtual13/main.cpp
index a0a5e841b29..8484831ef0c 100644
--- a/regression/cpp-from-CVS/virtual13/main.cpp
+++ b/regression/cpp-from-CVS/virtual13/main.cpp
@@ -10,4 +10,3 @@ int main(int argc, char* argv[])
assert(((A&)c2).f() == ((B&)c2).f());
return 0;
}
-
diff --git a/regression/cpp-from-CVS/virtual2/main.cpp b/regression/cpp-from-CVS/virtual2/main.cpp
index 679085f3769..9ef8f7de453 100644
--- a/regression/cpp-from-CVS/virtual2/main.cpp
+++ b/regression/cpp-from-CVS/virtual2/main.cpp
@@ -4,7 +4,7 @@ class X
{
public:
virtual int f();
-
+
int m;
};
@@ -21,8 +21,8 @@ class Y:public X
int main()
{
Y y;
-
+
y.f();
-
+
assert(g==10);
}
diff --git a/regression/cpp/Address_of_Method2/main.cpp b/regression/cpp/Address_of_Method2/main.cpp
index 1e3f0f2636f..aed7a46d386 100644
--- a/regression/cpp/Address_of_Method2/main.cpp
+++ b/regression/cpp/Address_of_Method2/main.cpp
@@ -11,7 +11,7 @@ int main()
{
x a;
void *p;
-
+
// this should fail
p=a.f;
}
diff --git a/regression/cpp/Address_of_Method3/main.cpp b/regression/cpp/Address_of_Method3/main.cpp
index c1bf6e2cb65..ffad3b91fb7 100644
--- a/regression/cpp/Address_of_Method3/main.cpp
+++ b/regression/cpp/Address_of_Method3/main.cpp
@@ -2,7 +2,7 @@ struct x
{
void f();
void f(int);
-
+
};
void x::f()
diff --git a/regression/cpp/Bit_fields1/main.cpp b/regression/cpp/Bit_fields1/main.cpp
index 888d0247c54..435da18867c 100644
--- a/regression/cpp/Bit_fields1/main.cpp
+++ b/regression/cpp/Bit_fields1/main.cpp
@@ -9,16 +9,16 @@ struct some_struct {
// an anonymous bitfield
signed int :2;
-
+
// with typedef
INT x:1;
-
+
// made of sizeof
unsigned int abc: sizeof(int);
// enums are integers!
some_enum_type enum_field1 : 5;
-
+
// and good as field sizes
some_enum_type enum_field2 : E1;
} X;
diff --git a/regression/cpp/Friend2/main.cpp b/regression/cpp/Friend2/main.cpp
index a03a7eb7806..ceeb4be689c 100644
--- a/regression/cpp/Friend2/main.cpp
+++ b/regression/cpp/Friend2/main.cpp
@@ -8,7 +8,7 @@ class X
X aa;
aa.x=1;
}
-
+
public:
X() { }
};
diff --git a/regression/cpp/Function_Overloading1/main.cpp b/regression/cpp/Function_Overloading1/main.cpp
index 4be1d167dd6..de23c697a2c 100644
--- a/regression/cpp/Function_Overloading1/main.cpp
+++ b/regression/cpp/Function_Overloading1/main.cpp
@@ -9,7 +9,7 @@ namespace std {
extern "C" {
int abs(int) __attribute__((nothrow)) ;
}
- extern "C++" {
+ extern "C++" {
inline long abs(long n) __attribute__((nothrow));
inline long long abs(long long n) __attribute__((nothrow));
}
@@ -25,4 +25,3 @@ int main(int argc, char* argv[])
return 1;
return 0;
}
-
diff --git a/regression/cpp/Function_Overloading2/main.cpp b/regression/cpp/Function_Overloading2/main.cpp
index b68fb37f5f7..06204bf75ed 100644
--- a/regression/cpp/Function_Overloading2/main.cpp
+++ b/regression/cpp/Function_Overloading2/main.cpp
@@ -29,4 +29,3 @@ int main(int argc, char* argv[])
if(fabs(x) >= 50)
return 0;
}
-
diff --git a/regression/cpp/Method_qualifier1/main.cpp b/regression/cpp/Method_qualifier1/main.cpp
index 0bde6744ea8..33479b6ee6d 100644
--- a/regression/cpp/Method_qualifier1/main.cpp
+++ b/regression/cpp/Method_qualifier1/main.cpp
@@ -15,7 +15,7 @@ int main()
const my_class &zz_const=zz;
volatile my_class &zz_volatile=zz;
const volatile my_class &zz_const_volatile=zz;
-
+
assert(zz.my_method()==1);
assert(zz_const.my_method()==2);
assert(zz_volatile.my_method()==3);
diff --git a/regression/cpp/ModeC2/main.cpp b/regression/cpp/ModeC2/main.cpp
index e2ef4a07da3..e7b0ee799f8 100644
--- a/regression/cpp/ModeC2/main.cpp
+++ b/regression/cpp/ModeC2/main.cpp
@@ -22,7 +22,7 @@ namespace SOME
extern "C" void somef(char)
{
}
-
+
extern "C++" void somef(int)
{
}
diff --git a/regression/cpp/Pointer_Conversion2/main.cpp b/regression/cpp/Pointer_Conversion2/main.cpp
index e988d4b9d46..3b10b78a6d5 100644
--- a/regression/cpp/Pointer_Conversion2/main.cpp
+++ b/regression/cpp/Pointer_Conversion2/main.cpp
@@ -6,7 +6,7 @@ int main()
int some_struct::* ptr2; // this is a member pointer
int (some_struct::*ptr3)(int); // this is a pointer to a method
int (*ptr4)(int); // function pointer
-
+
// The number '0' can be converted to any pointer
ptr1=0;
ptr2=0;
diff --git a/regression/cpp/Qualifiers_In_Template_Specialisation1/main.cpp b/regression/cpp/Qualifiers_In_Template_Specialisation1/main.cpp
index 25cf6b9bd4e..20af2cb6769 100644
--- a/regression/cpp/Qualifiers_In_Template_Specialisation1/main.cpp
+++ b/regression/cpp/Qualifiers_In_Template_Specialisation1/main.cpp
@@ -13,4 +13,3 @@ int main(void) {
return 0;
}
-
diff --git a/regression/cpp/Resolver1/main.cpp b/regression/cpp/Resolver1/main.cpp
index 91620c92389..8624a0cd366 100644
--- a/regression/cpp/Resolver1/main.cpp
+++ b/regression/cpp/Resolver1/main.cpp
@@ -4,9 +4,9 @@ class T
T()
{
}
-
+
typedef int my_type;
-
+
void f()
{
T::my_type x;
diff --git a/regression/cpp/Resolver12/main.cpp b/regression/cpp/Resolver12/main.cpp
index 8f3c5bebff0..a21acbceadc 100644
--- a/regression/cpp/Resolver12/main.cpp
+++ b/regression/cpp/Resolver12/main.cpp
@@ -5,4 +5,3 @@ int main()
A a;
a.x; // bad
}
-
diff --git a/regression/cpp/Resolver4/main.cpp b/regression/cpp/Resolver4/main.cpp
index 66b3221df2f..2e862e9a04b 100644
--- a/regression/cpp/Resolver4/main.cpp
+++ b/regression/cpp/Resolver4/main.cpp
@@ -7,4 +7,3 @@ int main()
{
A::f(0);
}
-
diff --git a/regression/cpp/Scope1/main.cpp b/regression/cpp/Scope1/main.cpp
index 3d022c0e3a1..6c55979eca1 100644
--- a/regression/cpp/Scope1/main.cpp
+++ b/regression/cpp/Scope1/main.cpp
@@ -7,7 +7,7 @@ class A
public:
typedef int tt;
};
-
+
class C
{
public:
diff --git a/regression/cpp/Template_Instantiation2/main.cpp b/regression/cpp/Template_Instantiation2/main.cpp
index 5fead23248b..244d242732e 100644
--- a/regression/cpp/Template_Instantiation2/main.cpp
+++ b/regression/cpp/Template_Instantiation2/main.cpp
@@ -6,5 +6,3 @@ public :
template<>
int c::f00(const char*);
-
-
diff --git a/regression/cpp/Template_Instantiation3/main.cpp b/regression/cpp/Template_Instantiation3/main.cpp
index 066719e1187..0e01d2f2adf 100644
--- a/regression/cpp/Template_Instantiation3/main.cpp
+++ b/regression/cpp/Template_Instantiation3/main.cpp
@@ -18,7 +18,7 @@ struct sc_ufixed
const sc_ufixed<1, 1> one(1U);
int main (void) {
- //const sc_ufixed<1, 1> one(1U);
+ //const sc_ufixed<1, 1> one(1U);
one.multiply(one);
return 0;
}
diff --git a/regression/cpp/Template_Instantiation4/main.cpp b/regression/cpp/Template_Instantiation4/main.cpp
index d1f3dfe9295..36746126b0b 100644
--- a/regression/cpp/Template_Instantiation4/main.cpp
+++ b/regression/cpp/Template_Instantiation4/main.cpp
@@ -4,7 +4,7 @@ class X {
X()
{
}
-
+
static void some_func()
{
// This is an unbounded expansion,
diff --git a/regression/cpp/Template_Instantiation5/main.cpp b/regression/cpp/Template_Instantiation5/main.cpp
index 9875dd52404..1d71d999e69 100644
--- a/regression/cpp/Template_Instantiation5/main.cpp
+++ b/regression/cpp/Template_Instantiation5/main.cpp
@@ -14,7 +14,7 @@ class template_test
//printf ("elem is '%c' \n", elem);
return elem;
}
-
+
void add(void)
{
int c = elem + elem;
diff --git a/regression/cpp/Trailing_Return_Type1/main.cpp b/regression/cpp/Trailing_Return_Type1/main.cpp
index 6db117efe50..45531ec5d66 100644
--- a/regression/cpp/Trailing_Return_Type1/main.cpp
+++ b/regression/cpp/Trailing_Return_Type1/main.cpp
@@ -16,7 +16,7 @@ class some_class
return x + 1;
}
#endif
-
+
// template function
template
static auto f003(int x) -> someT
diff --git a/regression/cpp/Unary_Function_Overload1/main.cpp b/regression/cpp/Unary_Function_Overload1/main.cpp
index 951be62b468..da623789a9d 100644
--- a/regression/cpp/Unary_Function_Overload1/main.cpp
+++ b/regression/cpp/Unary_Function_Overload1/main.cpp
@@ -13,4 +13,3 @@ int main (void) {
return 1;
}
-
diff --git a/regression/cpp/Unary_Function_Overload2/main.cpp b/regression/cpp/Unary_Function_Overload2/main.cpp
index 25e562ced50..732ba2cc5c6 100644
--- a/regression/cpp/Unary_Function_Overload2/main.cpp
+++ b/regression/cpp/Unary_Function_Overload2/main.cpp
@@ -13,4 +13,3 @@ int main (void) {
return 1;
}
-
diff --git a/regression/cpp/Unary_Function_Overload3/main.cpp b/regression/cpp/Unary_Function_Overload3/main.cpp
index a09edff1318..58b9a139c8a 100644
--- a/regression/cpp/Unary_Function_Overload3/main.cpp
+++ b/regression/cpp/Unary_Function_Overload3/main.cpp
@@ -10,4 +10,3 @@ int main (void) {
return 1;
}
-
diff --git a/regression/cpp/bitwise_and1/main.cpp b/regression/cpp/bitwise_and1/main.cpp
index 522e9ed30a2..c26474125bd 100644
--- a/regression/cpp/bitwise_and1/main.cpp
+++ b/regression/cpp/bitwise_and1/main.cpp
@@ -7,7 +7,7 @@ int main()
// This should be converted into a bit-wise AND
// (not an address-of).
i=(intx)&i;
-
+
// This is an address-of.
i=(long int)&i;
}
diff --git a/regression/cpp/enum1/main.cpp b/regression/cpp/enum1/main.cpp
index b49c168dca5..e593bc7eda0 100644
--- a/regression/cpp/enum1/main.cpp
+++ b/regression/cpp/enum1/main.cpp
@@ -27,4 +27,3 @@ int main()
namespace whereever { enum some_tag { something }; }
enum whereever::some_tag whatnot = whereever::something;
-
diff --git a/regression/cpp/enum4/main.cpp b/regression/cpp/enum4/main.cpp
index 172868b6b4a..d3f9ed38ff7 100644
--- a/regression/cpp/enum4/main.cpp
+++ b/regression/cpp/enum4/main.cpp
@@ -6,6 +6,6 @@ typedef enum enumname enumname;
int main()
{
enumname x;
-
+
x=ASD;
}
diff --git a/regression/cpp/enum5/main.cpp b/regression/cpp/enum5/main.cpp
index ce70e9edfd3..3921e5c185c 100644
--- a/regression/cpp/enum5/main.cpp
+++ b/regression/cpp/enum5/main.cpp
@@ -19,13 +19,13 @@ int main()
// conversion from int
assert(IMPH_STATE(2)==IMPH_BGF_STOPPED);
-
+
// comparison with int
assert(IMPH_BGF_STOPPED==2);
-
+
// implicit conversion to int
int z= IMPH_ENABLED | IMPH_BGF_STOPPED;
-
+
// operator overloading
IMPH_STATE x = IMPH_ENABLED & IMPH_BGF_STOPPED;
assert(x==IMPH_BGF_STOPPED);
diff --git a/regression/cpp/enum8/main.cpp b/regression/cpp/enum8/main.cpp
index 23257b30dc9..b948ef723b0 100644
--- a/regression/cpp/enum8/main.cpp
+++ b/regression/cpp/enum8/main.cpp
@@ -39,4 +39,3 @@ int main()
assert(f(some_struct_var.e1)==1);
assert(f(some_struct_var.e2)==2);
}
-
diff --git a/regression/cpp/lvalue1/main.cpp b/regression/cpp/lvalue1/main.cpp
index ced96f1e2eb..f6977c20167 100644
--- a/regression/cpp/lvalue1/main.cpp
+++ b/regression/cpp/lvalue1/main.cpp
@@ -6,7 +6,7 @@ int main()
// casts to references are lvalues
asd &c=(asd &)((int &)a |= (int &)b);
-
+
// in C++, comma expressions are lvalues
(a, b)=ASD;
}
diff --git a/regression/cpp/nullptr1/main.cpp b/regression/cpp/nullptr1/main.cpp
index d0d35592605..6d178630634 100644
--- a/regression/cpp/nullptr1/main.cpp
+++ b/regression/cpp/nullptr1/main.cpp
@@ -17,12 +17,10 @@ int main()
nullptr_t my_null;
my_null=nullptr;
my_null=0;
-
+
char buffer[10];
void *p=my_null, *q=buffer;
assert(q!=nullptr);
-
+
something(nullptr);
}
-
-
diff --git a/regression/cpp/sizeof1/main.cpp b/regression/cpp/sizeof1/main.cpp
index 94035f69d4d..d6667784463 100644
--- a/regression/cpp/sizeof1/main.cpp
+++ b/regression/cpp/sizeof1/main.cpp
@@ -4,7 +4,7 @@ class C
public:
int i;
int j;
-
+
void f()
{
}
@@ -20,7 +20,7 @@ static_assert(sizeof(class C)==sizeof c, "size of class C");
int i;
static_assert(sizeof(i)==4, "size of i");
-
+
// and this, too
typedef unsigned int UINT32;
static_assert(sizeof(UINT32)==4, "size of UINT32");
diff --git a/regression/cpp/sizeof3/main.cpp b/regression/cpp/sizeof3/main.cpp
index 1e05d8ab5fc..9de2f38b1b2 100644
--- a/regression/cpp/sizeof3/main.cpp
+++ b/regression/cpp/sizeof3/main.cpp
@@ -12,4 +12,3 @@ int main()
bar();
return 0;
}
-
diff --git a/regression/cpp/static_assert1/main.cpp b/regression/cpp/static_assert1/main.cpp
index 61a2e699500..f0587527c70 100644
--- a/regression/cpp/static_assert1/main.cpp
+++ b/regression/cpp/static_assert1/main.cpp
@@ -5,7 +5,7 @@ static_assert(sizeof(int)==sizeof(int), "sizeof(int)==sizeof(int)");
class C1
{
static_assert(2==2, "2==2");
-
+
typedef int T;
static_assert(sizeof(T)==sizeof(int), "sizeof(T)==sizeof(int)");
};
diff --git a/regression/cpp/switch1/main.cpp b/regression/cpp/switch1/main.cpp
index 247a8570596..873f8fcdff1 100644
--- a/regression/cpp/switch1/main.cpp
+++ b/regression/cpp/switch1/main.cpp
@@ -3,7 +3,7 @@
int main()
{
int i;
-
+
switch(i)
{
case 0: assert(i==0);
@@ -14,9 +14,9 @@ int main()
default:
assert(i!=0 && i!=1);
}
-
+
int z=0;
-
+
// a declaration is ok here
switch(int z=123)
{
@@ -24,6 +24,6 @@ int main()
default: assert(0);
}
- // and there is scope!
+ // and there is scope!
assert(z==0);
}
diff --git a/regression/cpp/typecast_ambiguity1/main.cpp b/regression/cpp/typecast_ambiguity1/main.cpp
index 46a49ce387d..bd26527ef5e 100644
--- a/regression/cpp/typecast_ambiguity1/main.cpp
+++ b/regression/cpp/typecast_ambiguity1/main.cpp
@@ -8,13 +8,13 @@ int main()
(X) + z; // this is a typecast
(Y) + z; // this is an addition
-
+
(X) - z; // this is a typecast
(Y) - z; // this is a subtraction
-
+
(X) & z; // this is a typecast
(Y) & z; // this is a bitwise and
-
+
(X) * p; // this is a typecast
z=(int)(p) & 0x1fff; // this is bitwise and
diff --git a/regression/cpp/typecast_ambiguity2/main.cpp b/regression/cpp/typecast_ambiguity2/main.cpp
index 0d41f881af5..47fca7cb8e1 100644
--- a/regression/cpp/typecast_ambiguity2/main.cpp
+++ b/regression/cpp/typecast_ambiguity2/main.cpp
@@ -14,4 +14,3 @@ int main()
return (foo)((1));
}
-
diff --git a/regression/cpp/typedef2/main.cpp b/regression/cpp/typedef2/main.cpp
index 502104cbbcd..f0e222ea20f 100644
--- a/regression/cpp/typedef2/main.cpp
+++ b/regression/cpp/typedef2/main.cpp
@@ -12,4 +12,3 @@ void func2(TP tp)
int main()
{
}
-
diff --git a/regression/cpp/union4/main.cpp b/regression/cpp/union4/main.cpp
index 4daf13a3dcb..0de32e22347 100644
--- a/regression/cpp/union4/main.cpp
+++ b/regression/cpp/union4/main.cpp
@@ -4,4 +4,3 @@ struct A
union {int a;};
char a;
};
-
diff --git a/regression/fault-localization/all_properties1/main.c b/regression/fault-localization/all_properties1/main.c
index e66a3212556..f948457cd29 100644
--- a/regression/fault-localization/all_properties1/main.c
+++ b/regression/fault-localization/all_properties1/main.c
@@ -1,4 +1,4 @@
-#include
+#include
void main()
{
diff --git a/regression/fault-localization/all_properties2/main.c b/regression/fault-localization/all_properties2/main.c
index b575e995d47..8cffac4abe1 100644
--- a/regression/fault-localization/all_properties2/main.c
+++ b/regression/fault-localization/all_properties2/main.c
@@ -1,4 +1,4 @@
-#include
+#include
void main()
{
diff --git a/regression/fault-localization/stop_on_fail1/main.c b/regression/fault-localization/stop_on_fail1/main.c
index e66a3212556..f948457cd29 100644
--- a/regression/fault-localization/stop_on_fail1/main.c
+++ b/regression/fault-localization/stop_on_fail1/main.c
@@ -1,4 +1,4 @@
-#include
+#include
void main()
{
diff --git a/regression/goto-analyzer/intervals1/intervals1.c b/regression/goto-analyzer/intervals1/intervals1.c
index 026e572f8ef..a797452b198 100644
--- a/regression/goto-analyzer/intervals1/intervals1.c
+++ b/regression/goto-analyzer/intervals1/intervals1.c
@@ -3,10 +3,10 @@
int main()
{
int i, j;
-
+
if(i>=20)
assert(i>=10);
-
+
if(i>=10 && i<=20)
assert(i!=30);
diff --git a/regression/goto-analyzer/intervals4/intervals4.c b/regression/goto-analyzer/intervals4/intervals4.c
index e9bc51f30b5..790a5f1379f 100644
--- a/regression/goto-analyzer/intervals4/intervals4.c
+++ b/regression/goto-analyzer/intervals4/intervals4.c
@@ -3,10 +3,10 @@
int main()
{
int i;
-
+
if(i>0)
if(i<3)
assert(i>=1 && i<=2);
-
+
return 0;
-}
+}
diff --git a/regression/goto-analyzer/intervals5/intervals5.c b/regression/goto-analyzer/intervals5/intervals5.c
index 960e7473cc6..ed19ba71590 100644
--- a/regression/goto-analyzer/intervals5/intervals5.c
+++ b/regression/goto-analyzer/intervals5/intervals5.c
@@ -3,10 +3,10 @@
int main()
{
int i;
-
+
if(i>0)
if(i<3)
assert(i>=1 || i<=2);
-
+
return 0;
-}
+}
diff --git a/regression/goto-instrument-unwind/Makefile b/regression/goto-instrument-unwind/Makefile
index 45c2db4d8c2..8346f07d4d1 100644
--- a/regression/goto-instrument-unwind/Makefile
+++ b/regression/goto-instrument-unwind/Makefile
@@ -13,10 +13,10 @@ testnew:
@../test.pl -c ../unwind-chain.sh -F
test:
- @../test.pl -c ../unwind-chain.sh
+ @../test.pl -c ../unwind-chain.sh
tests.log: ../test.pl
- @../test.pl -c ../unwind-chain.sh
+ @../test.pl -c ../unwind-chain.sh
clean:
@for dir in *; do \
diff --git a/regression/goto-instrument-unwind/break-loop1/main.c b/regression/goto-instrument-unwind/break-loop1/main.c
index b5323c4ff5d..eed96ccbb21 100644
--- a/regression/goto-instrument-unwind/break-loop1/main.c
+++ b/regression/goto-instrument-unwind/break-loop1/main.c
@@ -8,7 +8,7 @@ int main()
* every loop will be unwound K times
**/
const unsigned K=10;
-
+
const unsigned n=100;
unsigned c=0, i;
unsigned tres=K/2;;
@@ -24,7 +24,7 @@ int main()
unsigned eva=n;
if(K=0, "property");
}
}
diff --git a/regression/k-induction/basic3/main.c b/regression/k-induction/basic3/main.c
index d3504140457..8bf287b84f4 100644
--- a/regression/k-induction/basic3/main.c
+++ b/regression/k-induction/basic3/main.c
@@ -3,7 +3,7 @@ int glob;
int main()
{
int loc=0;
-
+
while(glob!=1000)
{
if(glob<10) glob++;
diff --git a/regression/k-induction/chain.sh b/regression/k-induction/chain.sh
index 7b4653ae5d0..1bf168f0764 100755
--- a/regression/k-induction/chain.sh
+++ b/regression/k-induction/chain.sh
@@ -22,5 +22,3 @@ if [ $? == 0 ] ; then echo "## Base case passes" ; else echo "## Base case fails
$goto_instrument --k-induction $k --step-case $name.o $name.step.o
$cbmc $name.step.o
if [ $? == 0 ] ; then echo "## Step case passes" ; else echo "## Step case fails" ; fi
-
-
diff --git a/regression/strings/cprover-string-hack.h b/regression/strings/cprover-string-hack.h
index 8a560e9d70d..9160e935529 100644
--- a/regression/strings/cprover-string-hack.h
+++ b/regression/strings/cprover-string-hack.h
@@ -70,4 +70,3 @@ extern __CPROVER_string __CPROVER_uninterpreted_string_char_set_func(__CPROVER_s
extern __CPROVER_string __CPROVER_uninterpreted_string_copy_func(__CPROVER_string str);
extern unsigned __CPROVER_uninterpreted_string_parse_int_func(__CPROVER_string str);
extern __CPROVER_string __CPROVER_uninterpreted_string_of_int_func(unsigned i);
-
diff --git a/regression/strings/java_case/test.desc b/regression/strings/java_case/test.desc
index 7397314cca8..49ea16d56ff 100644
--- a/regression/strings/java_case/test.desc
+++ b/regression/strings/java_case/test.desc
@@ -7,4 +7,4 @@ test_case.class
^\[assertion.2\] assertion at file test_case.java line 12: SUCCESS$
^\[assertion.3\] assertion at file test_case.java line 13: SUCCESS$
^\[assertion.4\] assertion at file test_case.java line 14: FAILURE$
---
\ No newline at end of file
+--
diff --git a/regression/strings/java_code_point/test.desc b/regression/strings/java_code_point/test.desc
index bb69366ce61..1543a327fa4 100644
--- a/regression/strings/java_code_point/test.desc
+++ b/regression/strings/java_code_point/test.desc
@@ -8,4 +8,4 @@ test_code_point.class
^\[assertion.3\] assertion at file test_code_point.java line 7: SUCCESS$
^\[assertion.4\] assertion at file test_code_point.java line 8: SUCCESS$
^\[assertion.5\] assertion at file test_code_point.java line 11: SUCCESS$
---
\ No newline at end of file
+--
diff --git a/regression/strings/java_float/test.desc b/regression/strings/java_float/test.desc
index 47e915cda98..5edfd6eea22 100644
--- a/regression/strings/java_float/test.desc
+++ b/regression/strings/java_float/test.desc
@@ -7,4 +7,4 @@ test_float.class
^\[assertion.2\] assertion at file test_float.java line 15: SUCCESS$
^\[assertion.3\] assertion at file test_float.java line 16: SUCCESS$
^\[assertion.4\] assertion at file test_float.java line 17: FAILURE$
---
\ No newline at end of file
+--
diff --git a/regression/strings/java_set_length/test.desc b/regression/strings/java_set_length/test.desc
index 59204c9c5a8..66cf52835ac 100644
--- a/regression/strings/java_set_length/test.desc
+++ b/regression/strings/java_set_length/test.desc
@@ -6,4 +6,4 @@ test_set_length.class
^\[assertion.1\] assertion at file test_set_length.java line 8: SUCCESS$
^\[assertion.2\] assertion at file test_set_length.java line 9: SUCCESS$
^\[assertion.3\] assertion at file test_set_length.java line 10: FAILURE$
---
\ No newline at end of file
+--
diff --git a/regression/strings/test1/test.desc b/regression/strings/test1/test.desc
index 3483081c0f0..f622390356d 100644
--- a/regression/strings/test1/test.desc
+++ b/regression/strings/test1/test.desc
@@ -1,6 +1,6 @@
CORE
test.c
---pass
+--pass
^EXIT=10$
^SIGNAL=0$
^\[main.assertion.1\] assertion c1 == c2: SUCCESS$
diff --git a/regression/strings/test_char_set/test.c b/regression/strings/test_char_set/test.c
index 61aaf9b768e..bd19cbaa46d 100644
--- a/regression/strings/test_char_set/test.c
+++ b/regression/strings/test_char_set/test.c
@@ -7,7 +7,7 @@ int main()
__CPROVER_string s = __CPROVER_string_literal("abc");;
char c = 'p';
__CPROVER_string t = __CPROVER_char_set(s,1,c);;
-
+
assert(__CPROVER_string_equal(t, __CPROVER_string_literal("apc")));
assert(__CPROVER_string_equal(t, __CPROVER_string_literal("abc")));
return 0;
diff --git a/regression/strings/test_concat/test.c b/regression/strings/test_concat/test.c
index ceab520e960..007b9ca1b5c 100644
--- a/regression/strings/test_concat/test.c
+++ b/regression/strings/test_concat/test.c
@@ -9,7 +9,7 @@ int main()
t = __CPROVER_string_literal("ppo");
u = __CPROVER_string_concat(s, t);
__CPROVER_char c = __CPROVER_char_at(u,i);
-
+
assert(c == __CPROVER_char_literal("p"));
assert(__CPROVER_char_at(u,2) == __CPROVER_char_literal("p"));
return 0;
diff --git a/regression/strings/test_contains/test.c b/regression/strings/test_contains/test.c
index 9e7c627f3c4..89749e487b7 100644
--- a/regression/strings/test_contains/test.c
+++ b/regression/strings/test_contains/test.c
@@ -7,11 +7,11 @@ int main()
__CPROVER_string s1 = __CPROVER_string_literal("a1");
__CPROVER_string s2 = __CPROVER_string_literal("2b");
__CPROVER_string t = __CPROVER_string_concat(s1, s2);
-
+
int i = nondet_int();
-
- if(i==1)
+
+ if(i==1)
assert(!__CPROVER_string_contains(t,__CPROVER_string_literal("3")));
else if(i==2)
assert(__CPROVER_string_contains(t,__CPROVER_string_literal("12")));
diff --git a/regression/strings/test_easychair/test.c b/regression/strings/test_easychair/test.c
index 5d249225280..617cbfd7196 100644
--- a/regression/strings/test_easychair/test.c
+++ b/regression/strings/test_easychair/test.c
@@ -40,4 +40,3 @@ int main(){
// s survived all checks
return true;
}
-
diff --git a/regression/strings/test_equal/test.c b/regression/strings/test_equal/test.c
index 2f26689589d..de70cc9d3fc 100644
--- a/regression/strings/test_equal/test.c
+++ b/regression/strings/test_equal/test.c
@@ -8,6 +8,6 @@ int main()
s = __CPROVER_string_literal("pippo");
assert(__CPROVER_string_equal(s, __CPROVER_string_literal("pippo")));
assert(__CPROVER_string_equal(s, __CPROVER_string_literal("mippo")));
-
+
return 0;
}
diff --git a/regression/strings/test_index_of/test.desc b/regression/strings/test_index_of/test.desc
index af22cc2efb5..6d9ddbc6281 100644
--- a/regression/strings/test_index_of/test.desc
+++ b/regression/strings/test_index_of/test.desc
@@ -6,4 +6,4 @@ test.c
^\[main.assertion.1\] assertion firstSlash == 3: SUCCESS$
^\[main.assertion.2\] assertion lastSlash == 7: SUCCESS$
^\[main.assertion.3\] assertion firstSlash != 3 || lastSlash != 7: FAILURE$
---
\ No newline at end of file
+--
diff --git a/regression/strings/test_pass1/test.c b/regression/strings/test_pass1/test.c
index 0ec758c9f64..abc3e9ed50a 100644
--- a/regression/strings/test_pass1/test.c
+++ b/regression/strings/test_pass1/test.c
@@ -7,8 +7,8 @@ int main()
__CPROVER_string t;
__CPROVER_string s = __CPROVER_string_concat(t, t);
__CPROVER_assume(__CPROVER_string_equal(s, __CPROVER_string_literal("aa")));
-
- assert(__CPROVER_string_equal(t,__CPROVER_string_literal("a")));
+
+ assert(__CPROVER_string_equal(t,__CPROVER_string_literal("a")));
assert(!__CPROVER_string_equal(t,__CPROVER_string_literal("a")));
// Warning the following does not express the same thing, because
// equality can fail while the two sides represent the same thing:
diff --git a/regression/strings/test_pass1/test.desc b/regression/strings/test_pass1/test.desc
index 2531c253510..7548b6e91ef 100644
--- a/regression/strings/test_pass1/test.desc
+++ b/regression/strings/test_pass1/test.desc
@@ -6,4 +6,3 @@ test.c
^\[main.assertion.1\] assertion __CPROVER_uninterpreted_string_equal_func(t, __CPROVER_uninterpreted_string_literal_func(\"a\")): SUCCESS
^\[main.assertion.2\] assertion !__CPROVER_uninterpreted_string_equal_func(t, __CPROVER_uninterpreted_string_literal_func(\"a\")): FAILURE$
^\*\* 1 of 2 failed (2 iterations)$
-
diff --git a/regression/strings/test_pass_pc1/test.c b/regression/strings/test_pass_pc1/test.c
index 95dadef8c1d..d1697fc990b 100644
--- a/regression/strings/test_pass_pc1/test.c
+++ b/regression/strings/test_pass_pc1/test.c
@@ -7,7 +7,7 @@ int main()
__CPROVER_string s1,s2;
__CPROVER_string t = __CPROVER_string_concat(s1, s2);
__CPROVER_assume(__CPROVER_string_isprefix(__CPROVER_string_literal("a1"),s1));
-
+
__CPROVER_assume(__CPROVER_string_contains(s2,__CPROVER_string_literal("12")));
__CPROVER_assume(__CPROVER_string_issuffix(__CPROVER_string_literal("cd"),t));
diff --git a/regression/strings/test_pass_pc3/test.desc b/regression/strings/test_pass_pc3/test.desc
index b4c45aee0ee..88f4659c45d 100644
--- a/regression/strings/test_pass_pc3/test.desc
+++ b/regression/strings/test_pass_pc3/test.desc
@@ -6,4 +6,3 @@ test.c
^\[main.assertion.1\] assertion __CPROVER_uninterpreted_string_length_func(s3) == 0: FAILURE$
^\[main.assertion.2\] assertion __CPROVER_uninterpreted_string_length_func(s3) < 2: SUCCESS$
^VERIFICATION FAILED$
-
diff --git a/regression/strings/test_prefix/test.c b/regression/strings/test_prefix/test.c
index 041a6a3ed41..d3ba0388d54 100644
--- a/regression/strings/test_prefix/test.c
+++ b/regression/strings/test_prefix/test.c
@@ -12,6 +12,6 @@ int main()
__CPROVER_bool c = __CPROVER_string_isprefix(__CPROVER_string_literal("Wello"),s);
assert(b);
assert(c);
-
+
return 0;
}
diff --git a/regression/strings/test_substring/test.c b/regression/strings/test_substring/test.c
index d2c26eca01a..b86f4f88cd7 100644
--- a/regression/strings/test_substring/test.c
+++ b/regression/strings/test_substring/test.c
@@ -6,7 +6,7 @@ int main()
{
__CPROVER_string s = __CPROVER_string_literal("abcdef");
__CPROVER_string t = __CPROVER_string_substring(s,2,4);
-
+
assert(__CPROVER_string_equal(t,__CPROVER_string_literal("cd")));
assert(__CPROVER_string_equal(t,__CPROVER_string_literal("cc")));
assert(!__CPROVER_string_equal(t,__CPROVER_string_literal("bc")));
diff --git a/regression/strings/test_substring/test.desc b/regression/strings/test_substring/test.desc
index 6fe9134b59d..327d5bbe1f2 100644
--- a/regression/strings/test_substring/test.desc
+++ b/regression/strings/test_substring/test.desc
@@ -7,4 +7,4 @@ test.c
^\[main.assertion.2\] assertion __CPROVER_uninterpreted_string_equal_func(t, __CPROVER_uninterpreted_string_literal_func(\"cc\")): FAILURE$
^\[main.assertion.3\] assertion !__CPROVER_uninterpreted_string_equal_func(t, __CPROVER_uninterpreted_string_literal_func(\"bc\")): SUCCESS$
^\[main.assertion.4\] assertion !__CPROVER_uninterpreted_string_equal_func(t, __CPROVER_uninterpreted_string_literal_func(\"cd\")): FAILURE$
---
\ No newline at end of file
+--
diff --git a/regression/strings/test_suffix/test.c b/regression/strings/test_suffix/test.c
index d28bde61712..f623f4d7342 100644
--- a/regression/strings/test_suffix/test.c
+++ b/regression/strings/test_suffix/test.c
@@ -10,6 +10,6 @@ int main()
assert(__CPROVER_string_issuffix(__CPROVER_string_literal("po"),s));
assert(__CPROVER_string_issuffix(__CPROVER_string_literal("pp"),s));
-
+
return 0;
}
diff --git a/regression/symex-infeasibility/bst-safe/main.c b/regression/symex-infeasibility/bst-safe/main.c
index 35c0e33a30a..868a2049a0d 100644
--- a/regression/symex-infeasibility/bst-safe/main.c
+++ b/regression/symex-infeasibility/bst-safe/main.c
@@ -99,4 +99,3 @@ int main() {
return 0;
}
-
diff --git a/regression/symex-infeasibility/counter-unsafe/main.c b/regression/symex-infeasibility/counter-unsafe/main.c
index 8d0b9b75b36..909459094cd 100644
--- a/regression/symex-infeasibility/counter-unsafe/main.c
+++ b/regression/symex-infeasibility/counter-unsafe/main.c
@@ -37,4 +37,3 @@ int main() {
assert(0 <= y && y != n);
return 0;
}
-
diff --git a/regression/symex-infeasibility/insertion-sort-safe/main.c b/regression/symex-infeasibility/insertion-sort-safe/main.c
index 0b194efde58..df01181380b 100644
--- a/regression/symex-infeasibility/insertion-sort-safe/main.c
+++ b/regression/symex-infeasibility/insertion-sort-safe/main.c
@@ -44,4 +44,3 @@ int main() {
return 0;
}
-
diff --git a/regression/symex-infeasibility/insertion-sort-unsafe/main.c b/regression/symex-infeasibility/insertion-sort-unsafe/main.c
index 1aad931c710..21960ff19e5 100644
--- a/regression/symex-infeasibility/insertion-sort-unsafe/main.c
+++ b/regression/symex-infeasibility/insertion-sort-unsafe/main.c
@@ -45,4 +45,3 @@ int main() {
return 0;
}
-
diff --git a/regression/symex-infeasibility/tp5/main.c b/regression/symex-infeasibility/tp5/main.c
index e56d7bff20c..b8b2df491fe 100644
--- a/regression/symex-infeasibility/tp5/main.c
+++ b/regression/symex-infeasibility/tp5/main.c
@@ -23,4 +23,3 @@ int main(void) {
assert(f(x) == g(x));
}
}
-
diff --git a/regression/symex/array1/main.c b/regression/symex/array1/main.c
index 332c5d20323..6f172867b3a 100644
--- a/regression/symex/array1/main.c
+++ b/regression/symex/array1/main.c
@@ -12,10 +12,10 @@ int main()
int i;
// zero initialization
- assert(some_int_array[1]==0);
+ assert(some_int_array[1]==0);
if(i>=0 && i<10) assert(some_int_array[i]==0);
some_int_array[5]=5;
- assert(some_int_array[1]==0);
+ assert(some_int_array[1]==0);
assert(some_int_array[5]==5);
}
diff --git a/regression/symex/function_pointer1/main.c b/regression/symex/function_pointer1/main.c
index 3d578de8eec..80ed753180c 100644
--- a/regression/symex/function_pointer1/main.c
+++ b/regression/symex/function_pointer1/main.c
@@ -21,7 +21,7 @@ int main()
f_ptr=f1;
f_ptr();
assert(global==1);
-
+
f_ptr=f2;
f_ptr();
assert(global==2);
diff --git a/regression/symex/if1/main.c b/regression/symex/if1/main.c
index 42ee8b1b318..ab5dda196d9 100644
--- a/regression/symex/if1/main.c
+++ b/regression/symex/if1/main.c
@@ -3,7 +3,7 @@
int main()
{
int i;
-
+
if(i==1)
assert(i==1);
else
diff --git a/regression/symex/malloc1/main.c b/regression/symex/malloc1/main.c
index 3d27ae92d39..e5fe1e6f14b 100644
--- a/regression/symex/malloc1/main.c
+++ b/regression/symex/malloc1/main.c
@@ -4,12 +4,12 @@
int main()
{
int *p;
-
+
p=(int *)malloc(sizeof(int));
-
+
*p=1;
-
+
assert(*p==1);
-
+
free(p);
}
diff --git a/regression/symex/pointer1/main.c b/regression/symex/pointer1/main.c
index 23ff39299d6..b03fc8e4a9a 100644
--- a/regression/symex/pointer1/main.c
+++ b/regression/symex/pointer1/main.c
@@ -8,7 +8,7 @@ int main()
// pointer into an integer
q=(char *)&i;
-
+
i=0x03020100;
// endianness-dependent
@@ -21,15 +21,15 @@ int main()
assert(ch1==1);
assert(ch2==2);
assert(ch3==3);
-
+
unsigned int *up=(unsigned int *)q;
assert(*up==i);
-
+
// pointer with conditional
int input, x, y;
p=input?&x:&y;
*p=1;
-
+
if(input)
assert(x==1);
else
diff --git a/regression/symex/pointer3/main.c b/regression/symex/pointer3/main.c
index 332327a640f..29661994a99 100644
--- a/regression/symex/pointer3/main.c
+++ b/regression/symex/pointer3/main.c
@@ -4,9 +4,9 @@ int main()
{
int choice;
int x=1, y=2, *p=choice?&x:&y;
-
+
*p=3;
-
+
if(choice)
assert(x==3 && y==2);
else
diff --git a/regression/symex/show-trace1/main.c b/regression/symex/show-trace1/main.c
index 57bc6bb1288..e5a7ae24717 100644
--- a/regression/symex/show-trace1/main.c
+++ b/regression/symex/show-trace1/main.c
@@ -3,11 +3,11 @@ int input();
int main()
{
int i, j, k;
-
+
i=input();
j=input();
k=input();
-
+
if(i==2)
if(j==i+1)
if(k==i*j)
diff --git a/regression/symex/struct2/main.c b/regression/symex/struct2/main.c
index 9d5126ee006..a0781a64a3f 100644
--- a/regression/symex/struct2/main.c
+++ b/regression/symex/struct2/main.c
@@ -8,7 +8,7 @@ struct X
int main()
{
int *p;
-
+
p=&x.a;
*p=10;
p++;
diff --git a/regression/symex/struct3/main.c b/regression/symex/struct3/main.c
index 4c2c7287041..6f9ac01146a 100644
--- a/regression/symex/struct3/main.c
+++ b/regression/symex/struct3/main.c
@@ -9,9 +9,9 @@ int main()
{
int i;
char *p;
-
+
p=&x.a;
-
+
p[0]=1;
p[1]=2;
p[2]=3;
@@ -24,7 +24,7 @@ int main()
// same again, directly to head of struct
p=(char *)&y;
-
+
p[0]=1;
p[1]=2;
p[2]=3;
diff --git a/src/Makefile b/src/Makefile
index 06a973118dd..0ba04a97a1d 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -53,7 +53,7 @@ $(patsubst %, %.dir, $(DIRS)):
$(patsubst %, %_generated_files, $(DIRS)):
$(MAKE) $(MAKEARGS) -C $(patsubst %_generated_files, %, $@) generated_files
-
+
generated_files: $(patsubst %, %_generated_files, $(DIRS))
# cleaning
diff --git a/src/aa-path-symex/Makefile b/src/aa-path-symex/Makefile
index f25bb6288b8..272a422aac0 100644
--- a/src/aa-path-symex/Makefile
+++ b/src/aa-path-symex/Makefile
@@ -14,4 +14,3 @@ all: aa-path-symex$(LIBEXT)
aa-path-symex$(LIBEXT): $(OBJ)
$(LINKLIB)
-
diff --git a/src/aa-path-symex/build_goto_trace.cpp b/src/aa-path-symex/build_goto_trace.cpp
index dd7fedfc02c..ac37f4ea6fb 100644
--- a/src/aa-path-symex/build_goto_trace.cpp
+++ b/src/aa-path-symex/build_goto_trace.cpp
@@ -27,25 +27,25 @@ void build_goto_trace(
{
// follow the history in the state,
// but in a forwards-fashion
-
+
std::vector steps;
state.history.build_history(steps);
-
+
unsigned step_nr;
-
+
for(step_nr=0; step_nr target_mapt;
target_mapt target_map;
-
+
forall_goto_functions(f_it, goto_functions)
{
const goto_functionst::goto_functiont &goto_function = f_it->second;
@@ -68,12 +68,12 @@ void locst::build(const goto_functionst &goto_functions)
else
function_entry.first_loc=loc_reft::nil();
}
-
+
if(function_map.find(ID_main)==function_map.end())
throw "no entry point";
-
+
entry_loc=function_map[ID_main].first_loc;
-
+
// build branch targets
for(unsigned l=0; ltype << " "
// << loc.target->location
<< " " << as_string(ns, *loc.target) << "\n";
-
+
if(!loc.branch_target.is_nil())
out << " T: " << loc.branch_target << "\n";
}
-
+
out << "\n";
out << "The entry location is L" << entry_loc << ".\n";
}
-
diff --git a/src/aa-path-symex/locs.h b/src/aa-path-symex/locs.h
index 94f00c0316d..bf83d504ada 100644
--- a/src/aa-path-symex/locs.h
+++ b/src/aa-path-symex/locs.h
@@ -24,47 +24,47 @@ struct loct
function(_function)
{
}
-
+
goto_programt::const_targett target;
irep_idt function;
-
+
// we only support a single branch target
loc_reft branch_target;
};
class locst
-{
+{
public:
typedef std::vector loc_vectort;
loc_vectort loc_vector;
loc_reft entry_loc;
-
+
class function_entryt
{
public:
loc_reft first_loc;
code_typet type;
};
-
+
typedef std::map function_mapt;
function_mapt function_map;
-
+
locst(const namespacet &_ns);
void build(const goto_functionst &goto_functions);
void output(std::ostream &out) const;
-
+
inline loct &operator[] (loc_reft l)
{
assert(l.loc_number>=0 && l.loc_number < loc_vector.size());
return loc_vector[l.loc_number];
}
-
+
inline const loct &operator[] (loc_reft l) const
{
assert(l.loc_number>=0 && l.loc_number < loc_vector.size());
return loc_vector[l.loc_number];
}
-
+
static inline loc_reft begin()
{
loc_reft tmp;
@@ -91,14 +91,14 @@ class target_to_loc_mapt
for(loc_reft it=locs.begin(); it!=locs.end(); ++it)
map[locs[it].target]=it;
}
-
+
inline loc_reft operator[](const goto_programt::const_targett t) const
{
mapt::const_iterator it=map.find(t);
assert(it!=map.end());
return it->second;
}
-
+
protected:
typedef std::map mapt;
mapt map;
diff --git a/src/aa-path-symex/path_symex.cpp b/src/aa-path-symex/path_symex.cpp
index dd23210b958..6ea307ca058 100644
--- a/src/aa-path-symex/path_symex.cpp
+++ b/src/aa-path-symex/path_symex.cpp
@@ -33,7 +33,7 @@ class path_symext
inline path_symext()
{
}
-
+
void operator()(
path_symex_statet &state,
std::list &furter_states);
@@ -43,17 +43,17 @@ class path_symext
void do_goto(
path_symex_statet &state,
bool taken);
-
+
void do_assert_fail(path_symex_statet &state)
{
const goto_programt::instructiont &instruction=
*state.get_instruction();
-
+
state.record_step();
state.next_pc();
exprt guard=state.read(not_exprt(instruction.guard));
state.history->guard=guard;
- }
+ }
protected:
void do_goto(
@@ -68,13 +68,13 @@ class path_symext
exprt f=state.read(call.function());
function_call_rec(state, call, f, further_states);
}
-
+
void function_call_rec(
path_symex_statet &state,
const code_function_callt &function_call,
const exprt &function,
std::list &further_states);
-
+
void return_from_function(
path_symex_statet &state,
const exprt &return_value);
@@ -208,7 +208,7 @@ void path_symext::assign(
// read the address of the lhs, with propagation
exprt lhs_address=state.read(address_of_exprt(lhs));
-
+
// now SSA it, no propagation
exprt ssa_lhs=
state.read_no_propagate(dereference_exprt(lhs_address));
@@ -249,7 +249,7 @@ inline static typet c_sizeof_type_rec(const exprt &expr)
if(t.is_not_nil()) return t;
}
}
-
+
return nil_typet();
}
@@ -260,16 +260,16 @@ void path_symext::symex_malloc(
{
if(code.operands().size()!=1)
throw "malloc expected to have one operand";
-
+
// increment dynamic object counter
unsigned dynamic_count=++state.var_map.dynamic_count;
-
+
exprt size=code.op0();
typet object_type=nil_typet();
-
+
{
exprt tmp_size=state.read(size); // to allow constant propagation
-
+
// special treatment for sizeof(T)*x
if(tmp_size.id()==ID_mult &&
tmp_size.operands().size()==2 &&
@@ -277,12 +277,12 @@ void path_symext::symex_malloc(
{
object_type=array_typet(
c_sizeof_type_rec(tmp_size.op0()),
- tmp_size.op1());
+ tmp_size.op1());
}
else
{
typet tmp_type=c_sizeof_type_rec(tmp_size);
-
+
if(tmp_type.is_not_nil())
{
// Did the size get multiplied?
@@ -298,25 +298,25 @@ void path_symext::symex_malloc(
else
{
mp_integer elements=alloc_size/elem_size;
-
+
if(elements*elem_size==alloc_size)
object_type=array_typet(tmp_type, from_integer(elements, tmp_size.type()));
}
}
}
}
-
+
if(object_type.is_nil())
object_type=array_typet(unsigned_char_type(), tmp_size);
// we introduce a fresh symbol for the size
// to prevent any issues of the size getting ever changed
-
+
if(object_type.id()==ID_array &&
!to_array_type(object_type).size().is_constant())
{
exprt &size=to_array_type(object_type).size();
-
+
symbolt size_symbol;
size_symbol.base_name="dynamic_object_size"+i2string(dynamic_count);
@@ -328,13 +328,13 @@ void path_symext::symex_malloc(
//state.var_map(size_symbol.name, suffix, size_symbol.type);
assign(state,
- size_symbol.symbol_expr(),
+ size_symbol.symbol_expr(),
size);
size=size_symbol.symbol_expr();
}
}
-
+
// value
symbolt value_symbol;
@@ -348,7 +348,7 @@ void path_symext::symex_malloc(
//state.var_map(value_symbol.name, suffix, value_symbol.type);
address_of_exprt rhs;
-
+
if(object_type.id()==ID_array)
{
rhs.type()=pointer_typet(value_symbol.type.subtype());
@@ -362,7 +362,7 @@ void path_symext::symex_malloc(
rhs.op0()=value_symbol.symbol_expr();
rhs.type()=pointer_typet(value_symbol.type);
}
-
+
if(rhs.type()!=lhs.type())
rhs.make_typecast(lhs.type());
@@ -383,31 +383,31 @@ Function: path_symext::assign_rec
void path_symext::assign_rec(
path_symex_statet &state,
- exprt::operandst &guard,
- const exprt &ssa_lhs,
+ exprt::operandst &guard,
+ const exprt &ssa_lhs,
const exprt &ssa_rhs)
{
//const typet &ssa_lhs_type=state.var_map.ns.follow(ssa_lhs.type());
-
+
#ifdef DEBUG
std::cout << "assign_rec: " << ssa_lhs.pretty() << std::endl;
//std::cout << "ssa_lhs_type: " << ssa_lhs_type.id() << std::endl;
#endif
-
+
if(ssa_lhs.id()==ID_symbol)
{
// These are expected to the SSA symbols
assert(ssa_lhs.get_bool(ID_C_SSA_symbol));
-
+
const symbol_exprt &symbol_expr=to_symbol_expr(ssa_lhs);
const irep_idt &full_identifier=symbol_expr.get(ID_C_full_identifier);
-
+
#ifdef DEBUG
const irep_idt &ssa_identifier=symbol_expr.get_identifier();
std::cout << "SSA symbol identifier: " << ssa_identifier << std::endl;
std::cout << "full identifier: " << full_identifier << std::endl;
#endif
-
+
var_mapt::var_infot &var_info=state.var_map[full_identifier];
assert(var_info.full_identifier==full_identifier);
@@ -447,7 +447,7 @@ void path_symext::assign_rec(
// record the step
state.record_step();
path_symex_stept &step=*state.history;
-
+
if(!guard.empty()) step.guard=conjunction(guard);
step.full_lhs=ssa_lhs;
step.ssa_lhs=new_lhs;
@@ -469,7 +469,7 @@ void path_symext::assign_rec(
const typet &compound_type=
state.var_map.ns.follow(struct_op.type());
-
+
if(compound_type.id()==ID_struct)
{
throw "unexpected struct member on lhs";
@@ -481,7 +481,7 @@ void path_symext::assign_rec(
new_rhs.type()=struct_op.type();
new_rhs.set_component_name(ssa_lhs_member_expr.get_component_name());
new_rhs.op()=ssa_rhs;
-
+
assign_rec(state, guard, struct_op, new_rhs);
}
else
@@ -493,7 +493,7 @@ void path_symext::assign_rec(
std::cout << "assign_rec ID_index" << std::endl;
#endif
- throw "unexpected array index on lhs";
+ throw "unexpected array index on lhs";
}
else if(ssa_lhs.id()==ID_dereference)
{
@@ -516,7 +516,7 @@ void path_symext::assign_rec(
guard.push_back(cond);
assign_rec(state, guard, lhs_if_expr.true_case(), ssa_rhs);
guard.pop_back();
-
+
// false
guard.push_back(not_exprt(cond));
assign_rec(state, guard, lhs_if_expr.false_case(), ssa_rhs);
@@ -531,12 +531,12 @@ void path_symext::assign_rec(
const byte_extract_exprt &byte_extract_expr=
to_byte_extract_expr(ssa_lhs);
-
+
// assignment to byte_extract operators:
// turn into byte_update operator
-
+
irep_idt new_id;
-
+
if(ssa_lhs.id()==ID_byte_extract_little_endian)
new_id=ID_byte_update_little_endian;
else if(ssa_lhs.id()==ID_byte_extract_big_endian)
@@ -550,7 +550,7 @@ void path_symext::assign_rec(
new_rhs.op()=byte_extract_expr.op();
new_rhs.offset()=byte_extract_expr.offset();
new_rhs.value()=ssa_rhs;
-
+
const exprt new_lhs=byte_extract_expr.op();
assign_rec(state, guard, new_lhs, new_rhs);
@@ -561,12 +561,12 @@ void path_symext::assign_rec(
to_struct_type(state.var_map.ns.follow(ssa_lhs.type()));
const struct_typet::componentst &components=
struct_type.components();
-
+
// split up into components
const exprt::operandst &operands=ssa_lhs.operands();
-
+
assert(operands.size()==components.size());
-
+
for(unsigned i=0; isecond;
loc_reft function_entry_point=function_entry.first_loc;
-
+
// do we have a body?
if(function_entry_point==loc_reft())
{
@@ -678,7 +678,7 @@ void path_symext::function_call_rec(
state.next_pc();
return;
}
-
+
// push a frame on the call stack
path_symex_statet::threadt &thread=state.threads[state.get_current_thread()];
thread.call_stack.push_back(path_symex_statet::framet());
@@ -686,7 +686,7 @@ void path_symext::function_call_rec(
thread.call_stack.back().return_location=thread.pc.next_loc();
thread.call_stack.back().return_lhs=call.lhs();
thread.call_stack.back().saved_local_vars=thread.local_vars;
-
+
// update statistics
state.recursion_map[function_identifier]++;
@@ -695,7 +695,7 @@ void path_symext::function_call_rec(
const code_typet::argumentst &function_arguments=code_type.arguments();
const exprt::operandst &call_arguments=call.arguments();
-
+
// now assign the argument values
for(unsigned i=0; iguard=guard;
}
break;
-
+
case ASSERT:
case SKIP:
case LOCATION:
@@ -1074,17 +1074,17 @@ void path_symext::operator()(
state.next_pc();
state.inside_atomic_section=false;
break;
-
+
case ASSIGN:
assign(state, to_code_assign(instruction.code));
state.next_pc();
break;
-
+
case FUNCTION_CALL:
state.record_step();
function_call(state, to_code_function_call(instruction.code), further_states);
break;
-
+
case OTHER:
state.record_step();
@@ -1218,4 +1218,3 @@ void path_symex_assert_fail(path_symex_statet &state)
path_symext path_symex;
path_symex.do_assert_fail(state);
}
-
diff --git a/src/aa-path-symex/path_symex_history.cpp b/src/aa-path-symex/path_symex_history.cpp
index 6ddd2bb0f12..33ed11f4f5d 100644
--- a/src/aa-path-symex/path_symex_history.cpp
+++ b/src/aa-path-symex/path_symex_history.cpp
@@ -33,9 +33,9 @@ void path_symex_stept::output(std::ostream &out) const
p_it!=pc_vector.end();
p_it++)
out << " " << *p_it;
- */
+ */
out << "\n";
-
+
out << "Guard: " << from_expr(guard) << "\n";
out << "Full LHS: " << from_expr(full_lhs) << "\n";
out << "SSA LHS: " << from_expr(ssa_lhs) << "\n";
diff --git a/src/aa-path-symex/path_symex_history.h b/src/aa-path-symex/path_symex_history.h
index 5f499807770..85eb9ea8248 100644
--- a/src/aa-path-symex/path_symex_history.h
+++ b/src/aa-path-symex/path_symex_history.h
@@ -35,34 +35,34 @@ class path_symex_step_reft
index(std::numeric_limits::max()), history(0)
{
}
-
+
inline bool is_nil() const
{
return index==std::numeric_limits::max();
}
-
+
inline path_symex_historyt &get_history() const
{
assert(history!=0);
return *history;
}
-
+
// pre-decrement
inline path_symex_step_reft &operator--();
-
+
inline path_symex_stept &operator*() const { return get(); }
inline path_symex_stept *operator->() const { return &get(); }
-
+
void generate_successor();
- // build a forward-traversible version of the history
+ // build a forward-traversible version of the history
void build_history(std::vector &dest) const;
protected:
// we use a vector to store all steps
std::size_t index;
class path_symex_historyt *history;
-
+
inline path_symex_stept &get() const;
};
@@ -73,10 +73,10 @@ class path_symex_stept
{
public:
path_symex_step_reft predecessor;
-
+
// the thread that did the step
unsigned thread_nr;
-
+
// the instruction that was executed
loc_reft pc;
@@ -84,8 +84,8 @@ class path_symex_stept
exprt full_lhs;
symbol_exprt ssa_lhs;
- bool hidden;
-
+ bool hidden;
+
path_symex_stept():
guard(nil_exprt()),
ssa_rhs(nil_exprt()),
@@ -93,10 +93,10 @@ class path_symex_stept
hidden(false)
{
}
-
+
// interface to solvers; this converts a single step
void convert(decision_proceduret &dest) const;
-
+
void output(std::ostream &) const;
};
@@ -110,7 +110,7 @@ static inline decision_proceduret &operator << (
src->convert(dest);
--src;
}
-
+
return dest;
}
diff --git a/src/aa-path-symex/path_symex_state.cpp b/src/aa-path-symex/path_symex_state.cpp
index 3fc43a01cba..08397535741 100644
--- a/src/aa-path-symex/path_symex_state.cpp
+++ b/src/aa-path-symex/path_symex_state.cpp
@@ -156,21 +156,21 @@ exprt path_symex_statet::read(const exprt &src, bool propagate)
#ifdef DEBUG
//std::cout << "path_symex_statet::read " << src.pretty() << std::endl;
#endif
-
+
// This has four phases!
// 1. Floating-point expression adjustment (rounding mode)
// 2. Dereferencing, including propagation of pointers.
// 3. Rewriting to SSA symbols
// 4. Simplifier
-
+
exprt tmp1=src;
adjust_float_expressions(tmp1, var_map.ns);
// we force propagation for dereferencing
exprt tmp2=dereference_rec(tmp1, true);
-
+
exprt tmp3=instantiate_rec(tmp2, propagate);
-
+
exprt tmp4=simplify_expr(tmp3, var_map.ns);
#ifdef DEBUG
@@ -202,12 +202,12 @@ exprt path_symex_statet::instantiate_rec(
#endif
const typet &src_type=var_map.ns.follow(src.type());
-
+
if(src_type.id()==ID_struct) // src is a struct
{
const struct_typet &struct_type=to_struct_type(src_type);
const struct_typet::componentst &components=struct_type.components();
-
+
struct_exprt result(src.type());
result.operands().resize(components.size());
@@ -225,43 +225,43 @@ exprt path_symex_statet::instantiate_rec(
}
else
new_src=member_exprt(src, component_name, subtype);
-
+
// recursive call
result.operands()[i]=instantiate_rec(new_src, propagate);
}
return result; // done
- }
+ }
else if(src_type.id()==ID_array) // src is an array
{
const array_typet &array_type=to_array_type(src_type);
const typet &subtype=array_type.subtype();
-
+
if(array_type.size().is_constant())
{
mp_integer size;
if(to_integer(array_type.size(), size))
throw "failed to convert array size";
-
+
unsigned long long size_int=integer2unsigned(size);
-
+
array_exprt result(array_type);
result.operands().resize(size_int);
-
+
// split it up into elements
for(unsigned long long i=0; ithread_nr!=current_thread)
no_thread_interleavings++;
-
+
// update our statistics
depth++;
@@ -726,18 +726,18 @@ bool path_symex_statet::is_feasible(
{
// feed path constraint to decision procedure
decision_procedure << history;
-
+
// check whether SAT
switch(decision_procedure())
{
case decision_proceduret::D_TAUTOLOGY:
case decision_proceduret::D_SATISFIABLE: return true;
-
+
case decision_proceduret::D_UNSATISFIABLE: return false;
-
+
case decision_proceduret::D_ERROR: throw "error from decsion procedure";
}
-
+
return true; // not really reachable
}
@@ -763,7 +763,7 @@ bool path_symex_statet::check_assertion(
// the assertion in SSA
exprt assertion=read(instruction.guard);
-
+
// trivial?
if(assertion.is_true()) return true; // no error
@@ -773,20 +773,19 @@ bool path_symex_statet::check_assertion(
// negate the assertion
decision_procedure.set_to(assertion, false);
- // check whether SAT
+ // check whether SAT
switch(decision_procedure.dec_solve())
{
case decision_proceduret::D_TAUTOLOGY:
case decision_proceduret::D_SATISFIABLE:
return false; // error
-
+
case decision_proceduret::D_UNSATISFIABLE:
return true; // no error
-
+
default:
throw "error from decision procedure";
}
return true; // not really reachable
}
-
diff --git a/src/aa-path-symex/path_symex_state.h b/src/aa-path-symex/path_symex_state.h
index f29d39da5c5..5663e07ce9a 100644
--- a/src/aa-path-symex/path_symex_state.h
+++ b/src/aa-path-symex/path_symex_state.h
@@ -104,7 +104,7 @@ class path_symex_statet
// it's a given explicit value or a symbol with given identifier
exprt value;
symbol_exprt ssa_symbol;
-
+
// for uninterpreted functions or arrays we maintain an index set
typedef std::set index_sett;
index_sett index_set;
@@ -115,11 +115,11 @@ class path_symex_statet
{
}
};
-
+
// the values of the shared variables
typedef std::vector var_valt;
var_valt shared_vars;
-
+
// procedure frame
struct framet
{
@@ -129,31 +129,31 @@ class path_symex_statet
var_valt saved_local_vars;
};
- // call stack
+ // call stack
typedef std::vector call_stackt;
-
+
// the state of a thread
struct threadt
{
public:
- loc_reft pc;
+ loc_reft pc;
call_stackt call_stack; // the call stack
var_valt local_vars; // thread-local variables
bool active;
-
+
threadt():active(true)
{
}
};
-
+
typedef std::vector threadst;
threadst threads;
// warning: reference is not stable
var_statet &get_var_state(const var_mapt::var_infot &var_info);
-
+
bool inside_atomic_section;
-
+
inline unsigned get_current_thread() const
{
return current_thread;
@@ -163,7 +163,7 @@ class path_symex_statet
{
current_thread=_thread;
}
-
+
goto_programt::const_targett get_instruction() const;
// branch taken case
@@ -198,7 +198,7 @@ class path_symex_statet
// execution history
path_symex_step_reft history;
-
+
// adds an entry to the history
void record_step();
@@ -206,13 +206,13 @@ class path_symex_statet
void record_branch_step(bool taken);
// various state transformers
-
+
inline threadt &add_thread()
{
threads.resize(threads.size()+1);
return threads.back();
}
-
+
inline void disable_current_thread()
{
threads[current_thread].active=false;
@@ -232,8 +232,8 @@ class path_symex_statet
{
threads[current_thread].pc=new_pc;
}
-
- // output
+
+ // output
void output(std::ostream &out) const;
void output(const threadt &thread, std::ostream &out) const;
@@ -242,7 +242,7 @@ class path_symex_statet
{
return read(src, true);
}
-
+
// instantiate without constant propagation
inline exprt read_no_propagate(const exprt &src)
{
@@ -252,17 +252,17 @@ class path_symex_statet
exprt dereference_rec(const exprt &src, bool propagate);
std::string array_index_as_string(const exprt &) const;
-
+
inline unsigned get_no_thread_interleavings() const
{
return no_thread_interleavings;
}
-
+
inline unsigned get_depth() const
{
return depth;
}
-
+
bool is_feasible(class decision_proceduret &) const;
bool check_assertion(class decision_proceduret &);
@@ -346,5 +346,5 @@ path_symex_statet initial_state(
var_mapt &var_map,
const locst &locs,
path_symex_historyt &);
-
+
#endif
diff --git a/src/aa-path-symex/var_map.cpp b/src/aa-path-symex/var_map.cpp
index fc4ec91ef31..a487db47bfd 100644
--- a/src/aa-path-symex/var_map.cpp
+++ b/src/aa-path-symex/var_map.cpp
@@ -41,13 +41,13 @@ void var_mapt::var_infot::output(std::ostream &out) const
case THREAD_LOCAL: out << "THREAD_LOCAL"; break;
case SHARED: out << "SHARED"; break;
}
-
+
out << "\n";
-
+
out << "number: " << number << "\n";
-
+
out << "type: " << type << "\n";
-
+
out << "\n";
}
@@ -85,7 +85,7 @@ void var_mapt::init(var_infot &var_info)
else
var_info.kind=var_infot::PROCEDURE_LOCAL;
}
-
+
catch(std::string s)
{
throw "var_mapt::init identifier \"" +
diff --git a/src/aa-path-symex/var_map.h b/src/aa-path-symex/var_map.h
index c7b5bf50c03..e21c6d8e4d7 100644
--- a/src/aa-path-symex/var_map.h
+++ b/src/aa-path-symex/var_map.h
@@ -25,7 +25,7 @@ class var_mapt
struct var_infot
{
enum { SHARED, THREAD_LOCAL, PROCEDURE_LOCAL } kind;
-
+
inline bool is_shared() const
{
return kind==SHARED;
@@ -39,13 +39,13 @@ class var_mapt
// the type of the identifier (struct member or array)
typet type;
-
+
unsigned ssa_counter;
-
+
var_infot():kind(SHARED), number(0), ssa_counter(0)
{
}
-
+
irep_idt ssa_identifier() const;
symbol_exprt ssa_symbol() const
@@ -56,14 +56,14 @@ class var_mapt
return s;
}
- inline void increment_ssa_counter()
+ inline void increment_ssa_counter()
{
++ssa_counter;
}
-
+
void output(std::ostream &out) const;
};
-
+
typedef std::map id_mapt;
id_mapt id_map;
@@ -79,7 +79,7 @@ class var_mapt
result=id_map.insert(std::pair(
full_identifier, var_infot()));
-
+
if(result.second) // inserted?
{
result.first->second.full_identifier=full_identifier;
@@ -88,10 +88,10 @@ class var_mapt
result.first->second.type=type;
init(result.first->second);
}
-
+
return result.first->second;
}
-
+
inline var_infot &operator[](const irep_idt &full_identifier)
{
return id_map[full_identifier];
@@ -105,7 +105,7 @@ class var_mapt
dynamic_count=0;
id_map.clear();
}
-
+
void init(var_infot &var_info);
const namespacet &ns;
@@ -115,7 +115,7 @@ class var_mapt
public:
unsigned nondet_count; // free inputs
- unsigned dynamic_count; // memory allocation
+ unsigned dynamic_count; // memory allocation
};
#endif
diff --git a/src/aa-symex/Makefile b/src/aa-symex/Makefile
index 1a9068fb97c..5ff56e5ded2 100644
--- a/src/aa-symex/Makefile
+++ b/src/aa-symex/Makefile
@@ -59,4 +59,3 @@ symex$(EXEEXT): $(OBJ)
symex-mac-signed: cbmc$(EXEEXT)
strip symex$(EXEEXT) ; codesign -v -s $(OSX_IDENTITY) symex$(EXEEXT)
-
diff --git a/src/aa-symex/path_search.cpp b/src/aa-symex/path_search.cpp
index 103e23515ff..8ad24bc828e 100644
--- a/src/aa-symex/path_search.cpp
+++ b/src/aa-symex/path_search.cpp
@@ -49,14 +49,14 @@ path_searcht::resultt path_searcht::operator()(
locst locs(ns);
var_mapt var_map(ns);
-
+
locs.build(goto_functions);
- // this is the container for the history-forest
+ // this is the container for the history-forest
path_symex_historyt history;
-
+
queue.push_back(initial_state(var_map, locs, history));
-
+
// set up the statistics
number_of_paths=0;
number_of_instructions=0;
@@ -68,9 +68,9 @@ path_searcht::resultt path_searcht::operator()(
// stop the time
start_time=current_time();
-
+
initialize_property_map(goto_functions);
-
+
while(!queue.empty())
{
// Pick a state from the queue,
@@ -106,7 +106,7 @@ path_searcht::resultt path_searcht::operator()(
while(state->is_lazy() && state->is_executable());
assert(queue.size() == queue_size);
}
-
+
// TODO: check lazy states before fast forwarding, or perhaps it
// is better to even check before inserting into queue
if(drop_state(*state))
@@ -115,13 +115,13 @@ path_searcht::resultt path_searcht::operator()(
queue.erase(state);
continue;
}
-
+
if(!state->is_executable())
{
queue.erase(state);
continue;
}
-
+
// count only executable instructions
number_of_instructions++;
@@ -140,7 +140,7 @@ path_searcht::resultt path_searcht::operator()(
else
{
check_assertion(*state, ns);
-
+
// all assertions failed?
if(number_of_failed_properties==property_map.size())
break;
@@ -241,7 +241,7 @@ Function: path_searcht::try_await()
Inputs:
Outputs: returns true if and only if at least one child process
- has terminated
+ has terminated
Purpose: POSIX-compliant nonblocking wait on child processes,
child's status is preserved for await() function
@@ -287,7 +287,7 @@ void path_searcht::report_statistics()
<< number_of_VCCs_after_simplification
<< " remaining after simplification"
<< messaget::eom;
-
+
time_periodt total_time=current_time()-start_time;
status() << "Runtime: " << total_time << "s total, "
<< sat_time << "s SAT" << messaget::eom;
@@ -329,20 +329,20 @@ void path_searcht::do_show_vcc(
{
// keep statistics
number_of_VCCs++;
-
+
const goto_programt::instructiont &instruction=
*state.get_instruction();
-
+
mstreamt &out=result();
if(instruction.location.is_not_nil())
out << instruction.location << "\n";
-
+
if(instruction.location.get_comment()!="")
out << instruction.location.get_comment() << "\n";
-
+
unsigned count=1;
-
+
std::vector steps;
state.history.build_history(steps);
@@ -350,7 +350,7 @@ void path_searcht::do_show_vcc(
s_it=steps.begin();
s_it!=steps.end();
s_it++)
- {
+ {
if((*s_it)->guard.is_not_nil())
{
std::string string_value=from_expr(ns, "", (*s_it)->guard);
@@ -368,7 +368,7 @@ void path_searcht::do_show_vcc(
}
out << "|--------------------------" << "\n";
-
+
exprt assertion=state.read(instruction.guard);
out << "{" << 1 << "} "
@@ -376,7 +376,7 @@ void path_searcht::do_show_vcc(
if(!assertion.is_true())
number_of_VCCs_after_simplification++;
-
+
out << eom;
}
@@ -396,10 +396,10 @@ bool path_searcht::drop_state(const statet &state) const
{
// depth
if(depth_limit!=-1 && state.get_depth()>depth_limit) return true;
-
+
// context bound
if(context_bound!=-1 && state.get_no_thread_interleavings()) return true;
-
+
// unwinding limit -- loops
if(unwind_limit!=-1 && state.get_instruction()->is_backwards_goto())
{
@@ -410,7 +410,7 @@ bool path_searcht::drop_state(const statet &state) const
if(it->second>unwind_limit)
return true;
}
-
+
// unwinding limit -- recursion
if(unwind_limit!=-1 && state.get_instruction()->is_function_call())
{
@@ -421,7 +421,7 @@ bool path_searcht::drop_state(const statet &state) const
if(it->second>unwind_limit)
return true;
}
-
+
return false;
}
@@ -443,13 +443,13 @@ void path_searcht::check_assertion(
{
// keep statistics
number_of_VCCs++;
-
+
const goto_programt::instructiont &instruction=
*state.get_instruction();
irep_idt property_name=instruction.location.get_property_id();
property_entryt &property_entry=property_map[property_name];
-
+
if(property_entry.status==FAIL)
return; // already failed
else if(property_entry.status==NOT_REACHED)
@@ -463,7 +463,7 @@ void path_searcht::check_assertion(
// keep statistics
number_of_VCCs_after_simplification++;
-
+
status() << "Checking property " << property_name << eom;
// take the time
@@ -471,7 +471,7 @@ void path_searcht::check_assertion(
satcheckt satcheck;
bv_pointerst bv_pointers(ns, satcheck);
-
+
satcheck.set_message_handler(get_message_handler());
bv_pointers.set_message_handler(get_message_handler());
@@ -481,7 +481,7 @@ void path_searcht::check_assertion(
property_entry.status=FAIL;
number_of_failed_properties++;
}
-
+
sat_time+=current_time()-sat_start_time;
}
@@ -507,7 +507,7 @@ void path_searcht::initialize_property_map(
if(!it->second.is_inlined())
{
const goto_programt &goto_program=it->second.body;
-
+
for(goto_programt::instructionst::const_iterator
it=goto_program.instructions.begin();
it!=goto_program.instructions.end();
@@ -515,14 +515,14 @@ void path_searcht::initialize_property_map(
{
if(!it->is_assert())
continue;
-
+
const locationt &location=it->location;
-
+
irep_idt property_name=location.get_property_id();
-
+
property_entryt &property_entry=property_map[property_name];
property_entry.status=NOT_REACHED;
property_entry.description=location.get_comment();
}
- }
+ }
}
diff --git a/src/aa-symex/path_search.h b/src/aa-symex/path_search.h
index f10c9659ff6..4557f0736e2 100644
--- a/src/aa-symex/path_search.h
+++ b/src/aa-symex/path_search.h
@@ -32,7 +32,7 @@ class path_searcht:public safety_checkert
const goto_functionst &goto_functions);
bool show_vcc;
-
+
unsigned depth_limit;
unsigned context_bound;
unsigned unwind_limit;
@@ -56,7 +56,7 @@ class path_searcht:public safety_checkert
irep_idt description;
goto_tracet error_trace;
};
-
+
typedef std::map property_mapt;
property_mapt property_map;
@@ -75,18 +75,18 @@ class path_searcht:public safety_checkert
// State queue. Iterators are stable.
typedef std::list queuet;
queuet queue;
-
+
queuet::iterator pick_state();
-
+
bool execute(queuet::iterator state, const namespacet &);
-
+
void check_assertion(statet &state, const namespacet &);
void do_show_vcc(statet &state, const namespacet &);
-
+
bool drop_state(const statet &state) const;
-
+
void report_statistics();
-
+
void initialize_property_map(
const goto_functionst &goto_functions);
};
diff --git a/src/aa-symex/symex_main.cpp b/src/aa-symex/symex_main.cpp
index 4f0c56c15b3..eed970eb5cc 100644
--- a/src/aa-symex/symex_main.cpp
+++ b/src/aa-symex/symex_main.cpp
@@ -1,6 +1,6 @@
/*******************************************************************\
-Module: Symex Main Module
+Module: Symex Main Module
Author: Daniel Kroening, kroening@kroening.com
diff --git a/src/aa-symex/symex_parseoptions.cpp b/src/aa-symex/symex_parseoptions.cpp
index 11f1e7cfae2..a83ce22223f 100644
--- a/src/aa-symex/symex_parseoptions.cpp
+++ b/src/aa-symex/symex_parseoptions.cpp
@@ -56,7 +56,7 @@ symex_parseoptionst::symex_parseoptionst(int argc, const char **argv):
language_uit("Symex " CBMC_VERSION, cmdline)
{
}
-
+
/*******************************************************************\
Function: symex_parseoptionst::eval_verbosity
@@ -73,7 +73,7 @@ void symex_parseoptionst::eval_verbosity()
{
// this is our default verbosity
int v=messaget::M_STATISTICS;
-
+
if(cmdline.isset("verbosity"))
{
v=unsafe_string2int(cmdline.getval("verbosity"));
@@ -82,7 +82,7 @@ void symex_parseoptionst::eval_verbosity()
else if(v>10)
v=10;
}
-
+
set_verbosity(v);
}
@@ -207,7 +207,7 @@ int symex_parseoptionst::doit()
if(get_goto_program(options, goto_functions))
return 6;
-
+
label_properties(goto_functions);
if(cmdline.isset("show-properties"))
@@ -219,13 +219,13 @@ int symex_parseoptionst::doit()
if(set_properties(goto_functions))
return 7;
-
+
if(cmdline.isset("show-locs"))
{
const namespacet ns(symbol_table);
locst locs(ns);
locs.build(goto_functions);
- locs.output(std::cout);
+ locs.output(std::cout);
return 0;
}
@@ -235,7 +235,7 @@ int symex_parseoptionst::doit()
{
const namespacet ns(symbol_table);
path_searcht path_search(ns);
-
+
path_search.set_message_handler(get_message_handler());
path_search.set_verbosity(get_verbosity());
@@ -262,17 +262,17 @@ int symex_parseoptionst::doit()
report_properties(path_search.property_map);
report_success();
return 0;
-
+
case safety_checkert::UNSAFE:
report_properties(path_search.property_map);
report_failure();
return 10;
-
+
default:
return 8;
}
}
-
+
catch(const std::string error_msg)
{
error() << error_msg << messaget::eom;
@@ -285,7 +285,7 @@ int symex_parseoptionst::doit()
return 8;
}
- #if 0
+ #if 0
// let's log some more statistics
debug() << "Memory consumption:" << messaget::endl;
memory_info(debug());
@@ -324,12 +324,12 @@ bool symex_parseoptionst::set_properties(goto_functionst &goto_functions)
error(e);
return true;
}
-
+
catch(int)
{
return true;
}
-
+
return false;
}
@@ -344,7 +344,7 @@ Function: symex_parseoptionst::get_goto_program
Purpose:
\*******************************************************************/
-
+
bool symex_parseoptionst::get_goto_program(
const optionst &options,
goto_functionst &goto_functions)
@@ -365,7 +365,7 @@ bool symex_parseoptionst::get_goto_program(
if(read_goto_binary(cmdline.args[0],
symbol_table, goto_functions, get_message_handler()))
return true;
-
+
config.ansi_c.set_from_symbol_table(symbol_table);
if(cmdline.isset("show-symbol-table"))
@@ -373,9 +373,9 @@ bool symex_parseoptionst::get_goto_program(
show_symbol_table();
return true;
}
-
+
irep_idt entry_point=goto_functions.entry_point();
-
+
if(symbol_table.symbols.find(entry_point)==symbol_table.symbols.end())
{
error() << "The goto binary has no entry point; please complete linking" << eom;
@@ -389,43 +389,43 @@ bool symex_parseoptionst::get_goto_program(
error() << "Please give one source file only" << eom;
return true;
}
-
+
std::string filename=cmdline.args[0];
-
+
#ifdef _MSC_VER
std::ifstream infile(widen(filename).c_str());
#else
std::ifstream infile(filename.c_str());
#endif
-
+
if(!infile)
{
error() << "failed to open input file `" << filename << "'" << eom;
return true;
}
-
+
languaget *language=get_language_from_filename(filename);
-
+
if(language==NULL)
{
error() << "failed to figure out type of file `" << filename << "'" << eom;
return true;
}
-
+
status("Parsing", filename);
-
+
if(language->parse(infile, filename, get_message_handler()))
{
error() << "PARSING ERROR" << eom;
return true;
}
-
+
language->show_parse(std::cout);
return true;
}
else
{
-
+
if(parse()) return true;
if(typecheck()) return true;
if(final()) return true;
@@ -440,7 +440,7 @@ bool symex_parseoptionst::get_goto_program(
}
irep_idt entry_point=goto_functions.entry_point();
-
+
if(symbol_table.symbols.find(entry_point)==symbol_table.symbols.end())
{
error() << "No entry point; please provide a main function" << eom;
@@ -471,18 +471,18 @@ bool symex_parseoptionst::get_goto_program(
error(e);
return true;
}
-
+
catch(int)
{
return true;
}
-
+
catch(std::bad_alloc)
{
error() << "Out of memory" << eom;
return true;
}
-
+
return false;
}
@@ -497,7 +497,7 @@ Function: symex_parseoptionst::process_goto_program
Purpose:
\*******************************************************************/
-
+
bool symex_parseoptionst::process_goto_program(
const optionst &options,
goto_functionst &goto_functions)
@@ -509,20 +509,20 @@ bool symex_parseoptionst::process_goto_program(
// do partial inlining
status() << "Partial Inlining" << eom;
goto_partial_inline(goto_functions, ns, ui_message_handler);
-
+
// add generic checks
status() << "Generic Property Instrumentation" << eom;
goto_check(ns, options, goto_functions);
-
+
// recalculate numbers, etc.
goto_functions.update();
// add loop ids
goto_functions.compute_loop_numbers();
-
+
// if we aim to cover, replace
// all assertions by false to prevent simplification
-
+
if(cmdline.isset("cover-assertions"))
make_assertions_false(goto_functions);
@@ -552,18 +552,18 @@ bool symex_parseoptionst::process_goto_program(
error(e);
return true;
}
-
+
catch(int)
{
return true;
}
-
+
catch(std::bad_alloc)
{
error() << "Out of memory" << eom;
return true;
}
-
+
return false;
}
@@ -635,10 +635,10 @@ void symex_parseoptionst::report_properties(
it++)
if(it->second.status==path_searcht::FAIL)
failed++;
-
+
status() << "** " << failed
<< " of " << property_map.size() << " failed"
- << eom;
+ << eom;
}
}
@@ -662,7 +662,7 @@ void symex_parseoptionst::report_success()
{
case ui_message_handlert::PLAIN:
break;
-
+
case ui_message_handlert::XML_UI:
{
xmlt xml("cprover-status");
@@ -671,7 +671,7 @@ void symex_parseoptionst::report_success()
std::cout << std::endl;
}
break;
-
+
default:
assert(false);
}
@@ -700,7 +700,7 @@ void symex_parseoptionst::show_counterexample(
std::cout << std::endl << "Counterexample:" << std::endl;
show_goto_trace(std::cout, ns, error_trace);
break;
-
+
case ui_message_handlert::XML_UI:
{
xmlt xml;
@@ -708,7 +708,7 @@ void symex_parseoptionst::show_counterexample(
std::cout << xml << std::endl;
}
break;
-
+
default:
assert(false);
}
@@ -734,7 +734,7 @@ void symex_parseoptionst::report_failure()
{
case ui_message_handlert::PLAIN:
break;
-
+
case ui_message_handlert::XML_UI:
{
xmlt xml("cprover-status");
@@ -743,7 +743,7 @@ void symex_parseoptionst::report_failure()
std::cout << std::endl;
}
break;
-
+
default:
assert(false);
}
@@ -766,11 +766,11 @@ void symex_parseoptionst::help()
std::cout <<
"\n"
"* * Symex " CBMC_VERSION " - Copyright (C) 2013 ";
-
+
std::cout << "(" << (sizeof(void *)*8) << "-bit version)";
-
+
std::cout << " * *\n";
-
+
std::cout <<
"* * Daniel Kroening * *\n"
"* * University of Oxford * *\n"
diff --git a/src/aa-symex/symex_parseoptions.h b/src/aa-symex/symex_parseoptions.h
index ba70d68c242..4c2ba908088 100644
--- a/src/aa-symex/symex_parseoptions.h
+++ b/src/aa-symex/symex_parseoptions.h
@@ -63,14 +63,14 @@ class symex_parseoptionst:
bool process_goto_program(
const optionst &options,
goto_functionst &goto_functions);
-
+
bool set_properties(goto_functionst &goto_functions);
void report_success();
void report_failure();
void report_properties(const path_searcht::property_mapt &);
void show_counterexample(const class goto_tracet &);
-
+
void eval_verbosity();
};
diff --git a/src/analyses/Makefile b/src/analyses/Makefile
index 4aa6927e205..89f14e4f768 100644
--- a/src/analyses/Makefile
+++ b/src/analyses/Makefile
@@ -19,6 +19,5 @@ all: analyses$(LIBEXT)
###############################################################################
-analyses$(LIBEXT): $(OBJ)
+analyses$(LIBEXT): $(OBJ)
$(LINKLIB)
-
diff --git a/src/analyses/ai.cpp b/src/analyses/ai.cpp
index dd976334aae..2b8f46d08cd 100644
--- a/src/analyses/ai.cpp
+++ b/src/analyses/ai.cpp
@@ -98,10 +98,10 @@ Function: ai_baset::entry_state
void ai_baset::entry_state(const goto_functionst &goto_functions)
{
// find the 'entry function'
-
+
goto_functionst::function_mapt::const_iterator
f_it=goto_functions.function_map.find(goto_functions.entry_point());
-
+
if(f_it!=goto_functions.function_map.end())
entry_state(f_it->second.body);
}
@@ -122,7 +122,7 @@ void ai_baset::entry_state(const goto_programt &goto_program)
{
// The first instruction of 'goto_program' is the entry point,
// and we make that 'top'.
- get_state(goto_program.instructions.begin()).make_top();
+ get_state(goto_program.instructions.begin()).make_top();
}
/*******************************************************************\
@@ -199,11 +199,11 @@ ai_baset::locationt ai_baset::get_next(
working_sett &working_set)
{
assert(!working_set.empty());
-
+
working_sett::iterator i=working_set.begin();
locationt l=i->second;
working_set.erase(i);
-
+
return l;
}
@@ -229,13 +229,13 @@ bool ai_baset::fixedpoint(
// We will put all locations at least once into the working set.
forall_goto_program_instructions(i_it, goto_program)
put_in_working_set(working_set, i_it);
-
+
bool new_data=false;
while(!working_set.empty())
{
locationt l=get_next(working_set);
-
+
if(visit(l, working_set, goto_program, goto_functions, ns))
new_data=true;
}
@@ -282,9 +282,9 @@ bool ai_baset::visit(
std::unique_ptr tmp_state(
make_temporary_state(current));
-
+
statet &new_values=*tmp_state;
-
+
bool have_new_values=false;
if(l->is_function_call() &&
@@ -307,18 +307,18 @@ bool ai_baset::visit(
get_state(to_l);
new_values.transform(l, to_l, *this, ns);
-
+
if(merge(new_values, l, to_l))
have_new_values=true;
}
-
+
if(have_new_values)
{
new_data=true;
put_in_working_set(working_set, to_l);
}
}
-
+
return new_data;
}
@@ -355,17 +355,17 @@ bool ai_baset::do_function_call(
return merge(*tmp_state, l_call, l_return);
}
-
+
assert(!goto_function.body.instructions.empty());
// This is the edge from call site to function head.
-
+
{
// get the state at the beginning of the function
locationt l_begin=goto_function.body.instructions.begin();
// initialize state, if necessary
get_state(l_begin);
-
+
// do the edge from the call site to the beginning of the function
std::unique_ptr tmp_state(make_temporary_state(get_state(l_call)));
tmp_state->transform(l_call, l_begin, *this, ns);
@@ -395,7 +395,7 @@ bool ai_baset::do_function_call(
// Propagate those
return merge(*tmp_state, l_end, l_return);
}
-}
+}
/*******************************************************************\
@@ -417,13 +417,13 @@ bool ai_baset::do_function_call_rec(
const namespacet &ns)
{
assert(!goto_functions.function_map.empty());
-
+
bool new_data=false;
if(function.id()==ID_symbol)
{
const irep_idt &identifier=function.get(ID_identifier);
-
+
if(recursion_set.find(identifier)!=recursion_set.end())
{
// recursion detected!
@@ -431,27 +431,27 @@ bool ai_baset::do_function_call_rec(
}
else
recursion_set.insert(identifier);
-
+
goto_functionst::function_mapt::const_iterator it=
goto_functions.function_map.find(identifier);
-
+
if(it==goto_functions.function_map.end())
throw "failed to find function "+id2string(identifier);
-
+
new_data=do_function_call(
l_call, l_return,
goto_functions,
it,
arguments,
ns);
-
+
recursion_set.erase(identifier);
}
else if(function.id()==ID_if)
{
if(function.operands().size()!=3)
throw "if has three operands";
-
+
bool new_data1=
do_function_call_rec(
l_call, l_return,
@@ -489,7 +489,7 @@ bool ai_baset::do_function_call_rec(
throw "unexpected function_call argument: "+
function.id_string();
}
-
+
return new_data;
}
@@ -596,4 +596,3 @@ void ai_baset::concurrent_fixedpoint(
}
}
}
-
diff --git a/src/analyses/ai.h b/src/analyses/ai.h
index 5265830c1e0..c362cce8474 100644
--- a/src/analyses/ai.h
+++ b/src/analyses/ai.h
@@ -31,9 +31,9 @@ class ai_domain_baset
virtual ~ai_domain_baset()
{
}
-
+
typedef goto_programt::const_targett locationt;
-
+
// how function calls are treated:
// a) there is an edge from each call site to the function head
// b) there is an edge from the last instruction (END_FUNCTION) of the function
@@ -52,7 +52,7 @@ class ai_domain_baset
const namespacet &ns) const
{
}
-
+
// no states
virtual void make_bottom()
{
@@ -62,12 +62,12 @@ class ai_domain_baset
virtual void make_top()
{
}
-
+
// a reasonable entry-point state
virtual void make_entry()
{
}
-
+
// also add
//
// bool merge(const T &b, locationt from, locationt to);
@@ -87,7 +87,7 @@ class ai_baset
ai_baset()
{
}
-
+
virtual ~ai_baset()
{
}
@@ -101,7 +101,7 @@ class ai_baset
entry_state(goto_program);
fixedpoint(goto_program, goto_functions, ns);
}
-
+
inline void operator()(
const goto_functionst &goto_functions,
const namespacet &ns)
@@ -132,7 +132,7 @@ class ai_baset
virtual void clear()
{
}
-
+
virtual void output(
const namespacet &ns,
const goto_functionst &goto_functions,
@@ -179,9 +179,9 @@ class ai_baset
// the work-queue is sorted by location number
typedef std::map working_sett;
-
+
locationt get_next(working_sett &working_set);
-
+
void put_in_working_set(
working_sett &working_set,
locationt l)
@@ -189,13 +189,13 @@ class ai_baset
working_set.insert(
std::pair(l->location_number, l));
}
-
+
// true = found s.th. new
bool fixedpoint(
const goto_programt &goto_program,
const goto_functionst &goto_functions,
const namespacet &ns);
-
+
virtual void fixedpoint(
const goto_functionst &goto_functions,
const namespacet &ns)=0;
@@ -214,10 +214,10 @@ class ai_baset
const goto_programt &goto_program,
const goto_functionst &goto_functions,
const namespacet &ns);
-
+
typedef std::set recursion_sett;
recursion_sett recursion_set;
-
+
// function calls
bool do_function_call_rec(
locationt l_call, locationt l_return,
@@ -234,7 +234,7 @@ class ai_baset
const namespacet &ns);
// abstract methods
-
+
virtual bool merge(const statet &src, locationt from, locationt to)=0;
// for concurrent fixedpoint
virtual bool merge_shared(
@@ -265,14 +265,14 @@ class ait:public ai_baset
if(it==state_map.end()) throw "failed to find state";
return it->second;
}
-
+
inline const domainT &operator[](locationt l) const
{
typename state_mapt::const_iterator it=state_map.find(l);
if(it==state_map.end()) throw "failed to find state";
return it->second;
}
-
+
virtual void clear()
{
state_map.clear();
@@ -302,7 +302,7 @@ class ait:public ai_baset
statet &dest=get_state(to);
return static_cast(dest).merge(static_cast(src), from, to);
}
-
+
virtual statet *make_temporary_state(const statet &s)
{
return new domainT(static_cast(s));
@@ -315,7 +315,7 @@ class ait:public ai_baset
sequential_fixedpoint(goto_functions, ns);
}
-private:
+private:
// to enforce that domainT is derived from ai_domain_baset
void dummy(const domainT &s) { const statet &x=s; (void)x; }
diff --git a/src/analyses/call_graph.cpp b/src/analyses/call_graph.cpp
index adefb37fb06..347bcd0a0b2 100644
--- a/src/analyses/call_graph.cpp
+++ b/src/analyses/call_graph.cpp
@@ -19,7 +19,7 @@ Function: call_grapht::call_grapht
Outputs:
- Purpose:
+ Purpose:
\*******************************************************************/
@@ -35,7 +35,7 @@ Function: call_grapht::call_grapht
Outputs:
- Purpose:
+ Purpose:
\*******************************************************************/
@@ -56,7 +56,7 @@ Function: call_grapht::add
Outputs:
- Purpose:
+ Purpose:
\*******************************************************************/
@@ -83,7 +83,7 @@ Function: call_grapht::add
Outputs:
- Purpose:
+ Purpose:
\*******************************************************************/
@@ -102,7 +102,7 @@ Function: call_grapht::output_dot
Outputs:
- Purpose:
+ Purpose:
\*******************************************************************/
@@ -119,7 +119,7 @@ void call_grapht::output_dot(std::ostream &out) const
<< " [arrowhead=\"vee\"];"
<< "\n";
}
-
+
out << "}\n";
}
@@ -131,7 +131,7 @@ Function: call_grapht::output
Outputs:
- Purpose:
+ Purpose:
\*******************************************************************/
@@ -154,7 +154,7 @@ Function: call_grapht::output_xml
Outputs:
- Purpose:
+ Purpose:
\*******************************************************************/
diff --git a/src/analyses/call_graph.h b/src/analyses/call_graph.h
index beceb50b792..935f6a94f9d 100644
--- a/src/analyses/call_graph.h
+++ b/src/analyses/call_graph.h
@@ -28,7 +28,7 @@ class call_grapht
grapht graph;
void add(const irep_idt &caller, const irep_idt &callee);
-
+
protected:
void add(const irep_idt &function,
const goto_programt &body);
diff --git a/src/analyses/cfg_dominators.h b/src/analyses/cfg_dominators.h
index 8fda453a7eb..c80754e4f1f 100644
--- a/src/analyses/cfg_dominators.h
+++ b/src/analyses/cfg_dominators.h
@@ -136,7 +136,7 @@ void cfg_dominators_templatet::fixedpoint(P &program)
typename cfgt::nodet &n=cfg[cfg.entry_map[entry_node]];
n.dominators.insert(entry_node);
- for(typename cfgt::edgest::const_iterator
+ for(typename cfgt::edgest::const_iterator
s_it=(post_dom?n.in:n.out).begin();
s_it!=(post_dom?n.in:n.out).end();
++s_it)
@@ -151,7 +151,7 @@ void cfg_dominators_templatet::fixedpoint(P &program)
bool changed=false;
typename cfgt::nodet &node=cfg[cfg.entry_map[current]];
if(node.dominators.empty())
- for(typename cfgt::edgest::const_iterator
+ for(typename cfgt::edgest::const_iterator
p_it=(post_dom?node.out:node.in).begin();
!changed && p_it!=(post_dom?node.out:node.in).end();
++p_it)
@@ -163,11 +163,11 @@ void cfg_dominators_templatet::fixedpoint(P &program)
}
// compute intersection of predecessors
- for(typename cfgt::edgest::const_iterator
+ for(typename cfgt::edgest::const_iterator
p_it=(post_dom?node.out:node.in).begin();
p_it!=(post_dom?node.out:node.in).end();
++p_it)
- {
+ {
const target_sett &other=cfg[p_it->first].dominators;
if(other.empty())
continue;
@@ -198,7 +198,7 @@ void cfg_dominators_templatet::fixedpoint(P &program)
if(changed) // fixed point for node reached?
{
- for(typename cfgt::edgest::const_iterator
+ for(typename cfgt::edgest::const_iterator
s_it=(post_dom?node.in:node.out).begin();
s_it!=(post_dom?node.in:node.out).end();
++s_it)
@@ -229,7 +229,7 @@ void cfg_dominators_templatet::output(std::ostream &out) const
it!=cfg.entry_map.end(); ++it)
{
unsigned n=it->first->location_number;
-
+
if(post_dom)
out << n << " post-dominated by ";
else
@@ -238,7 +238,7 @@ void cfg_dominators_templatet::output(std::ostream &out) const
d_it!=it->second.dominators.end();)
{
out << (*d_it)->location_number;
- if (++d_it!=it->second.dominators.end())
+ if (++d_it!=it->second.dominators.end())
out << ", ";
}
out << "\n";
diff --git a/src/analyses/constant_propagator.cpp b/src/analyses/constant_propagator.cpp
index 7e66937efee..66fb6ef71b3 100644
--- a/src/analyses/constant_propagator.cpp
+++ b/src/analyses/constant_propagator.cpp
@@ -85,7 +85,7 @@ void constant_propagator_domaint::transform(
std::cout << "before:\n";
output(std::cout,ai,ns);
#endif
-
+
if(from->is_decl())
{
const code_declt &code_decl=to_code_decl(from->code);
@@ -105,7 +105,7 @@ void constant_propagator_domaint::transform(
}
else if(from->is_goto())
{
- exprt g;
+ exprt g;
if(from->get_target()==to)
g = simplify_expr(from->guard, ns);
else
@@ -121,7 +121,7 @@ void constant_propagator_domaint::transform(
else if(from->is_function_call())
{
const exprt &function=to_code_function_call(from->code).function();
-
+
if(function.id()==ID_symbol)
{
const irep_idt &identifier=to_symbol_expr(function).get_identifier();
@@ -168,14 +168,14 @@ bool constant_propagator_domaint::two_way_propagate_rec(
std::cout << "two_way_propagate_rec: " << from_expr(ns,"",expr) << '\n';
#endif
bool change = false;
-
+
if(expr.id()==ID_and)
{
// need a fixed point here to get the most out of it
do
{
change = false;
-
+
forall_operands(it, expr)
if(two_way_propagate_rec(*it, ns))
change = true;
@@ -184,10 +184,10 @@ bool constant_propagator_domaint::two_way_propagate_rec(
}
else if(expr.id()==ID_equal)
{
- const exprt &lhs = expr.op0();
+ const exprt &lhs = expr.op0();
const exprt &rhs = expr.op1();
- // two-way propagation
+ // two-way propagation
valuest copy_values = values;
assign_rec(copy_values, lhs, rhs, ns);
if(!values.is_constant(rhs) || values.is_constant(lhs))
@@ -238,12 +238,12 @@ Function: constant_propagator_domaint::valuest::is_constant
bool constant_propagator_domaint::valuest::is_constant(const exprt &expr) const
{
- if(expr.id()==ID_side_effect &&
- to_side_effect_expr(expr).get_statement()==ID_nondet)
+ if(expr.id()==ID_side_effect &&
+ to_side_effect_expr(expr).get_statement()==ID_nondet)
return false;
- if(expr.id()==ID_side_effect &&
- to_side_effect_expr(expr).get_statement()==ID_malloc)
+ if(expr.id()==ID_side_effect &&
+ to_side_effect_expr(expr).get_statement()==ID_malloc)
return false;
if(expr.id()==ID_symbol)
@@ -278,16 +278,16 @@ bool constant_propagator_domaint::valuest::is_constant_address_of(const exprt &e
if(expr.id()==ID_index)
return is_constant_address_of(to_index_expr(expr).array()) &&
is_constant(to_index_expr(expr).index());
-
+
if(expr.id()==ID_member)
return is_constant_address_of(to_member_expr(expr).struct_op());
-
+
if(expr.id()==ID_dereference)
return is_constant(to_dereference_expr(expr).pointer());
if(expr.id()==ID_string_constant)
return true;
-
+
return true;
}
@@ -341,7 +341,7 @@ void constant_propagator_domaint::valuest::output(
if(is_bottom)
out << " bottom\n";
- for(replace_symbolt::expr_mapt::const_iterator
+ for(replace_symbolt::expr_mapt::const_iterator
it=replace_const.expr_map.begin();
it!=replace_const.expr_map.end();
++it)
@@ -383,7 +383,7 @@ Function: constant_propagator_domaint::valuest::merge
bool constant_propagator_domaint::valuest::merge(const valuest &src)
{
- //nothing to do
+ //nothing to do
if(src.is_bottom)
return false;
@@ -394,11 +394,11 @@ bool constant_propagator_domaint::valuest::merge(const valuest &src)
is_bottom = src.is_bottom;
return true;
}
-
+
bool changed = false;
//set everything to top that is not in src
- for(replace_symbolt::expr_mapt::const_iterator
+ for(replace_symbolt::expr_mapt::const_iterator
it=replace_const.expr_map.begin();
it!=replace_const.expr_map.end();
)
@@ -413,12 +413,12 @@ bool constant_propagator_domaint::valuest::merge(const valuest &src)
else ++it;
}
- for(replace_symbolt::expr_mapt::const_iterator
+ for(replace_symbolt::expr_mapt::const_iterator
it=src.replace_const.expr_map.begin();
it!=src.replace_const.expr_map.end();
++it)
- {
- replace_symbolt::expr_mapt::iterator
+ {
+ replace_symbolt::expr_mapt::iterator
c_it = replace_const.expr_map.find(it->first);
if(c_it != replace_const.expr_map.end())
@@ -457,15 +457,15 @@ bool constant_propagator_domaint::valuest::meet(const valuest &src)
{
if(src.is_bottom || is_bottom)
return false;
-
+
bool changed = false;
- for(replace_symbolt::expr_mapt::const_iterator
+ for(replace_symbolt::expr_mapt::const_iterator
it=src.replace_const.expr_map.begin();
it!=src.replace_const.expr_map.end();
++it)
{
- replace_symbolt::expr_mapt::iterator
+ replace_symbolt::expr_mapt::iterator
c_it = replace_const.expr_map.find(it->first);
if(c_it != replace_const.expr_map.end())
@@ -513,7 +513,7 @@ Function: constant_propagator_ait::replace
Inputs:
- Outputs:
+ Outputs:
Purpose:
@@ -533,7 +533,7 @@ Function: constant_propagator_ait::replace
Inputs:
- Outputs:
+ Outputs:
Purpose:
@@ -568,8 +568,8 @@ void constant_propagator_ait::replace(
{
s_it->second.values.replace_const(to_code_function_call(it->code).function());
simplify_expr(to_code_function_call(it->code).function(), ns);
-
- exprt::operandst &args =
+
+ exprt::operandst &args =
to_code_function_call(it->code).arguments();
for(exprt::operandst::iterator o_it = args.begin();
@@ -593,14 +593,14 @@ Function: constant_propagator_ait::replace_types_rec
Inputs:
- Outputs:
+ Outputs:
Purpose:
\*******************************************************************/
void constant_propagator_ait::replace_types_rec(
- const replace_symbolt &replace_const,
+ const replace_symbolt &replace_const,
exprt &expr)
{
replace_const(expr.type());
@@ -608,4 +608,3 @@ void constant_propagator_ait::replace_types_rec(
Forall_operands(it, expr)
replace_types_rec(replace_const, *it);
}
-
diff --git a/src/analyses/constant_propagator.h b/src/analyses/constant_propagator.h
index 7c7d7086373..36170c71a74 100644
--- a/src/analyses/constant_propagator.h
+++ b/src/analyses/constant_propagator.h
@@ -24,22 +24,22 @@ class constant_propagator_domaint:public ai_domain_baset
{
public:
valuest():is_bottom(true) { }
-
+
// maps variables to constants
replace_symbol_extt replace_const;
bool is_bottom;
-
+
void output(std::ostream &, const namespacet &) const;
-
+
bool merge(const valuest &src);
bool meet(const valuest &src);
-
+
inline void set_to_bottom()
{
replace_const.clear();
is_bottom = true;
}
-
+
inline void set_to(const irep_idt &lhs_id, const exprt &rhs_val)
{
replace_const.expr_map[lhs_id] = rhs_val;
@@ -59,7 +59,7 @@ class constant_propagator_domaint:public ai_domain_baset
{
return set_to_top(expr.get_identifier());
}
-
+
inline void set_to_top()
{
replace_const.clear();
@@ -68,7 +68,7 @@ class constant_propagator_domaint:public ai_domain_baset
};
valuest values;
-
+
protected:
void assign(
valuest &dest,
@@ -115,7 +115,7 @@ class constant_propagator_ait:public ait
const namespacet &);
void replace_types_rec(
- const replace_symbolt &replace_const,
+ const replace_symbolt &replace_const,
exprt &expr);
};
diff --git a/src/analyses/custom_bitvector_analysis.cpp b/src/analyses/custom_bitvector_analysis.cpp
index 8ed4da40997..883ea1ef188 100644
--- a/src/analyses/custom_bitvector_analysis.cpp
+++ b/src/analyses/custom_bitvector_analysis.cpp
@@ -21,7 +21,7 @@ Function: custom_bitvector_domaint::set_bit
Outputs:
- Purpose:
+ Purpose:
\*******************************************************************/
@@ -35,15 +35,15 @@ void custom_bitvector_domaint::set_bit(
case SET_MUST:
set_bit(must_bits[identifier], bit_nr);
break;
-
+
case CLEAR_MUST:
clear_bit(must_bits[identifier], bit_nr);
break;
-
+
case SET_MAY:
set_bit(may_bits[identifier], bit_nr);
break;
-
+
case CLEAR_MAY:
clear_bit(may_bits[identifier], bit_nr);
break;
@@ -58,7 +58,7 @@ Function: custom_bitvector_domaint::set_bit
Outputs:
- Purpose:
+ Purpose:
\*******************************************************************/
@@ -79,7 +79,7 @@ Function: custom_bitvector_domaint::object2id
Outputs:
- Purpose:
+ Purpose:
\*******************************************************************/
@@ -92,7 +92,7 @@ irep_idt custom_bitvector_domaint::object2id(const exprt &src)
else if(src.id()==ID_dereference)
{
const exprt &op=to_dereference_expr(src).pointer();
-
+
if(op.id()==ID_address_of)
{
return object2id(to_address_of_expr(op).object());
@@ -124,7 +124,7 @@ Function: custom_bitvector_domaint::assign_lhs
Outputs:
- Purpose:
+ Purpose:
\*******************************************************************/
@@ -144,7 +144,7 @@ Function: custom_bitvector_domaint::assign_lhs
Outputs:
- Purpose:
+ Purpose:
\*******************************************************************/
@@ -158,7 +158,7 @@ void custom_bitvector_domaint::assign_lhs(
must_bits.erase(identifier);
else
must_bits[identifier]=vectors.must_bits;
-
+
if(vectors.may_bits==0)
may_bits.erase(identifier);
else
@@ -173,7 +173,7 @@ Function: custom_bitvector_domaint::get_rhs
Outputs:
- Purpose:
+ Purpose:
\*******************************************************************/
@@ -184,10 +184,10 @@ custom_bitvector_domaint::vectorst
bitst::const_iterator may_it=may_bits.find(identifier);
if(may_it!=may_bits.end()) vectors.may_bits=may_it->second;
-
+
bitst::const_iterator must_it=must_bits.find(identifier);
if(must_it!=must_bits.end()) vectors.must_bits=must_it->second;
-
+
return vectors;
}
@@ -199,7 +199,7 @@ Function: custom_bitvector_domaint::get_rhs
Outputs:
- Purpose:
+ Purpose:
\*******************************************************************/
@@ -223,7 +223,7 @@ custom_bitvector_domaint::vectorst
vectorst v_false=get_rhs(to_if_expr(rhs).false_case());
return merge(v_true, v_false);
}
-
+
return vectorst();
}
@@ -235,7 +235,7 @@ Function: custom_bitvector_analysist::get_bit_nr
Outputs:
- Purpose:
+ Purpose:
\*******************************************************************/
@@ -250,9 +250,9 @@ unsigned custom_bitvector_analysist::get_bit_nr(
return get_bit_nr(to_index_expr(string_expr).array());
else if(string_expr.id()==ID_string_constant)
{
- irep_idt value=string_expr.get(ID_value);
+ irep_idt value=string_expr.get(ID_value);
return bits(value);
- }
+ }
else
return bits("(unknown)");
}
@@ -265,7 +265,7 @@ Function: custom_bitvector_domaint::aliases
Outputs:
- Purpose:
+ Purpose:
\*******************************************************************/
@@ -282,7 +282,7 @@ std::set custom_bitvector_analysist::aliases(
else if(src.id()==ID_dereference)
{
exprt pointer=to_dereference_expr(src).pointer();
-
+
std::set pointer_set=
local_may_alias_factory(loc).get(loc, pointer);
@@ -295,9 +295,9 @@ std::set custom_bitvector_analysist::aliases(
{
result.insert(dereference_exprt(*p_it));
}
-
+
result.insert(src);
-
+
return result;
}
else if(src.id()==ID_typecast)
@@ -316,7 +316,7 @@ Function: custom_bitvector_domaint::transform
Outputs:
- Purpose:
+ Purpose:
\*******************************************************************/
@@ -340,15 +340,15 @@ void custom_bitvector_domaint::transform(
// may alias other stuff
std::set lhs_set=cba.aliases(code_assign.lhs(), from);
-
+
vectorst rhs_vectors=get_rhs(code_assign.rhs());
-
+
for(std::set::const_iterator
l_it=lhs_set.begin(); l_it!=lhs_set.end(); l_it++)
{
assign_lhs(*l_it, rhs_vectors);
}
-
+
// is it a pointer?
if(code_assign.lhs().type().id()==ID_pointer)
{
@@ -386,7 +386,7 @@ void custom_bitvector_domaint::transform(
{
const code_function_callt &code_function_call=to_code_function_call(instruction.code);
const exprt &function=code_function_call.function();
-
+
if(function.id()==ID_symbol)
{
const irep_idt &identifier=to_symbol_expr(function).get_identifier();
@@ -400,9 +400,9 @@ void custom_bitvector_domaint::transform(
{
unsigned bit_nr=
cba.get_bit_nr(code_function_call.arguments()[1]);
-
+
modet mode;
-
+
if(identifier=="__CPROVER_set_must")
mode=SET_MUST;
else if(identifier=="__CPROVER_clear_must")
@@ -413,9 +413,9 @@ void custom_bitvector_domaint::transform(
mode=CLEAR_MAY;
else
assert(false);
-
+
exprt lhs=code_function_call.arguments()[0];
-
+
if(lhs.is_constant() &&
to_constant_expr(lhs).get_value()==ID_NULL) // NULL means all
{
@@ -443,10 +443,10 @@ void custom_bitvector_domaint::transform(
else
{
dereference_exprt deref(lhs);
-
+
// may alias other stuff
std::set lhs_set=cba.aliases(deref, from);
-
+
for(std::set::const_iterator
l_it=lhs_set.begin(); l_it!=lhs_set.end(); l_it++)
{
@@ -458,11 +458,11 @@ void custom_bitvector_domaint::transform(
}
}
break;
-
+
case OTHER:
{
const irep_idt &statement=instruction.code.get_statement();
-
+
if(statement=="set_may" ||
statement=="set_must" ||
statement=="clear_may" ||
@@ -472,9 +472,9 @@ void custom_bitvector_domaint::transform(
unsigned bit_nr=
cba.get_bit_nr(instruction.code.op1());
-
+
modet mode;
-
+
if(statement=="set_must")
mode=SET_MUST;
else if(statement=="clear_must")
@@ -485,9 +485,9 @@ void custom_bitvector_domaint::transform(
mode=CLEAR_MAY;
else
assert(false);
-
+
exprt lhs=instruction.code.op0();
-
+
if(lhs.is_constant() &&
to_constant_expr(lhs).get_value()==ID_NULL) // NULL means all
{
@@ -515,10 +515,10 @@ void custom_bitvector_domaint::transform(
else
{
dereference_exprt deref(lhs);
-
+
// may alias other stuff
std::set lhs_set=cba.aliases(deref, from);
-
+
for(std::set::const_iterator
l_it=lhs_set.begin(); l_it!=lhs_set.end(); l_it++)
{
@@ -528,12 +528,12 @@ void custom_bitvector_domaint::transform(
}
}
break;
-
+
case GOTO:
if(has_get_must_or_may(instruction.guard))
{
exprt guard=instruction.guard;
-
+
if(to!=from->get_target()) guard.make_not();
exprt result=eval(guard, cba);
@@ -556,7 +556,7 @@ Function: custom_bitvector_domaint::output
Outputs:
- Purpose:
+ Purpose:
\*******************************************************************/
@@ -570,14 +570,14 @@ void custom_bitvector_domaint::output(
const custom_bitvector_analysist &cba=
static_cast(ai);
-
+
for(bitst::const_iterator it=may_bits.begin();
it!=may_bits.end();
it++)
{
out << it->first << " MAY:";
bit_vectort b=it->second;
-
+
for(unsigned i=0; b!=0; i++, b>>=1)
if(b&1)
{
@@ -616,7 +616,7 @@ Function: custom_bitvector_domaint::merge
Outputs:
- Purpose:
+ Purpose:
\*******************************************************************/
@@ -667,7 +667,7 @@ bool custom_bitvector_domaint::merge(
if(old!=a_it->second) changed=true;
}
}
-
+
// erase blank ones
erase_blank_vectors(may_bits);
erase_blank_vectors(must_bits);
@@ -708,7 +708,7 @@ Function: custom_bitvector_domaint::has_get_must_or_may
Outputs:
- Purpose:
+ Purpose:
\*******************************************************************/
@@ -717,7 +717,7 @@ bool custom_bitvector_domaint::has_get_must_or_may(const exprt &src)
if(src.id()=="get_must" ||
src.id()=="get_may")
return true;
-
+
forall_operands(it, src)
if(has_get_must_or_may(*it)) return true;
@@ -732,7 +732,7 @@ Function: custom_bitvector_domaint::eval
Outputs:
- Purpose:
+ Purpose:
\*******************************************************************/
@@ -748,7 +748,7 @@ exprt custom_bitvector_domaint::eval(
custom_bitvector_analysis.get_bit_nr(src.op1());
exprt pointer=src.op0();
-
+
if(pointer.is_constant() &&
to_constant_expr(pointer).get_value()==ID_NULL) // NULL means all
{
@@ -761,7 +761,7 @@ exprt custom_bitvector_domaint::eval(
{
if(get_bit(b_it->second, bit_nr)) return true_exprt();
}
-
+
return false_exprt();
}
else if(src.id()=="get_must")
@@ -797,7 +797,7 @@ exprt custom_bitvector_domaint::eval(
exprt tmp=src;
Forall_operands(it, tmp)
*it=eval(*it, custom_bitvector_analysis);
-
+
return tmp;
}
}
@@ -810,7 +810,7 @@ Function: custom_bitvector_analysist::instrument
Outputs:
- Purpose:
+ Purpose:
\*******************************************************************/
@@ -826,7 +826,7 @@ Function: custom_bitvector_analysist::check
Outputs:
- Purpose:
+ Purpose:
\*******************************************************************/
@@ -841,7 +841,7 @@ void custom_bitvector_analysist::check(
forall_goto_functions(f_it, goto_functions)
{
if(!f_it->second.body.has_assertion()) continue;
-
+
if(f_it->first=="__actual_thread_spawn")
continue;
@@ -852,7 +852,7 @@ void custom_bitvector_analysist::check(
{
exprt result;
irep_idt description;
-
+
if(i_it->is_assert())
{
if(!custom_bitvector_domaint::has_get_must_or_may(i_it->guard))
@@ -862,7 +862,7 @@ void custom_bitvector_analysist::check(
exprt tmp=eval(i_it->guard, i_it);
result=simplify_expr(tmp, ns);
-
+
description=i_it->source_location.get_comment();
}
else
@@ -875,7 +875,7 @@ void custom_bitvector_analysist::check(
out << "SUCCESS";
else if(result.is_false())
out << "FAILURE";
- else
+ else
out << "UNKNOWN";
out << "\">\n";
out << xml(i_it->source_location);
@@ -905,7 +905,7 @@ void custom_bitvector_analysist::check(
if(!use_xml)
out << '\n';
}
-
+
if(!use_xml)
out << "SUMMARY: " << pass << " pass, " << fail << " fail, "
<< unknown << " unknown\n";
diff --git a/src/analyses/custom_bitvector_analysis.h b/src/analyses/custom_bitvector_analysis.h
index 9433b919408..b700c0b35ed 100644
--- a/src/analyses/custom_bitvector_analysis.h
+++ b/src/analyses/custom_bitvector_analysis.h
@@ -17,7 +17,7 @@ Author: Daniel Kroening, kroening@kroening.com
/*******************************************************************\
Class: custom_bitvector_domaint
-
+
Purpose:
\*******************************************************************/
@@ -65,9 +65,9 @@ class custom_bitvector_domaint:public ai_domain_baset
locationt to);
typedef unsigned long long bit_vectort;
-
+
typedef std::map bitst;
-
+
struct vectorst
{
bit_vectort may_bits, must_bits;
@@ -75,7 +75,7 @@ class custom_bitvector_domaint:public ai_domain_baset
{
}
};
-
+
static vectorst merge(const vectorst &a, const vectorst &b)
{
vectorst result;
@@ -83,16 +83,16 @@ class custom_bitvector_domaint:public ai_domain_baset
result.must_bits=a.must_bits&b.must_bits;
return result;
}
-
+
bitst may_bits, must_bits;
-
+
void assign_lhs(const exprt &, const vectorst &);
void assign_lhs(const irep_idt &, const vectorst &);
vectorst get_rhs(const exprt &) const;
vectorst get_rhs(const irep_idt &) const;
bool is_bottom;
-
+
custom_bitvector_domaint():is_bottom(true)
{
}
@@ -102,7 +102,7 @@ class custom_bitvector_domaint:public ai_domain_baset
const exprt &src,
custom_bitvector_analysist &) const;
-protected:
+protected:
typedef enum { SET_MUST, CLEAR_MUST, SET_MAY, CLEAR_MAY } modet;
void set_bit(const exprt &, unsigned bit_nr, modet);
@@ -112,24 +112,24 @@ class custom_bitvector_domaint:public ai_domain_baset
{
dest|=(1ll<
+class custom_bitvector_analysist:public ait
{
public:
void instrument(goto_functionst &);
@@ -144,7 +144,7 @@ class custom_bitvector_analysist:public ait
typedef numbering bitst;
bitst bits;
-
+
protected:
virtual void initialize(const goto_functionst &_goto_functions)
{
@@ -154,7 +154,7 @@ class custom_bitvector_analysist:public ait
friend class custom_bitvector_domaint;
local_may_alias_factoryt local_may_alias_factory;
-
+
std::set aliases(const exprt &, locationt loc);
};
diff --git a/src/analyses/dependence_graph.cpp b/src/analyses/dependence_graph.cpp
index 44bcf2211eb..2e20389259d 100644
--- a/src/analyses/dependence_graph.cpp
+++ b/src/analyses/dependence_graph.cpp
@@ -379,4 +379,3 @@ void dependence_grapht::add_dep(
nodes[n_from].out[n_to].add(kind);
nodes[n_to].in[n_from].add(kind);
}
-
diff --git a/src/analyses/dependence_graph.h b/src/analyses/dependence_graph.h
index 1b07b4ec140..cb25b7ff88b 100644
--- a/src/analyses/dependence_graph.h
+++ b/src/analyses/dependence_graph.h
@@ -177,4 +177,3 @@ class dependence_grapht:
};
#endif
-
diff --git a/src/analyses/dirty.cpp b/src/analyses/dirty.cpp
index aa1f4db55e1..bc4327581cd 100644
--- a/src/analyses/dirty.cpp
+++ b/src/analyses/dirty.cpp
@@ -53,7 +53,7 @@ void dirtyt::find_dirty(const exprt &expr)
find_dirty_address_of(address_of_expr.object());
return;
}
-
+
forall_operands(it, expr)
find_dirty(*it);
}
diff --git a/src/analyses/dirty.h b/src/analyses/dirty.h
index 709366ad33a..a200690b963 100644
--- a/src/analyses/dirty.h
+++ b/src/analyses/dirty.h
@@ -47,13 +47,13 @@ class dirtyt
{
return dirty;
}
-
+
protected:
void build(const goto_functiont &goto_function);
// variables whose address is taken
id_sett dirty;
-
+
void find_dirty(const exprt &expr);
void find_dirty_address_of(const exprt &expr);
};
diff --git a/src/analyses/escape_analysis.cpp b/src/analyses/escape_analysis.cpp
index 1cc15cd43c8..7d610c3198a 100644
--- a/src/analyses/escape_analysis.cpp
+++ b/src/analyses/escape_analysis.cpp
@@ -20,7 +20,7 @@ Function: escape_domaint::is_tracked
Outputs:
- Purpose:
+ Purpose:
\*******************************************************************/
@@ -32,7 +32,7 @@ bool escape_domaint::is_tracked(const symbol_exprt &symbol)
identifier=="__CPROVER_dead_object" ||
identifier=="__CPROVER_deallocated")
return false;
-
+
return true;
}
@@ -44,7 +44,7 @@ Function: escape_domaint::get_function
Outputs:
- Purpose:
+ Purpose:
\*******************************************************************/
@@ -59,7 +59,7 @@ irep_idt escape_domaint::get_function(const exprt &lhs)
irep_idt identifier=to_symbol_expr(lhs).get_identifier();
return identifier;
}
-
+
return irep_idt();
}
@@ -71,7 +71,7 @@ Function: escape_domaint::assign_lhs_cleanup
Outputs:
- Purpose:
+ Purpose:
\*******************************************************************/
@@ -85,7 +85,7 @@ void escape_domaint::assign_lhs_cleanup(
if(is_tracked(symbol_expr))
{
irep_idt identifier=symbol_expr.get_identifier();
-
+
if(cleanup_functions.empty())
cleanup_map.erase(identifier);
else
@@ -102,7 +102,7 @@ Function: escape_domaint::assign_lhs_aliases
Outputs:
- Purpose:
+ Purpose:
\*******************************************************************/
@@ -137,7 +137,7 @@ Function: escape_domaint::get_rhs_cleanup
Outputs:
- Purpose:
+ Purpose:
\*******************************************************************/
@@ -154,7 +154,7 @@ void escape_domaint::get_rhs_cleanup(
const escape_domaint::cleanup_mapt::const_iterator m_it=
cleanup_map.find(identifier);
-
+
if(m_it!=cleanup_map.end())
cleanup_functions.insert(m_it->second.cleanup_functions.begin(),
m_it->second.cleanup_functions.end());
@@ -179,7 +179,7 @@ Function: escape_domaint::get_rhs_aliases
Outputs:
- Purpose:
+ Purpose:
\*******************************************************************/
@@ -194,7 +194,7 @@ void escape_domaint::get_rhs_aliases(
{
irep_idt identifier=symbol_expr.get_identifier();
alias_set.insert(identifier);
-
+
for(aliasest::const_iterator it=aliases.begin();
it!=aliases.end();
it++)
@@ -225,7 +225,7 @@ Function: escape_domaint::get_rhs_aliases_address_of
Outputs:
- Purpose:
+ Purpose:
\*******************************************************************/
@@ -256,7 +256,7 @@ Function: escape_domaint::transform
Outputs:
- Purpose:
+ Purpose:
\*******************************************************************/
@@ -277,7 +277,7 @@ void escape_domaint::transform(
case ASSIGN:
{
const code_assignt &code_assign=to_code_assign(instruction.code);
-
+
std::set cleanup_functions;
get_rhs_cleanup(code_assign.rhs(), cleanup_functions);
assign_lhs_cleanup(code_assign.lhs(), cleanup_functions);
@@ -308,7 +308,7 @@ void escape_domaint::transform(
{
const code_function_callt &code_function_call=to_code_function_call(instruction.code);
const exprt &function=code_function_call.function();
-
+
if(function.id()==ID_symbol)
{
const irep_idt &identifier=to_symbol_expr(function).get_identifier();
@@ -326,7 +326,7 @@ void escape_domaint::transform(
// may alias other stuff
std::set lhs_set;
get_rhs_aliases(lhs, lhs_set);
-
+
for(std::set::const_iterator
l_it=lhs_set.begin(); l_it!=lhs_set.end(); l_it++)
{
@@ -338,7 +338,7 @@ void escape_domaint::transform(
}
}
break;
-
+
case END_FUNCTION:
// This is the edge to the call site.
break;
@@ -355,7 +355,7 @@ Function: escape_domaint::output
Outputs:
- Purpose:
+ Purpose:
\*******************************************************************/
@@ -382,13 +382,13 @@ void escape_domaint::output(
out << ' ' << *c_it;
out << '\n';
}
-
+
for(aliasest::const_iterator a_it1=aliases.begin();
a_it1!=aliases.end();
a_it1++)
{
bool first=true;
-
+
for(aliasest::const_iterator a_it2=aliases.begin();
a_it2!=aliases.end();
a_it2++)
@@ -413,7 +413,7 @@ Function: escape_domaint::merge
Outputs:
- Purpose:
+ Purpose:
\*******************************************************************/
@@ -443,9 +443,9 @@ bool escape_domaint::merge(
a_cleanup.insert(b_cleanup.begin(), b_cleanup.end());
if(a_cleanup.size()!=old_size) changed=true;
}
-
+
// kill empty ones
-
+
for(cleanup_mapt::iterator a_it=cleanup_map.begin();
a_it!=cleanup_map.end();
) // no a_it++
@@ -455,13 +455,13 @@ bool escape_domaint::merge(
else
a_it++;
}
-
+
// do union
for(aliasest::const_iterator it=b.aliases.begin();
it!=b.aliases.end(); it++)
{
irep_idt b_root=b.aliases.find(it);
-
+
if(!aliases.same_set(*it, b_root))
{
aliases.make_union(*it, b_root);
@@ -478,7 +478,7 @@ bool escape_domaint::merge(
aliases.isolate(it);
}
#endif
-
+
return changed;
}
@@ -490,18 +490,18 @@ Function: escape_domaint::check_lhs
Outputs:
- Purpose:
+ Purpose:
\*******************************************************************/
void escape_domaint::check_lhs(
const exprt &lhs,
- std::set &cleanup_functions)
+ std::set &cleanup_functions)
{
if(lhs.id()==ID_symbol)
{
const irep_idt &identifier=to_symbol_expr(lhs).get_identifier();
-
+
// pointer with aleanup function?
const escape_domaint::cleanup_mapt::const_iterator m_it=
cleanup_map.find(identifier);
@@ -511,7 +511,7 @@ void escape_domaint::check_lhs(
// count the aliases
unsigned count=0;
-
+
for(aliasest::const_iterator
a_it=aliases.begin();
a_it!=aliases.end();
@@ -540,7 +540,7 @@ Function: escape_analysist::insert_cleanup
Outputs:
- Purpose:
+ Purpose:
\*******************************************************************/
@@ -553,14 +553,14 @@ void escape_analysist::insert_cleanup(
const namespacet &ns)
{
source_locationt source_location=location->source_location;
-
+
for(std::set::const_iterator c_it=cleanup_functions.begin();
c_it!=cleanup_functions.end();
c_it++)
{
symbol_exprt function=ns.lookup(*c_it).symbol_expr();
const code_typet &function_type=to_code_type(function.type());
-
+
goto_function.body.insert_before_swap(location);
code_function_callt code;
code.lhs().make_nil();
@@ -575,7 +575,7 @@ void escape_analysist::insert_cleanup(
if(arg.type()!=param_type) arg.make_typecast(param_type);
code.arguments().push_back(arg);
}
-
+
location->make_function_call(code);
location->source_location=source_location;
}
@@ -589,7 +589,7 @@ Function: escape_analysist::instrument
Outputs:
- Purpose:
+ Purpose:
\*******************************************************************/
@@ -604,7 +604,7 @@ void escape_analysist::instrument(
get_state(i_it);
const goto_programt::instructiont &instruction=*i_it;
-
+
switch(instruction.type)
{
case ASSIGN:
@@ -620,14 +620,14 @@ void escape_analysist::instrument(
case DEAD:
{
const code_deadt &code_dead=to_code_dead(instruction.code);
-
+
std::set cleanup_functions1;
-
+
escape_domaint &d=operator[](i_it);
const escape_domaint::cleanup_mapt::const_iterator m_it=
d.cleanup_map.find("&"+id2string(code_dead.get_identifier()));
-
+
// does it have a cleanup function for the object?
if(m_it!=d.cleanup_map.end())
{
@@ -637,12 +637,12 @@ void escape_analysist::instrument(
}
std::set cleanup_functions2;
-
+
d.check_lhs(code_dead.symbol(), cleanup_functions2);
insert_cleanup(f_it->second, i_it, code_dead.symbol(), cleanup_functions1, true, ns);
insert_cleanup(f_it->second, i_it, code_dead.symbol(), cleanup_functions2, false, ns);
-
+
for(unsigned i=0; i aliasest;
aliasest aliases;
-
+
struct cleanupt
{
std::set cleanup_functions;
};
-
+
typedef std::map cleanup_mapt;
cleanup_mapt cleanup_map;
-
+
bool is_bottom;
-protected:
+protected:
void assign_lhs_cleanup(const exprt &, const std::set &);
void get_rhs_cleanup(const exprt &, std::set &);
void assign_lhs_aliases(const exprt &, const std::set &);
@@ -81,13 +81,13 @@ class escape_domaint:public ai_domain_baset
void get_rhs_aliases_address_of(const exprt &, std::set &);
irep_idt get_function(const exprt &);
void check_lhs(const exprt &, std::set &);
-
+
friend class escape_analysist;
-
+
bool is_tracked(const symbol_exprt &);
};
-class escape_analysist:public ait
+class escape_analysist:public ait
{
public:
void instrument(
@@ -102,7 +102,7 @@ class escape_analysist:public ait
friend class escape_domaint;
numbering bits;
-
+
void insert_cleanup(
goto_functionst::goto_functiont &,
goto_programt::targett,
diff --git a/src/analyses/flow_insensitive_analysis.cpp b/src/analyses/flow_insensitive_analysis.cpp
index 43df95892ee..e4782b76e73 100644
--- a/src/analyses/flow_insensitive_analysis.cpp
+++ b/src/analyses/flow_insensitive_analysis.cpp
@@ -43,7 +43,7 @@ exprt flow_insensitive_abstract_domain_baset::get_guard(
tmp.make_not();
return tmp;
}
-
+
return from->guard;
}
@@ -67,13 +67,13 @@ exprt flow_insensitive_abstract_domain_baset::get_return_lhs(locationt to) const
if(to->is_end_function())
return static_cast(get_nil_irep());
-
+
// must be the function call
assert(to->is_function_call());
const code_function_callt &code=
to_code_function_call(to_code(to->code));
-
+
return code.lhs();
}
@@ -163,7 +163,7 @@ void flow_insensitive_analysis_baset::output(
const irep_idt &identifier,
std::ostream &out) const
{
- get_state().output(ns, out);
+ get_state().output(ns, out);
}
/*******************************************************************\
@@ -182,15 +182,15 @@ flow_insensitive_analysis_baset::locationt flow_insensitive_analysis_baset::get_
working_sett &working_set)
{
assert(!working_set.empty());
-
+
// working_sett::iterator i=working_set.begin();
// locationt l=i->second;
// working_set.erase(i);
-
+
// pop_heap(working_set.begin(), working_set.end());
locationt l=working_set.top();
working_set.pop();
-
+
return l;
}
@@ -212,21 +212,21 @@ bool flow_insensitive_analysis_baset::fixedpoint(
{
if(goto_program.instructions.empty())
return false;
-
+
working_sett working_set;
-
+
// make_heap(working_set.begin(), working_set.end());
put_in_working_set(
working_set,
goto_program.instructions.begin());
-
+
bool new_data=false;
while(!working_set.empty())
{
locationt l=get_next(working_set);
-
+
if(visit(l, working_set, goto_program, goto_functions))
new_data=true;
}
@@ -253,15 +253,15 @@ bool flow_insensitive_analysis_baset::visit(
const goto_functionst &goto_functions)
{
bool new_data=false;
-
+
#if 0
- std::cout << "Visiting: " << l->function << " " <<
+ std::cout << "Visiting: " << l->function << " " <<
l->location_number << std::endl;
#endif
goto_programt::const_targetst successors;
goto_program.get_successors(l, successors);
-
+
seen_locations.insert(l);
if (statistics.find(l)==statistics.end())
statistics[l]=1;
@@ -277,15 +277,15 @@ bool flow_insensitive_analysis_baset::visit(
if(to_l==goto_program.instructions.end())
continue;
-
+
bool changed=false;
-
+
if(l->is_function_call())
{
// this is a big special case
const code_function_callt &code=
to_code_function_call(to_code(l->code));
-
+
changed=
do_function_call_rec(
l,
@@ -296,17 +296,17 @@ bool flow_insensitive_analysis_baset::visit(
}
else
changed = get_state().transform(ns, l, to_l);
-
+
if(changed || !seen(to_l))
{
- new_data=true;
- put_in_working_set(working_set, to_l);
+ new_data=true;
+ put_in_working_set(working_set, to_l);
}
}
-
+
// if (id2string(l->function).find("debug")!=std::string::npos)
// std::cout << l->function << std::endl; //=="messages::debug")
-
+
// {
// static unsigned state_cntr=0;
// std::string s("pastate"); s += i2string(state_cntr);
@@ -344,33 +344,33 @@ bool flow_insensitive_analysis_baset::do_function_call(
if(!goto_function.body_available())
{
- const code_function_callt &code =
+ const code_function_callt &code =
to_code_function_call(to_code(l_call->code));
-
+
goto_programt temp;
-
+
goto_programt::targett r=temp.add_instruction();
r->make_return();
r->code=code_returnt();
r->function=f_it->first;
r->location_number=0;
-
+
exprt rhs=side_effect_expr_nondett(code.lhs().type());
- r->code.move_to_operands(rhs);
-
- goto_programt::targett t=temp.add_instruction(END_FUNCTION);
+ r->code.move_to_operands(rhs);
+
+ goto_programt::targett t=temp.add_instruction(END_FUNCTION);
t->code.set(ID_identifier, code.function());
t->function=f_it->first;
t->location_number=1;
-
+
locationt l_next=l_call; l_next++;
bool new_data=state.transform(ns, l_call, r);
new_data = state.transform(ns, r, t) || new_data;
new_data = state.transform(ns, t, l_next) || new_data;
-
+
return new_data;
}
-
+
assert(!goto_function.body.instructions.empty());
bool new_data=false;
@@ -378,9 +378,9 @@ bool flow_insensitive_analysis_baset::do_function_call(
{
// get the state at the beginning of the function
locationt l_begin=goto_function.body.instructions.begin();
-
+
// do the edge from the call site to the beginning of the function
- new_data=state.transform(ns, l_call, l_begin);
+ new_data=state.transform(ns, l_call, l_begin);
// do each function at least once
if(functions_done.find(f_it->first)==
@@ -410,9 +410,9 @@ bool flow_insensitive_analysis_baset::do_function_call(
l_next++;
new_data = state.transform(ns, l_end, l_next) || new_data;
}
-
+
return new_data;
-}
+}
/*******************************************************************\
@@ -432,13 +432,13 @@ bool flow_insensitive_analysis_baset::do_function_call_rec(
const exprt::operandst &arguments,
statet &state,
const goto_functionst &goto_functions)
-{
+{
bool new_data = false;
-
+
if(function.id()==ID_symbol)
{
const irep_idt &identifier=function.get(ID_identifier);
-
+
if(recursion_set.find(identifier)!=recursion_set.end())
{
// recursion detected!
@@ -446,29 +446,29 @@ bool flow_insensitive_analysis_baset::do_function_call_rec(
}
else
recursion_set.insert(identifier);
-
+
goto_functionst::function_mapt::const_iterator it=
goto_functions.function_map.find(identifier);
-
+
if(it==goto_functions.function_map.end())
throw "failed to find function "+id2string(identifier);
-
- new_data =
+
+ new_data =
do_function_call(
l_call,
goto_functions,
it,
arguments,
state);
-
+
recursion_set.erase(identifier);
}
else if(function.id()==ID_if)
{
if(function.operands().size()!=3)
throw "if takes three arguments";
-
- new_data =
+
+ new_data =
do_function_call_rec(
l_call,
function.op1(),
@@ -488,7 +488,7 @@ bool flow_insensitive_analysis_baset::do_function_call_rec(
{
// get value set
expr_sett values;
-
+
get_reference_set(function, values);
// now call all of these
@@ -499,19 +499,19 @@ bool flow_insensitive_analysis_baset::do_function_call_rec(
if(it->id()==ID_object_descriptor)
{
const object_descriptor_exprt &o=to_object_descriptor_expr(*it);
-
+
// ... but only if they are actually functions.
goto_functionst::function_mapt::const_iterator it=
goto_functions.function_map.find(o.object().get(ID_identifier));
-
+
if (it!=goto_functions.function_map.end())
{
new_data =
do_function_call_rec(
- l_call,
- o.object(),
- arguments,
- state,
+ l_call,
+ o.object(),
+ arguments,
+ state,
goto_functions) || new_data;
}
}
diff --git a/src/analyses/flow_insensitive_analysis.h b/src/analyses/flow_insensitive_analysis.h
index 8906a40b39d..ffe5f3671ad 100644
--- a/src/analyses/flow_insensitive_analysis.h
+++ b/src/analyses/flow_insensitive_analysis.h
@@ -37,15 +37,15 @@ class flow_insensitive_abstract_domain_baset
virtual ~flow_insensitive_abstract_domain_baset()
{
}
-
+
virtual void output(
const namespacet &ns,
std::ostream &out) const
{
}
-
+
typedef hash_set_cont expr_sett;
-
+
virtual void get_reference_set(
const namespacet &ns,
const exprt &expr,
@@ -54,17 +54,17 @@ class flow_insensitive_abstract_domain_baset
// dummy, overload me!
expr_set.clear();
}
-
+
virtual void clear(void)=0;
-
+
protected:
friend class flow_insensitive_analysis_baset;
bool changed;
- // utilities
-
+ // utilities
+
// get guard of a conditional edge
exprt get_guard(locationt from, locationt to) const;
-
+
// get lhs that return value is assigned to
// for an edge that returns from a function
exprt get_return_lhs(locationt to) const;
@@ -75,11 +75,11 @@ class flow_insensitive_analysis_baset
public:
typedef flow_insensitive_abstract_domain_baset statet;
typedef goto_programt::const_targett locationt;
-
+
std::set seen_locations;
-
+
std::map statistics;
-
+
bool seen( const locationt& l )
{
return (seen_locations.find(l)!=seen_locations.end());
@@ -90,7 +90,7 @@ class flow_insensitive_analysis_baset
initialized(false)
{
}
-
+
virtual void initialize(
const goto_programt &goto_program)
{
@@ -99,23 +99,23 @@ class flow_insensitive_analysis_baset
initialized=true;
}
}
-
+
virtual void initialize(
const goto_functionst &goto_functions)
{
if(!initialized)
{
- initialized=true;
+ initialized=true;
}
}
-
+
virtual void update(const goto_programt &goto_program);
-
+
virtual void update(const goto_functionst &goto_functions);
-
+
virtual void operator()(
const goto_programt &goto_program);
-
+
virtual void operator()(
const goto_functionst &goto_functions);
@@ -127,7 +127,7 @@ class flow_insensitive_analysis_baset
{
initialized=false;
}
-
+
virtual void output(
const goto_functionst &goto_functions,
std::ostream &out);
@@ -141,16 +141,16 @@ class flow_insensitive_analysis_baset
protected:
const namespacet &ns;
-
+
virtual void output(
const goto_programt &goto_program,
const irep_idt &identifier,
std::ostream &out) const;
typedef std::priority_queue working_sett;
-
+
locationt get_next(working_sett &working_set);
-
+
void put_in_working_set(
working_sett &working_set,
locationt l)
@@ -162,11 +162,11 @@ class flow_insensitive_analysis_baset
bool fixedpoint(
const goto_programt &goto_program,
const goto_functionst &goto_functions);
-
+
bool fixedpoint(
goto_functionst::function_mapt::const_iterator it,
const goto_functionst &goto_functions);
-
+
void fixedpoint(
const goto_functionst &goto_functions);
@@ -176,21 +176,21 @@ class flow_insensitive_analysis_baset
working_sett &working_set,
const goto_programt &goto_program,
const goto_functionst &goto_functions);
-
+
static locationt successor(locationt l)
{
l++;
return l;
}
-
+
typedef std::set functions_donet;
functions_donet functions_done;
typedef std::set recursion_sett;
recursion_sett recursion_set;
-
+
bool initialized;
-
+
// function calls
bool do_function_call_rec(
locationt l_call,
@@ -207,10 +207,10 @@ class flow_insensitive_analysis_baset
statet &new_state);
// abstract methods
-
+
virtual statet &get_state()=0;
virtual const statet &get_state() const=0;
-
+
typedef flow_insensitive_abstract_domain_baset::expr_sett expr_sett;
virtual void get_reference_set(
@@ -230,13 +230,13 @@ class flow_insensitive_analysist:public flow_insensitive_analysis_baset
}
typedef goto_programt::const_targett locationt;
-
+
virtual void clear()
{
state.clear();
flow_insensitive_analysis_baset::clear();
}
-
+
inline T& get_data() { return state; }
inline const T& get_data() const { return state; }
@@ -245,7 +245,7 @@ class flow_insensitive_analysist:public flow_insensitive_analysis_baset
virtual statet &get_state() { return state; }
- virtual const statet &get_state() const { return state; }
+ virtual const statet &get_state() const { return state; }
void get_reference_set(
const exprt &expr,
@@ -254,7 +254,7 @@ class flow_insensitive_analysist:public flow_insensitive_analysis_baset
state.get_reference_set(ns, expr, expr_set);
}
-private:
+private:
// to enforce that T is derived from abstract_domain_baset
void dummy(const T &s) { const statet &x=dummy1(s); (void)x; }
};
diff --git a/src/analyses/global_may_alias.cpp b/src/analyses/global_may_alias.cpp
index 41ba46985e7..0e3e190aa29 100644
--- a/src/analyses/global_may_alias.cpp
+++ b/src/analyses/global_may_alias.cpp
@@ -16,7 +16,7 @@ Function: global_may_alias_domaint::assign_lhs_aliases
Outputs:
- Purpose:
+ Purpose:
\*******************************************************************/
@@ -47,7 +47,7 @@ Function: global_may_alias_domaint::get_rhs_aliases
Outputs:
- Purpose:
+ Purpose:
\*******************************************************************/
@@ -59,7 +59,7 @@ void global_may_alias_domaint::get_rhs_aliases(
{
irep_idt identifier=to_symbol_expr(rhs).get_identifier();
alias_set.insert(identifier);
-
+
for(aliasest::const_iterator it=aliases.begin();
it!=aliases.end();
it++)
@@ -89,7 +89,7 @@ Function: global_may_alias_domaint::get_rhs_aliases_address_of
Outputs:
- Purpose:
+ Purpose:
\*******************************************************************/
@@ -120,7 +120,7 @@ Function: global_may_alias_domaint::transform
Outputs:
- Purpose:
+ Purpose:
\*******************************************************************/
@@ -137,7 +137,7 @@ void global_may_alias_domaint::transform(
case ASSIGN:
{
const code_assignt &code_assign=to_code_assign(instruction.code);
-
+
std::set aliases;
get_rhs_aliases(code_assign.rhs(), aliases);
assign_lhs_aliases(code_assign.lhs(), aliases);
@@ -170,7 +170,7 @@ Function: global_may_alias_domaint::output
Outputs:
- Purpose:
+ Purpose:
\*******************************************************************/
@@ -184,7 +184,7 @@ void global_may_alias_domaint::output(
a_it1++)
{
bool first=true;
-
+
for(aliasest::const_iterator a_it2=aliases.begin();
a_it2!=aliases.end();
a_it2++)
@@ -209,7 +209,7 @@ Function: global_may_alias_domaint::merge
Outputs:
- Purpose:
+ Purpose:
\*******************************************************************/
@@ -225,7 +225,7 @@ bool global_may_alias_domaint::merge(
it!=b.aliases.end(); it++)
{
irep_idt b_root=b.aliases.find(it);
-
+
if(!aliases.same_set(*it, b_root))
{
aliases.make_union(*it, b_root);
@@ -242,6 +242,6 @@ bool global_may_alias_domaint::merge(
aliases.isolate(it);
}
#endif
-
+
return changed;
}
diff --git a/src/analyses/global_may_alias.h b/src/analyses/global_may_alias.h
index 26d5469a2f9..49f6d7f8688 100644
--- a/src/analyses/global_may_alias.h
+++ b/src/analyses/global_may_alias.h
@@ -18,7 +18,7 @@ Author: Daniel Kroening, kroening@kroening.com
/*******************************************************************\
Class: global_may_alias_domaint
-
+
Purpose:
\*******************************************************************/
@@ -43,27 +43,27 @@ class global_may_alias_domaint:public ai_domain_baset
const global_may_alias_domaint &b,
locationt from,
locationt to);
-
+
void make_bottom()
{
aliases.clear();
}
-
+
void make_top()
{
aliases.clear();
}
-
+
typedef union_find aliasest;
aliasest aliases;
-
-protected:
+
+protected:
void assign_lhs_aliases(const exprt &, const std::set &);
void get_rhs_aliases(const exprt &, std::set &);
void get_rhs_aliases_address_of(const exprt &, std::set &);
};
-class global_may_alias_analysist:public ait
+class global_may_alias_analysist:public ait
{
protected:
virtual void initialize(const goto_functionst &_goto_functions)
diff --git a/src/analyses/goto_check.cpp b/src/analyses/goto_check.cpp
index 40e4fa860cd..8aa43ba9769 100644
--- a/src/analyses/goto_check.cpp
+++ b/src/analyses/goto_check.cpp
@@ -46,14 +46,14 @@ class goto_checkt
retain_trivial=_options.get_bool_option("retain-trivial");
enable_assert_to_assume=_options.get_bool_option("assert-to-assume");
enable_assertions=_options.get_bool_option("assertions");
- enable_assumptions=_options.get_bool_option("assumptions");
+ enable_assumptions=_options.get_bool_option("assumptions");
error_labels=_options.get_list_option("error-label");
}
typedef goto_functionst::goto_functiont goto_functiont;
void goto_check(goto_functiont &goto_function);
-
+
irep_idt mode;
protected:
@@ -84,20 +84,20 @@ class goto_checkt
const source_locationt &,
const exprt &src_expr,
const guardt &guard);
-
+
goto_programt new_code;
typedef std::set assertionst;
assertionst assertions;
-
+
void invalidate(const exprt &lhs);
-
+
inline static bool has_dereference(const exprt &src)
{
return has_subexpr(src, ID_dereference);
}
bool enable_bounds_check;
- bool enable_pointer_check;
+ bool enable_pointer_check;
bool enable_memory_leak_check;
bool enable_div_by_zero_check;
bool enable_signed_overflow_check;
@@ -138,7 +138,7 @@ void goto_checkt::invalidate(const exprt &lhs)
// clear all assertions about 'symbol'
find_symbols_sett find_symbols_set;
find_symbols_set.insert(to_symbol_expr(lhs).get_identifier());
-
+
for(assertionst::iterator
it=assertions.begin();
it!=assertions.end();
@@ -146,11 +146,11 @@ void goto_checkt::invalidate(const exprt &lhs)
{
assertionst::iterator next=it;
next++;
-
+
if(has_symbol(*it, find_symbols_set) ||
has_dereference(*it))
assertions.erase(it);
-
+
it=next;
}
}
@@ -220,10 +220,10 @@ void goto_checkt::undefined_shift_check(
// Undefined for all types and shifts if distance exceeds width,
// and also undefined for negative distances.
-
+
const typet &distance_type=
ns.follow(expr.distance().type());
-
+
if(distance_type.id()==ID_signedbv)
{
binary_relation_exprt inequality(
@@ -240,15 +240,15 @@ void goto_checkt::undefined_shift_check(
const typet &op_type=
ns.follow(expr.op().type());
-
+
if(op_type.id()==ID_unsignedbv || op_type.id()==ID_signedbv)
- {
+ {
exprt width_expr=
from_integer(to_bitvector_type(op_type).get_width(), distance_type);
if(width_expr.is_nil())
throw "no number for width for operator "+expr.id_string();
-
+
binary_relation_exprt inequality(
expr.distance(), ID_lt, width_expr);
@@ -322,24 +322,24 @@ void goto_checkt::integer_overflow_check(
// First, check type.
const typet &type=ns.follow(expr.type());
-
+
if(type.id()==ID_signedbv && !enable_signed_overflow_check)
return;
if(type.id()==ID_unsignedbv && !enable_unsigned_overflow_check)
return;
-
+
// add overflow subgoal
if(expr.id()==ID_typecast)
{
// conversion to signed int may overflow
-
+
if(expr.operands().size()!=1)
throw "typecast takes one operand";
const typet &old_type=ns.follow(expr.op0().type());
-
+
if(type.id()==ID_signedbv)
{
std::size_t new_width=to_signedbv_type(type).get_width();
@@ -514,7 +514,7 @@ void goto_checkt::integer_overflow_check(
expr,
guard);
}
-
+
return;
}
else if(expr.id()==ID_mod)
@@ -528,7 +528,7 @@ void goto_checkt::integer_overflow_check(
{
// overflow on unary- can only happen with the smallest
// representable number 100....0
-
+
equal_exprt int_min_eq(
expr.op0(), to_signedbv_type(type).smallest_expr());
@@ -540,7 +540,7 @@ void goto_checkt::integer_overflow_check(
expr,
guard);
}
-
+
return;
}
@@ -551,11 +551,11 @@ void goto_checkt::integer_overflow_check(
{
// The overflow checks are binary!
// We break these up.
-
+
for(unsigned i=1; i=3)
{
assert(expr.id()!=ID_minus);
-
+
// break up
exprt tmp=make_binary(expr);
float_overflow_check(tmp, guard);
@@ -751,7 +751,7 @@ void goto_checkt::nan_check(
// first, check type
if(expr.type().id()!=ID_floatbv)
return;
-
+
if(expr.id()!=ID_plus &&
expr.id()!=ID_mult &&
expr.id()!=ID_div &&
@@ -759,9 +759,9 @@ void goto_checkt::nan_check(
return;
// add NaN subgoal
-
+
exprt isnan;
-
+
if(expr.id()==ID_div)
{
assert(expr.operands().size()==2);
@@ -774,7 +774,7 @@ void goto_checkt::nan_check(
ieee_float_equal_exprt(expr.op1(), gen_zero(expr.op1().type())));
exprt div_inf=unary_exprt(ID_isinf, expr.op1(), bool_typet());
-
+
isnan=or_exprt(zero_div_zero, div_inf);
}
else if(expr.id()==ID_mult)
@@ -946,7 +946,7 @@ void goto_checkt::pointer_validity_check(
local_bitvector_analysist::flagst flags=
local_bitvector_analysis->get(t, pointer);
-
+
const typet &dereference_type=pointer_type.subtype();
// For Java, we only need to check for null
@@ -1108,7 +1108,7 @@ void goto_checkt::bounds_check(
+array_type.id_string();
std::string name=array_name(expr.array());
-
+
const exprt &index=expr.index();
object_descriptor_exprt ode;
ode.build(expr, ns);
@@ -1125,7 +1125,7 @@ void goto_checkt::bounds_check(
else
{
mp_integer i;
-
+
if(!to_integer(index, i) && i>=0)
{
// ok
@@ -1275,14 +1275,14 @@ void goto_checkt::add_guarded_claim(
new_expr=exprt(ID_implies, bool_typet());
new_expr.move_to_operands(guard_expr, expr);
}
-
+
if(assertions.insert(new_expr).second)
{
goto_program_instruction_typet type=
enable_assert_to_assume?ASSUME:ASSERT;
-
+
goto_programt::targett t=new_code.add_instruction(type);
-
+
std::string source_expr_string=from_expr(ns, "", src_expr);
t->guard.swap(new_expr);
@@ -1410,7 +1410,7 @@ void goto_checkt::check_rec(
else if(expr.id()==ID_div)
{
div_by_zero_check(to_div_expr(expr), guard);
-
+
if(expr.type().id()==ID_signedbv)
integer_overflow_check(expr, guard);
else if(expr.type().id()==ID_floatbv)
@@ -1497,7 +1497,7 @@ void goto_checkt::goto_check(goto_functiont &goto_function)
}
assertions.clear();
-
+
local_bitvector_analysist local_bitvector_analysis_obj(goto_function);
local_bitvector_analysis=&local_bitvector_analysis_obj;
@@ -1507,7 +1507,7 @@ void goto_checkt::goto_check(goto_functiont &goto_function)
{
t=it;
goto_programt::instructiont &i=*it;
-
+
new_code.clear();
// we clear all recorded assertions if
@@ -1516,7 +1516,7 @@ void goto_checkt::goto_check(goto_functiont &goto_function)
if(retain_trivial ||
i.is_target())
assertions.clear();
-
+
check(i.guard);
// magic ERROR label?
@@ -1539,11 +1539,11 @@ void goto_checkt::goto_check(goto_functiont &goto_function)
t->source_location.set("user-provided", true);
}
}
-
+
if(i.is_other())
{
const irep_idt &statement=i.code.get(ID_statement);
-
+
if(statement==ID_expression)
{
check(i.code);
@@ -1557,10 +1557,10 @@ void goto_checkt::goto_check(goto_functiont &goto_function)
else if(i.is_assign())
{
const code_assignt &code_assign=to_code_assign(i.code);
-
+
check(code_assign.lhs());
check(code_assign.rhs());
-
+
// the LHS might invalidate any assertion
invalidate(code_assign.lhs());
}
@@ -1568,7 +1568,7 @@ void goto_checkt::goto_check(goto_functiont &goto_function)
{
const code_function_callt &code_function_call=
to_code_function_call(i.code);
-
+
// for Java, need to check whether 'this' is null
// on non-static method invocations
if(mode==ID_java &&
@@ -1578,10 +1578,10 @@ void goto_checkt::goto_check(goto_functiont &goto_function)
to_code_type(code_function_call.function().type()).has_this())
{
exprt pointer=code_function_call.arguments()[0];
-
+
local_bitvector_analysist::flagst flags=
local_bitvector_analysis->get(t, pointer);
-
+
if(flags.is_unknown() || flags.is_null())
{
notequal_exprt not_eq_null(pointer, gen_zero(pointer.type()));
@@ -1595,7 +1595,7 @@ void goto_checkt::goto_check(goto_functiont &goto_function)
guardt());
}
}
-
+
forall_operands(it, code_function_call)
check(*it);
@@ -1618,11 +1618,11 @@ void goto_checkt::goto_check(goto_functiont &goto_function)
i.code.op0().operands().size()==1)
{
// must not throw NULL
-
+
exprt pointer=i.code.op0().op0();
if(pointer.type().subtype().get(ID_identifier)!="java::java.lang.AssertionError")
- {
+ {
notequal_exprt not_eq_null(pointer, gen_zero(pointer.type()));
add_guarded_claim(
@@ -1656,7 +1656,7 @@ void goto_checkt::goto_check(goto_functiont &goto_function)
{
assert(i.code.operands().size()==1);
const symbol_exprt &variable=to_symbol_expr(i.code.op0());
-
+
// is it dirty?
if(local_bitvector_analysis->dirty(variable))
{
@@ -1686,7 +1686,7 @@ void goto_checkt::goto_check(goto_functiont &goto_function)
goto_programt::targett t=new_code.add_instruction();
t->make_assignment();
t->code=code_assignt(leak_expr, leak_expr);
-
+
source_locationt source_location;
source_location.set_function(i.function);
@@ -1722,10 +1722,10 @@ void goto_checkt::goto_check(goto_functiont &goto_function)
if(it->source_location.get_column()!=irep_idt())
i_it->source_location.set_column(it->source_location.get_column());
}
-
+
if(i_it->function==irep_idt()) i_it->function=it->function;
}
-
+
// insert new instructions -- make sure targets are not moved
while(!new_code.instructions.empty())
@@ -1756,7 +1756,7 @@ void goto_check(
{
goto_checkt goto_check(ns, options);
goto_check.goto_check(goto_function);
-}
+}
/*******************************************************************\
@@ -1776,7 +1776,7 @@ void goto_check(
goto_functionst &goto_functions)
{
goto_checkt goto_check(ns, options);
-
+
for(goto_functionst::function_mapt::iterator
it=goto_functions.function_map.begin();
it!=goto_functions.function_map.end();
@@ -1784,7 +1784,7 @@ void goto_check(
{
goto_check.goto_check(it->second);
}
-}
+}
/*******************************************************************\
@@ -1804,7 +1804,7 @@ void goto_check(
{
const namespacet ns(goto_model.symbol_table);
goto_checkt goto_check(ns, options);
-
+
for(goto_functionst::function_mapt::iterator
it=goto_model.goto_functions.function_map.begin();
it!=goto_model.goto_functions.function_map.end();
@@ -1812,4 +1812,4 @@ void goto_check(
{
goto_check.goto_check(it->second);
}
-}
+}
diff --git a/src/analyses/goto_rw.cpp b/src/analyses/goto_rw.cpp
index 0efe8d2ff85..2d84edc27ea 100644
--- a/src/analyses/goto_rw.cpp
+++ b/src/analyses/goto_rw.cpp
@@ -1,6 +1,6 @@
/*******************************************************************\
-Module:
+Module:
Author: Daniel Kroening
@@ -1015,7 +1015,7 @@ void goto_rw(goto_programt::const_targett target,
case NO_INSTRUCTION_TYPE:
assert(false);
break;
-
+
case GOTO:
case ASSUME:
case ASSERT:
@@ -1024,7 +1024,7 @@ void goto_rw(goto_programt::const_targett target,
rw_range_sett::READ,
target->guard);
break;
-
+
case RETURN:
{
const code_returnt &code_return=
@@ -1036,7 +1036,7 @@ void goto_rw(goto_programt::const_targett target,
code_return.return_value());
}
break;
-
+
case OTHER:
//if it's printf, mark the operands as read here
if (target->code.get(ID_statement)==ID_printf)
@@ -1045,7 +1045,7 @@ void goto_rw(goto_programt::const_targett target,
rw_set.get_objects_rec(target, rw_range_sett::READ, *it);
}
break;
-
+
case SKIP:
case START_THREAD:
case END_THREAD:
@@ -1056,12 +1056,12 @@ void goto_rw(goto_programt::const_targett target,
case THROW:
case CATCH:
// these don't read or write anything
- break;
+ break;
case ASSIGN:
goto_rw(target, to_code_assign(target->code), rw_set);
break;
-
+
case DEAD:
rw_set.get_objects_rec(
target,
@@ -1077,7 +1077,7 @@ void goto_rw(goto_programt::const_targett target,
rw_range_sett::LHS_W,
to_code_decl(target->code).symbol());
break;
-
+
case FUNCTION_CALL:
goto_rw(target, to_code_function_call(target->code), rw_set);
break;
@@ -1128,4 +1128,3 @@ void goto_rw(const goto_functionst &goto_functions,
goto_rw(body, rw_set);
}
}
-
diff --git a/src/analyses/goto_rw.h b/src/analyses/goto_rw.h
index ab324d4e801..54b8bb309f8 100644
--- a/src/analyses/goto_rw.h
+++ b/src/analyses/goto_rw.h
@@ -1,6 +1,6 @@
/*******************************************************************\
-Module:
+Module:
Author: Daniel Kroening
diff --git a/src/analyses/interval_analysis.cpp b/src/analyses/interval_analysis.cpp
index 80183b3516e..f260c10372d 100644
--- a/src/analyses/interval_analysis.cpp
+++ b/src/analyses/interval_analysis.cpp
@@ -34,7 +34,7 @@ void instrument_intervals(
find_symbols(i_it->code, symbols);
find_symbols(i_it->guard, symbols);
}
-
+
Forall_goto_program_instructions(i_it, goto_function.body)
{
if(i_it==goto_function.body.instructions.begin())
@@ -60,7 +60,7 @@ void instrument_intervals(
else
continue; // don't instrument
}
-
+
const interval_domaint &d=interval_analysis[i_it];
exprt::operandst assertion;
@@ -74,7 +74,7 @@ void instrument_intervals(
if(!tmp.is_true())
assertion.push_back(tmp);
}
-
+
if(!assertion.empty())
{
goto_programt::targett t=i_it;
@@ -104,7 +104,7 @@ void interval_analysis(
goto_functionst &goto_functions)
{
ait interval_analysis;
-
+
interval_analysis(goto_functions, ns);
Forall_goto_functions(f_it, goto_functions)
diff --git a/src/analyses/interval_domain.cpp b/src/analyses/interval_domain.cpp
index 4f8aca54d4b..93a487f6c41 100644
--- a/src/analyses/interval_domain.cpp
+++ b/src/analyses/interval_domain.cpp
@@ -90,15 +90,15 @@ void interval_domaint::transform(
case DECL:
havoc_rec(to_code_decl(instruction.code).symbol());
break;
-
+
case DEAD:
havoc_rec(to_code_dead(instruction.code).symbol());
break;
-
+
case ASSIGN:
assign(to_code_assign(instruction.code));
break;
-
+
case GOTO:
{
locationt next=from;
@@ -109,11 +109,11 @@ void interval_domaint::transform(
assume(instruction.guard, ns);
}
break;
-
+
case ASSUME:
assume(instruction.guard, ns);
break;
-
+
case FUNCTION_CALL:
{
const code_function_callt &code_function_call=
@@ -122,7 +122,7 @@ void interval_domaint::transform(
havoc_rec(code_function_call.lhs());
}
break;
-
+
default:;
}
}
@@ -163,7 +163,7 @@ bool interval_domaint::merge(
integer_intervalt previous=it->second;
it->second.join(b_it->second);
if(it->second!=previous) result=true;
-
+
it++;
}
}
@@ -182,7 +182,7 @@ bool interval_domaint::merge(
ieee_float_intervalt previous=it->second;
it->second.join(b_it->second);
if(it->second!=previous) result=true;
-
+
it++;
}
}
@@ -269,27 +269,27 @@ void interval_domaint::assume_rec(
assume_rec(lhs, ID_le, rhs);
return;
}
-
+
if(id==ID_notequal)
return; // won't do split
-
+
if(id==ID_ge)
- return assume_rec(rhs, ID_le, lhs);
-
+ return assume_rec(rhs, ID_le, lhs);
+
if(id==ID_gt)
- return assume_rec(rhs, ID_lt, lhs);
+ return assume_rec(rhs, ID_lt, lhs);
// we now have lhs < rhs or
// lhs <= rhs
assert(id==ID_lt || id==ID_le);
- #ifdef DEBUG
- std::cout << "assume_rec: "
+ #ifdef DEBUG
+ std::cout << "assume_rec: "
<< from_expr(lhs) << " " << id << " "
<< from_expr(rhs) << "\n";
#endif
-
+
if(lhs.id()==ID_symbol && rhs.id()==ID_constant)
{
irep_idt lhs_identifier=to_symbol_expr(lhs).get_identifier();
@@ -315,7 +315,7 @@ void interval_domaint::assume_rec(
else if(lhs.id()==ID_constant && rhs.id()==ID_symbol)
{
irep_idt rhs_identifier=to_symbol_expr(rhs).get_identifier();
-
+
if(is_int(lhs.type()) && is_int(rhs.type()))
{
mp_integer tmp;
@@ -338,7 +338,7 @@ void interval_domaint::assume_rec(
{
irep_idt lhs_identifier=to_symbol_expr(lhs).get_identifier();
irep_idt rhs_identifier=to_symbol_expr(rhs).get_identifier();
-
+
if(is_int(lhs.type()) && is_int(rhs.type()))
{
integer_intervalt &lhs_i=int_map[lhs_identifier];
@@ -459,18 +459,18 @@ exprt interval_domaint::make_expression(const symbol_exprt &src) const
exprt::operandst conjuncts;
- if(interval.upper_set)
+ if(interval.upper_set)
{
exprt tmp=from_integer(interval.upper, src.type());
conjuncts.push_back(binary_relation_exprt(src, ID_le, tmp));
}
- if(interval.lower_set)
+ if(interval.lower_set)
{
exprt tmp=from_integer(interval.lower, src.type());
conjuncts.push_back(binary_relation_exprt(tmp, ID_le, src));
}
-
+
return conjunction(conjuncts);
}
else if(is_float(src.type()))
@@ -483,18 +483,18 @@ exprt interval_domaint::make_expression(const symbol_exprt &src) const
exprt::operandst conjuncts;
- if(interval.upper_set)
+ if(interval.upper_set)
{
exprt tmp=interval.upper.to_expr();
conjuncts.push_back(binary_relation_exprt(src, ID_le, tmp));
}
- if(interval.lower_set)
+ if(interval.lower_set)
{
exprt tmp=interval.lower.to_expr();
conjuncts.push_back(binary_relation_exprt(tmp, ID_le, src));
}
-
+
return conjunction(conjuncts);
}
else
diff --git a/src/analyses/interval_domain.h b/src/analyses/interval_domain.h
index 0c3d9aa68c9..b8cc21fa0d9 100644
--- a/src/analyses/interval_domain.h
+++ b/src/analyses/interval_domain.h
@@ -24,13 +24,13 @@ class interval_domaint:public ai_domain_baset
// Trivial, conjunctive interval domain for both float
// and integers. The categorization 'float' and 'integers'
// is done by is_int and is_float.
-
+
virtual void transform(
locationt from,
locationt to,
ai_baset &ai,
const namespacet &ns);
-
+
virtual void output(
std::ostream &out,
const ai_baset &ai,
@@ -40,7 +40,7 @@ class interval_domaint:public ai_domain_baset
const interval_domaint &b,
locationt from,
locationt to);
-
+
// no states
virtual void make_bottom()
{
@@ -48,7 +48,7 @@ class interval_domaint:public ai_domain_baset
float_map.clear();
bottom=true;
}
-
+
// all states
virtual void make_top()
{
@@ -58,14 +58,14 @@ class interval_domaint:public ai_domain_baset
}
exprt make_expression(const symbol_exprt &) const;
-
+
void assume(const exprt &, const namespacet &);
inline static bool is_int(const typet &src)
{
return src.id()==ID_signedbv || src.id()==ID_unsignedbv;
}
-
+
inline static bool is_float(const typet &src)
{
return src.id()==ID_floatbv;
diff --git a/src/analyses/invariant_propagation.cpp b/src/analyses/invariant_propagation.cpp
index 3c244ed0bc4..56e285247e0 100644
--- a/src/analyses/invariant_propagation.cpp
+++ b/src/analyses/invariant_propagation.cpp
@@ -72,12 +72,12 @@ void invariant_propagationt::add_objects(
// get the globals
object_listt globals;
get_globals(globals);
-
+
// get the locals
goto_programt::decl_identifierst locals;
goto_program.get_decl_identifiers(locals);
- // cache the list for the locals to speed things up
+ // cache the list for the locals to speed things up
typedef hash_map_cont object_cachet;
object_cachet object_cache;
@@ -88,7 +88,7 @@ void invariant_propagationt::add_objects(
{
#if 0
invariant_sett &is=(*this)[i_it].invariant_set;
-
+
is.add_objects(globals);
#endif
@@ -103,7 +103,7 @@ void invariant_propagationt::add_objects(
if(e_it==object_cache.end())
{
const symbolt &symbol=ns.lookup(*l_it);
-
+
object_listt &objects=object_cache[*l_it];
get_objects(symbol, objects);
#if 0
@@ -116,7 +116,7 @@ void invariant_propagationt::add_objects(
#endif
}
}
-}
+}
/*******************************************************************\
@@ -137,7 +137,7 @@ void invariant_propagationt::get_objects(
std::list object_list;
get_objects_rec(symbol.symbol_expr(), object_list);
-
+
for(std::list::const_iterator
it=object_list.begin();
it!=object_list.end();
@@ -167,12 +167,12 @@ void invariant_propagationt::get_objects_rec(
t.id()==ID_union)
{
const struct_typet &struct_type=to_struct_type(t);
-
+
const struct_typet::componentst &c=struct_type.components();
-
+
exprt member_expr(ID_member);
member_expr.copy_to_operands(src);
-
+
for(struct_typet::componentst::const_iterator
it=c.begin();
it!=c.end();
@@ -213,7 +213,7 @@ void invariant_propagationt::add_objects(
// get the globals
object_listt globals;
get_globals(globals);
-
+
for(goto_functionst::function_mapt::const_iterator
f_it=goto_functions.function_map.begin();
f_it!=goto_functions.function_map.end();
@@ -222,10 +222,10 @@ void invariant_propagationt::add_objects(
// get the locals
std::set locals;
get_local_identifiers(f_it->second, locals);
-
+
const goto_programt &goto_program=f_it->second.body;
- // cache the list for the locals to speed things up
+ // cache the list for the locals to speed things up
typedef hash_map_cont object_cachet;
object_cachet object_cache;
@@ -236,7 +236,7 @@ void invariant_propagationt::add_objects(
{
#if 0
invariant_sett &is=(*this)[i_it].invariant_set;
-
+
is.add_objects(globals);
#endif
@@ -251,7 +251,7 @@ void invariant_propagationt::add_objects(
if(e_it==object_cache.end())
{
const symbolt &symbol=ns.lookup(*l_it);
-
+
object_listt &objects=object_cache[*l_it];
get_objects(symbol, objects);
#if 0
@@ -265,7 +265,7 @@ void invariant_propagationt::add_objects(
}
}
}
-}
+}
/*******************************************************************\
@@ -287,7 +287,7 @@ void invariant_propagationt::get_globals(
if(it->second.is_lvalue &&
it->second.is_static_lifetime)
get_objects(it->second, dest);
-}
+}
/*******************************************************************\
@@ -317,9 +317,9 @@ bool invariant_propagationt::check_type(const typet &type) const
return true;
else if(type.id()==ID_bool)
return true;
-
+
return false;
-}
+}
/*******************************************************************\
@@ -340,12 +340,12 @@ void invariant_propagationt::initialize(const goto_programt &goto_program)
forall_goto_program_instructions(it, goto_program)
{
invariant_sett &s=state_map[it].invariant_set;
-
+
if(it==goto_program.instructions.begin())
s.make_true();
else
s.make_false();
-
+
s.set_value_sets(value_sets);
s.set_object_store(object_store);
s.set_namespace(ns);
@@ -372,7 +372,7 @@ void invariant_propagationt::initialize(const goto_functionst &goto_functions)
for(goto_functionst::function_mapt::const_iterator f_it=
goto_functions.function_map.begin();
- f_it!=goto_functions.function_map.end();
+ f_it!=goto_functions.function_map.end();
f_it++)
initialize(f_it->second.body);
}
@@ -417,14 +417,14 @@ void invariant_propagationt::simplify(goto_programt &goto_program)
state_mapt::const_iterator s_it=state_map.find(i_it);
if(s_it==state_map.end()) continue;
-
+
const invariant_sett &invariant_set=s_it->second.invariant_set;
-
+
exprt simplified_guard(i_it->guard);
-
+
invariant_set.simplify(simplified_guard);
::simplify(simplified_guard, ns);
-
+
if(invariant_set.implies(simplified_guard).is_true())
i_it->guard=true_exprt();
}
diff --git a/src/analyses/invariant_propagation.h b/src/analyses/invariant_propagation.h
index 0e89339ee12..5df6f6925d7 100644
--- a/src/analyses/invariant_propagation.h
+++ b/src/analyses/invariant_propagation.h
@@ -27,7 +27,7 @@ class invariant_propagationt:public
object_store(_ns)
{
}
-
+
const invariant_sett &lookup(locationt l) const
{
return (*this)[l].invariant_set;
@@ -38,16 +38,16 @@ class invariant_propagationt:public
void make_all_true();
void make_all_false();
-
+
void simplify(goto_programt &goto_program);
void simplify(goto_functionst &goto_functions);
-
+
typedef ait baset;
-
+
protected:
const namespacet &ns;
value_setst &value_sets;
-
+
inv_object_storet object_store;
typedef std::list object_listt;
@@ -62,9 +62,9 @@ class invariant_propagationt:public
void get_objects_rec(
const exprt &src,
std::list &dest);
-
+
void get_globals(object_listt &globals);
-
+
bool check_type(const typet &type) const;
};
diff --git a/src/analyses/invariant_set.cpp b/src/analyses/invariant_set.cpp
index 5ad5404a863..c5cfac661a5 100644
--- a/src/analyses/invariant_set.cpp
+++ b/src/analyses/invariant_set.cpp
@@ -56,25 +56,25 @@ bool inv_object_storet::get(const exprt &expr, unsigned &n)
{
std::string s=build_string(expr);
if(s=="") return true;
-
+
// if it's a constant, we add it in any case
if(is_constant(expr))
{
n=map.number(s);
-
+
if(n>=entries.size())
{
entries.resize(n+1);
entries[n].expr=expr;
entries[n].is_constant=true;
}
-
+
return false;
}
return map.get_number(s, n);
}
-
+
/*******************************************************************\
Function: inv_object_storet::add
@@ -90,21 +90,21 @@ Function: inv_object_storet::add
unsigned inv_object_storet::add(const exprt &expr)
{
std::string s=build_string(expr);
-
+
assert(s!="");
unsigned n=map.number(s);
-
+
if(n>=entries.size())
{
entries.resize(n+1);
entries[n].expr=expr;
entries[n].is_constant=is_constant(expr);
}
-
+
return n;
}
-
+
/*******************************************************************\
Function: inv_object_storet::is_constant
@@ -121,7 +121,7 @@ bool inv_object_storet::is_constant(unsigned n) const
{
assert(n &p)
// check if there is a contradiction with two constants
unsigned r=eq_set.find(p.first);
-
+
bool constant_seen=false;
mp_integer c;
-
+
for(unsigned i=0; iis_constant(i))
@@ -343,12 +343,12 @@ void invariant_sett::add_eq(const std::pair &p)
make_false();
return;
}
- else
+ else
constant_seen=true;
}
// replicate <= and != constraints
-
+
for(ineq_sett::const_iterator it=le_set.begin();
it!=le_set.end();
it++)
@@ -384,24 +384,24 @@ void invariant_sett::add_eq(
if(eq.first==ineq.first)
{
n=ineq;
- n.first=eq.second;
+ n.first=eq.second;
dest.insert(n);
}
-
+
if(eq.first==ineq.second)
{
n=ineq;
n.second=eq.second;
dest.insert(n);
}
-
+
if(eq.second==ineq.first)
{
n=ineq;
- n.first=eq.first;
+ n.first=eq.first;
dest.insert(n);
}
-
+
if(eq.second==ineq.second)
{
n=ineq;
@@ -426,16 +426,16 @@ tvt invariant_sett::is_eq(std::pair p) const
{
std::pair s=p;
std::swap(s.first, s.second);
-
+
if(has_eq(p))
return tvt(true);
-
+
if(has_ne(p) || has_ne(s))
return tvt(false);
return tvt::unknown();
}
-
+
/*******************************************************************\
Function: invariant_sett::is_le
@@ -452,17 +452,17 @@ tvt invariant_sett::is_le(std::pair p) const
{
std::pair s=p;
std::swap(s.first, s.second);
-
+
if(has_eq(p))
return tvt(true);
-
+
if(has_le(p))
return tvt(true);
-
+
if(has_le(s))
if(has_ne(s) || has_ne(p))
return tvt(false);
-
+
return tvt::unknown();
}
@@ -505,7 +505,7 @@ void invariant_sett::output(
out << to_string(j, identifier);
}
-
+
out << std::endl;
}
@@ -561,7 +561,7 @@ void invariant_sett::add_type_bounds(const exprt &expr, const typet &type)
{
unsigned a;
if(get_object(expr, a)) return;
-
+
add_bounds(a, boundst(0, power(2, op_width)-1));
}
}
@@ -606,13 +606,13 @@ void invariant_sett::strengthen_rec(const exprt &expr)
#if 0
std::cout << "S: " << from_expr(*ns, "", expr) << std::endl;
#endif
-
+
if(is_false)
{
// we can't get any stronger
return;
}
-
+
if(expr.is_true())
{
// do nothing, it's useless
@@ -635,26 +635,26 @@ void invariant_sett::strengthen_rec(const exprt &expr)
expr.id()==ID_lt)
{
assert(expr.operands().size()==2);
-
+
// special rule: x <= (a & b)
// implies: x<=a && x<=b
if(expr.op1().id()==ID_bitand)
{
const exprt &bitand_op=expr.op1();
-
+
forall_operands(it, bitand_op)
{
exprt tmp(expr);
tmp.op1()=*it;
strengthen_rec(tmp);
}
-
+
return;
}
std::pair p;
-
+
if(get_object(expr.op0(), p.first) ||
get_object(expr.op1(), p.second))
return;
@@ -662,7 +662,7 @@ void invariant_sett::strengthen_rec(const exprt &expr)
mp_integer i0, i1;
bool have_i0=!to_integer(expr.op0(), i0);
bool have_i1=!to_integer(expr.op1(), i1);
-
+
if(expr.id()==ID_le)
{
if(have_i0)
@@ -690,20 +690,20 @@ void invariant_sett::strengthen_rec(const exprt &expr)
else if(expr.id()==ID_equal)
{
assert(expr.operands().size()==2);
-
+
const typet &op_type=ns->follow(expr.op0().type());
-
+
if(op_type.id()==ID_struct)
{
const struct_typet &struct_type=to_struct_type(op_type);
-
+
const struct_typet::componentst &c=struct_type.components();
-
+
exprt lhs_member_expr(ID_member);
exprt rhs_member_expr(ID_member);
lhs_member_expr.copy_to_operands(expr.op0());
rhs_member_expr.copy_to_operands(expr.op1());
-
+
for(struct_typet::componentst::const_iterator
it=c.begin();
it!=c.end();
@@ -719,21 +719,21 @@ void invariant_sett::strengthen_rec(const exprt &expr)
equal_exprt equality;
equality.lhs()=lhs_member_expr;
equality.rhs()=rhs_member_expr;
-
+
// recursive call
strengthen_rec(equality);
}
-
+
return;
}
-
+
// special rule: x = (a & b)
// implies: x<=a && x<=b
if(expr.op1().id()==ID_bitand)
{
const exprt &bitand_op=expr.op1();
-
+
forall_operands(it, bitand_op)
{
exprt tmp(expr);
@@ -741,7 +741,7 @@ void invariant_sett::strengthen_rec(const exprt &expr)
tmp.id(ID_le);
strengthen_rec(tmp);
}
-
+
return;
}
else if(expr.op0().id()==ID_bitand)
@@ -751,7 +751,7 @@ void invariant_sett::strengthen_rec(const exprt &expr)
strengthen_rec(tmp);
return;
}
-
+
// special rule: x = (type) y
if(expr.op1().id()==ID_typecast)
{
@@ -763,9 +763,9 @@ void invariant_sett::strengthen_rec(const exprt &expr)
assert(expr.op0().operands().size()==1);
add_type_bounds(expr.op1(), expr.op0().op0().type());
}
-
+
std::pair p, s;
-
+
if(get_object(expr.op0(), p.first) ||
get_object(expr.op1(), p.second))
return;
@@ -789,13 +789,13 @@ void invariant_sett::strengthen_rec(const exprt &expr)
else if(expr.id()==ID_notequal)
{
assert(expr.operands().size()==2);
-
+
std::pair p;
-
+
if(get_object(expr.op0(), p.first) ||
get_object(expr.op1(), p.second))
return;
-
+
// check if this is a contradiction
if(has_eq(p))
make_false();
@@ -822,7 +822,7 @@ tvt invariant_sett::implies(const exprt &expr) const
nnf(tmp);
return implies_rec(tmp);
}
-
+
/*******************************************************************\
Function: invariant_sett::implies
@@ -839,11 +839,11 @@ tvt invariant_sett::implies_rec(const exprt &expr) const
{
if(expr.type().id()!=ID_bool)
throw "implies: non-Boolean expression";
-
+
#if 0
std::cout << "I: " << from_expr(*ns, "", expr) << std::endl;
#endif
-
+
if(is_false) // can't get any stronger
return tvt(true);
@@ -858,7 +858,7 @@ tvt invariant_sett::implies_rec(const exprt &expr) const
forall_operands(it, expr)
if(implies_rec(*it)!=tvt(true))
return tvt::unknown();
-
+
return tvt(true);
}
else if(expr.id()==ID_or)
@@ -875,23 +875,23 @@ tvt invariant_sett::implies_rec(const exprt &expr) const
assert(expr.operands().size()==2);
std::pair p;
-
+
bool ob0=get_object(expr.op0(), p.first);
bool ob1=get_object(expr.op1(), p.second);
-
+
if(ob0 || ob1) return tvt::unknown();
-
+
tvt r;
-
+
if(expr.id()==ID_le)
{
r=is_le(p);
if(!r.is_unknown()) return r;
-
+
boundst b0, b1;
get_bounds(p.first, b0);
get_bounds(p.second, b1);
-
+
return b0<=b1;
}
else if(expr.id()==ID_lt)
@@ -902,7 +902,7 @@ tvt invariant_sett::implies_rec(const exprt &expr) const
boundst b0, b1;
get_bounds(p.first, b0);
get_bounds(p.second, b1);
-
+
return b0second;
}
@@ -987,14 +987,14 @@ void invariant_sett::nnf(exprt &expr, bool negate)
else if(expr.id()==ID_and)
{
if(negate) expr.id(ID_or);
-
+
Forall_operands(it, expr)
nnf(*it, negate);
}
else if(expr.id()==ID_or)
{
if(negate) expr.id(ID_and);
-
+
Forall_operands(it, expr)
nnf(*it, negate);
}
@@ -1116,10 +1116,10 @@ exprt invariant_sett::get_constant(const exprt &expr) const
unsigned a;
if(!get_object(expr, a))
- {
+ {
// bounds?
bounds_mapt::const_iterator it=bounds_map.find(a);
-
+
if(it!=bounds_map.end())
{
if(it->second.singleton())
@@ -1133,12 +1133,12 @@ exprt invariant_sett::get_constant(const exprt &expr) const
if(eq_set.find(i)==r)
{
const exprt &e=object_store->get_expr(i);
-
+
if(e.is_constant())
{
mp_integer value;
assert(!to_integer(e, value));
-
+
if(expr.type().id()==ID_pointer)
{
if(value==0)
@@ -1155,14 +1155,14 @@ exprt invariant_sett::get_constant(const exprt &expr) const
{
if(e.type()==expr.type())
return e;
-
+
exprt tmp(ID_typecast, expr.type());
tmp.copy_to_operands(e);
return tmp;
}
}
}
-
+
return static_cast(get_nil_irep());
}
@@ -1226,13 +1226,13 @@ bool invariant_sett::make_union(const invariant_sett &other)
make_threaded();
return true; // change
}
-
+
if(threaded)
return false; // no change
if(other.is_false)
return false; // no change
-
+
if(is_false)
{
// copy
@@ -1241,22 +1241,22 @@ bool invariant_sett::make_union(const invariant_sett &other)
le_set=other.le_set;
ne_set=other.ne_set;
bounds_map=other.bounds_map;
-
+
return true; // change
}
-
+
// equalities first
unsigned old_eq_roots=eq_set.count_roots();
-
+
eq_set.intersection(other.eq_set);
// inequalities
unsigned old_ne_set=ne_set.size();
unsigned old_le_set=le_set.size();
-
+
intersection(ne_set, other.ne_set);
intersection(le_set, other.le_set);
-
+
// bounds
if(make_union_bounds_map(other.bounds_map))
return true;
@@ -1264,7 +1264,7 @@ bool invariant_sett::make_union(const invariant_sett &other)
if(old_eq_roots!=eq_set.count_roots()) return true;
if(old_ne_set!=ne_set.size()) return true;
if(old_le_set!=le_set.size()) return true;
-
+
return false; // no change
}
@@ -1283,7 +1283,7 @@ Function: invariant_sett::make_union_bounds_map
bool invariant_sett::make_union_bounds_map(const bounds_mapt &other)
{
bool changed=false;
-
+
for(bounds_mapt::iterator
it=bounds_map.begin();
it!=bounds_map.end();
@@ -1307,7 +1307,7 @@ bool invariant_sett::make_union_bounds_map(const bounds_mapt &other)
it++;
}
}
-
+
return changed;
}
@@ -1421,14 +1421,14 @@ void invariant_sett::assignment(
equal_exprt equality;
equality.lhs()=lhs;
equality.rhs()=rhs;
-
+
// first evaluate RHS
simplify(equality.rhs());
::simplify(equality.rhs(), *ns);
-
+
// now kill LHS
modifies(lhs);
-
+
// and put it back
strengthen(equality);
}
@@ -1491,7 +1491,7 @@ void invariant_sett::apply_code(const codet &code)
{
// does nothing
}
- else if(statement=="lock" ||
+ else if(statement=="lock" ||
statement=="unlock" ||
statement==ID_asm)
{
diff --git a/src/analyses/invariant_set.h b/src/analyses/invariant_set.h
index b15c70c856b..3420b67c21f 100644
--- a/src/analyses/invariant_set.h
+++ b/src/analyses/invariant_set.h
@@ -26,14 +26,14 @@ class inv_object_storet
}
bool get(const exprt &expr, unsigned &n);
-
+
unsigned add(const exprt &expr);
-
+
bool is_constant(unsigned n) const;
bool is_constant(const exprt &expr) const;
static bool is_constant_address(const exprt &expr);
-
+
const irep_idt &operator[](unsigned n) const
{
return map[n];
@@ -44,9 +44,9 @@ class inv_object_storet
assert(n mapt;
mapt map;
-
+
struct entryt
{
bool is_constant;
exprt expr;
};
-
+
std::vector entries;
-
+
std::string build_string(const exprt &expr) const;
static bool is_constant_address_rec(const exprt &expr);
@@ -75,22 +75,22 @@ class invariant_sett
public:
// equalities ==
unsigned_union_find eq_set;
-
+
// <=
typedef std::set > ineq_sett;
ineq_sett le_set;
-
+
// !=
ineq_sett ne_set;
-
+
// bounds
typedef interval_template boundst;
typedef std::map bounds_mapt;
bounds_mapt bounds_map;
-
+
bool threaded;
bool is_false;
-
+
invariant_sett():
threaded(false),
is_false(false),
@@ -99,16 +99,16 @@ class invariant_sett
ns(NULL)
{
}
-
+
void output(
const irep_idt &identifier,
std::ostream &out) const;
// true = added s.th.
bool make_union(const invariant_sett &other_invariants);
-
+
void strengthen(const exprt &expr);
-
+
void make_true()
{
eq_set.clear();
@@ -140,7 +140,7 @@ class invariant_sett
void assignment(
const exprt &lhs,
const exprt &rhs);
-
+
void set_value_sets(value_setst &_value_sets)
{
value_sets=&_value_sets;
@@ -150,16 +150,16 @@ class invariant_sett
{
object_store=&_object_store;
}
-
+
void set_namespace(const namespacet &_ns)
{
ns=&_ns;
}
-
+
static void intersection(ineq_sett &dest, const ineq_sett &other)
{
ineq_sett::iterator it_d=dest.begin();
-
+
while(it_d!=dest.end())
{
ineq_sett::iterator next_d(it_d);
@@ -167,11 +167,11 @@ class invariant_sett
if(other.find(*it_d)==other.end())
dest.erase(it_d);
-
+
it_d=next_d;
- }
+ }
}
-
+
static void remove(ineq_sett &dest, unsigned a)
{
for(ineq_sett::iterator it=dest.begin();
@@ -187,34 +187,34 @@ class invariant_sett
it=next;
}
}
-
+
tvt implies(const exprt &expr) const;
-
+
void simplify(exprt &expr) const;
-
+
protected:
value_setst *value_sets;
inv_object_storet *object_store;
const namespacet *ns;
-
+
tvt implies_rec(const exprt &expr) const;
static void nnf(exprt &expr, bool negate=false);
void strengthen_rec(const exprt &expr);
-
+
void add_type_bounds(const exprt &expr, const typet &type);
void add_bounds(unsigned a, const boundst &bound)
{
bounds_map[a].intersect_with(bound);
}
-
+
void get_bounds(unsigned a, boundst &dest) const;
// true = added s.th.
bool make_union_bounds_map(const bounds_mapt &other);
void modifies(unsigned a);
-
+
std::string to_string(
unsigned a,
const irep_idt &identifier) const;
@@ -222,7 +222,7 @@ class invariant_sett
bool get_object(
const exprt &expr,
unsigned &n) const;
-
+
exprt get_constant(const exprt &expr) const;
// queries
@@ -230,31 +230,31 @@ class invariant_sett
{
return eq_set.same_set(p.first, p.second);
}
-
+
bool has_le(const std::pair &p) const
{
return le_set.find(p)!=le_set.end();
}
-
+
bool has_ne(const std::pair &p) const
{
return ne_set.find(p)!=ne_set.end();
}
-
+
tvt is_eq(std::pair p) const;
tvt is_le(std::pair p) const;
-
+
tvt is_lt(std::pair p) const
{
return is_le(p) && !is_eq(p);
}
-
+
tvt is_ge(std::pair p) const
{
std::swap(p.first, p.second);
return is_eq(p) || is_lt(p);
}
-
+
tvt is_gt(std::pair p) const
{
return !is_le(p);
@@ -271,7 +271,7 @@ class invariant_sett
{
add(p, le_set);
}
-
+
void add_ne(const std::pair &p)
{
add(p, ne_set);
diff --git a/src/analyses/invariant_set_domain.cpp b/src/analyses/invariant_set_domain.cpp
index 0302c336e36..6ee0be8e6e0 100644
--- a/src/analyses/invariant_set_domain.cpp
+++ b/src/analyses/invariant_set_domain.cpp
@@ -42,7 +42,7 @@ void invariant_set_domaint::transform(
invariant_set.strengthen(tmp);
}
break;
-
+
case ASSERT:
case ASSUME:
{
@@ -51,7 +51,7 @@ void invariant_set_domaint::transform(
invariant_set.strengthen(tmp);
}
break;
-
+
case RETURN:
// ignore
break;
@@ -62,24 +62,24 @@ void invariant_set_domaint::transform(
invariant_set.assignment(assignment.lhs(), assignment.rhs());
}
break;
-
+
case OTHER:
if(from_l->code.is_not_nil())
invariant_set.apply_code(from_l->code);
break;
-
+
case DECL:
invariant_set.apply_code(from_l->code);
break;
-
+
case FUNCTION_CALL:
invariant_set.apply_code(from_l->code);
break;
-
+
case START_THREAD:
- invariant_set.make_threaded();
+ invariant_set.make_threaded();
break;
-
+
default:;
// do nothing
}
diff --git a/src/analyses/invariant_set_domain.h b/src/analyses/invariant_set_domain.h
index 5ab7f8015f8..528e5b404e2 100644
--- a/src/analyses/invariant_set_domain.h
+++ b/src/analyses/invariant_set_domain.h
@@ -17,7 +17,7 @@ class invariant_set_domaint:public ai_domain_baset
public:
invariant_sett invariant_set;
- // overloading
+ // overloading
inline bool merge(
const invariant_set_domaint &other,
@@ -34,7 +34,7 @@ class invariant_set_domaint:public ai_domain_baset
{
invariant_set.output("", out);
}
-
+
virtual void initialize(
const namespacet &ns,
locationt l)
diff --git a/src/analyses/is_threaded.cpp b/src/analyses/is_threaded.cpp
index 310b3e4ac06..ba3121717cb 100644
--- a/src/analyses/is_threaded.cpp
+++ b/src/analyses/is_threaded.cpp
@@ -16,7 +16,7 @@ class is_threaded_domaint:public ai_domain_baset
bool has_spawn;
public:
bool is_threaded;
-
+
inline is_threaded_domaint():has_spawn(false), is_threaded(false)
{
}
@@ -40,7 +40,7 @@ class is_threaded_domaint:public ai_domain_baset
return old_i_t!=is_threaded || old_h_s!=has_spawn;
}
-
+
void transform(
locationt from,
locationt to,
@@ -75,9 +75,9 @@ void is_threadedt::compute(const goto_functionst &goto_functions)
const namespacet ns(symbol_table);
ait is_threaded_analysis;
-
+
is_threaded_analysis(goto_functions, ns);
-
+
for(goto_functionst::function_mapt::const_iterator
f_it=goto_functions.function_map.begin();
f_it!=goto_functions.function_map.end();
@@ -92,4 +92,3 @@ void is_threadedt::compute(const goto_functionst &goto_functions)
is_threaded_set.insert(i_it);
}
}
-
diff --git a/src/analyses/is_threaded.h b/src/analyses/is_threaded.h
index 88a785a71b9..7b68e62c6f3 100644
--- a/src/analyses/is_threaded.h
+++ b/src/analyses/is_threaded.h
@@ -28,7 +28,7 @@ class is_threadedt
{
return is_threaded_set.find(t)!=is_threaded_set.end();
}
-
+
protected:
typedef std::set is_threaded_sett;
is_threaded_sett is_threaded_set;
diff --git a/src/analyses/local_bitvector_analysis.cpp b/src/analyses/local_bitvector_analysis.cpp
index d2ccb7e785e..9e01e9cb283 100644
--- a/src/analyses/local_bitvector_analysis.cpp
+++ b/src/analyses/local_bitvector_analysis.cpp
@@ -26,7 +26,7 @@ Function: local_bitvector_analysist::flagst::print
Outputs:
- Purpose:
+ Purpose:
\*******************************************************************/
@@ -50,14 +50,14 @@ Function: local_bitvector_analysist::loc_infot::merge
Outputs:
- Purpose:
+ Purpose:
\*******************************************************************/
bool local_bitvector_analysist::loc_infot::merge(const loc_infot &src)
{
bool result=false;
-
+
std::size_t max_index=
std::max(src.points_to.size(), points_to.size());
@@ -66,7 +66,7 @@ bool local_bitvector_analysist::loc_infot::merge(const loc_infot &src)
if(points_to[i].merge(src.points_to[i]))
result=true;
}
-
+
return result;
}
@@ -100,7 +100,7 @@ Function: local_bitvector_analysist::assign_lhs
Outputs:
- Purpose:
+ Purpose:
\*******************************************************************/
@@ -142,7 +142,7 @@ void local_bitvector_analysist::assign_lhs(
assign_lhs(to_if_expr(lhs).false_case(), rhs, loc_info_src, loc_info_dest);
}
}
-
+
/*******************************************************************\
Function: local_bitvector_analysist::get
@@ -151,7 +151,7 @@ Function: local_bitvector_analysist::get
Outputs:
- Purpose:
+ Purpose:
\*******************************************************************/
@@ -160,9 +160,9 @@ local_bitvector_analysist::flagst local_bitvector_analysist::get(
const exprt &rhs)
{
local_cfgt::loc_mapt::const_iterator loc_it=cfg.loc_map.find(t);
-
+
assert(loc_it!=cfg.loc_map.end());
-
+
const loc_infot &loc_info_src=loc_infos[loc_it->second];
return get_rec(rhs, loc_info_src);
@@ -176,7 +176,7 @@ Function: local_bitvector_analysist::get_rec
Outputs:
- Purpose:
+ Purpose:
\*******************************************************************/
@@ -205,7 +205,7 @@ local_bitvector_analysist::flagst local_bitvector_analysist::get_rec(
else if(rhs.id()==ID_address_of)
{
const exprt &object=to_address_of_expr(rhs).object();
-
+
if(object.id()==ID_symbol)
{
if(locals.is_local(to_symbol_expr(object).get_identifier()))
@@ -298,7 +298,7 @@ local_bitvector_analysist::flagst local_bitvector_analysist::get_rec(
else
return flagst::mk_unknown();
}
-
+
/*******************************************************************\
Function: local_bitvector_analysist::build
@@ -307,7 +307,7 @@ Function: local_bitvector_analysist::build
Outputs:
- Purpose:
+ Purpose:
\*******************************************************************/
@@ -316,10 +316,10 @@ void local_bitvector_analysist::build(const goto_functiont &goto_function)
if(cfg.nodes.empty()) return;
work_queuet work_queue;
- work_queue.push(0);
-
+ work_queue.push(0);
+
loc_infos.resize(cfg.nodes.size());
-
+
// Gather the objects we track, and
// feed in sufficiently bad defaults for their value
// in the entry location.
@@ -336,10 +336,10 @@ void local_bitvector_analysist::build(const goto_functiont &goto_function)
const local_cfgt::nodet &node=cfg.nodes[loc_nr];
const goto_programt::instructiont &instruction=*node.t;
work_queue.pop();
-
+
const loc_infot &loc_info_src=loc_infos[loc_nr];
loc_infot loc_info_dest=loc_infos[loc_nr];
-
+
switch(instruction.type)
{
case ASSIGN:
@@ -393,7 +393,7 @@ Function: local_bitvector_analysist::output
Outputs:
- Purpose:
+ Purpose:
\*******************************************************************/
@@ -424,8 +424,7 @@ void local_bitvector_analysist::output(
out << "\n";
goto_function.body.output_instruction(ns, "", out, i_it);
out << "\n";
-
+
l++;
}
}
-
diff --git a/src/analyses/local_bitvector_analysis.h b/src/analyses/local_bitvector_analysis.h
index e36b7470cac..788f7d34c14 100644
--- a/src/analyses/local_bitvector_analysis.h
+++ b/src/analyses/local_bitvector_analysis.h
@@ -20,7 +20,7 @@ Author: Daniel Kroening, kroening@kroening.com
/*******************************************************************\
Class: local_bitvector_analysist
-
+
Purpose:
\*******************************************************************/
@@ -29,7 +29,7 @@ class local_bitvector_analysist
{
public:
typedef goto_functionst::goto_functiont goto_functiont;
-
+
explicit local_bitvector_analysist(
const goto_functiont &_goto_function):
dirty(_goto_function),
@@ -43,7 +43,7 @@ class local_bitvector_analysist
std::ostream &out,
const goto_functiont &goto_function,
const namespacet &ns) const;
-
+
dirtyt dirty;
localst locals;
local_cfgt cfg;
@@ -54,7 +54,7 @@ class local_bitvector_analysist
inline flagst():bits(0)
{
}
-
+
void clear()
{
bits=0;
@@ -76,16 +76,16 @@ class local_bitvector_analysist
explicit inline flagst(const bitst _bits):bits(_bits)
{
}
-
+
unsigned bits;
-
+
inline bool merge(const flagst &other)
{
unsigned old=bits;
bits|=other.bits; // bit-wise or
return old!=bits;
}
-
+
inline static flagst mk_unknown()
{
return flagst(B_unknown);
@@ -174,7 +174,7 @@ class local_bitvector_analysist
f.print(out);
return out;
}
-
+
inline friend flagst operator|(const flagst f1, const flagst f2)
{
flagst result=f1;
@@ -185,40 +185,40 @@ class local_bitvector_analysist
flagst get(
const goto_programt::const_targett t,
const exprt &src);
-
+
protected:
void build(const goto_functiont &goto_function);
typedef std::stack work_queuet;
numbering pointers;
-
+
// pointers -> flagst
// This is a vector, so it's fast.
typedef expanding_vector points_tot;
- // the information tracked per program location
+ // the information tracked per program location
class loc_infot
{
public:
points_tot points_to;
-
+
bool merge(const loc_infot &src);
};
typedef std::vector loc_infost;
loc_infost loc_infos;
-
+
void assign_lhs(
const exprt &lhs,
const exprt &rhs,
const loc_infot &loc_info_src,
loc_infot &loc_info_dest);
-
+
flagst get_rec(
const exprt &rhs,
const loc_infot &loc_info_src);
-
+
bool is_tracked(const irep_idt &identifier);
};
diff --git a/src/analyses/local_cfg.cpp b/src/analyses/local_cfg.cpp
index 7ed586278be..0f70def622b 100644
--- a/src/analyses/local_cfg.cpp
+++ b/src/analyses/local_cfg.cpp
@@ -29,7 +29,7 @@ Function: local_cfgt::build
Outputs:
- Purpose:
+ Purpose:
\*******************************************************************/
@@ -37,9 +37,9 @@ void local_cfgt::build(const goto_programt &goto_program)
{
nodes.resize(goto_program.instructions.size());
- {
+ {
node_nrt loc_nr=0;
-
+
for(goto_programt::const_targett it=goto_program.instructions.begin();
it!=goto_program.instructions.end();
it++, loc_nr++)
@@ -53,36 +53,36 @@ void local_cfgt::build(const goto_programt &goto_program)
{
nodet &node=nodes[loc_nr];
const goto_programt::instructiont &instruction=*node.t;
-
+
switch(instruction.type)
{
case GOTO:
if(!instruction.guard.is_true())
node.successors.push_back(loc_nr+1);
-
+
for(goto_programt::targetst::const_iterator
t_it=instruction.targets.begin();
t_it!=instruction.targets.end();
t_it++)
{
node_nrt l=loc_map.find(*t_it)->second;
- node.successors.push_back(l);
+ node.successors.push_back(l);
}
break;
-
+
case START_THREAD:
node.successors.push_back(loc_nr+1);
-
+
for(goto_programt::targetst::const_iterator
t_it=instruction.targets.begin();
t_it!=instruction.targets.end();
t_it++)
{
node_nrt l=loc_map.find(*t_it)->second;
- node.successors.push_back(l);
+ node.successors.push_back(l);
}
break;
-
+
case THROW:
case END_FUNCTION:
case END_THREAD:
@@ -91,6 +91,5 @@ void local_cfgt::build(const goto_programt &goto_program)
default:
node.successors.push_back(loc_nr+1);
}
- }
+ }
}
-
diff --git a/src/analyses/local_cfg.h b/src/analyses/local_cfg.h
index 687fa7fc8f3..92eda353932 100644
--- a/src/analyses/local_cfg.h
+++ b/src/analyses/local_cfg.h
@@ -16,7 +16,7 @@ Author: Daniel Kroening, kroening@kroening.com
/*******************************************************************\
Class: local_cfgt
-
+
Purpose:
\*******************************************************************/
@@ -36,16 +36,16 @@ class local_cfgt
typedef std::map loc_mapt;
loc_mapt loc_map;
-
+
typedef std::vector nodest;
nodest nodes;
-
+
inline explicit local_cfgt(const goto_programt &_goto_program)
{
build(_goto_program);
}
-protected:
+protected:
void build(const goto_programt &goto_program);
};
diff --git a/src/analyses/local_may_alias.cpp b/src/analyses/local_may_alias.cpp
index 787648554c6..c69158aebd7 100644
--- a/src/analyses/local_may_alias.cpp
+++ b/src/analyses/local_may_alias.cpp
@@ -33,7 +33,7 @@ Function: local_may_aliast::loc_infot::merge
bool local_may_aliast::loc_infot::merge(const loc_infot &src)
{
bool changed=false;
-
+
// do union; this should be amortized linear
for(std::size_t i=0; i local_may_aliast::get(
const exprt &rhs) const
{
local_cfgt::loc_mapt::const_iterator loc_it=cfg.loc_map.find(t);
-
+
assert(loc_it!=cfg.loc_map.end());
-
+
const loc_infot &loc_info_src=loc_infos[loc_it->second];
-
+
object_sett result_tmp;
get_rec(result_tmp, rhs, loc_info_src);
@@ -165,7 +165,7 @@ std::set local_may_aliast::get(
{
result.insert(objects[*it]);
}
-
+
return result;
}
@@ -177,7 +177,7 @@ Function: local_may_aliast::aliases
Outputs:
- Purpose:
+ Purpose:
\*******************************************************************/
@@ -186,11 +186,11 @@ bool local_may_aliast::aliases(
const exprt &src1, const exprt &src2) const
{
local_cfgt::loc_mapt::const_iterator loc_it=cfg.loc_map.find(t);
-
+
assert(loc_it!=cfg.loc_map.end());
-
+
const loc_infot &loc_info_src=loc_infos[loc_it->second];
-
+
object_sett tmp1, tmp2;
get_rec(tmp1, src1, loc_info_src);
get_rec(tmp2, src2, loc_info_src);
@@ -200,12 +200,12 @@ bool local_may_aliast::aliases(
return true;
std::list result;
-
+
std::set_intersection(
tmp1.begin(), tmp1.end(),
tmp2.begin(), tmp2.end(),
std::back_inserter(result));
-
+
return !result.empty();
}
@@ -217,7 +217,7 @@ Function: local_may_aliast::get_rec
Outputs:
- Purpose:
+ Purpose:
\*******************************************************************/
@@ -238,9 +238,9 @@ void local_may_aliast::get_rec(
if(rhs.type().id()==ID_pointer)
{
unsigned src_pointer=objects.number(rhs);
-
+
dest.insert(src_pointer);
-
+
for(std::size_t i=0; isource_location << "\n";
const loc_infot &loc_info=loc_infos[l];
-
+
for(std::size_t i=0; i work_queuet;
mutable numbering objects;
-
+
typedef unsigned_union_find alias_sett;
- // the information tracked per program location
+ // the information tracked per program location
class loc_infot
{
public:
alias_sett aliases;
-
+
bool merge(const loc_infot &src);
};
typedef std::vector loc_infost;
loc_infost loc_infos;
-
+
void assign_lhs(
const exprt &lhs,
const exprt &rhs,
const loc_infot &loc_info_src,
loc_infot &loc_info_dest);
-
- typedef std::set object_sett;
-
+
+ typedef std::set object_sett;
+
void get_rec(
object_sett &dest,
const exprt &rhs,
const loc_infot &loc_info_src) const;
-
+
unsigned unknown_object;
};
@@ -102,7 +102,7 @@ class local_may_alias_factoryt
inline local_may_alias_factoryt():goto_functions(NULL)
{
}
-
+
inline void operator()(const goto_functionst &_goto_functions)
{
goto_functions=&_goto_functions;
@@ -111,7 +111,7 @@ class local_may_alias_factoryt
forall_goto_program_instructions(i_it, f_it->second.body)
target_map[i_it]=f_it->first;
}
-
+
local_may_aliast & operator()(const irep_idt &fkt)
{
assert(goto_functions!=NULL);
@@ -123,7 +123,7 @@ class local_may_alias_factoryt
return *(fkt_map[fkt]=std::unique_ptr(
new local_may_aliast(f_it2->second)));
}
-
+
local_may_aliast & operator()(goto_programt::const_targett t)
{
target_mapt::const_iterator t_it=
@@ -131,13 +131,13 @@ class local_may_alias_factoryt
assert(t_it!=target_map.end());
return operator()(t_it->second);
}
-
+
std::set get(
const goto_programt::const_targett t,
const exprt &src) const;
protected:
- const goto_functionst *goto_functions;
+ const goto_functionst *goto_functions;
typedef std::map > fkt_mapt;
fkt_mapt fkt_map;
diff --git a/src/analyses/locals.cpp b/src/analyses/locals.cpp
index 590da4bcd9e..e9a41949e50 100644
--- a/src/analyses/locals.cpp
+++ b/src/analyses/locals.cpp
@@ -33,10 +33,10 @@ void localst::build(const goto_functiont &goto_function)
locals_map[code_decl.get_identifier()]=
to_symbol_expr(code_decl.symbol());
}
-
+
const code_typet::parameterst ¶meters=
goto_function.type.parameters();
-
+
for(code_typet::parameterst::const_iterator
it=parameters.begin();
it!=parameters.end();
diff --git a/src/analyses/locals.h b/src/analyses/locals.h
index 3732d3a58b1..78883ad4699 100644
--- a/src/analyses/locals.h
+++ b/src/analyses/locals.h
@@ -35,7 +35,7 @@ class localst
typedef std::map locals_mapt;
locals_mapt locals_map;
-
+
protected:
void build(const goto_functiont &goto_function);
};
diff --git a/src/analyses/natural_loops.cpp b/src/analyses/natural_loops.cpp
index 5fa585db07a..92a1dc1efce 100644
--- a/src/analyses/natural_loops.cpp
+++ b/src/analyses/natural_loops.cpp
@@ -33,8 +33,7 @@ void show_natural_loops(const goto_functionst &goto_functions)
natural_loopst natural_loops;
natural_loops(it->second.body);
natural_loops.output(std::cout);
-
+
std::cout << std::endl;
}
}
-
diff --git a/src/analyses/natural_loops.h b/src/analyses/natural_loops.h
index 204cf3362ae..50f84183370 100644
--- a/src/analyses/natural_loops.h
+++ b/src/analyses/natural_loops.h
@@ -26,7 +26,7 @@ class natural_loops_templatet
// map loop headers to loops
typedef std::map loop_mapt;
-
+
loop_mapt loop_map;
inline void operator()(P &program)
@@ -35,12 +35,12 @@ class natural_loops_templatet
}
void output(std::ostream &) const;
-
+
inline const cfg_dominators_templatet& get_dominator_info() const
{
return cfg_dominators;
}
-
+
inline natural_loops_templatet()
{
}
@@ -55,7 +55,7 @@ class natural_loops_templatet
typedef typename cfg_dominators_templatet::cfgt::nodet nodet;
void compute(P &program);
- void compute_natural_loop(T, T);
+ void compute_natural_loop(T, T);
};
class natural_loopst:
@@ -109,10 +109,10 @@ void natural_loops_templatet::compute(P &program)
{
const nodet &node=
cfg_dominators.cfg[cfg_dominators.cfg.entry_map[m_it]];
-
+
#ifdef DEBUG
- std::cout << "Computing loop for "
- << m_it->location_number << " -> "
+ std::cout << "Computing loop for "
+ << m_it->location_number << " -> "
<< (*n_it)->location_number << "\n";
#endif
if(node.dominators.find(*n_it)!=node.dominators.end())
@@ -142,7 +142,7 @@ template
void natural_loops_templatet::compute_natural_loop(T m, T n)
{
assert(n->location_number<=m->location_number);
-
+
std::stack stack;
natural_loopt &loop=loop_map[n];
@@ -194,7 +194,7 @@ void natural_loops_templatet::output(std::ostream &out) const
h_it!=loop_map.end(); ++h_it)
{
unsigned n=h_it->first->location_number;
-
+
out << n << " is head of { ";
for(typename natural_loopt::const_iterator l_it=h_it->second.begin();
l_it!=h_it->second.end(); ++l_it)
diff --git a/src/analyses/reaching_definitions.cpp b/src/analyses/reaching_definitions.cpp
index ea43251fb97..c0cda391b9e 100644
--- a/src/analyses/reaching_definitions.cpp
+++ b/src/analyses/reaching_definitions.cpp
@@ -961,4 +961,3 @@ void reaching_definitions_analysist::initialize(
concurrency_aware_ait::initialize(goto_functions);
}
-
diff --git a/src/analyses/reaching_definitions.h b/src/analyses/reaching_definitions.h
index 4eb76ffaae0..91225e8fc86 100644
--- a/src/analyses/reaching_definitions.h
+++ b/src/analyses/reaching_definitions.h
@@ -249,4 +249,3 @@ class reaching_definitions_analysist :
};
#endif
-
diff --git a/src/analyses/replace_symbol_ext.cpp b/src/analyses/replace_symbol_ext.cpp
index 2a53bca1faf..801ce69e881 100644
--- a/src/analyses/replace_symbol_ext.cpp
+++ b/src/analyses/replace_symbol_ext.cpp
@@ -32,7 +32,7 @@ bool replace_symbol_extt::replace(exprt &dest) const
if(have_to_replace(dest.type()))
if(!replace_symbolt::replace(dest.type()))
result=false;
-
+
// now do expression itself
if(!have_to_replace(dest))
diff --git a/src/analyses/static_analysis.cpp b/src/analyses/static_analysis.cpp
index 656644d42c9..3737e109ab7 100644
--- a/src/analyses/static_analysis.cpp
+++ b/src/analyses/static_analysis.cpp
@@ -46,7 +46,7 @@ exprt static_analysis_baset::get_guard(
tmp.make_not();
return tmp;
}
-
+
return from->guard;
}
@@ -70,13 +70,13 @@ exprt static_analysis_baset::get_return_lhs(locationt to)
if(to->is_end_function())
return static_cast(get_nil_irep());
-
+
// must be the function call
assert(to->is_function_call());
const code_function_callt &code=
to_code_function_call(to->code);
-
+
return code.lhs();
}
@@ -270,11 +270,11 @@ void static_analysis_baset::update(
if(!has_location(i_it))
{
generate_state(i_it);
-
+
if(!first)
merge(get_state(i_it), get_state(previous), i_it);
}
-
+
first=false;
previous=i_it;
}
@@ -296,11 +296,11 @@ static_analysis_baset::locationt static_analysis_baset::get_next(
working_sett &working_set)
{
assert(!working_set.empty());
-
+
working_sett::iterator i=working_set.begin();
locationt l=i->second;
working_set.erase(i);
-
+
return l;
}
@@ -322,19 +322,19 @@ bool static_analysis_baset::fixedpoint(
{
if(goto_program.instructions.empty())
return false;
-
+
working_sett working_set;
put_in_working_set(
working_set,
goto_program.instructions.begin());
-
+
bool new_data=false;
while(!working_set.empty())
{
locationt l=get_next(working_set);
-
+
if(visit(l, working_set, goto_program, goto_functions))
new_data=true;
}
@@ -365,7 +365,7 @@ bool static_analysis_baset::visit(
statet ¤t=get_state(l);
current.seen=true;
-
+
goto_programt::const_targetst successors;
goto_program.get_successors(l, successors);
@@ -382,7 +382,7 @@ bool static_analysis_baset::visit(
std::unique_ptr tmp_state(
make_temporary_state(current));
-
+
statet &new_values=*tmp_state;
if(l->is_function_call())
@@ -400,19 +400,19 @@ bool static_analysis_baset::visit(
}
else
new_values.transform(ns, l, to_l);
-
+
statet &other=get_state(to_l);
bool have_new_values=
merge(other, new_values, to_l);
-
+
if(have_new_values)
new_data=true;
-
+
if(have_new_values || !other.seen)
put_in_working_set(working_set, to_l);
}
-
+
return new_data;
}
@@ -439,17 +439,17 @@ void static_analysis_baset::do_function_call(
if(!goto_function.body_available())
return; // do nothing
-
+
assert(!goto_function.body.instructions.empty());
{
// get the state at the beginning of the function
locationt l_begin=goto_function.body.instructions.begin();
-
+
// do the edge from the call site to the beginning of the function
std::unique_ptr tmp_state(make_temporary_state(new_state));
- tmp_state->transform(ns, l_call, l_begin);
-
+ tmp_state->transform(ns, l_call, l_begin);
+
statet &begin_state=get_state(l_begin);
bool new_data=false;
@@ -497,7 +497,7 @@ void static_analysis_baset::do_function_call(
// effect on current procedure (if any)
new_state.transform(ns, l_call, l_return);
}
-}
+}
/*******************************************************************\
@@ -525,7 +525,7 @@ void static_analysis_baset::do_function_call_rec(
if(function.id()==ID_symbol)
{
const irep_idt &identifier=function.get(ID_identifier);
-
+
if(recursion_set.find(identifier)!=recursion_set.end())
{
// recursion detected!
@@ -533,29 +533,29 @@ void static_analysis_baset::do_function_call_rec(
}
else
recursion_set.insert(identifier);
-
+
goto_functionst::function_mapt::const_iterator it=
goto_functions.function_map.find(identifier);
-
+
if(it==goto_functions.function_map.end())
throw "failed to find function "+id2string(identifier);
-
+
do_function_call(
l_call, l_return,
goto_functions,
it,
arguments,
new_state);
-
+
recursion_set.erase(identifier);
}
else if(function.id()==ID_if)
{
if(function.operands().size()!=3)
throw "if takes three arguments";
-
+
std::unique_ptr n2(make_temporary_state(new_state));
-
+
do_function_call_rec(
l_call, l_return,
function.op1(),
@@ -569,7 +569,7 @@ void static_analysis_baset::do_function_call_rec(
arguments,
*n2,
goto_functions);
-
+
merge(new_state, *n2, l_return);
}
else if(function.id()==ID_dereference)
@@ -588,7 +588,7 @@ void static_analysis_baset::do_function_call_rec(
if(it->id()==ID_object_descriptor)
{
const object_descriptor_exprt &o=to_object_descriptor_expr(*it);
- std::unique_ptr n2(make_temporary_state(new_state));
+ std::unique_ptr n2(make_temporary_state(new_state));
do_function_call_rec(l_call, l_return, o.object(), arguments, *n2, goto_functions);
merge(new_state, *n2, l_return);
}
@@ -718,4 +718,3 @@ void static_analysis_baset::concurrent_fixedpoint(
}
}
}
-
diff --git a/src/analyses/static_analysis.h b/src/analyses/static_analysis.h
index 830918f53e3..4d289296938 100644
--- a/src/analyses/static_analysis.h
+++ b/src/analyses/static_analysis.h
@@ -30,7 +30,7 @@ class domain_baset
virtual ~domain_baset()
{
}
-
+
typedef goto_programt::const_targett locationt;
// will go away,
@@ -59,10 +59,10 @@ class domain_baset
std::ostream &out) const
{
}
-
+
typedef hash_set_cont expr_sett;
- // will go away
+ // will go away
virtual void get_reference_set(
const namespacet &ns,
const exprt &expr,
@@ -71,17 +71,17 @@ class domain_baset
// dummy, overload me!
dest.clear();
}
-
+
// also add
//
// bool merge(const T &b, locationt to);
//
// this computes the join between "this" and "b"
// return true if "this" has changed
-
+
protected:
bool seen;
-
+
friend class static_analysis_baset;
};
@@ -98,7 +98,7 @@ class static_analysis_baset
initialized(false)
{
}
-
+
virtual void initialize(
const goto_programt &goto_program)
{
@@ -108,7 +108,7 @@ class static_analysis_baset
generate_states(goto_program);
}
}
-
+
virtual void initialize(
const goto_functionst &goto_functions)
{
@@ -118,13 +118,13 @@ class static_analysis_baset
generate_states(goto_functions);
}
}
-
+
virtual void update(const goto_programt &goto_program);
virtual void update(const goto_functionst &goto_functions);
-
+
virtual void operator()(
const goto_programt &goto_program);
-
+
virtual void operator()(
const goto_functionst &goto_functions);
@@ -136,7 +136,7 @@ class static_analysis_baset
{
initialized=false;
}
-
+
virtual void output(
const goto_functionst &goto_functions,
std::ostream &out) const;
@@ -149,33 +149,33 @@ class static_analysis_baset
}
virtual bool has_location(locationt l) const=0;
-
+
void insert(locationt l)
{
generate_state(l);
}
- // utilities
-
+ // utilities
+
// get guard of a conditional edge
static exprt get_guard(locationt from, locationt to);
-
+
// get lhs that return value is assigned to
// for an edge that returns from a function
static exprt get_return_lhs(locationt to);
protected:
const namespacet &ns;
-
+
virtual void output(
const goto_programt &goto_program,
const irep_idt &identifier,
std::ostream &out) const;
typedef std::map working_sett;
-
+
locationt get_next(working_sett &working_set);
-
+
void put_in_working_set(
working_sett &working_set,
locationt l)
@@ -188,7 +188,7 @@ class static_analysis_baset
bool fixedpoint(
const goto_programt &goto_program,
const goto_functionst &goto_functions);
-
+
virtual void fixedpoint(
const goto_functionst &goto_functions)=0;
@@ -203,31 +203,31 @@ class static_analysis_baset
working_sett &working_set,
const goto_programt &goto_program,
const goto_functionst &goto_functions);
-
+
static locationt successor(locationt l)
{
l++;
return l;
}
-
+
virtual bool merge(statet &a, const statet &b, locationt to)=0;
// for concurrent fixedpoint
virtual bool merge_shared(statet &a, const statet &b, locationt to)=0;
-
+
typedef std::set functions_donet;
functions_donet functions_done;
typedef std::set recursion_sett;
recursion_sett recursion_set;
-
+
void generate_states(
const goto_functionst &goto_functions);
void generate_states(
const goto_programt &goto_program);
-
+
bool initialized;
-
+
// function calls
void do_function_call_rec(
locationt l_call, locationt l_return,
@@ -244,7 +244,7 @@ class static_analysis_baset
statet &new_state);
// abstract methods
-
+
virtual void generate_state(locationt l)=0;
virtual statet &get_state(locationt l)=0;
virtual const statet &get_state(locationt l) const=0;
@@ -277,14 +277,14 @@ class static_analysist:public static_analysis_baset
if(it==state_map.end()) throw "failed to find state";
return it->second;
}
-
+
inline const T &operator[](locationt l) const
{
typename state_mapt::const_iterator it=state_map.find(l);
if(it==state_map.end()) throw "failed to find state";
return it->second;
}
-
+
virtual void clear()
{
state_map.clear();
@@ -295,7 +295,7 @@ class static_analysist:public static_analysis_baset
{
return state_map.count(l)!=0;
}
-
+
protected:
typedef std::map state_mapt;
state_mapt state_map;
@@ -318,7 +318,7 @@ class static_analysist:public static_analysis_baset
{
return static_cast(a).merge(static_cast(b), to);
}
-
+
virtual statet *make_temporary_state(statet &s)
{
return new T(static_cast(s));
@@ -342,7 +342,7 @@ class static_analysist:public static_analysis_baset
sequential_fixedpoint(goto_functions);
}
-private:
+private:
// to enforce that T is derived from domain_baset
void dummy(const T &s) { const statet &x=dummy1(s); (void)x; }
diff --git a/src/analyses/uninitialized_domain.cpp b/src/analyses/uninitialized_domain.cpp
index 4967df42c80..cb58c208158 100644
--- a/src/analyses/uninitialized_domain.cpp
+++ b/src/analyses/uninitialized_domain.cpp
@@ -50,7 +50,7 @@ void uninitialized_domaint::transform(
std::list written=expressions_written(*from);
forall_expr_list(it, written) assign(*it);
-
+
// we only care about the *first* uninitalized use
forall_expr_list(it, read) assign(*it);
}
@@ -121,7 +121,7 @@ bool uninitialized_domaint::merge(
locationt to)
{
unsigned old_uninitialized=uninitialized.size();
-
+
uninitialized.insert(
other.uninitialized.begin(),
other.uninitialized.end());
diff --git a/src/analyses/uninitialized_domain.h b/src/analyses/uninitialized_domain.h
index 78064e86c37..04066fe4b47 100644
--- a/src/analyses/uninitialized_domain.h
+++ b/src/analyses/uninitialized_domain.h
@@ -27,17 +27,16 @@ class uninitialized_domaint:public ai_domain_baset
std::ostream &out,
const ai_baset &ai,
const namespacet &ns) const;
-
+
// returns true iff there is s.th. new
bool merge(
const uninitialized_domaint &other,
locationt from,
locationt to);
-
+
protected:
void assign(const exprt &lhs);
};
typedef ait
uninitialized_analysist;
-
diff --git a/src/ansi-c/Makefile b/src/ansi-c/Makefile
index 0764c137f49..5d6381c6b00 100644
--- a/src/ansi-c/Makefile
+++ b/src/ansi-c/Makefile
@@ -79,7 +79,7 @@ library_check: library/*.c
[ $$ec -eq 0 ] || exit $$ec ; \
done
touch $@
-
+
cprover_library.inc: library/converter$(EXEEXT) library/*.c
cat library/*.c | library/converter$(EXEEXT) > $@
@@ -108,6 +108,5 @@ generated_files: cprover_library.inc gcc_builtin_headers_generic.inc \
###############################################################################
-ansi-c$(LIBEXT): $(OBJ)
+ansi-c$(LIBEXT): $(OBJ)
$(LINKLIB)
-
diff --git a/src/ansi-c/anonymous_member.cpp b/src/ansi-c/anonymous_member.cpp
index b4309576fa8..9aa1d2317b9 100644
--- a/src/ansi-c/anonymous_member.cpp
+++ b/src/ansi-c/anonymous_member.cpp
@@ -34,7 +34,7 @@ static exprt make_member_expr(
if(struct_union.get_bool(ID_C_lvalue))
result.set(ID_C_lvalue, true);
- // todo: should to typedef chains properly
+ // todo: should to typedef chains properly
const typet &type=
ns.follow(struct_union.type());
@@ -42,7 +42,7 @@ static exprt make_member_expr(
type.get_bool(ID_C_constant) ||
struct_union.type().get_bool(ID_C_constant))
result.set(ID_C_constant, true);
-
+
return result;
}
@@ -75,7 +75,7 @@ exprt get_component_rec(
it++)
{
const typet &type=ns.follow(it->type());
-
+
if(it->get_name()==component_name)
{
return make_member_expr(struct_union, *it, ns);
@@ -88,7 +88,7 @@ exprt get_component_rec(
if(result.is_not_nil()) return result;
}
}
-
+
return nil_exprt();
}
@@ -130,6 +130,6 @@ bool has_component_rec(
return true;
}
}
-
+
return false;
}
diff --git a/src/ansi-c/anonymous_member.h b/src/ansi-c/anonymous_member.h
index 865066f8e5b..df76e716427 100644
--- a/src/ansi-c/anonymous_member.h
+++ b/src/ansi-c/anonymous_member.h
@@ -18,4 +18,3 @@ bool has_component_rec(
const typet &struct_union_type,
const irep_idt &component_name,
const namespacet &ns);
-
diff --git a/src/ansi-c/ansi_c_convert_type.cpp b/src/ansi-c/ansi_c_convert_type.cpp
index b445aa5f2d1..8fde8c57c4d 100644
--- a/src/ansi-c/ansi_c_convert_type.cpp
+++ b/src/ansi-c/ansi_c_convert_type.cpp
@@ -119,7 +119,7 @@ void ansi_c_convert_typet::read_rec(const typet &type)
bv_cnt++;
const exprt &size_expr=
static_cast(type.find(ID_size));
-
+
bv_width=size_expr;
}
else if(type.id()==ID_custom_floatbv)
@@ -207,7 +207,7 @@ void ansi_c_convert_typet::read_rec(const typet &type)
{
const exprt &as_expr=
static_cast(static_cast(type));
-
+
forall_operands(it, as_expr)
{
// these are symbols
@@ -254,7 +254,7 @@ Function: ansi_c_convert_typet::write
void ansi_c_convert_typet::write(typet &type)
{
type.clear();
-
+
// first, do "other"
if(!other.empty())
@@ -437,7 +437,7 @@ void ansi_c_convert_typet::write(typet &type)
else
{
// it is integer -- signed or unsigned?
-
+
bool is_signed=true; // default
if(signed_cnt && unsigned_cnt)
@@ -459,7 +459,7 @@ void ansi_c_convert_typet::write(typet &type)
error() << "conflicting type modifiers" << eom;
throw 0;
}
-
+
if(int8_cnt)
type=is_signed?signed_char_type():unsigned_char_type();
else if(int16_cnt)
@@ -535,7 +535,7 @@ void ansi_c_convert_typet::write(typet &type)
new_type.subtype().swap(type);
type=new_type;
}
-
+
if(complex_cnt)
{
// These take more or less arbitrary subtypes.
@@ -551,7 +551,7 @@ void ansi_c_convert_typet::write(typet &type)
new_type.subtype()=type;
type.swap(new_type);
}
-
+
c_qualifiers.write(type);
if(packed)
diff --git a/src/ansi-c/ansi_c_convert_type.h b/src/ansi-c/ansi_c_convert_type.h
index b8060b80dcf..f87e4c86a8f 100644
--- a/src/ansi-c/ansi_c_convert_type.h
+++ b/src/ansi-c/ansi_c_convert_type.h
@@ -22,7 +22,7 @@ class ansi_c_convert_typet:public messaget
int_cnt, short_cnt, long_cnt,
double_cnt, float_cnt, c_bool_cnt,
proper_bool_cnt, complex_cnt;
-
+
// extensions
unsigned int8_cnt, int16_cnt, int32_cnt, int64_cnt,
ptr32_cnt, ptr64_cnt,
@@ -30,7 +30,7 @@ class ansi_c_convert_typet:public messaget
floatbv_cnt, fixedbv_cnt;
typet gcc_attribute_mode;
-
+
bool packed, aligned;
exprt vector_size, alignment, bv_width, fraction_width;
exprt msc_based; // this is Visual Studio
@@ -38,22 +38,22 @@ class ansi_c_convert_typet:public messaget
// storage spec
c_storage_spect c_storage_spec;
-
+
// qualifiers
c_qualifierst c_qualifiers;
void read(const typet &type);
void write(typet &type);
-
+
source_locationt source_location;
-
+
std::list other;
-
+
ansi_c_convert_typet(message_handlert &_message_handler):
messaget(_message_handler)
{
}
-
+
void clear()
{
unsigned_cnt=signed_cnt=char_cnt=int_cnt=short_cnt=
@@ -67,14 +67,14 @@ class ansi_c_convert_typet:public messaget
fraction_width.make_nil();
msc_based.make_nil();
gcc_attribute_mode.make_nil();
-
+
packed=aligned=constructor=destructor=false;
other.clear();
c_storage_spec.clear();
c_qualifiers.clear();
}
-
+
protected:
void read_rec(const typet &type);
};
diff --git a/src/ansi-c/ansi_c_declaration.cpp b/src/ansi-c/ansi_c_declaration.cpp
index c006c34cd5e..f9dea43c02b 100644
--- a/src/ansi-c/ansi_c_declaration.cpp
+++ b/src/ansi-c/ansi_c_declaration.cpp
@@ -29,7 +29,7 @@ Function: ansi_c_declaratort::build
void ansi_c_declaratort::build(irept &src)
{
typet *p=static_cast(&src);
-
+
// walk down subtype until we hit symbol or "abstract"
while(true)
{
@@ -62,7 +62,7 @@ void ansi_c_declaratort::build(irept &src)
else
p=&t.subtype();
}
-
+
type()=static_cast(src);
value().make_nil();
}
@@ -95,7 +95,7 @@ void ansi_c_declarationt::output(std::ostream &out) const
out << "\n";
out << "Type: " << type().pretty() << "\n";
-
+
for(declaratorst::const_iterator d_it=declarators().begin();
d_it!=declarators().end();
d_it++)
@@ -123,7 +123,7 @@ typet ansi_c_declarationt::full_type(
// this gets types that are still raw parse trees
while(p->is_not_nil())
{
- if(p->id()==ID_pointer || p->id()==ID_array ||
+ if(p->id()==ID_pointer || p->id()==ID_array ||
p->id()==ID_vector || p->id()==ID_c_bit_field ||
p->id()==ID_block_pointer || p->id()==ID_code)
p=&p->subtype();
@@ -138,7 +138,7 @@ typet ansi_c_declarationt::full_type(
}
*p=type();
-
+
return result;
}
@@ -158,7 +158,7 @@ void ansi_c_declarationt::to_symbol(
const ansi_c_declaratort &declarator,
symbolt &symbol) const
{
- symbol.clear();
+ symbol.clear();
symbol.value=declarator.value();
symbol.type=full_type(declarator);
symbol.name=declarator.get_name();
@@ -169,16 +169,16 @@ void ansi_c_declarationt::to_symbol(
symbol.is_macro=get_is_typedef() || get_is_enum_constant();
symbol.is_parameter=get_is_parameter();
symbol.is_weak=get_is_weak();
-
+
// is it a function?
-
+
if(symbol.type.id()==ID_code && !symbol.is_type)
{
symbol.is_static_lifetime=false;
symbol.is_thread_local=false;
symbol.is_file_local=get_is_static();
-
+
if(get_is_inline())
symbol.type.set(ID_C_inlined, true);
@@ -205,13 +205,13 @@ void ansi_c_declarationt::to_symbol(
!symbol.is_macro &&
!symbol.is_type &&
(get_is_global() || get_is_static());
-
+
symbol.is_thread_local=
(!symbol.is_static_lifetime && !get_is_extern()) ||
get_is_thread_local();
-
+
symbol.is_file_local=
- symbol.is_macro ||
+ symbol.is_macro ||
(!get_is_global() && !get_is_extern()) ||
(get_is_global() && get_is_static()) ||
symbol.is_parameter;
diff --git a/src/ansi-c/ansi_c_declaration.h b/src/ansi-c/ansi_c_declaration.h
index 25c00feda6f..87ea59a818a 100644
--- a/src/ansi-c/ansi_c_declaration.h
+++ b/src/ansi-c/ansi_c_declaration.h
@@ -24,27 +24,27 @@ class ansi_c_declaratort:public exprt
{
return static_cast(add(ID_value));
}
-
+
inline const exprt &value() const
{
return static_cast(find(ID_value));
}
-
+
inline void set_name(const irep_idt &name)
{
return set(ID_name, name);
}
-
+
inline irep_idt get_name() const
{
return get(ID_name);
}
-
+
inline irep_idt get_base_name() const
{
return get(ID_base_name);
}
-
+
inline void set_base_name(const irep_idt &base_name)
{
return set(ID_base_name, base_name);
@@ -71,112 +71,112 @@ class ansi_c_declarationt:public exprt
inline ansi_c_declarationt():exprt(ID_declaration)
{
}
-
+
inline bool get_is_typedef() const
{
return get_bool(ID_is_typedef);
}
-
+
inline void set_is_typedef(bool is_typedef)
{
set(ID_is_typedef, is_typedef);
}
-
+
inline bool get_is_enum_constant() const
{
return get_bool(ID_is_enum_constant);
}
-
+
inline void set_is_enum_constant(bool is_enum_constant)
{
set(ID_is_enum_constant, is_enum_constant);
}
-
+
inline bool get_is_static() const
{
return get_bool(ID_is_static);
}
-
+
inline void set_is_static(bool is_static)
{
set(ID_is_static, is_static);
}
-
+
inline bool get_is_parameter() const
{
return get_bool(ID_is_parameter);
}
-
+
inline void set_is_parameter(bool is_parameter)
{
set(ID_is_parameter, is_parameter);
}
-
+
inline bool get_is_member() const
{
return get_bool(ID_is_member);
}
-
+
inline void set_is_member(bool is_member)
{
set(ID_is_member, is_member);
}
-
+
inline bool get_is_global() const
{
return get_bool(ID_is_global);
}
-
+
inline void set_is_global(bool is_global)
{
set(ID_is_global, is_global);
}
-
+
inline bool get_is_register() const
{
return get_bool(ID_is_register);
}
-
+
inline void set_is_register(bool is_register)
{
set(ID_is_register, is_register);
}
-
+
inline bool get_is_thread_local() const
{
return get_bool(ID_is_thread_local);
}
-
+
inline void set_is_thread_local(bool is_thread_local)
{
set(ID_is_thread_local, is_thread_local);
}
-
+
inline bool get_is_inline() const
{
return get_bool(ID_is_inline);
}
-
+
inline void set_is_inline(bool is_inline)
{
set(ID_is_inline, is_inline);
}
-
+
inline bool get_is_extern() const
{
return get_bool(ID_is_extern);
}
-
+
inline void set_is_extern(bool is_extern)
{
set(ID_is_extern, is_extern);
}
-
+
inline bool get_is_static_assert() const
{
return get_bool(ID_is_static_assert);
}
-
+
inline void set_is_static_assert(bool is_static_assert)
{
set(ID_is_static_assert, is_static_assert);
@@ -191,7 +191,7 @@ class ansi_c_declarationt:public exprt
{
set(ID_is_weak, is_weak);
}
-
+
void to_symbol(
const ansi_c_declaratort &,
symbolt &symbol) const;
@@ -210,7 +210,7 @@ class ansi_c_declarationt:public exprt
return (declaratorst &)operands();
}
- // special case of a declaration with exactly one declarator
+ // special case of a declaration with exactly one declarator
inline const ansi_c_declaratort &declarator() const
{
assert(declarators().size()==1);
@@ -222,9 +222,9 @@ class ansi_c_declarationt:public exprt
assert(declarators().size()==1);
return declarators()[0];
}
-
+
void output(std::ostream &) const;
-
+
inline void add_initializer(exprt &value)
{
assert(!declarators().empty());
diff --git a/src/ansi-c/ansi_c_entry_point.cpp b/src/ansi-c/ansi_c_entry_point.cpp
index f4db1403fbd..1acfb7d4459 100644
--- a/src/ansi-c/ansi_c_entry_point.cpp
+++ b/src/ansi-c/ansi_c_entry_point.cpp
@@ -46,7 +46,7 @@ exprt::operandst build_function_environment(
{
exprt::operandst result;
result.resize(parameters.size());
-
+
std::size_t i=0;
for(const auto & p : parameters)
@@ -55,25 +55,25 @@ exprt::operandst build_function_environment(
if(base_name.empty()) base_name="argument#"+i2string(i);
irep_idt identifier=id2string(goto_functionst::entry_point())+
"::"+id2string(base_name);
-
- {
+
+ {
auxiliary_symbolt new_symbol;
new_symbol.mode=ID_C;
new_symbol.is_static_lifetime=false;
new_symbol.name=identifier;
new_symbol.base_name=base_name;
new_symbol.type=p.type();
-
+
symbol_table.move(new_symbol);
}
-
+
symbol_exprt symbol_expr(identifier, p.type());
code_declt decl;
decl.symbol()=symbol_expr;
-
+
init_code.add(decl);
-
+
codet input(ID_input);
input.operands().resize(2);
@@ -82,13 +82,13 @@ exprt::operandst build_function_environment(
index_exprt(string_constantt(base_name), gen_zero(index_type())));
input.op1()=symbol_expr;
input.add_source_location()=p.source_location();
-
+
init_code.move_to_operands(input);
-
+
result[i]=symbol_expr;
i++;
}
-
+
return result;
}
@@ -124,7 +124,7 @@ void record_function_outputs(
const symbolt &return_symbol=symbol_table.lookup("return'");
output.op0()=address_of_exprt(
- index_exprt(string_constantt(return_symbol.base_name),
+ index_exprt(string_constantt(return_symbol.base_name),
gen_zero(index_type())));
output.op1()=return_symbol.symbol_expr();
@@ -149,7 +149,7 @@ void record_function_outputs(
output.operands().resize(2);
output.op0()=address_of_exprt(
- index_exprt(string_constantt(symbol.base_name),
+ index_exprt(string_constantt(symbol.base_name),
gen_zero(index_type())));
output.op1()=symbol.symbol_expr();
output.add_source_location()=p.source_location();
@@ -185,35 +185,35 @@ bool ansi_c_entry_point(
return false; // silently ignore
irep_idt main_symbol;
-
+
// find main symbol
if(config.main!="")
{
std::list matches;
-
+
forall_symbol_base_map(it, symbol_table.symbol_base_map, config.main)
{
// look it up
symbol_tablet::symbolst::const_iterator s_it=symbol_table.symbols.find(it->second);
-
+
if(s_it==symbol_table.symbols.end()) continue;
-
+
if(s_it->second.type.id()==ID_code)
matches.push_back(it->second);
}
-
+
if(matches.empty())
{
messaget message(message_handler);
- message.error() << "main symbol `" << config.main
+ message.error() << "main symbol `" << config.main
<< "' not found" << messaget::eom;
return true; // give up
}
-
+
if(matches.size()>=2)
{
messaget message(message_handler);
- message.error() << "main symbol `" << config.main
+ message.error() << "main symbol `" << config.main
<< "' is ambiguous" << messaget::eom;
return true;
}
@@ -222,16 +222,16 @@ bool ansi_c_entry_point(
}
else
main_symbol=standard_main;
-
+
// look it up
symbol_tablet::symbolst::const_iterator s_it=
symbol_table.symbols.find(main_symbol);
-
+
if(s_it==symbol_table.symbols.end())
return false; // give up silently
-
+
const symbolt &symbol=s_it->second;
-
+
// check if it has a body
if(symbol.value.is_nil())
{
@@ -243,9 +243,9 @@ bool ansi_c_entry_point(
if(static_lifetime_init(symbol_table, symbol.location, message_handler))
return true;
-
+
code_blockt init_code;
-
+
// build call to initialization function
{
@@ -259,7 +259,7 @@ bool ansi_c_entry_point(
<< messaget::eom;
return true;
}
-
+
code_function_callt call_init;
call_init.lhs().make_nil();
call_init.add_source_location()=symbol.location;
@@ -269,7 +269,7 @@ bool ansi_c_entry_point(
}
// build call to main function
-
+
code_function_callt call_main;
call_main.add_source_location()=symbol.location;
call_main.function()=symbol.symbol_expr();
@@ -303,36 +303,36 @@ bool ansi_c_entry_point(
const symbolt &argc_symbol=ns.lookup("argc'");
const symbolt &argv_symbol=ns.lookup("argv'");
-
+
{
// assume argc is at least one
exprt one=from_integer(1, argc_symbol.type);
-
+
exprt ge(ID_ge, typet(ID_bool));
ge.copy_to_operands(argc_symbol.symbol_expr(), one);
-
+
codet assumption;
assumption.set_statement(ID_assume);
assumption.move_to_operands(ge);
init_code.move_to_operands(assumption);
}
-
+
{
// assume argc is at most MAX/8-1
mp_integer upper_bound=
power(2, config.ansi_c.int_width-4);
-
+
exprt bound_expr=from_integer(upper_bound, argc_symbol.type);
-
+
exprt le(ID_le, typet(ID_bool));
le.copy_to_operands(argc_symbol.symbol_expr(), bound_expr);
-
+
codet assumption;
assumption.set_statement(ID_assume);
assumption.move_to_operands(le);
init_code.move_to_operands(assumption);
}
-
+
{
// record argc as an input
codet input(ID_input);
@@ -342,14 +342,14 @@ bool ansi_c_entry_point(
input.op1()=argc_symbol.symbol_expr();
init_code.move_to_operands(input);
}
-
+
if(parameters.size()==3)
- {
+ {
const symbolt &envp_size_symbol=ns.lookup("envp_size'");
// assume envp_size is INTMAX-1
mp_integer max;
-
+
if(envp_size_symbol.type.id()==ID_signedbv)
{
max=to_signedbv_type(envp_size_symbol.type).largest();
@@ -360,21 +360,21 @@ bool ansi_c_entry_point(
}
else
assert(false);
-
+
exprt max_minus_one=from_integer(max-1, envp_size_symbol.type);
-
+
exprt le(ID_le, bool_typet());
le.copy_to_operands(envp_size_symbol.symbol_expr(), max_minus_one);
-
+
codet assumption;
assumption.set_statement(ID_assume);
assumption.move_to_operands(le);
init_code.move_to_operands(assumption);
}
-
+
{
/* zero_string doesn't work yet */
-
+
/*
exprt zero_string(ID_zero_string, array_typet());
zero_string.type().subtype()=char_type();
@@ -387,11 +387,11 @@ bool ansi_c_entry_point(
if(argv_symbol.type.subtype()!=address_of.type())
address_of.make_typecast(argv_symbol.type.subtype());
-
+
// assign argv[*] to the address of a string-object
exprt array_of("array_of", argv_symbol.type);
array_of.copy_to_operands(address_of);
-
+
init_code.copy_to_operands(
code_assignt(argv_symbol.symbol_expr(), array_of));
*/
@@ -401,12 +401,12 @@ bool ansi_c_entry_point(
// assign argv[argc] to NULL
exprt null(ID_constant, argv_symbol.type.subtype());
null.set(ID_value, ID_NULL);
-
+
exprt index_expr(ID_index, argv_symbol.type.subtype());
index_expr.copy_to_operands(
argv_symbol.symbol_expr(),
argc_symbol.symbol_expr());
-
+
// disable bounds check on that one
index_expr.set("bounds_check", false);
@@ -414,44 +414,44 @@ bool ansi_c_entry_point(
}
if(parameters.size()==3)
- {
+ {
const symbolt &envp_symbol=ns.lookup("envp'");
const symbolt &envp_size_symbol=ns.lookup("envp_size'");
-
+
// assume envp[envp_size] is NULL
exprt null(ID_constant, envp_symbol.type.subtype());
null.set(ID_value, ID_NULL);
-
+
exprt index_expr(ID_index, envp_symbol.type.subtype());
index_expr.copy_to_operands(
envp_symbol.symbol_expr(),
envp_size_symbol.symbol_expr());
-
+
// disable bounds check on that one
index_expr.set("bounds_check", false);
-
+
exprt is_null(ID_equal, typet(ID_bool));
is_null.copy_to_operands(index_expr, null);
-
+
codet assumption2;
assumption2.set_statement(ID_assume);
assumption2.move_to_operands(is_null);
init_code.move_to_operands(assumption2);
}
-
+
{
exprt::operandst &operands=call_main.arguments();
if(parameters.size()==3)
operands.resize(3);
- else
+ else
operands.resize(2);
-
+
exprt &op0=operands[0];
exprt &op1=operands[1];
-
+
op0=argc_symbol.symbol_expr();
-
+
{
const exprt &arg1=parameters[1];
@@ -460,7 +460,7 @@ bool ansi_c_entry_point(
// disable bounds check on that one
index_expr.set("bounds_check", false);
-
+
op1=exprt(ID_address_of, arg1.type());
op1.move_to_operands(index_expr);
}
@@ -472,11 +472,11 @@ bool ansi_c_entry_point(
exprt &op2=operands[2];
const exprt &arg2=parameters[2];
-
+
exprt index_expr(ID_index, arg2.type().subtype());
index_expr.copy_to_operands(
envp_symbol.symbol_expr(), gen_zero(index_type()));
-
+
op2=exprt(ID_address_of, arg2.type());
op2.move_to_operands(index_expr);
}
@@ -503,12 +503,12 @@ bool ansi_c_entry_point(
code_typet main_type;
main_type.return_type()=empty_typet();
-
+
new_symbol.name=goto_functionst::entry_point();
new_symbol.type.swap(main_type);
new_symbol.value.swap(init_code);
new_symbol.mode=symbol.mode;
-
+
if(symbol_table.move(new_symbol))
{
messaget message;
@@ -516,6 +516,6 @@ bool ansi_c_entry_point(
message.error() << "failed to move main symbol" << messaget::eom;
return true;
}
-
+
return false;
}
diff --git a/src/ansi-c/ansi_c_internal_additions.cpp b/src/ansi-c/ansi_c_internal_additions.cpp
index dc424d6cd57..ca4cf92f637 100644
--- a/src/ansi-c/ansi_c_internal_additions.cpp
+++ b/src/ansi-c/ansi_c_internal_additions.cpp
@@ -140,7 +140,7 @@ void ansi_c_internal_additions(std::string &code)
"void __CPROVER_input(const char *id, ...);\n"
"void __CPROVER_output(const char *id, ...);\n"
"void __CPROVER_cover(__CPROVER_bool condition);\n"
-
+
// concurrency-related
"void __CPROVER_atomic_begin();\n"
"void __CPROVER_atomic_end();\n"
@@ -151,13 +151,13 @@ void ansi_c_internal_additions(std::string &code)
// traces
"void CBMC_trace(int lvl, const char *event, ...);\n"
-
+
// pointers
"unsigned __CPROVER_POINTER_OBJECT(const void *p);\n"
"signed __CPROVER_POINTER_OFFSET(const void *p);\n"
"__CPROVER_bool __CPROVER_DYNAMIC_OBJECT(const void *p);\n"
"extern unsigned char __CPROVER_memory[__CPROVER_constant_infinity_uint];\n"
-
+
// malloc
"void *__CPROVER_malloc(__CPROVER_size_t size);\n"
"const void *__CPROVER_deallocated=0;\n"
@@ -169,7 +169,7 @@ void ansi_c_internal_additions(std::string &code)
// this is ANSI-C
"extern __CPROVER_thread_local const char __func__[__CPROVER_constant_infinity_uint];\n"
-
+
// this is GCC
"extern __CPROVER_thread_local const char __FUNCTION__[__CPROVER_constant_infinity_uint];\n"
"extern __CPROVER_thread_local const char __PRETTY_FUNCTION__[__CPROVER_constant_infinity_uint];\n"
@@ -202,7 +202,7 @@ void ansi_c_internal_additions(std::string &code)
"double __CPROVER_fabs(double x);\n"
"long double __CPROVER_fabsl(long double x);\n"
"float __CPROVER_fabsf(float x);\n"
-
+
// arrays
"__CPROVER_bool __CPROVER_array_equal(const void *array1, const void *array2);\n"
"void __CPROVER_array_copy(const void *dest, const void *src);\n"
@@ -211,10 +211,10 @@ void ansi_c_internal_additions(std::string &code)
// k-induction
"void __CPROVER_k_induction_hint(unsigned min, unsigned max, "
"unsigned step, unsigned loop_free);\n"
-
+
// format string-related
"int __CPROVER_scanf(const char *, ...);\n"
-
+
// pipes, write, read, close
"struct __CPROVER_pipet {\n"
" _Bool widowed;\n"
@@ -228,7 +228,7 @@ void ansi_c_internal_additions(std::string &code)
"unsigned __CPROVER_pipe_count=0;\n"
"\n";
-
+
// GCC junk stuff, also for CLANG and ARM
if(config.ansi_c.mode==configt::ansi_ct::flavourt::GCC ||
config.ansi_c.mode==configt::ansi_ct::flavourt::APPLE ||
@@ -246,7 +246,7 @@ void ansi_c_internal_additions(std::string &code)
{
if(config.ansi_c.mode==configt::ansi_ct::flavourt::APPLE)
code+="typedef double __float128;\n"; // clang doesn't do __float128
-
+
code+=gcc_builtin_headers_ia32;
code+=gcc_builtin_headers_ia32_2;
}
@@ -290,15 +290,15 @@ void ansi_c_internal_additions(std::string &code)
if(config.ansi_c.os==configt::ansi_ct::ost::OS_WIN)
code+="int __noop();\n"
"int __assume(int);\n";
-
+
// ARM stuff
if(config.ansi_c.mode==configt::ansi_ct::flavourt::ARM)
code+=arm_builtin_headers;
-
+
// CW stuff
if(config.ansi_c.mode==configt::ansi_ct::flavourt::CODEWARRIOR)
code+=cw_builtin_headers;
-
+
// Architecture strings
ansi_c_architecture_strings(code);
}
diff --git a/src/ansi-c/ansi_c_internal_additions.h b/src/ansi-c/ansi_c_internal_additions.h
index 366af5f85a4..9ac0dc3a269 100644
--- a/src/ansi-c/ansi_c_internal_additions.h
+++ b/src/ansi-c/ansi_c_internal_additions.h
@@ -14,4 +14,3 @@ void ansi_c_architecture_strings(std::string &code);
extern const char gcc_builtin_headers_generic[];
extern const char gcc_builtin_headers_ia32[];
extern const char arm_builtin_headers[];
-
diff --git a/src/ansi-c/ansi_c_language.cpp b/src/ansi-c/ansi_c_language.cpp
index 5c80e6905a6..6e3b587d248 100644
--- a/src/ansi-c/ansi_c_language.cpp
+++ b/src/ansi-c/ansi_c_language.cpp
@@ -86,7 +86,7 @@ bool ansi_c_languaget::preprocess(
return c_preprocess(path, outstream, get_message_handler());
}
-
+
/*******************************************************************\
Function: ansi_c_languaget::parse
@@ -150,7 +150,7 @@ bool ansi_c_languaget::parse(
return result;
}
-
+
/*******************************************************************\
Function: ansi_c_languaget::typecheck
@@ -173,10 +173,10 @@ bool ansi_c_languaget::typecheck(
return true;
remove_internal_symbols(new_symbol_table);
-
+
if(linking(symbol_table, new_symbol_table, get_message_handler()))
return true;
-
+
return false;
}
@@ -196,7 +196,7 @@ bool ansi_c_languaget::final(symbol_tablet &symbol_table)
{
if(ansi_c_entry_point(symbol_table, "main", get_message_handler()))
return true;
-
+
return false;
}
@@ -211,7 +211,7 @@ Function: ansi_c_languaget::show_parse
Purpose:
\*******************************************************************/
-
+
void ansi_c_languaget::show_parse(std::ostream &out)
{
parse_tree.output(out);
@@ -308,7 +308,7 @@ Function: ansi_c_languaget::to_expr
Purpose:
\*******************************************************************/
-
+
bool ansi_c_languaget::to_expr(
const std::string &code,
const std::string &module,
@@ -321,7 +321,7 @@ bool ansi_c_languaget::to_expr(
std::istringstream i_preprocessed(
"void __my_expression = (void) (\n"+code+"\n);");
-
+
// parsing
ansi_c_parser.clear();
@@ -338,14 +338,14 @@ bool ansi_c_languaget::to_expr(
else
{
expr=ansi_c_parser.parse_tree.items.front().declarator().value();
-
+
// typecheck it
result=ansi_c_typecheck(expr, get_message_handler(), ns);
}
// save some memory
ansi_c_parser.clear();
-
+
// now remove that (void) cast
if(expr.id()==ID_typecast &&
expr.type().id()==ID_empty &&
diff --git a/src/ansi-c/ansi_c_language.h b/src/ansi-c/ansi_c_language.h
index 901df70df7c..5344bce5ebb 100644
--- a/src/ansi-c/ansi_c_language.h
+++ b/src/ansi-c/ansi_c_language.h
@@ -29,7 +29,7 @@ class ansi_c_languaget:public languaget
virtual bool parse(
std::istream &instream,
const std::string &path);
-
+
virtual bool typecheck(
symbol_tablet &symbol_table,
const std::string &module);
@@ -38,10 +38,10 @@ class ansi_c_languaget:public languaget
symbol_tablet &symbol_table);
virtual void show_parse(std::ostream &out);
-
+
virtual ~ansi_c_languaget();
ansi_c_languaget() { }
-
+
virtual bool from_expr(
const exprt &expr,
std::string &code,
@@ -62,21 +62,21 @@ class ansi_c_languaget:public languaget
const std::string &module,
exprt &expr,
const namespacet &ns);
-
+
virtual languaget *new_language()
{ return new ansi_c_languaget; }
-
+
virtual std::string id() const { return "C"; }
virtual std::string description() const { return "ANSI-C 99"; }
virtual std::set extensions() const;
- virtual void modules_provided(std::set &modules);
-
+ virtual void modules_provided(std::set &modules);
+
protected:
ansi_c_parse_treet parse_tree;
std::string parse_path;
};
-
+
languaget *new_ansi_c_language();
-
+
#endif
diff --git a/src/ansi-c/ansi_c_parser.cpp b/src/ansi-c/ansi_c_parser.cpp
index 5454b26f5f8..88787d4b519 100644
--- a/src/ansi-c/ansi_c_parser.cpp
+++ b/src/ansi-c/ansi_c_parser.cpp
@@ -36,7 +36,7 @@ ansi_c_id_classt ansi_c_parsert::lookup(
tag?"tag-"+id2string(base_name):
label?"label-"+id2string(base_name):
base_name;
-
+
for(scopest::const_reverse_iterator it=scopes.rbegin();
it!=scopes.rend();
it++)
@@ -51,7 +51,7 @@ ansi_c_id_classt ansi_c_parsert::lookup(
return n_it->second.id_class;
}
}
-
+
// Not found.
// If it's a tag, we will add to current scope.
if(tag)
@@ -87,7 +87,7 @@ void ansi_c_parsert::add_tag_with_body(irept &tag)
"tag-"+tag.get_string(ID_C_base_name);
irep_idt prefixed_name=current_scope().prefix+scope_name;
-
+
if(prefixed_name!=tag.get(ID_identifier))
{
// re-defined in a deeper scope
@@ -138,15 +138,15 @@ void ansi_c_parsert::add_declarator(
assert(declarator.is_not_nil());
ansi_c_declarationt &ansi_c_declaration=
to_ansi_c_declaration(declaration);
-
+
ansi_c_declaratort new_declarator;
new_declarator.build(declarator);
irep_idt base_name=new_declarator.get_base_name();
-
+
bool is_member=ansi_c_declaration.get_is_member();
bool is_parameter=ansi_c_declaration.get_is_parameter();
-
+
if(is_member)
{
// we don't put them into a struct scope (unlike C++)
@@ -154,7 +154,7 @@ void ansi_c_parsert::add_declarator(
ansi_c_declaration.declarators().push_back(new_declarator);
return; // done
}
-
+
// global?
if(current_scope().prefix=="")
ansi_c_declaration.set_is_global(true);
@@ -167,14 +167,14 @@ void ansi_c_parsert::add_declarator(
bool is_extern=c_storage_spec.is_extern;
bool force_root_scope=false;
-
+
// Functions always go into global scope, unless
// declared as a parameter or are typedefs.
if(new_declarator.type().id()==ID_code &&
!is_parameter &&
!is_typedef)
force_root_scope=true;
-
+
// variables marked as 'extern' always go into global scope
if(is_extern)
force_root_scope=true;
@@ -185,18 +185,18 @@ void ansi_c_parsert::add_declarator(
scopet &scope=
force_root_scope?root_scope():current_scope();
- // set the final name
+ // set the final name
irep_idt prefixed_name=force_root_scope?
base_name:
current_scope().prefix+id2string(base_name);
new_declarator.set_name(prefixed_name);
- // add to scope
+ // add to scope
ansi_c_identifiert &identifier=scope.name_map[base_name];
identifier.id_class=id_class;
identifier.prefixed_name=prefixed_name;
}
-
+
ansi_c_declaration.declarators().push_back(new_declarator);
}
@@ -211,7 +211,7 @@ Function: ansi_c_parsert::get_class
Purpose:
\*******************************************************************/
-
+
ansi_c_id_classt ansi_c_parsert::get_class(const typet &type)
{
if(type.id()==ID_typedef)
diff --git a/src/ansi-c/ansi_c_parser.h b/src/ansi-c/ansi_c_parser.h
index b6440e815f5..0ca7f4f5b89 100644
--- a/src/ansi-c/ansi_c_parser.h
+++ b/src/ansi-c/ansi_c_parser.h
@@ -28,30 +28,30 @@ class ansi_c_parsert:public parsert
{
public:
ansi_c_parse_treet parse_tree;
-
+
ansi_c_parsert():
cpp98(false), cpp11(false),
for_has_scope(false)
{
}
-
+
virtual bool parse() override
{
return yyansi_cparse()!=0;
}
- virtual void clear() override
+ virtual void clear() override
{
parsert::clear();
parse_tree.clear();
-
+
// scanner state
tag_following=false;
asm_block_following=false;
parenthesis_counter=0;
string_literal.clear();
pragma_pack.clear();
-
+
// setup global scope
scopes.clear();
scopes.push_back(scopet());
@@ -67,33 +67,33 @@ class ansi_c_parsert:public parsert
typedef configt::ansi_ct::flavourt modet;
modet mode;
- // recognize C++98 and C++11 keywords
+ // recognize C++98 and C++11 keywords
bool cpp98, cpp11;
-
+
// in C99 and upwards, for(;;) has a scope
bool for_has_scope;
- typedef ansi_c_identifiert identifiert;
+ typedef ansi_c_identifiert identifiert;
typedef ansi_c_scopet scopet;
typedef std::list scopest;
scopest scopes;
-
+
scopet &root_scope()
{
return scopes.front();
}
-
+
const scopet &root_scope() const
{
return scopes.front();
}
-
+
void pop_scope()
{
scopes.pop_back();
}
-
+
scopet ¤t_scope()
{
assert(!scopes.empty());
@@ -113,7 +113,7 @@ class ansi_c_parsert:public parsert
assert(declaration.id()==ID_declaration);
parse_tree.items.push_back(declaration);
}
-
+
void new_scope(const std::string &prefix)
{
const scopet ¤t=current_scope();
@@ -128,7 +128,7 @@ class ansi_c_parsert:public parsert
bool label);
static ansi_c_id_classt get_class(const typet &type);
-
+
irep_idt lookup_label(const irep_idt base_name)
{
irep_idt identifier;
diff --git a/src/ansi-c/ansi_c_scope.cpp b/src/ansi-c/ansi_c_scope.cpp
index 4807916f4a6..8c2bcc4e589 100644
--- a/src/ansi-c/ansi_c_scope.cpp
+++ b/src/ansi-c/ansi_c_scope.cpp
@@ -36,4 +36,3 @@ void ansi_c_scopet::print(std::ostream &out) const
<< "\n";
}
}
-
diff --git a/src/ansi-c/ansi_c_scope.h b/src/ansi-c/ansi_c_scope.h
index 7bd953dca9e..b95cdcb06f7 100644
--- a/src/ansi-c/ansi_c_scope.h
+++ b/src/ansi-c/ansi_c_scope.h
@@ -20,12 +20,12 @@ class ansi_c_identifiert
public:
ansi_c_id_classt id_class;
irep_idt base_name, prefixed_name;
-
+
ansi_c_identifiert():id_class(ANSI_C_UNKNOWN)
{
}
};
-
+
class ansi_c_scopet
{
public:
@@ -33,19 +33,19 @@ class ansi_c_scopet
// ansi_c_identifiert.
typedef hash_map_cont name_mapt;
name_mapt name_map;
-
+
std::string prefix;
-
+
// We remember the last declarator for the benefit
// of function argument scoping.
irep_idt last_declarator;
-
+
// for(;;) and { } scopes are numbered
unsigned compound_counter;
unsigned anon_counter;
-
+
ansi_c_scopet():compound_counter(0), anon_counter(0) { }
-
+
void swap(ansi_c_scopet &scope)
{
name_map.swap(scope.name_map);
@@ -53,7 +53,7 @@ class ansi_c_scopet
last_declarator.swap(scope.last_declarator);
std::swap(compound_counter, scope.compound_counter);
}
-
+
void print(std::ostream &out) const;
};
diff --git a/src/ansi-c/ansi_c_typecheck.cpp b/src/ansi-c/ansi_c_typecheck.cpp
index 5abe39acef5..53daf912dc2 100644
--- a/src/ansi-c/ansi_c_typecheck.cpp
+++ b/src/ansi-c/ansi_c_typecheck.cpp
@@ -97,6 +97,6 @@ bool ansi_c_typecheck(
{
ansi_c_typecheck.error() << e << messaget::eom;
}
-
+
return ansi_c_typecheck.get_error_found();
}
diff --git a/src/ansi-c/c_preprocess.cpp b/src/ansi-c/c_preprocess.cpp
index 28523fff96c..0177d5950eb 100644
--- a/src/ansi-c/c_preprocess.cpp
+++ b/src/ansi-c/c_preprocess.cpp
@@ -46,7 +46,7 @@ Author: Daniel Kroening, kroening@kroening.com
" -D__INTMAX_TYPE__=\"long long int\""\
" -D__UINTMAX_TYPE__=\"long long unsigned int\""\
" -D__INTPTR_TYPE__=\"int\""\
- " -D__UINTPTR_TYPE__=\"unsigned int\""
+ " -D__UINTPTR_TYPE__=\"unsigned int\""
#define GCC_DEFINES_32 \
" -D__INT_MAX__=2147483647"\
@@ -61,8 +61,8 @@ Author: Daniel Kroening, kroening@kroening.com
" -D__INTMAX_TYPE__=\"long long int\""\
" -D__UINTMAX_TYPE__=\"long long unsigned int\""\
" -D__INTPTR_TYPE__=\"long int\""\
- " -D__UINTPTR_TYPE__=\"long unsigned int\""
-
+ " -D__UINTPTR_TYPE__=\"long unsigned int\""
+
#define GCC_DEFINES_LP64 \
" -D__INT_MAX__=2147483647"\
" -D__CHAR_BIT__=8"\
@@ -76,7 +76,7 @@ Author: Daniel Kroening, kroening@kroening.com
" -D__INTMAX_TYPE__=\"long int\""\
" -D__UINTMAX_TYPE__=\"long unsigned int\""\
" -D__INTPTR_TYPE__=\"long int\""\
- " -D__UINTPTR_TYPE__=\"long unsigned int\""
+ " -D__UINTPTR_TYPE__=\"long unsigned int\""
#define GCC_DEFINES_LLP64 \
" -D__INT_MAX__=2147483647"\
@@ -91,7 +91,7 @@ Author: Daniel Kroening, kroening@kroening.com
" -D__INTMAX_TYPE__=\"long long int\""\
" -D__UINTMAX_TYPE__=\"long long unsigned int\""\
" -D__INTPTR_TYPE__=\"long long int\""\
- " -D__UINTPTR_TYPE__=\"long long unsigned int\""
+ " -D__UINTPTR_TYPE__=\"long long unsigned int\""
/*******************************************************************\
@@ -133,7 +133,7 @@ static std::string shell_quote(const std::string &src)
{
#ifdef _WIN32
// first check if quoting is needed at all
-
+
if(src.find(' ')==std::string::npos &&
src.find('"')==std::string::npos &&
src.find('&')==std::string::npos &&
@@ -147,9 +147,9 @@ static std::string shell_quote(const std::string &src)
// seems fine -- return as is
return src;
}
-
+
std::string result;
-
+
result+='"';
for(unsigned i=0; i::const_iterator
it=config.ansi_c.defines.begin();
it!=config.ansi_c.defines.end();
@@ -542,9 +542,9 @@ bool c_preprocess_visual_studio(
// (this is already in UTF-8).
command_file << shell_quote(file) << "\n";
}
-
+
std::string tmpi=get_temporary_file("tmp.cl", "");
-
+
std::string command="CL @\""+command_file_name+"\"";
command+=" > \""+tmpi+"\"";
command+=" 2> \""+stderr_file+"\"";
@@ -615,13 +615,13 @@ void postprocess_codewarrior(
// /* #line 1 "__ppc_eabi_init.cpp" /* stack depth 0 */
//
// We remove the initial '/* ' prefix
-
+
std::string line;
-
+
while(instream)
{
std::getline(instream, line);
-
+
if(line.size()>=2 &&
line[0]=='#' && (line[1]=='#' || line[1]==' ' || line[1]=='\t'))
{
@@ -664,7 +664,7 @@ bool c_preprocess_codewarrior(
std::string stderr_file=get_temporary_file("tmp.stderr", "");
std::string command;
-
+
command="mwcceppc -E -P -D__CPROVER__ -ppopt line -ppopt full";
for(std::list::const_iterator
@@ -690,7 +690,7 @@ bool c_preprocess_codewarrior(
it!=config.ansi_c.preprocessor_options.end();
it++)
command+=" "+*it;
-
+
int result;
std::string tmpi=get_temporary_file("tmp.cl", "");
@@ -761,16 +761,16 @@ bool c_preprocess_gcc_clang(
std::string stderr_file=get_temporary_file("tmp.stderr", "");
std::string command;
-
+
if(preprocessor==configt::ansi_ct::preprocessort::CLANG)
command="clang";
else
command="gcc";
-
+
command +=" -E -undef -D__CPROVER__";
command+=" -D__WORDSIZE="+i2string(config.ansi_c.pointer_width);
-
+
command+=" -D__DBL_MIN_EXP__=\"(-1021)\"";
command+=" -D__FLT_MIN__=1.17549435e-38F";
command+=" -D__DEC64_SUBNORMAL_MIN__=0.000000000000001E-383DD";
@@ -876,13 +876,13 @@ bool c_preprocess_gcc_clang(
else
command+=GCC_DEFINES_32;
}
-
+
// The width of wchar_t depends on the OS!
{
command+=" -D__WCHAR_MAX__="+type_max(wchar_t_type());
-
+
std::string sig=config.ansi_c.wchar_t_is_unsigned?"unsigned":"signed";
-
+
if(config.ansi_c.wchar_t_width==config.ansi_c.short_int_width)
command+=" -D__WCHAR_TYPE__=\""+sig+" short int\"";
else if(config.ansi_c.wchar_t_width==config.ansi_c.int_width)
@@ -928,11 +928,11 @@ bool c_preprocess_gcc_clang(
case configt::ansi_ct::ost::NO_OS:
command+=" -nostdinc"; // make sure we don't mess with the system library
break;
-
+
default:
assert(false);
}
-
+
// Standard Defines, ANSI9899 6.10.8
switch(config.ansi_c.c_standard)
{
@@ -951,7 +951,7 @@ bool c_preprocess_gcc_clang(
command += " -D __STDC_IEC_559__=1";
command += " -D __STDC_IEC_559_COMPLEX__=1";
command += " -D __STDC_ISO_10646__=1";
-
+
for(std::list::const_iterator
it=config.ansi_c.defines.begin();
it!=config.ansi_c.defines.end();
@@ -975,10 +975,10 @@ bool c_preprocess_gcc_clang(
it!=config.ansi_c.preprocessor_options.end();
it++)
command+=" "+*it;
-
+
int result;
- #if 0
+ #if 0
// the following forces the mode
switch(config.ansi_c.mode)
{
@@ -1087,9 +1087,9 @@ bool c_preprocess_arm(
std::string stderr_file=get_temporary_file("tmp.stderr", "");
std::string command;
-
+
command="armcc -E -D__CPROVER__";
-
+
// command+=" -D__sizeof_int="+i2string(config.ansi_c.int_width/8);
// command+=" -D__sizeof_long="+i2string(config.ansi_c.long_int_width/8);
// command+=" -D__sizeof_ptr="+i2string(config.ansi_c.pointer_width/8);
@@ -1104,7 +1104,7 @@ bool c_preprocess_arm(
// if(config.ansi_c.char_is_unsigned)
// command+=" -D__CHAR_UNSIGNED__";
-
+
if(config.ansi_c.os!=configt::ansi_ct::ost::OS_WIN)
{
command+=" -D__WORDSIZE="+i2string(config.ansi_c.pointer_width);
@@ -1116,7 +1116,7 @@ bool c_preprocess_arm(
else if(config.ansi_c.int_width==64)
command+=GCC_DEFINES_LP64;
}
-
+
// Standard Defines, ANSI9899 6.10.8
command+=" -D__STDC__";
//command+=" -D__STDC_VERSION__=199901L";
@@ -1224,14 +1224,14 @@ bool c_preprocess_none(
#else
std::ifstream infile(file);
#endif
-
+
if(!infile)
{
messaget message(message_handler);
message.error() << "failed to open `" << file << "'" << messaget::eom;
return true;
}
-
+
if(config.ansi_c.mode==configt::ansi_ct::flavourt::CODEWARRIOR)
{
// special treatment for "/* #line"
@@ -1269,6 +1269,6 @@ bool test_c_preprocessor(message_handlert &message_handler)
{
std::ostringstream out;
std::istringstream in(c_test_program);
-
+
return c_preprocess(in, out, message_handler);
}
diff --git a/src/ansi-c/c_preprocess.h b/src/ansi-c/c_preprocess.h
index a9f4cb2d83e..37b6bfa83c1 100644
--- a/src/ansi-c/c_preprocess.h
+++ b/src/ansi-c/c_preprocess.h
@@ -18,7 +18,7 @@ bool c_preprocess(
const std::string &path,
std::ostream &outstream,
message_handlert &message_handler);
-
+
bool c_preprocess(
std::istream &instream,
std::ostream &outstream,
@@ -26,5 +26,5 @@ bool c_preprocess(
// returns 'true' in case of error
bool test_c_preprocessor(message_handlert &message_handler);
-
+
#endif
diff --git a/src/ansi-c/c_qualifiers.cpp b/src/ansi-c/c_qualifiers.cpp
index 2602565810c..75ca8bf9c05 100644
--- a/src/ansi-c/c_qualifiers.cpp
+++ b/src/ansi-c/c_qualifiers.cpp
@@ -25,7 +25,7 @@ Function: c_qualifierst::as_string
std::string c_qualifierst::as_string() const
{
std::string qualifiers;
-
+
if(is_constant)
qualifiers+="const ";
@@ -34,19 +34,19 @@ std::string c_qualifierst::as_string() const
if(is_restricted)
qualifiers+="restrict ";
-
+
if(is_atomic)
qualifiers+="_Atomic ";
-
+
if(is_ptr32)
qualifiers+="__ptr32 ";
-
+
if(is_ptr64)
qualifiers+="__ptr64 ";
if(is_noreturn)
qualifiers+="_Noreturn ";
-
+
return qualifiers;
}
@@ -185,4 +185,3 @@ std::ostream &operator << (
{
return out << c_qualifiers.as_string();
}
-
diff --git a/src/ansi-c/c_qualifiers.h b/src/ansi-c/c_qualifiers.h
index 006b3f481df..f676d12b2b7 100644
--- a/src/ansi-c/c_qualifiers.h
+++ b/src/ansi-c/c_qualifiers.h
@@ -20,13 +20,13 @@ class c_qualifierst
{
clear();
}
-
+
explicit c_qualifierst(const typet &src)
{
clear();
read(src);
}
-
+
void clear()
{
is_constant=false;
@@ -40,21 +40,21 @@ class c_qualifierst
// standard ones
bool is_constant, is_volatile, is_restricted, is_atomic, is_noreturn;
-
+
// MS Visual Studio extension
bool is_ptr32, is_ptr64;
-
+
// gcc extension
bool is_transparent_union;
-
+
// will likely add alignment here as well
-
+
std::string as_string() const;
void read(const typet &src);
void write(typet &src) const;
-
+
static void clear(typet &dest);
-
+
bool is_subset_of(const c_qualifierst &q) const
{
return (!is_constant || q.is_constant) &&
@@ -67,7 +67,7 @@ class c_qualifierst
// is_transparent_union isn't checked
}
-
+
friend bool operator == (
const c_qualifierst &a,
const c_qualifierst &b)
@@ -88,7 +88,7 @@ class c_qualifierst
{
return !(a==b);
}
-
+
c_qualifierst &operator += (
const c_qualifierst &b)
{
@@ -102,7 +102,7 @@ class c_qualifierst
is_noreturn|=b.is_noreturn;
return *this;
}
-
+
friend unsigned count(const c_qualifierst &q)
{
return q.is_constant+q.is_volatile+q.is_restricted+q.is_atomic+
diff --git a/src/ansi-c/c_sizeof.cpp b/src/ansi-c/c_sizeof.cpp
index c39c7e2080e..4de0d9dd22b 100644
--- a/src/ansi-c/c_sizeof.cpp
+++ b/src/ansi-c/c_sizeof.cpp
@@ -32,7 +32,7 @@ exprt c_sizeoft::sizeof_rec(const typet &type)
// this implementation will eventually be replaced
// by size_of_expr in util/pointer_offset_size.h
exprt dest;
-
+
if(type.id()==ID_signedbv ||
type.id()==ID_unsignedbv ||
type.id()==ID_floatbv ||
@@ -66,7 +66,7 @@ exprt c_sizeoft::sizeof_rec(const typet &type)
// the following is an MS extension
if(type.get_bool(ID_C_ptr32))
return from_integer(4, size_type());
-
+
std::size_t bits=config.ansi_c.pointer_width;
std::size_t bytes=bits/8;
if((bits%8)!=0) bytes++;
@@ -82,7 +82,7 @@ exprt c_sizeoft::sizeof_rec(const typet &type)
{
const exprt &size_expr=
to_array_type(type).size();
-
+
if(size_expr.is_nil())
{
// treated like an empty array
@@ -119,7 +119,7 @@ exprt c_sizeoft::sizeof_rec(const typet &type)
to_struct_type(type).components();
dest=from_integer(0, size_type());
-
+
mp_integer bit_field_width=0;
for(struct_typet::componentst::const_iterator
@@ -151,7 +151,7 @@ exprt c_sizeoft::sizeof_rec(const typet &type)
dest=plus_exprt(dest, tmp);
}
}
-
+
if(bit_field_width!=0)
dest=plus_exprt(dest, from_integer(bit_field_width/8, size_type()));
}
@@ -159,7 +159,7 @@ exprt c_sizeoft::sizeof_rec(const typet &type)
{
// the empty union will have size 0
exprt max_size=from_integer(0, size_type());
-
+
const union_typet::componentst &components=
to_union_type(type).components();
@@ -172,7 +172,7 @@ exprt c_sizeoft::sizeof_rec(const typet &type)
continue;
const typet &sub_type=it->type();
-
+
exprt tmp;
if(sub_type.id()==ID_c_bit_field)
@@ -212,7 +212,7 @@ exprt c_sizeoft::sizeof_rec(const typet &type)
// simply multiply
const exprt &size_expr=
to_vector_type(type).size();
-
+
exprt tmp_dest=sizeof_rec(type.subtype());
if(tmp_dest.is_nil())
@@ -258,7 +258,7 @@ exprt c_sizeoft::sizeof_rec(const typet &type)
// meaningful size.
dest.make_nil();
}
-
+
return dest;
}
@@ -282,7 +282,7 @@ exprt c_sizeoft::c_offsetof(
type.components();
exprt dest=from_integer(0, size_type());
-
+
mp_integer bit_field_width=0;
for(struct_typet::componentst::const_iterator
@@ -297,10 +297,10 @@ exprt c_sizeoft::c_offsetof(
dest=plus_exprt(dest, from_integer(bit_field_width/8, size_type()));
return dest;
}
-
+
if(it->get_bool(ID_is_type))
continue;
-
+
const typet &sub_type=ns.follow(it->type());
if(sub_type.id()==ID_code)
@@ -369,4 +369,3 @@ exprt c_offsetof(
simplify(tmp, ns);
return tmp;
}
-
diff --git a/src/ansi-c/c_sizeof.h b/src/ansi-c/c_sizeof.h
index b4ebc041951..2ec8508f928 100644
--- a/src/ansi-c/c_sizeof.h
+++ b/src/ansi-c/c_sizeof.h
@@ -15,7 +15,7 @@ class c_sizeoft
c_sizeoft(const namespacet &_ns):ns(_ns)
{
}
-
+
virtual ~c_sizeoft()
{
}
diff --git a/src/ansi-c/c_storage_spec.h b/src/ansi-c/c_storage_spec.h
index 05a4941b0af..b4a28c117c9 100644
--- a/src/ansi-c/c_storage_spec.h
+++ b/src/ansi-c/c_storage_spec.h
@@ -18,13 +18,13 @@ class c_storage_spect
{
clear();
}
-
+
explicit c_storage_spect(const typet &type)
{
clear();
read(type);
}
-
+
void clear()
{
is_typedef=false;
@@ -38,7 +38,7 @@ class c_storage_spect
asm_label.clear();
section.clear();
}
-
+
bool is_typedef, is_extern, is_static, is_register,
is_inline, is_thread_local, is_weak;
@@ -48,7 +48,7 @@ class c_storage_spect
// GCC asm labels __asm__("foo") - these change the symbol name
irep_idt asm_label;
irep_idt section;
-
+
friend bool operator == (
const c_storage_spect &a,
const c_storage_spect &b)
@@ -83,10 +83,10 @@ class c_storage_spect
a.is_inline |=b.is_inline;
a.is_thread_local |=b.is_thread_local;
// attributes belong to the declarator, don't replace them
-
+
return a;
}
-
+
void read(const typet &type);
};
diff --git a/src/ansi-c/c_typecast.cpp b/src/ansi-c/c_typecast.cpp
index 6e8f432711e..43bbbc7c7bb 100644
--- a/src/ansi-c/c_typecast.cpp
+++ b/src/ansi-c/c_typecast.cpp
@@ -106,7 +106,7 @@ bool is_void_pointer(const typet &type)
{
if(type.subtype().id()==ID_empty)
return true;
-
+
return is_void_pointer(type.subtype());
}
else
@@ -129,7 +129,7 @@ bool check_c_implicit_typecast(
const typet &src_type,
const typet &dest_type)
{
- // check qualifiers
+ // check qualifiers
if(src_type.id()==ID_pointer && dest_type.id()==ID_pointer &&
src_type.subtype().get_bool(ID_C_constant) &&
@@ -137,7 +137,7 @@ bool check_c_implicit_typecast(
return true;
if(src_type==dest_type) return false;
-
+
const irep_idt &src_type_id=src_type.id();
if(src_type_id==ID_c_bit_field)
@@ -251,7 +251,7 @@ bool check_c_implicit_typecast(
// imaginary part of the complex value is discarded and the value of the
// real part is converted according to the conversion rules for the
// corresponding real type.
-
+
return check_c_implicit_typecast(src_type.subtype(), dest_type);
}
}
@@ -269,7 +269,7 @@ bool check_c_implicit_typecast(
is_void_pointer(dest_type)) // to void from anything
return false;
}
-
+
if(dest_type.id()==ID_array &&
src_type.subtype()==dest_type.subtype()) return false;
@@ -312,12 +312,12 @@ Function: c_typecastt::follow_with_qualifiers
typet c_typecastt::follow_with_qualifiers(const typet &src_type)
{
if(src_type.id()!=ID_symbol) return src_type;
-
+
typet result_type=src_type;
-
+
// collect qualifiers
c_qualifierst qualifiers(src_type);
-
+
while(result_type.id()==ID_symbol)
{
const symbolt &followed_type_symbol=
@@ -422,8 +422,8 @@ c_typecastt::c_typet c_typecastt::get_c_type(
return COMPLEX;
else if(type.id()==ID_c_bit_field)
return get_c_type(to_c_bit_field_type(type).subtype());
-
- return OTHER;
+
+ return OTHER;
}
/*******************************************************************\
@@ -443,9 +443,9 @@ void c_typecastt::implicit_typecast_arithmetic(
c_typet c_type)
{
typet new_type;
-
+
const typet &expr_type=ns.follow(expr.type());
-
+
switch(c_type)
{
case PTR:
@@ -561,10 +561,10 @@ Function: c_typecastt::implicit_typecast
void c_typecastt::implicit_typecast(
exprt &expr,
const typet &type)
-{
+{
typet src_type=follow_with_qualifiers(expr.type()),
dest_type=follow_with_qualifiers(type);
-
+
typet type_qual=type;
c_qualifierst qualifiers(dest_type);
qualifiers.write(type_qual);
@@ -607,7 +607,7 @@ void c_typecastt::implicit_typecast_followed(
if(src_type.id()==ID_pointer &&
src_type.subtype().get_bool(ID_C_constant))
src_type_no_const.subtype().remove(ID_C_constant);
-
+
// Check union members.
const union_typet &dest_union_type=to_union_type(dest_type);
@@ -644,12 +644,12 @@ void c_typecastt::implicit_typecast_followed(
expr.set(ID_value, ID_NULL);
return; // ok
}
-
+
if(src_type.id()==ID_pointer ||
src_type.id()==ID_array)
{
// we are quite generous about pointers
-
+
const typet &src_sub=ns.follow(src_type.subtype());
const typet &dest_sub=ns.follow(dest_type.subtype());
@@ -699,7 +699,7 @@ void c_typecastt::implicit_typecast_followed(
return; // ok
}
}
-
+
if(check_c_implicit_typecast(src_type, dest_type))
errors.push_back("implicit conversion not permitted");
else if(src_type!=dest_type)
@@ -735,7 +735,7 @@ void c_typecastt::implicit_typecast_arithmetic(
// get the biggest width of both
unsigned width1=type1.get_int(ID_width);
unsigned width2=type2.get_int(ID_width);
-
+
// produce type
typet result_type;
@@ -753,7 +753,7 @@ void c_typecastt::implicit_typecast_arithmetic(
do_typecast(expr1, result_type);
do_typecast(expr2, result_type);
-
+
return;
}
else if(max_type==COMPLEX)
@@ -801,7 +801,7 @@ void c_typecastt::implicit_typecast_arithmetic(
{
if(c_type1==VOIDPTR)
do_typecast(expr1, expr2.type());
-
+
if(c_type2==VOIDPTR)
do_typecast(expr2, expr1.type());
}
@@ -824,7 +824,7 @@ void c_typecastt::do_typecast(exprt &expr, const typet &dest_type)
{
// special case: array -> pointer is actually
// something like address_of
-
+
const typet &src_type=ns.follow(expr.type());
if(src_type.id()==ID_array)
@@ -845,7 +845,7 @@ void c_typecastt::do_typecast(exprt &expr, const typet &dest_type)
// explicit comparision with zero.
// Note that this requires ieee_float_notequal
// in case of floating-point numbers.
-
+
if(dest_type.get(ID_C_c_type)==ID_bool)
{
expr=is_not_zero(expr, ns);
@@ -856,7 +856,7 @@ void c_typecastt::do_typecast(exprt &expr, const typet &dest_type)
expr=is_not_zero(expr, ns);
}
else
- {
+ {
expr.make_typecast(dest_type);
}
}
diff --git a/src/ansi-c/c_typecast.h b/src/ansi-c/c_typecast.h
index 203d00477c9..d2039237000 100644
--- a/src/ansi-c/c_typecast.h
+++ b/src/ansi-c/c_typecast.h
@@ -56,13 +56,13 @@ class c_typecastt
virtual void implicit_typecast_arithmetic(
exprt &expr1,
exprt &expr2);
-
+
std::list errors;
std::list warnings;
protected:
const namespacet &ns;
-
+
// these are in promotion order
enum c_typet { BOOL,
@@ -83,7 +83,7 @@ class c_typecastt
void implicit_typecast_arithmetic(
exprt &expr,
c_typet c_type);
-
+
typet follow_with_qualifiers(const typet &src);
// after follow_with_qualifiers
diff --git a/src/ansi-c/c_typecheck_argc_argv.cpp b/src/ansi-c/c_typecheck_argc_argv.cpp
index 5e77cbf0600..71ac609d4b3 100644
--- a/src/ansi-c/c_typecheck_argc_argv.cpp
+++ b/src/ansi-c/c_typecheck_argc_argv.cpp
@@ -40,7 +40,7 @@ void c_typecheck_baset::add_argc_argv(const symbolt &main_symbol)
}
symbolt *argc_new_symbol;
-
+
const exprt &op0=static_cast(parameters[0]);
const exprt &op1=static_cast(parameters[1]);
@@ -83,7 +83,7 @@ void c_typecheck_baset::add_argc_argv(const symbolt &main_symbol)
// need to add one to the size -- the array is terminated
// with NULL
exprt one_expr=from_integer(1, argc_new_symbol->type);
-
+
exprt size_expr(ID_plus, argc_new_symbol->type);
size_expr.copy_to_operands(argc_new_symbol->symbol_expr(), one_expr);
argv_type.add(ID_size).swap(size_expr);
@@ -99,21 +99,21 @@ void c_typecheck_baset::add_argc_argv(const symbolt &main_symbol)
symbolt *argv_new_symbol;
move_symbol(argv_symbol, argv_new_symbol);
}
-
+
if(parameters.size()==3)
- {
- symbolt envp_symbol;
+ {
+ symbolt envp_symbol;
envp_symbol.base_name="envp'";
envp_symbol.name="envp'";
envp_symbol.type=(static_cast