Skip to content

Move the declaration and description of options that configt handles into config.h #5874

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 4 commits into from
Mar 1, 2021

Conversation

martin-cs
Copy link
Collaborator

This is a tidy up that should not have any real effect on the tools but makes the source clearer. It raises the issue that --function and --string-abstraction are handled by configt and by parsing into optionst. I think that should be left for tidying up of the functionality of configt (or even, you know, removing it all together).

Although configt is not an ideal solution, I think it is best for it to do
all of the parsing for its option in one place.  As a side effect this adds
the C and C++ language options to goto-analyzer.
martin added 3 commits February 28, 2021 12:19
This should not change the functionality apart from:

- goto-analyzer no longer parses Java options.  They were ignored so
  this is an improvement.
- The no-arch option is no longer supported or documented.  It didn't
  work and was ignored so, again, an improvement.
- The '--gcc' option is now described in the help documentation on all
  platforms.
@martin-cs martin-cs force-pushed the refactor/config-set-up branch from 7a3d4bd to 42896e7 Compare February 28, 2021 12:57
@codecov
Copy link

codecov bot commented Feb 28, 2021

Codecov Report

Merging #5874 (42896e7) into develop (a56d059) will increase coverage by 0.00%.
The diff coverage is 62.50%.

Impacted file tree graph

@@           Coverage Diff            @@
##           develop    #5874   +/-   ##
========================================
  Coverage    72.90%   72.90%           
========================================
  Files         1423     1423           
  Lines       154196   154159   -37     
========================================
- Hits        112412   112397   -15     
+ Misses       41784    41762   -22     
Impacted Files Coverage Δ
src/goto-analyzer/goto_analyzer_parse_options.cpp 75.43% <0.00%> (+2.18%) ⬆️
src/goto-diff/goto_diff_parse_options.cpp 59.63% <ø> (+0.95%) ⬆️
src/util/config.h 50.00% <ø> (ø)
src/util/config.cpp 55.42% <66.66%> (+0.13%) ⬆️
src/cbmc/cbmc_parse_options.cpp 75.65% <100.00%> (+0.44%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update d8b71f5...42896e7. Read the comment docs.

@martin-cs
Copy link
Collaborator Author

The only failed test is diff coverage which I think drops because this is a net removal of (duplicated) code. I don't think this is a problem as such.

Copy link
Member

@peterschrammel peterschrammel left a comment

Choose a reason for hiding this comment

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

lgtm

What about the other executables besides cbmc and goto-analyzer?

@martin-cs
Copy link
Collaborator Author

@peterschrammel : goto-cc handles it's options in a completely different way so this code doesn't work for it. goto-instrument and goto-diff do not have these options (although, via configt the code is there) -- I was surprised too. I don't know what is going on with the Java tools in general so I tend to leave them be. This change shouldn't break anything in these tools.

@martin-cs martin-cs merged commit b26d347 into diffblue:develop Mar 1, 2021
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.

3 participants