From f6228ae0c1b61c50683967521defb96d702ad5f8 Mon Sep 17 00:00:00 2001 From: Sergio Date: Sun, 20 Jul 2025 19:33:06 +0200 Subject: [PATCH] iwyu clang-format --- .clang-format | 9 ++++++++- linux_utils/run_iwyu.sh | 8 +++++++- linux_utils/run_iwyu_dry_run.sh | 26 ++++++++++++++++++++++++++ source/asset.cpp | 10 ++++++---- source/background.cpp | 5 ++--- source/balloon_formations.cpp | 8 +++++--- source/balloon_manager.h | 3 ++- source/bullet.h | 1 + source/define_buttons.cpp | 5 +++-- source/external/gif.cpp | 1 - source/external/jail_shader.cpp | 1 - source/external/jail_shader.h | 1 - source/game_logo.cpp | 3 +-- source/main.cpp | 1 + source/path_sprite.cpp | 1 - source/scoreboard.cpp | 9 +++++---- source/sections/credits.cpp | 17 ++++++++--------- source/sections/game.h | 11 ++++------- source/sections/hiscore_table.h | 5 ++--- source/sections/instructions.h | 3 ++- source/sections/intro.cpp | 11 ++++++----- source/sections/logo.cpp | 6 +++--- source/sections/logo.h | 7 ++++--- source/tabe.cpp | 6 ++---- source/tiled_bg.cpp | 7 +++---- source/ui/menu_renderer.cpp | 5 ++--- source/ui/menu_renderer.h | 1 - source/ui/service_menu.cpp | 6 ++++-- source/utils.h | 5 +++-- 29 files changed, 110 insertions(+), 72 deletions(-) create mode 100755 linux_utils/run_iwyu_dry_run.sh diff --git a/.clang-format b/.clang-format index 72f58bf..fcb677d 100644 --- a/.clang-format +++ b/.clang-format @@ -9,4 +9,11 @@ AllowShortFunctionsOnASingleLine: All AlignOperands: false AlignAfterOpenBracket: DontAlign BinPackArguments: false -BinPackParameters: false \ No newline at end of file +BinPackParameters: false + +SortIncludes: CaseSensitive +IncludeBlocks: Merge +IncludeCategories: + - Regex: '.*' + Priority: 1 + SortPriority: -1 diff --git a/linux_utils/run_iwyu.sh b/linux_utils/run_iwyu.sh index 80fbd37..5c01506 100755 --- a/linux_utils/run_iwyu.sh +++ b/linux_utils/run_iwyu.sh @@ -16,5 +16,11 @@ cmake -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -S "$BASE_DIR" -B "$BUILD_DIR" # 🛠️ Ejecutar IWYU con fix_includes.py echo "🚀 Ejecutando IWYU..." iwyu_tool.py -p "$BUILD_DIR" -- -Xiwyu --mapping_file="$MAPPING_FILE" -Xiwyu --verbose=3 \ -| python3 /usr/bin/fix_includes.py --update_comments --reorder --nosafe_headers --dry_run +| python3 /usr/bin/fix_includes.py --update_comments --reorder --nosafe_headers +# 🧹 Reemplazar // for por // Para en líneas de #include +echo "✍️ Corrigiendo comentarios en includes..." +find "$BASE_DIR" -type f \( -name "*.cpp" -o -name "*.h" \) -exec \ +sed -i '/^#include .*\/\/ for/s/\/\/ for/\/\/ Para/' {} + + +echo "✅ Script completado." diff --git a/linux_utils/run_iwyu_dry_run.sh b/linux_utils/run_iwyu_dry_run.sh new file mode 100755 index 0000000..c0d4d69 --- /dev/null +++ b/linux_utils/run_iwyu_dry_run.sh @@ -0,0 +1,26 @@ +#!/bin/bash + +# 🏁 Ruta base del proyecto +BASE_DIR="/home/sergio/gitea/coffee_crisis_arcade_edition" + +# 📁 Ruta al build +BUILD_DIR="$BASE_DIR/build" + +# 📄 Archivo de mapping personalizado +MAPPING_FILE="$BASE_DIR/linux_utils/sdl3_mapping.imp" + +# 📦 Generar compile_commands.json +echo "🔧 Generando compile_commands.json..." +cmake -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -S "$BASE_DIR" -B "$BUILD_DIR" + +# 🛠️ Ejecutar IWYU con fix_includes.py +echo "🚀 Ejecutando IWYU..." +iwyu_tool.py -p "$BUILD_DIR" -- -Xiwyu --mapping_file="$MAPPING_FILE" -Xiwyu --verbose=3 \ +| python3 /usr/bin/fix_includes.py --update_comments --reorder --nosafe_headers --dry_run + +# 🧹 Reemplazar // for por // Para en líneas de #include +echo "✍️ Corrigiendo comentarios en includes..." +find "$BASE_DIR" -type f \( -name "*.cpp" -o -name "*.h" \) -exec \ +sed -i '/^#include .*\/\/ for/s/\/\/ for/\/\/ Para/' {} + + +echo "✅ Script completado." diff --git a/source/asset.cpp b/source/asset.cpp index 2f05cf8..4cb274e 100644 --- a/source/asset.cpp +++ b/source/asset.cpp @@ -1,10 +1,12 @@ #include "asset.h" -#include // Para SDL_LogInfo, SDL_LogCategory, SDL_LogError +#include // Para SDL_LogInfo, SDL_LogCategory, SDL_LogError, SDL_LogWarn -#include // Para find_if, max -#include // Para basic_ifstream, ifstream -#include // Para allocator, string, char_traits, operator+ +#include // Para max +#include // Para basic_ifstream, ifstream +#include // Para identity +#include // Para __find_if_fn, find_if +#include // Para allocator, string, operator==, operator+, char_traits, basic_string #include "utils.h" // Para getFileName diff --git a/source/background.cpp b/source/background.cpp index 0fcacb5..4dc0f23 100644 --- a/source/background.cpp +++ b/source/background.cpp @@ -1,11 +1,10 @@ #define _USE_MATH_DEFINES #include "background.h" -#include // Para SDL_SetRenderTarget, SDL_FRect, SDL_Creat... +#include // Para SDL_FRect, SDL_SetRenderTarget, SDL_CreateTexture, SDL_DestroyTexture, SDL_GetRenderTarget, SDL_RenderTexture, SDL_SetTextureAlphaMod, SDL_SetTextureBlendMode, SDL_BLENDMODE_BLEND, SDL_PixelFormat, SDL_RenderClear, SDL_SetRenderDrawColor, SDL_TextureAccess, SDL_FPoint #include // Para clamp, max -#include // Para cos, sin, M_PI -#include // Para basic_string +#include // Para M_PI, cos, sin #include "moving_sprite.h" // Para MovingSprite #include "param.h" // Para Param, ParamBackground, param diff --git a/source/balloon_formations.cpp b/source/balloon_formations.cpp index 0e6c4e2..a380508 100644 --- a/source/balloon_formations.cpp +++ b/source/balloon_formations.cpp @@ -1,8 +1,10 @@ #include "balloon_formations.h" -#include "balloon.h" // Para BALLOON_VELX_NEGATIVE, BALLOON_VELX_POSITIVE -#include "param.h" // Para param -#include "utils.h" // Para ParamGame, Param, Zone, BLOCK +#include // Para array + +#include "balloon.h" // Para BalloonType, BalloonSize, BALLOON_SIZE, BALLOON_VELX_NEGATIVE, BALLOON_VELX_POSITIVE +#include "param.h" // Para Param, ParamGame, param +#include "utils.h" // Para Zone, BLOCK void BalloonFormations::initBalloonFormations() { constexpr int Y4 = -BLOCK; diff --git a/source/balloon_manager.h b/source/balloon_manager.h index 9edcd27..ffc4704 100644 --- a/source/balloon_manager.h +++ b/source/balloon_manager.h @@ -2,11 +2,12 @@ #include // Para SDL_FRect +#include // Para array #include // Para shared_ptr, unique_ptr #include // Para string #include // Para vector -#include "balloon.h" // Para BALLOON_SPEED, Balloon +#include "balloon.h" // Para BALLOON_SPEED, Balloon, BalloonSize (ptr only), BalloonType (ptr only) #include "balloon_formations.h" // Para BalloonFormations #include "explosions.h" // Para Explosions #include "param.h" // Para Param, ParamGame, param diff --git a/source/bullet.h b/source/bullet.h index 78de849..988ab84 100644 --- a/source/bullet.h +++ b/source/bullet.h @@ -3,6 +3,7 @@ #include // Para Uint8 #include // Para unique_ptr +#include // Para string #include "animated_sprite.h" // Para AnimatedSprite #include "utils.h" // Para Circle diff --git a/source/define_buttons.cpp b/source/define_buttons.cpp index ba1c8b0..0c05f69 100644 --- a/source/define_buttons.cpp +++ b/source/define_buttons.cpp @@ -1,10 +1,11 @@ #include "define_buttons.h" -#include +#include // Para max, __all_of_fn, all_of +#include // Para identity #include "input.h" // Para Input, InputAction #include "lang.h" // Para getText -#include "options.h" // Para OptionsController, Options, options +#include "options.h" // Para GamepadOptions, controllers #include "param.h" // Para Param, param, ParamGame, ParamTitle #include "resource.h" // Para Resource #include "text.h" // Para Text diff --git a/source/external/gif.cpp b/source/external/gif.cpp index 8f535dc..28b4d20 100644 --- a/source/external/gif.cpp +++ b/source/external/gif.cpp @@ -1,7 +1,6 @@ #include "gif.h" #include // Para SDL_LogError, SDL_LogCategory, SDL_LogInfo - #include // Para memcpy, size_t #include // Para runtime_error #include // Para char_traits, operator==, basic_string, string diff --git a/source/external/jail_shader.cpp b/source/external/jail_shader.cpp index 3cdae9a..daf44bf 100644 --- a/source/external/jail_shader.cpp +++ b/source/external/jail_shader.cpp @@ -2,7 +2,6 @@ #include // Para SDL_GL_GetProcAddress, SDL_LogError #include // Para uintptr_t - #include // Para strncmp #include // Para runtime_error #include // Para vector diff --git a/source/external/jail_shader.h b/source/external/jail_shader.h index d03b05d..47aad0f 100644 --- a/source/external/jail_shader.h +++ b/source/external/jail_shader.h @@ -1,7 +1,6 @@ #pragma once #include // Para SDL_Texture, SDL_Window - #include // Para basic_string, string namespace shader { diff --git a/source/game_logo.cpp b/source/game_logo.cpp index 1dce56d..c4f9d66 100644 --- a/source/game_logo.cpp +++ b/source/game_logo.cpp @@ -1,9 +1,8 @@ #include "game_logo.h" -#include // Para SDL_SetTextureScaleMode, SDL_FlipMode +#include // Para SDL_SetTextureScaleMode, SDL_FlipMode, SDL_ScaleMode #include // Para max -#include // Para basic_string #include "animated_sprite.h" // Para AnimatedSprite #include "audio.h" // Para Audio diff --git a/source/main.cpp b/source/main.cpp index 10a4284..5c69716 100644 --- a/source/main.cpp +++ b/source/main.cpp @@ -8,6 +8,7 @@ Actualizando a la versión "Arcade Edition" en 08/05/2024 */ #include // Para make_unique, unique_ptr +#include // Para span #include "director.h" // Para Director diff --git a/source/path_sprite.cpp b/source/path_sprite.cpp index 85d7a97..7ae6fbe 100644 --- a/source/path_sprite.cpp +++ b/source/path_sprite.cpp @@ -1,7 +1,6 @@ // IWYU pragma: no_include #include "path_sprite.h" -#include // Para abs #include // Para function #include // Para move diff --git a/source/scoreboard.cpp b/source/scoreboard.cpp index 18febe0..4101c58 100644 --- a/source/scoreboard.cpp +++ b/source/scoreboard.cpp @@ -1,10 +1,11 @@ #include "scoreboard.h" -#include // Para SDL_DestroyTexture, SDL_SetRenderDrawColor +#include // Para SDL_DestroyTexture, SDL_SetRenderDrawColor, SDL_SetRenderTarget, SDL_CreateTexture, SDL_GetRenderTarget, SDL_GetTicks, SDL_RenderClear, SDL_RenderLine, SDL_RenderTexture, SDL_SetTextureBlendMode, SDL_FRect, SDL_BLENDMODE_BLEND, SDL_PixelFormat, SDL_Texture, SDL_TextureAccess -#include // Para roundf -#include // Para operator<<, setfill, setw -#include // Para basic_ostringstream, basic_ostream, basic_os... +#include // Para max +#include // Para roundf +#include // Para operator<<, setfill, setw +#include // Para basic_ostream, basic_ostringstream, basic_ostream::operator<<, ostringstream #include "enter_name.h" // Para NAME_SIZE #include "lang.h" // Para getText diff --git a/source/sections/credits.cpp b/source/sections/credits.cpp index ced7f25..707d7fa 100644 --- a/source/sections/credits.cpp +++ b/source/sections/credits.cpp @@ -1,15 +1,14 @@ // IWYU pragma: no_include #include "credits.h" -#include // Para SDL_RenderFillRect, SDL_RenderTexture +#include // Para SDL_RenderFillRect, SDL_RenderTexture, SDL_SetRenderTarget, SDL_SetRenderDrawColor, SDL_CreateTexture, SDL_DestroyTexture, SDL_GetTicks, SDL_GetRenderTarget, SDL_PixelFormat, SDL_PollEvent, SDL_RenderClear, SDL_RenderRect, SDL_SetTextureBlendMode, SDL_TextureAccess, SDL_BLENDMODE_BLEND, SDL_Event -#include // Para max, min, clamp -#include // Para array -#include // Para abs -#include // Para runtime_error -#include // Para basic_string, string -#include -#include // Para vector +#include // Para max, min, clamp +#include // Para array +#include // Para runtime_error +#include // Para basic_string, string +#include // Para string_view +#include // Para vector #include "audio.h" // Para Audio #include "balloon_manager.h" // Para BalloonManager @@ -28,7 +27,7 @@ #include "texture.h" // Para Texture #include "tiled_bg.h" // Para TiledBG, TiledBGMode #include "ui/service_menu.h" // Para ServiceMenu -#include "utils.h" // Para Color, Zone, SHADOW_TEXT_COLOR, NO_TEXT... +#include "utils.h" // Para Zone, SHADOW_TEXT_COLOR, NO_TEXT_COLOR, Color // Textos constexpr std::string_view TEXT_COPYRIGHT = "@2020,2025 JailDesigner"; diff --git a/source/sections/game.h b/source/sections/game.h index 60bcb2e..f20da7e 100644 --- a/source/sections/game.h +++ b/source/sections/game.h @@ -6,27 +6,24 @@ #include // Para string #include // Para vector +#include "bullet.h" // Para Bullet, BulletType (ptr only) +#include "item.h" // Para Item, ItemType (ptr only) #include "manage_hiscore_table.h" // Para HiScoreEntry #include "options.h" // Para SettingsOptions, settings, DifficultyCode (ptr only) +#include "path_sprite.h" // Para PathSprite, Path #include "player.h" // Para Player +#include "smart_sprite.h" // Para SmartSprite #include "utils.h" // Para Demo class Background; class Balloon; class BalloonManager; -class Bullet; class Fade; class Input; -class Item; -class PathSprite; class Scoreboard; class Screen; -class SmartSprite; class Tabe; class Texture; -enum class BulletType : Uint8; -enum class ItemType; -struct Path; // Modo demo constexpr bool GAME_MODE_DEMO_OFF = false; diff --git a/source/sections/hiscore_table.h b/source/sections/hiscore_table.h index 211c83d..547f8ac 100644 --- a/source/sections/hiscore_table.h +++ b/source/sections/hiscore_table.h @@ -6,14 +6,13 @@ #include // Para string #include // Para vector -#include "utils.h" // Para Color +#include "path_sprite.h" // Para Path, PathSprite (ptr only) +#include "utils.h" // Para Color class Background; class Fade; -class PathSprite; class Sprite; enum class FadeMode : Uint8; -struct Path; /* Esta clase gestiona un estado del programa. Se encarga de mostrar la tabla con las puntuaciones diff --git a/source/sections/instructions.h b/source/sections/instructions.h index 80260f9..80de33e 100644 --- a/source/sections/instructions.h +++ b/source/sections/instructions.h @@ -5,8 +5,9 @@ #include // Para unique_ptr, shared_ptr #include // Para vector +#include "sprite.h" // Para Sprite + class Fade; -class Sprite; class Text; class Texture; class TiledBG; diff --git a/source/sections/intro.cpp b/source/sections/intro.cpp index 9f2adbf..2c5b17d 100644 --- a/source/sections/intro.cpp +++ b/source/sections/intro.cpp @@ -1,11 +1,12 @@ #include "intro.h" -#include // Para SDL_GetTicks, SDL_SetRenderDrawColor, SDL... +#include // Para SDL_GetTicks, SDL_SetRenderDrawColor, SDL_FRect, SDL_RenderFillRect, SDL_GetRenderTarget, SDL_RenderClear, SDL_RenderRect, SDL_SetRenderTarget, SDL_BLENDMODE_BLEND, SDL_PixelFormat, SDL_PollEvent, SDL_RenderTexture, SDL_TextureAccess, SDLK_A, SDLK_C, SDLK_D, SDLK_F, SDLK_S, SDLK_V, SDLK_X, SDLK_Z, SDL_Event, SDL_EventType, Uint32 +#include // Para max #include // Para array #include // Para function -#include // Para basic_ostream, basic_ostream::operator<< -#include // Para basic_string, char_traits, string +#include // Para basic_ostream, basic_ostream::operator<<, operator<<, cout, endl, hex +#include // Para char_traits, basic_string, string #include // Para move #include "audio.h" // Para Audio @@ -13,7 +14,7 @@ #include "global_inputs.h" // Para check #include "input.h" // Para Input #include "lang.h" // Para getText -#include "param.h" // Para Param, param, ParamGame, ParamIntro, Para... +#include "param.h" // Para Param, param, ParamGame, ParamIntro, ParamTitle #include "path_sprite.h" // Para PathSprite, PathType #include "resource.h" // Para Resource #include "screen.h" // Para Screen @@ -21,7 +22,7 @@ #include "text.h" // Para Text #include "texture.h" // Para Texture #include "tiled_bg.h" // Para TiledBG, TiledBGMode -#include "utils.h" // Para Color, Zone, easeInOutExpo, easeInElastic +#include "utils.h" // Para Color, Zone, easeInOutExpo, easeInElastic, easeOutBounce, easeOutElastic, easeOutQuad, easeOutQuint #include "writer.h" // Para Writer #ifdef DEBUG diff --git a/source/sections/logo.cpp b/source/sections/logo.cpp index 18f041c..d7a3086 100644 --- a/source/sections/logo.cpp +++ b/source/sections/logo.cpp @@ -1,9 +1,9 @@ #include "logo.h" -#include // Para SDL_GetTicks, SDL_PollEvent, SDL_Event +#include // Para SDL_GetTicks, SDL_PollEvent, SDL_Event, SDL_FRect -#include // Para basic_string -#include // Para move +#include // Para max +#include // Para move #include "audio.h" // Para Audio #include "global_events.h" // Para check diff --git a/source/sections/logo.h b/source/sections/logo.h index e3e3595..379aa7c 100644 --- a/source/sections/logo.h +++ b/source/sections/logo.h @@ -2,12 +2,13 @@ #include // Para SDL_FPoint, Uint64 -#include // Para shared_ptr, unique_ptr +#include // Para unique_ptr, shared_ptr #include // Para vector -class Sprite; +#include "sprite.h" // Para Sprite +#include "utils.h" // Para Color + class Texture; -struct Color; /* Esta clase gestiona un estado del programa. Se encarga de dibujar por pantalla el diff --git a/source/tabe.cpp b/source/tabe.cpp index 58e9d4a..f8a35c6 100644 --- a/source/tabe.cpp +++ b/source/tabe.cpp @@ -4,10 +4,8 @@ #include // Para SDL_FlipMode, SDL_GetTicks #include // Para max -#include -#include // Para abs -#include // Para rand, abs -#include // Para basic_string +#include // Para array +#include // Para rand, abs #include "audio.h" // Para Audio #include "param.h" // Para Param, ParamGame, param diff --git a/source/tiled_bg.cpp b/source/tiled_bg.cpp index d11e00b..b904b56 100644 --- a/source/tiled_bg.cpp +++ b/source/tiled_bg.cpp @@ -1,12 +1,11 @@ #include "tiled_bg.h" -#include // Para SDL_SetRenderTarget, SDL_CreateTexture, SDL_De... +#include // Para SDL_SetRenderTarget, SDL_CreateTexture, SDL_DestroyTexture, SDL_FRect, SDL_GetRenderTarget, SDL_RenderTexture, SDL_PixelFormat, SDL_TextureAccess #include // Para sin #include // Para rand -#include // Para unique_ptr, make_unique -#include -#include // Para basic_string +#include // Para allocator, unique_ptr, make_unique +#include // Para pi #include "resource.h" // Para Resource #include "screen.h" // Para Screen diff --git a/source/ui/menu_renderer.cpp b/source/ui/menu_renderer.cpp index 1d964db..185a818 100644 --- a/source/ui/menu_renderer.cpp +++ b/source/ui/menu_renderer.cpp @@ -1,8 +1,7 @@ #include "menu_renderer.h" -#include // Para max -#include // Para basic_string -#include // Para pair, move +#include // Para max +#include // Para pair, move #include "menu_option.h" // Para MenuOption #include "param.h" // Para Param, param, ParamServiceMenu, ParamGame diff --git a/source/ui/menu_renderer.h b/source/ui/menu_renderer.h index a9c7ef2..ee6e117 100644 --- a/source/ui/menu_renderer.h +++ b/source/ui/menu_renderer.h @@ -1,7 +1,6 @@ #pragma once #include // Para SDL_FRect, Uint32 - #include #include // Para size_t #include // Para shared_ptr, unique_ptr diff --git a/source/ui/service_menu.cpp b/source/ui/service_menu.cpp index c7c3d89..5095be8 100644 --- a/source/ui/service_menu.cpp +++ b/source/ui/service_menu.cpp @@ -1,10 +1,12 @@ #include "ui/service_menu.h" +#include // Para max + #include "audio.h" // Para Audio #include "lang.h" // Para getText, getCodeFromName, getNameFromCode -#include "menu_option.h" // Para MenuOption, BoolOption, ActionOption, Int... +#include "menu_option.h" // Para MenuOption, BoolOption, ActionOption, IntOption, FolderOption, ListOption #include "menu_renderer.h" // Para MenuRenderer -#include "options.h" // Para PendingChanges, VideoOptions, pending_cha... +#include "options.h" // Para PendingChanges, VideoOptions, pending_changes, video, AudioOptions, SettingsOptions, audio, checkPendingChanges, settings, WindowOptions, getDifficultyCodeFromName, getDifficultyNameFromCode, window, MusicOptions, SoundOptions #include "param.h" // Para Param, param, ParamGame, ParamServiceMenu #include "resource.h" // Para Resource #include "screen.h" // Para Screen diff --git a/source/utils.h b/source/utils.h index 3d5c132..06dc388 100644 --- a/source/utils.h +++ b/source/utils.h @@ -1,12 +1,13 @@ #pragma once -#include // Para Uint8, SDL_FRect, SDL_FPoint, SDL_Renderer +#include // Para Uint8, SDL_FRect, SDL_FPoint, SDL_Renderer +#include // Para abs #include // Para max, min #include // Para array #include // Para isxdigit #include // Para int32_t -#include // Para abs, size_t +#include // Para size_t, abs #include // Para invalid_argument #include // Para string, basic_string, stoi #include // Para vector