Handle conversion operators correctly. #149
Merged
Conversation
This file contains 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
fitzgen
approved these changes
Jun 5, 2018
| @@ -155,49 +155,74 @@ macro_rules! log_demangle_as_inner { | |||
| } | |||
| } | |||
|
|
|||
| #[derive(Debug, Default, Clone, Copy)] | |||
| struct ParseContextState { | |||
There was a problem hiding this comment.
Is there a reason why you pulled this out instead of introducing a new in_conversion: Cell<bool> member to ParseContext? I think the latter would be easier to work with, since you wouldn't need to copy in/out the whole ParseContextState struct just to change one member.
There was a problem hiding this comment.
It seemed nicer than having a bunch of Cells but I don't feel strongly about it.
There was a problem hiding this comment.
I don't feel strongly either, so let's leave it.
src/ast.rs
Outdated
| Prefix::DataMember(ref prefix, ref member) => { | ||
| prefix.demangle(ctx, scope)?; | ||
| member.demangle(ctx, scope) | ||
| }*/ |
There was a problem hiding this comment.
Oops that's just left over crud from copying/pasting around.
Because these now parse as templates instead of template-templates, we need to special case the conversion operator case when printing function return types, as described in the CXX ABI text. We can do ctors and dtors here as well, which requires the change to the existing test. See https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;a=blob;f=libiberty/cp-demangle.c;h=3f2a097e7f2075e5750e40a31ce46589d4ab83d5;hb=e6d079c2fb797e84d7d234f9c8277fbe4558213b#l2464 for an explanation of the grammar involved.
fitzgen
approved these changes
Jun 5, 2018
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.
Because these now parse as templates instead of template-templates, we need to special case the conversion operator case when printing function return types, as described in the CXX ABI text. We can do ctors and dtors here as well, which requires the change to the existing test.
See https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;a=blob;f=libiberty/cp-demangle.c;h=3f2a097e7f2075e5750e40a31ce46589d4ab83d5;hb=e6d079c2fb797e84d7d234f9c8277fbe4558213b#l2464 for an explanation of the grammar involved.