[mypyc] Make namegen not need to use suffixes to disambiguate #7676
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
msullivan
force-pushed
the
tweak-mangling
branch
from
9fef2d4 to
d47609d
Compare
Accomplish this by using a mapping that doesn't collide on valid python identifiers. We map '.' to '___' and the (rare and unlikely, but possible) '___' to '_3___'. (This collides '___' with '.3', which is fine.) This makes naming not reliant on the order of processing things which is important for separate compilation, since it will turn out that most of our "internal" names actually do need to be exported (but we would still like to shorten the module name part). I also like the output better, even though it is a little more verbose, since it makes it obvious what is a module seperator and what is an underscore.
msullivan
force-pushed
the
tweak-mangling
branch
from
d47609d to
7290159
Compare
JukkaL
approved these changes
Oct 10, 2019
| @@ -1416,11 +1416,12 @@ def __init__(self, | |||
| else: | |||
| self.bound_sig = FuncSignature(sig.args[1:], sig.ret_type) | |||
|
|
|||
| @property | |||
| def shortname(self) -> str: | |||
| return self.class_name + '.' + self.name if self.class_name else self.name | |||
There was a problem hiding this comment.
Does this work with nested classes?
There was a problem hiding this comment.
Nothing about mypyc works with nested classes
| @@ -7,33 +7,34 @@ | |||
|
|
|||
| class TestNameGen(unittest.TestCase): | |||
| def test_candidate_suffixes(self) -> None: | |||
| assert candidate_suffixes('foo') == ['', 'foo_'] | |||
| assert candidate_suffixes('foo.bar') == ['', 'bar_', 'foo_bar_'] | |||
| assert candidate_suffixes('foo') == ['', 'foo.'] | |||
There was a problem hiding this comment.
Would it be useful to have an end-to-end test case that has things like triple underscores in names and possible name clashes, such as having names C.foo and C___foo in the same namespace?
There was a problem hiding this comment.
I'll add that to the name clash issue test
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.
Accomplish this by using a mapping that doesn't collide on valid
python identifiers. We map
.to___and the (rare and unlikely,but possible)
___to_3___. (This collides___with.3,which is fine.)
This makes naming not reliant on the order of processing things
which is important for separate compilation, since it will turn out
that most of our "internal" names actually do need to be exported
(but we would still like to shorten the module name part).
I also like the output better, even though it is a little more
verbose, since it makes it obvious what is a module separator and what
is an underscore.