Skip to content

Comments

XREF purge: CXREF, ECXREF, std/string.d, changelog.dd#4404

Merged
CyberShadow merged 5 commits intodlang:masterfrom
aG0aep6G:kill-xref-some-more
Jun 7, 2016
Merged

XREF purge: CXREF, ECXREF, std/string.d, changelog.dd#4404
CyberShadow merged 5 commits intodlang:masterfrom
aG0aep6G:kill-xref-some-more

Conversation

@aG0aep6G
Copy link
Contributor

@aG0aep6G aG0aep6G commented Jun 4, 2016

Caution: This removes all ref macros from changelog.dd, making it more complicated to get a preview of the changelog. With the planned upgrades to the changelog process (one file per entry, preview via doc tester), this should not be a problem in the far future. If it's a problem in the near future, I can duplicate the different REF variants, of course.

@aG0aep6G
Copy link
Contributor Author

aG0aep6G commented Jun 4, 2016

The first sed here is bad; writes "std" when it should be "core". Going to amend.

@aG0aep6G aG0aep6G force-pushed the kill-xref-some-more branch from d99a11d to e31d677 Compare June 4, 2016 21:24
@aG0aep6G
Copy link
Contributor Author

aG0aep6G commented Jun 4, 2016

The first sed here is bad; writes "std" when it should be "core". Going to amend.

Fixed.

@aG0aep6G
Copy link
Contributor Author

aG0aep6G commented Jun 5, 2016

This should be last of these for phobos, by the way.

@aG0aep6G
Copy link
Contributor Author

aG0aep6G commented Jun 5, 2016

Related pull requests for druntime and dmd:

@wilzbach
Copy link
Contributor

wilzbach commented Jun 5, 2016

Caution: This removes all ref macros from changelog.dd, making it more complicated to get a preview of the changelog. With the planned upgrades to the changelog process (one file per entry, preview via doc tester), this should not be a problem in the far future.

I doubt it will be a problem and if we can still reflect this during the changelog process. Also as you mentioned we will have @CyberShadow's preview for the changelog, so imho we are all good here.

This should be last of these for phobos, by the way.

Someone any last "famous" words? ;-)

@CyberShadow
Copy link
Member

CC @MartinNowak

@wilzbach
Copy link
Contributor

wilzbach commented Jun 7, 2016

@aG0aep6G tada - you've got a merge conflict :S

aG0aep6G added 5 commits June 8, 2016 00:22
Done by:

arg='\s*([^(),]*)'
from='\$\(CXREF\s'$arg','$arg'\)'
to='$(REF \2, core,\1)'
(find . -type f -name "*.d" -print0; \
    find . -type f -name "*.dd" -print0) | \
xargs -0 sed -i -r "s/$from/$to/g"
Done by:

arg='\s*([^(),]*)'
from='\$\(ECXREF\s'$arg','$arg'\)'
to='$(REF \2, etc,c,\1)'
(find . -type f -name "*.d" -print0; \
    find . -type f -name "*.dd" -print0) | \
xargs -0 sed -i -r "s/$from/$to/g"
SHORTXREF -> REF_SHORT:

arg='\s*([^(),]*)'
from='\$\(SHORTXREF\s'$arg','$arg'\)'
to='$(REF_SHORT \2, std,\1)'
sed -i -r "s/$from/$to/g" std/string.d

SHORTXREF_PACK -> REF_SHORT:

arg='\s*([^(),]*)'
from='\$\(SHORTXREF_PACK\s'$arg','$arg','$arg'\)'
to='$(REF_SHORT \3, std,\1,\2)'
sed -i -r "s/$from/$to/g" std/string.d
@aG0aep6G aG0aep6G force-pushed the kill-xref-some-more branch from e31d677 to 07ab737 Compare June 7, 2016 22:22
@aG0aep6G
Copy link
Contributor Author

aG0aep6G commented Jun 7, 2016

@aG0aep6G tada - you've got a merge conflict :S

:) Resolved manually. One little typo had been fixed in the meantime.

@CyberShadow
Copy link
Member

Auto-merge toggled on

@CyberShadow CyberShadow merged commit dbc50b8 into dlang:master Jun 7, 2016
@aG0aep6G aG0aep6G deleted the kill-xref-some-more branch June 7, 2016 23:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants