-
Notifications
You must be signed in to change notification settings - Fork 273
Json output through languaget interface #2098
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.
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
Json output through languaget interface #2098
Conversation
Does source_locationt really need language-specific conversion? |
It has the bytecode index as an attribute, which will eventually be moved to a |
b8d311f
to
4d3cca3
Compare
@@ -110,6 +110,7 @@ void show_loop_ids( | |||
forall_goto_functions(it, goto_functions) | |||
show_loop_ids_json(ui, it->second.body, loops); | |||
|
|||
// TODO: this needs clean up |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Needs separate fixing (#1757 (comment))
@@ -272,6 +272,7 @@ jsont dep_graph_domaint::output_json( | |||
const namespacet &ns) const | |||
{ | |||
json_arrayt graph; | |||
json_exprt json; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Might need separate fixing if language-specific output is desired (#1757 (comment))
@@ -87,7 +87,7 @@ void show_loop_ids_json( | |||
|
|||
json_objectt &loop=loops.push_back().make_object(); | |||
loop["name"]=json_stringt(id); | |||
loop["sourceLocation"]=json(it->source_location); | |||
loop["sourceLocation"] = json_exprt()(it->source_location); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Needs separate fixing (#1757 (comment))
11088d3
to
65a3b64
Compare
65a3b64
to
0103f35
Compare
May I suggest that the work done here is used as a basis for multiple PRs? It looks like a series of independent bug-fixes are happening here. |
@tautschnig, I can split up the first 7 commits into a few independent PRs. The last 3 commits that contain the big chunk of work, however, depend on everything before. |
Maybe it's just me, but I found it really hard to make sense of the changes when looking at the combined diff. It may be easier when doing commit-by-commit, but meaningful PRs might help get this merged very quickly. |
0103f35
to
5063681
Compare
5a576b5
to
f60e5be
Compare
Refactors util/json_expr to make it extensible
f60e5be
to
0a35969
Compare
@tautschnig, this is now rebased on develop (two previous PRs have been merged). I've split the remaining commits to make them more digestible, ensuring that all commits build. Please re-review. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks ok to me.
src/goto-programs/json_goto_trace.h
Outdated
@@ -21,6 +21,9 @@ Date: November 2005 | |||
#include <util/json_expr.h> | |||
#include <util/invariant.h> | |||
|
|||
#include <langapi/mode.h> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why is this file required here?
Labelling "do not merge" because TG bump is not passing yet. |
Similar to the other PR, I suggest distinguishing |
Due to above comment will hold of reviewing this - please let me know if you'd like it reviewed as is |
Closing this as it appears there is no progress on this at the moment. Also this appears to relate to #2157 that may be required to progress well here. If you believe this is erroneous, please reopen this PR. |
This removes the dependency of
util
onlangapi
.Depends on #2111mergedDepends on #2115merged