Skip to content

Commit

Permalink
Adapt print/messaget API, get_error_found
Browse files Browse the repository at this point in the history
  • Loading branch information
Matthias Güdemann committed Jun 5, 2017
1 parent 3b4b2f2 commit 5ce95a5
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 7 deletions.
10 changes: 6 additions & 4 deletions src/vcegar/abstractor.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -572,8 +572,9 @@ void abstractort::calc_abstract_trans_rel(
throw "unexpected result from predabs_sat1.solve()";
}

print(9, "Generated "+
i2string(trans_cube_set.no_insertions())+" cube(s)");
debug() <<"Generated "
<< i2string(trans_cube_set.no_insertions()) << " cube(s)"
<< eom;

if(show_cubes)
std::cout << trans_cube_set;
Expand Down Expand Up @@ -693,8 +694,9 @@ void abstractort::calc_abstract_initial_states(
}

// std::cout<<" The abstract transition relation \n";
print(9, "Generated "+
i2string(initial.no_insertions())+" cube(s)\n");
debug() << "Generated " <<
<< i2string(initial.no_insertions()) <, " cube(s)\n"
<< eom;

if(show_cubes)
std::cout << initial;
Expand Down
2 changes: 1 addition & 1 deletion src/vcegar/modelchecker_smv.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ bool modelchecker_smvt::read_result_cadence_smv(
counterexample);


print(9, "Cadence SMV counterexample sucessfully read");
debug() << "Cadence SMV counterexample sucessfully read" << eom;

return false;
}
Expand Down
7 changes: 5 additions & 2 deletions src/verilog/verilog_typecheck_expr.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2026,6 +2026,9 @@ bool verilog_typecheck(
message_handlert &message_handler,
const namespacet &ns)
{
const unsigned errors_before=
message_handler.get_message_count(messaget::M_ERROR);

verilog_typecheck_exprt verilog_typecheck_expr(
ns, module_identifier, message_handler);

Expand All @@ -2048,6 +2051,6 @@ bool verilog_typecheck(
{
verilog_typecheck_expr.error() << e << messaget::eom;
}
return verilog_typecheck_expr.get_error_found();

return message_handler.get_message_count(messaget::M_ERROR)!=errors_before;
}

0 comments on commit 5ce95a5

Please sign in to comment.