Skip to content
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

Fixing lint errors in files touched by PR #338 #343

Merged
merged 3 commits into from
Jan 3, 2017
Merged

Fixing lint errors in files touched by PR #338 #343

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1b308af
Fixing lint errors in files touched by PR #338
Dec 8, 2016
f98c61a
Add NOLINT exceptions to lines that fail the linter
Dec 21, 2016
fc59e01
Adjust ansi_c_entry_point.cpp to match coding standards
tautschnig Dec 23, 2016
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
25 changes: 14 additions & 11 deletions src/ansi-c/ansi_c_entry_point.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,8 @@ exprt::operandst build_function_environment(

for(const auto & p : parameters)
{
irep_idt base_name=p.get_base_name();
if(base_name.empty()) base_name="argument#"+i2string(i);
irep_idt base_name=p.get_base_name().empty()?
("argument#"+i2string(i)):p.get_base_name();
irep_idt identifier=id2string(goto_functionst::entry_point())+
"::"+id2string(base_name);

Expand Down Expand Up @@ -109,15 +109,12 @@ void record_function_outputs(
code_blockt &init_code,
symbol_tablet &symbol_table)
{
//const code_typet::parameterst &parameters=
// to_code_type(function.type).parameters();

bool has_return_value=
to_code_type(function.type).return_type()!=empty_typet();

if(has_return_value)
{
//record return value
// record return value
codet output(ID_output);
output.operands().resize(2);

Expand All @@ -138,10 +135,12 @@ void record_function_outputs(

for(const auto & p : parameters)
{
if(p.get_identifier().empty())
continue;

irep_idt identifier=p.get_identifier();
if(identifier.empty()) continue;

const symbolt &symbol = symbol_table.lookup(identifier);
const symbolt &symbol=symbol_table.lookup(identifier);

if(symbol.type.id()==ID_pointer)
{
Expand Down Expand Up @@ -194,9 +193,11 @@ bool ansi_c_entry_point(
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);
symbol_tablet::symbolst::const_iterator s_it=
symbol_table.symbols.find(it->second);

if(s_it==symbol_table.symbols.end()) continue;
if(s_it==symbol_table.symbols.end())
continue;

if(s_it->second.type.id()==ID_code)
matches.push_back(it->second);
Expand Down Expand Up @@ -456,7 +457,9 @@ bool ansi_c_entry_point(
const exprt &arg1=parameters[1];

exprt index_expr(ID_index, arg1.type().subtype());
index_expr.copy_to_operands(argv_symbol.symbol_expr(), gen_zero(index_type()));
index_expr.copy_to_operands(
argv_symbol.symbol_expr(),
gen_zero(index_type()));

// disable bounds check on that one
index_expr.set("bounds_check", false);
Expand Down
8 changes: 7 additions & 1 deletion src/ansi-c/ansi_c_language.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,8 +169,14 @@ bool ansi_c_languaget::typecheck(
{
symbol_tablet new_symbol_table;

if(ansi_c_typecheck(parse_tree, new_symbol_table, module, get_message_handler()))
if(ansi_c_typecheck(
parse_tree,
new_symbol_table,
module,
get_message_handler()))
{
return true;
}

remove_internal_symbols(new_symbol_table);

Expand Down
Loading