Skip to content

Fix overly long lines and use iostream for debugging only #1269

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 23, 2017
Merged

Fix overly long lines and use iostream for debugging only #1269

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 12 additions & 6 deletions src/solvers/flattening/arrays.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@ Author: Daniel Kroening, [email protected]

#include "arrays.h"

#include <iostream>

#include <langapi/language_util.h>

#include <util/std_expr.h>
Expand All @@ -20,6 +18,10 @@ Author: Daniel Kroening, [email protected]

#include <solvers/prop/prop.h>

#ifdef DEBUG
#include <iostream>
#endif

arrayst::arrayst(
const namespacet &_ns,
propt &_prop):equalityt(_ns, _prop)
Expand Down Expand Up @@ -48,7 +50,9 @@ literalt arrayst::record_array_equality(
if(!base_type_eq(op0.type(), op1.type(), ns))
{
prop.error() << equality.pretty() << messaget::eom;
DATA_INVARIANT(false, "record_array_equality got equality without matching types");
DATA_INVARIANT(
false,
"record_array_equality got equality without matching types");
}

DATA_INVARIANT(
Expand Down Expand Up @@ -133,7 +137,9 @@ void arrayst::collect_arrays(const exprt &a)
if(!base_type_eq(array_type, update_expr.old().type(), ns))
{
prop.error() << a.pretty() << messaget::eom;
DATA_INVARIANT(false, "collect_arrays got 'update' without matching types");
DATA_INVARIANT(
false,
"collect_arrays got 'update' without matching types");
}

arrays.make_union(a, update_expr.old());
Expand Down Expand Up @@ -291,7 +297,7 @@ void arrayst::add_array_Ackermann_constraints()
{
// this is quadratic!

#if 0
#ifdef DEBUG
std::cout << "arrays.size(): " << arrays.size() << '\n';
#endif

Expand All @@ -300,7 +306,7 @@ void arrayst::add_array_Ackermann_constraints()
{
const index_sett &index_set=index_map[arrays.find_number(i)];

#if 0
#ifdef DEBUG
std::cout << "index_set.size(): " << index_set.size() << '\n';
#endif

Expand Down