Skip to content
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.

Sign up for GitHub

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

Jump to bottom

[REG2.068.1] Issue 15150 - Public selective import causes conflict #5161

Merged
merged 3 commits into from Oct 6, 2015
Merged

[REG2.068.1] Issue 15150 - Public selective import causes conflict #5161

merged 3 commits into from Oct 6, 2015

Conversation

9rnsr
Copy link
Contributor

@9rnsr 9rnsr commented Oct 5, 2015

https://issues.dlang.org/show_bug.cgi?id=15150

Fix the divergence between EnumMember symbol and its representation VarDeclaration.

See also my detailed comment in bugzilla: https://issues.dlang.org/show_bug.cgi?id=15150#c1

@9rnsr
Resurrect line spaces in denum.d
8875575
@9rnsr
fix Issue 15150 - Public selective import causes conflict
9e1e61d 
By making `EnumMember` to the subclass of `VarDeclaration`, the symbol itself can be representation of the enum member name.
@CyberShadow
Copy link
Member

Thx! This is blocking dlang/druntime#1402

Edit: Confirmed that dlang/druntime#1402 is fixed with this (digger build master+druntime#1402+dmd#5161 succeeds)

@MartinNowak
Copy link
Member

What's up with the documentation change?
http://dtest.thecybershadow.net/results/700fcb253b69cbff4f313eca0193dea82fdb48c8/9e1e61d6e9d7713f8d64def9c468c0771bb6efff/

@9rnsr 9rnsr force-pushed the fix15150 branch 2 times, most recently from 4dc6073 to f9aa4c9 Compare October 6, 2015 05:39
@MartinNowak
Copy link
Member

I did fix this by removing the EnumMember code, but your fix is more conservative.
In any case please merge the test case 9rnsr#4.

@MartinNowak
Copy link
Member

Auto-merge toggled on

@9rnsr
Copy link
Contributor Author

9rnsr commented Oct 6, 2015

@MartinNowak Oh, I was overlooked the change. To keep compatibility of ddoc generation, I fixed doc.d and corresponding test case.

@9rnsr
Copy link
Contributor Author

9rnsr commented Oct 6, 2015

@MartinNowak Thanks!

MartinNowak added a commit that referenced this pull request Oct 6, 2015
@MartinNowak
Merge pull request #5161 from 9rnsr/fix15150
f8d24cd 
[REG2.068.1] Issue 15150 - Public selective import causes conflict
@MartinNowak MartinNowak merged commit f8d24cd into dlang:stable Oct 6, 2015
@9rnsr 9rnsr deleted the fix15150 branch October 6, 2015 07:05
@CyberShadow
Copy link
Member

@MartinNowak Could you please get this into master, as it's blocking dlang/druntime#1402 ?

@MartinNowak
Copy link
Member

@MartinNowak Could you please get this into master, as it's blocking dlang/druntime#1402 ?

Just make a merge_stable PR, #5167.

@MoonlightSentinel
Copy link
Contributor

This introduced a regression: https://issues.dlang.org/show_bug.cgi?id=20520

@WalterBright WalterBright mentioned this pull request Jan 3, 2023
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
4 participants
@9rnsr @CyberShadow @MartinNowak @MoonlightSentinel