Skip to content

Refactor java object factory #871

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 2 commits into from
May 19, 2017

Conversation

smowton
Copy link
Contributor

@smowton smowton commented Apr 25, 2017

This factors the Java object factory to:
(a) improve input declarations
(b) Refactor for clarity (replace some explicit gotos with higher-level code-ifthenelse constructs, by @owen-jones-diffblue)
(c) Split out certain parts of the nondet-init logic into individual functions, to make the diff vs. test-gen-support's version of the same code friendlier and make them more merge-compatible.

Depends on #823

@smowton
Copy link
Contributor Author

smowton commented Apr 25, 2017

@tautschnig this replaces my earlier PR, keeping the factoring but also keeping Owen's version of the nondet-boolean rewrite. @owen-jones-diffblue check if this subsumes any existing PRs?

@owen-mc-diffblue
Copy link
Contributor

The first commit (5feaefe) is just a cherry-pick of #823 , so that PR should be merged first really. The second commit (3ae0885) subsumes #865. I think that's it. #853 now just deals with the C code, so it isn't entangled with this PR.

@smowton smowton changed the title Refactor java object factory (Do not merge) Refactor java object factory Apr 25, 2017
@smowton
Copy link
Contributor Author

smowton commented Apr 25, 2017

OK, tagged #865 as subsumed and closed; marked this dependent on #823

@tautschnig
Copy link
Collaborator

Looks good to me, happy to approve once #823 is merged.

@peterschrammel peterschrammel changed the title (Do not merge) Refactor java object factory Refactor java object factory Apr 28, 2017
@smowton
Copy link
Contributor Author

smowton commented Apr 29, 2017

@peterschrammel take a look at the comments here re: the object factory convergence stuff

@kroening
Copy link
Member

Ready to go once rebased!

Owen Jones and others added 2 commits May 19, 2017 09:31
This splits out a few elements of the nondet-init logic that downstream
branches will / are likely to want to customise or use from multiple
call-sites.
@smowton smowton force-pushed the refactor-java-object-factory branch from 7cab60f to 405ce62 Compare May 19, 2017 08:31
@smowton
Copy link
Contributor Author

smowton commented May 19, 2017

Rebased.

@peterschrammel peterschrammel merged commit c4412e9 into diffblue:master May 19, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants