Enhance point api refactoring #33082
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
The cata-use-point-apis check tries to convert calls to overloads to which a point can be pased instead of separate coordinates. This wasn't working when the call was to a function template specialization. Make that work.
The cata-use-point-apis check wasn't refactoring calls to functions whose arguments were 'const int'. Fix that.
ZhilkinSerg
added
[C++]
ZhilkinSerg
reviewed
Aug 9, 2019
src/animation.cpp
Outdated
| @@ -704,7 +704,7 @@ namespace | |||
| { | |||
| void draw_sct_curses( game &g ) | |||
| { | |||
| const tripoint off = relative_view_pos( g.u, 0, 0, 0 ); | |||
| const tripoint off = relative_view_pos( g.u, tripoint( 0, 0, 0 ) ); | |||
There was a problem hiding this comment.
Suggested change
| const tripoint off = relative_view_pos( g.u, tripoint( 0, 0, 0 ) ); | |
| const tripoint off = relative_view_pos( g.u, tripoint_zero ); |
ZhilkinSerg
reviewed
Aug 9, 2019
tests/map_test.cpp
Outdated
| @@ -37,7 +37,7 @@ TEST_CASE( "map_bounds_checking" ) | |||
| // inelegant solution. | |||
| clear_map(); | |||
| map m; | |||
| m.load( 0, 0, 0, false ); | |||
| m.load( tripoint( 0, 0, 0 ), false ); | |||
There was a problem hiding this comment.
Suggested change
| m.load( tripoint( 0, 0, 0 ), false ); | |
| m.load( tripoint_zero, false ); |
ZhilkinSerg
reviewed
Aug 9, 2019
tests/map_test.cpp
Outdated
| @@ -62,7 +62,7 @@ TEST_CASE( "tinymap_bounds_checking" ) | |||
| // inelegant solution. | |||
| clear_map(); | |||
| tinymap m; | |||
| m.load( 0, 0, 0, false ); | |||
| m.load( tripoint( 0, 0, 0 ), false ); | |||
There was a problem hiding this comment.
Suggested change
| m.load( tripoint( 0, 0, 0 ), false ); | |
| m.load( tripoint_zero, false ); |
ZhilkinSerg
reviewed
Aug 9, 2019
tests/test_main.cpp
Outdated
| @@ -155,7 +155,7 @@ static void init_global_game_state( const std::vector<mod_id> &mods, | |||
| overmap_special_batch empty_specials( { 0, 0 } ); | |||
There was a problem hiding this comment.
Suggested change
| overmap_special_batch empty_specials( { 0, 0 } ); | |
| overmap_special_batch empty_specials( point_zero ); |
|
I'm planning to automate those changes to put |
dunstad
pushed a commit
to dunstad/Cataclysm-DDA
that referenced
this pull request
Aug 11, 2019
* Support porting calls to function templates The cata-use-point-apis check tries to convert calls to overloads to which a point can be pased instead of separate coordinates. This wasn't working when the call was to a function template specialization. Make that work. * Test variadic function template also * Handle const-qualified int arguments The cata-use-point-apis check wasn't refactoring calls to functions whose arguments were 'const int'. Fix that. * Apply refactoring pass using new features * Follow-on tidying up of refactored code * Add some point_zero, tripoint_zero
misterprimus
pushed a commit
to misterprimus/Cataclysm-DDA
that referenced
this pull request
Sep 21, 2019
* Support porting calls to function templates The cata-use-point-apis check tries to convert calls to overloads to which a point can be pased instead of separate coordinates. This wasn't working when the call was to a function template specialization. Make that work. * Test variadic function template also * Handle const-qualified int arguments The cata-use-point-apis check wasn't refactoring calls to functions whose arguments were 'const int'. Fix that. * Apply refactoring pass using new features * Follow-on tidying up of refactored code * Add some point_zero, tripoint_zero
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.
Summary
SUMMARY: None
Purpose of change
The
cata-use-point-apischeck I added in #32963 turned out to have some limitations.const intrather thanint.Describe the solution
Fix both those limitations.
Re-run the refactoring pass across the codebase again, capturing these new cases.
Additional context
Working gradually towards #32017.