Skip to content

Move {json,xml}_expr.{h,cpp} to goto-programs [blocks: #3734, #3736] #3711

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

Merged
merged 3 commits into from
Jan 10, 2019

Conversation

tautschnig
Copy link
Collaborator

This prepares the move of {json,xml}_expr.{h,cpp} to goto-programs to remove the
dependency of util on langapi.

  • Each commit message has a non-empty body, explaining why the change was made.
  • Methods or procedures I have added are documented, following the guidelines provided in CODING_STANDARD.md.
  • n/a The feature or user visible behaviour I have added or modified has been documented in the User Guide in doc/cprover-manual/
  • Regression or unit tests are included, or existing tests cover the modified code (in this case I have detailed which ones those are in the commit message).
  • n/a My commit message includes data points confirming performance improvements (if claimed).
  • My PR is restricted to a single feature or bugfix.
  • n/a White-space or formatting changes outside the feature-related changed lines are in commits of their own.

Copy link
Contributor

@allredj allredj left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

✔️
Passed Diffblue compatibility checks (cbmc commit: e6d5e21).
Build URL: https://travis-ci.com/diffblue/test-gen/builds/96535289

@tautschnig tautschnig changed the title Move {json,xml}(source_locationt) to {json,xml}_irep.{h,cpp} Move {json,xml}_expr.{h,cpp} to goto-programs Jan 7, 2019
Copy link
Contributor

@allredj allredj left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🚫
This PR failed Diffblue compatibility checks (cbmc commit: bf25f8d).
Build URL: https://travis-ci.com/diffblue/test-gen/builds/96539054
Status will be re-evaluated on next push.
Please contact @peterschrammel, @thk123, or @allredj for support.

Common spurious failures:

  • the cbmc commit has disappeared in the mean time (e.g. in a force-push)
  • the author is not in the list of contributors (e.g. first-time contributors).

The incompatibility may have been introduced by an earlier PR. In that case merging this
PR should be avoided unless it fixes the current incompatibility.

@tautschnig
Copy link
Collaborator Author

I suspect this requires a genuine update in TG as quite possibly it uses util/json_expr.h (which should now be goto-programs/json_expr.h. Could a bump please be created @allredj @peterschrammel @thk123?

@antlechner
Copy link
Contributor

@tautschnig It does look like this needs a TG update, I'm working on it and I'll keep you updated.

This prepares the move of {json,xml}_expr.{h,cpp} to goto-programs to remove the
dependency of util on langapi.
There should not be a dependency from util to langapi, and goto-programs is also
the only place where {json,xml}_expr are used.
@tautschnig
Copy link
Collaborator Author

Thank you @antlechner! I have rebased this PR to hopefully simplify the TG work.

Copy link
Contributor

@allredj allredj left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🚫
This PR failed Diffblue compatibility checks (cbmc commit: 833721d).
Build URL: https://travis-ci.com/diffblue/test-gen/builds/96755542
Status will be re-evaluated on next push.
Please contact @peterschrammel, @thk123, or @allredj for support.

Common spurious failures:

  • the cbmc commit has disappeared in the mean time (e.g. in a force-push)
  • the author is not in the list of contributors (e.g. first-time contributors).

The incompatibility may have been introduced by an earlier PR. In that case merging this
PR should be avoided unless it fixes the current incompatibility.

Copy link
Contributor

@allredj allredj left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🚫
This PR failed Diffblue compatibility checks (cbmc commit: d8b511f).
Build URL: https://travis-ci.com/diffblue/test-gen/builds/96772500
Status will be re-evaluated on next push.
Please contact @peterschrammel, @thk123, or @allredj for support.

Common spurious failures:

  • the cbmc commit has disappeared in the mean time (e.g. in a force-push)
  • the author is not in the list of contributors (e.g. first-time contributors).

The incompatibility may have been introduced by an earlier PR. In that case merging this
PR should be avoided unless it fixes the current incompatibility.

@antlechner
Copy link
Contributor

@tautschnig We have a TG pointer bump that passes now, so feel free to merge this PR. Thanks for notifying us that an update was needed. 🙂

@tautschnig
Copy link
Collaborator Author

Thanks @antlechner! Re-assigning to @kroening and @peterschrammel for review.

@tautschnig tautschnig changed the title Move {json,xml}_expr.{h,cpp} to goto-programs Move {json,xml}_expr.{h,cpp} to goto-programs [blocks: #3734, #3736] Jan 10, 2019
@kroening kroening removed their assignment Jan 10, 2019
@peterschrammel peterschrammel merged commit c509d28 into diffblue:develop Jan 10, 2019
@tautschnig tautschnig deleted the move-json-xml-expr branch January 10, 2019 18:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants