Rename convert to convert_with_precedence #916
Merged
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
tautschnig
requested changes
May 13, 2017
src/ansi-c/expr2c_class.h
Outdated
| @@ -205,7 +205,8 @@ class expr2ct | |||
| std::string convert_code_array_set(const codet &src, unsigned indent); | |||
| std::string convert_code_array_copy(const codet &src, unsigned indent); | |||
|
|
|||
| virtual std::string convert(const exprt &src, unsigned &precedence); | |||
| // NOLINTNEXTLINE(whitespace/line_length) | |||
| virtual std::string convert_with_precedence(const exprt &src, unsigned &precedence); | |||
There was a problem hiding this comment.
Please add a line break instead of silencing the linter.
src/cpp/expr2cpp.cpp
Outdated
| @@ -37,7 +37,8 @@ class expr2cppt:public expr2ct | |||
| } | |||
|
|
|||
| protected: | |||
| std::string convert(const exprt &src, unsigned &precedence) override; | |||
| // NOLINTNEXTLINE(whitespace/line_length) | |||
| std::string convert_with_precedence(const exprt &src, unsigned &precedence) override; | |||
src/java_bytecode/expr2java.h
Outdated
| protected: | ||
| virtual std::string convert(const exprt &src, unsigned &precedence); | ||
| // NOLINTNEXTLINE(whitespace/line_length) | ||
| virtual std::string convert_with_precedence(const exprt &src, unsigned &precedence); |
owen-mc-diffblue
force-pushed
the
cleanup/using-expr2ct-convert
branch
from
94a673a to
cf19251
Compare
It is bad style to have an interface method the same name as an internal method with a different signature. Then on overriding one of these methods the compiler only finds the overloaded one with the wrong signature, doesn't look up the base class and fails. We fix this problem by renaming the protected method. This simplifies the code in all derived classes.
owen-mc-diffblue
force-pushed
the
cleanup/using-expr2ct-convert
branch
from
cf19251 to
351e3a7
Compare
owen-mc-diffblue
pushed a commit
to owen-mc-diffblue/cbmc
that referenced
this pull request
May 18, 2017
Now that PR diffblue#916 has been merged, we don't need to manually forward convert(const exprt) and convert(const typet) calls to the base class.
Merged
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.
It is bad style to have an interface method the same name as an
internal method with a different signature. Then on overriding one of
these methods the compiler only finds the overloaded one with the wrong
signature, doesn't look up the base class and fails.
We fix this problem by renaming the protected method. This simplifies
the code in all derived classes.
This is an improvement on #888 , as suggested by @peterschrammel .