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.

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

Codechange: Replace more FOR_ALL_XXX macros with range-based for loops #9149

Merged
merged 3 commits into from May 3, 2021

Conversation

glx22
Copy link
Contributor

@glx22 glx22 commented Apr 30, 2021

Motivation / Problem

Continuing to reduce the number of FOR_XXX macro when it's possible.

Description

FOR_ALL_TARS was a basic iteration using _tar_filelist[sd].begin() and _tar_filelist[sd].end(), so I just replaced all usage by direct range-based for loops using _tar_filelist[sd].
FOR_ALL_SEARCHPATHS was iterating all the Searchpath enum, skipping empty searchpaths. As all these searchpaths are set only once in DeterminePaths(), I think it's simpler to just store valid searchpaths once they're set, and then use this stored value directly in for loops.
FOR_ALL_ROADTRAMTYPES is a range-based for loop with direct initialisation in the macro. It's better to add a static array with the 2 values, and use that in explicit for loops.

Limitations

Checklist for review

Some things are not automated, and forgotten often. This list is a reminder for the reviewers.

  • The bug fix is important enough to be backported? (label: 'backport requested')
  • This PR affects the save game format? (label 'savegame upgrade')
  • This PR affects the GS/AI API? (label 'needs review: Script API')
    • ai_changelog.hpp, gs_changelog.hpp need updating.
    • The compatibility wrappers (compat_*.nut) need updating.
  • This PR affects the NewGRF API? (label 'needs review: NewGRF')

@glx22 glx22 merged commit 2feb801 into OpenTTD:master May 3, 2021
@glx22 glx22 deleted the ranged_based_for branch May 3, 2021 17:47
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.

None yet

2 participants