Crangler #6367
Merged
Crangler #6367
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Two high-level comments:
|
kroening
force-pushed
the
crangler
branch
3 times, most recently
from
1c86b88 to
df0c3f4
Compare
Codecov Report
@@ Coverage Diff @@
## develop #6367 +/- ##
===========================================
- Coverage 76.00% 75.96% -0.05%
===========================================
Files 1527 1541 +14
Lines 164454 165017 +563
===========================================
+ Hits 125000 125349 +349
- Misses 39454 39668 +214
Continue to review full report at Codecov.
|
kroening
requested review from
chrisr-diffblue,
peterschrammel and
tautschnig
as code owners
tautschnig
reviewed
Oct 7, 2021
| { | ||
| if(cmdline.args.empty()) | ||
| { | ||
| std::cerr << "please give a configuration file\n"; |
There was a problem hiding this comment.
Use error logging via the message handler instead?
Comment on lines
+35
to
+37
| auto id = line.substr(8, space_pos - 8); | ||
| auto value = line.substr(space_pos + 1, std::string::npos); | ||
| map[id].value = value; |
There was a problem hiding this comment.
Do we need to care about #undef and a possible re-definition?
Comment on lines
+50
to
+64
| for(auto &t : tokens) | ||
| { | ||
| if(is_identifier(t)) | ||
| { | ||
| auto m_it = map.find(t.text); | ||
| if(m_it != map.end()) | ||
| { | ||
| out << m_it->second.value; | ||
| } | ||
| else | ||
| out << t.text; | ||
| } | ||
| else | ||
| out << t.text; | ||
| } |
There was a problem hiding this comment.
What about macros that use other macros? What about macros that take parameters (see getc_unlocked(fp) example in the comment)?
| public: | ||
| struct definet | ||
| { | ||
| optionalt<std::vector<std::string>> parameters; |
There was a problem hiding this comment.
Never used (although they'd need to be taken into account).
Comment on lines
+271
to
+340
| std::vector<std::string> argv = {"cc", "-E", source_file}; | ||
|
|
||
| for(const auto &include : c_wrangler.includes) | ||
| { | ||
| argv.push_back("-I"); | ||
| argv.push_back(include); | ||
| } | ||
|
|
||
| for(const auto &define : c_wrangler.defines) | ||
| argv.push_back(std::string("-D") + define); | ||
|
|
||
| std::ostringstream result; | ||
|
|
||
| auto run_result = run("cc", argv, "", result, ""); | ||
| if(run_result != 0) | ||
| throw system_exceptiont("preprocessing " + source_file + " has failed"); | ||
|
|
||
| return result.str(); |
There was a problem hiding this comment.
Should we have a Windows/MSVC version thereof?
Comment on lines
+294
to
+362
| std::vector<std::string> argv = {"cc", "-E", "-dM", source_file}; | ||
|
|
||
| for(const auto &include : config.includes) | ||
| { | ||
| argv.push_back("-I"); | ||
| argv.push_back(include); | ||
| } | ||
|
|
||
| std::ostringstream result; | ||
|
|
||
| auto run_result = run("cc", argv, "", result, ""); | ||
| if(run_result != 0) | ||
| throw system_exceptiont("preprocessing " + source_file + " has failed"); | ||
|
|
||
| c_definest defines; | ||
| defines.parse(result.str()); | ||
| return defines; |
tautschnig
approved these changes
Oct 7, 2021
kroening
force-pushed
the
crangler
branch
2 times, most recently
from
84c6a3b to
daacc1f
Compare
kroening
force-pushed
the
crangler
branch
3 times, most recently
from
9a8ddb6 to
39462d6
Compare
tautschnig
force-pushed
the
crangler
branch
6 times, most recently
from
c4b4049 to
6816e48
Compare
This is a command-line utility that makes changes to a preprocessed C file that are prescribed in a JSON configuration file. The initial set of transformations is as follows. * add a contract (pre/post/assigns) to a named C function * add a loop invariant to a loop identified by the name of the function its in and a loop number * remove the 'static' storage classifier from a function The resulting source file is written to standard output or to file specified in the JSON configuration.
To avoid having to list large numbers of functions for mangling, permit regular expressions as function name entries in the JSON configuration file.
Just like functions, objects can be file-local. To support accessing them, permit removing "static" from objects as well.
|
We might still want to add a capability to perform name mangling, but once done we should be able to get rid of the |
This was referenced Nov 11, 2021
Closed
TGWDB
approved these changes
Nov 17, 2021
This was referenced Nov 17, 2021
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This adds a new command-line tool, which replaces current flows that enact changes to the program that is analysed. The new flow is to make these changes before parsing, which enables more far-reaching changes and changes that depend on scoped identifiers.