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

Patch goto-analyzer reachable-functions json and xml output. #4947

Open
wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

Patch goto-analyzer reachable-functions json and xml output. #4947

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4a10024
Patch goto-analyzer reachable-functions json and xml output.
Jul 24, 2019
3f79983
Fix clang-format complaints
Jul 25, 2019
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
33 changes: 23 additions & 10 deletions src/goto-analyzer/unreachable_instructions.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,14 +249,20 @@ static void json_output_function(
const source_locationt &last_location,
json_arrayt &dest)
{
json_objectt entry{
{"function", json_stringt(function)},
{"file name",
json_stringt(concat_dir_file(
id2string(first_location.get_working_directory()),
id2string(first_location.get_file())))},
{"first line", json_numbert(id2string(first_location.get_line()))},
{"last line", json_numbert(id2string(last_location.get_line()))}};
// source locations occassionally omit line numbers
// an empty string makes json unparsable
std::string first_line = id2string(first_location.get_line());
std::string last_line = id2string(last_location.get_line());
first_line = first_line.empty() ? "0" : first_line;
last_line = last_line.empty() ? "0" : last_line;

json_objectt entry{{"function", json_stringt(function)},
{"file name",
json_stringt(concat_dir_file(
id2string(first_location.get_working_directory()),
id2string(first_location.get_file())))},
{"first line", json_numbert(first_line)},
{"last line", json_numbert(last_line)}};

dest.push_back(std::move(entry));
}
Expand All @@ -269,13 +275,20 @@ static void xml_output_function(
{
xmlt &x=dest.new_element("function");

// source locations occassionally omit line numbers
// an empty string makes xml unparsable
std::string first_line = id2string(first_location.get_line());
std::string last_line = id2string(last_location.get_line());
first_line = first_line.empty() ? "0" : first_line;
last_line = last_line.empty() ? "0" : last_line;

x.set_attribute("name", id2string(function));
x.set_attribute("file name",
concat_dir_file(
id2string(first_location.get_working_directory()),
id2string(first_location.get_file())));
x.set_attribute("first line", id2string(first_location.get_line()));
x.set_attribute("last line", id2string(last_location.get_line()));
x.set_attribute("first line", first_line);
x.set_attribute("last line", last_line);
}

static void list_functions(
Expand Down