style: Convert leading spaces to tabs in GeneralsMD Libraries and Tools by bobtista · Pull Request #2564 · TheSuperHackers/GeneralsGameCode

bobtista · 2026-04-09T19:08:38Z

Summary

Convert leading spaces/mixed whitespace to tabs, including access specifier indentation
All changes are whitespace-only (git diff -w is empty)
Uses tree-sitter-cpp for accurate C++ parsing with macro preprocessing

Access specifiers (public:/private:/protected:) are placed at the class
brace level, matching the existing codebase convention.

Script

The formatting script is included in the PR for reference but is not intended
to be merged — it shows how the changes were generated.

See scripts/cpp/convert_leading_spaces_to_tabs.py for details.

Part 4 of 4 — GeneralsMD/Code/Libraries/ and GeneralsMD/Code/Tools/ (161 files).
See also: #2561, #2562, #2563.

…tabs

greptile-apps · 2026-04-09T19:13:06Z

Greptile Summary

This PR (Part 4 of 4) converts leading spaces to pure tab indentation in 161 C++ source files under GeneralsMD/Code/Libraries/ and GeneralsMD/Code/Tools/, plus adds a reference Python conversion script using tree-sitter-cpp. Verified whitespace-only: git diff -w shows only the new Python script differs, confirming no logic changes are buried in the diff.

Confidence Score: 5/5

Safe to merge — all C++ changes are whitespace-only, verified by git diff -w.

161 C++ files with confirmed whitespace-only changes (git diff -w shows only the new Python script). The conversion is consistent with the codebase convention established in parts 1–3 of this series. The reference Python script is logically sound and its output has been validated by the diff itself.

No files require special attention.

Vulnerabilities

No security concerns identified. All C++ changes are purely whitespace (confirmed by git diff -w). The Python script processes only local files, uses no network I/O, and does not execute any shell commands.

Important Files Changed

Filename	Overview
scripts/cpp/convert_leading_spaces_to_tabs.py	New reference script using tree-sitter-cpp for AST-guided space→tab conversion; included for transparency, not intended to be permanently merged per PR description. No GPL/copyright header consistent with other scripts in the directory.
GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DDisplay.cpp	Largest single-file change (96 lines): whitespace-only corrections throughout this display implementation.
GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dx8wrapper.h	Whitespace-only: mixed space+tab indentation corrected to pure tabs in inline member functions and struct body.
GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dx8wrapper.cpp	Whitespace-only changes across this large DX8 rendering implementation file.
GeneralsMD/Code/Main/WinMain.cpp	Whitespace-only: leading spaces on WNDCLASS initialization and CreateWindow call corrected to tabs; multi-line continuation alignment preserved.
GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/shader.h	Whitespace-only: leading spaces before enum declarations corrected to tabs.
GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/camera.h	Whitespace-only: stray leading spaces on comment dividers and virtual method declarations corrected to tabs.

Flowchart

%%{init: {'theme': 'neutral'}}%%
flowchart TD
    A[Read .cpp/.h file\ncp1252 encoding] --> B[Preprocess macros\nfor tree-sitter]
    B --> C[Parse with\ntree-sitter-cpp]
    C --> D{Too many\nparse errors?}
    D -- yes --> E[Skip file]
    D -- no --> F[For each line]
    F --> G{Inside block\ncomment?}
    G -- yes --> H[Keep as-is]
    G -- no --> I{Blank / preprocessor\n/ already tabs?}
    I -- yes --> H
    I -- no --> J[Find AST node\nat first non-WS char]
    J --> K{ERROR ancestor\nor continuation?}
    K -- yes --> H
    K -- no --> L[get_indent_depth\nbased on AST]
    L --> M{depth==0 &\nspaces >= 4?}
    M -- yes --> H
    M -- no --> N[Replace leading WS\nwith N tabs]
    N --> O[Write converted file]

_{Reviews (2): Last reviewed commit: "fix: Handle braceless control-flow body ..." | Re-trigger Greptile}

Skyaero42

Picked out a few things that don't look right. They may appear multiple times in this PR.

Skyaero42 · 2026-04-09T19:14:19Z

GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DDisplayString.h


 	void checkForChangedTextData();  /**< called when we need to update our
-																				 render sentence and update extents */
+	render sentence and update extents */


This doesn't look right

I checked this on main, and I like it this way more. The goal is to remove leading spaces (convert to semantically the same indentation in tabs) only in this PR - I think aligning multiline things to previous line spots like open parens will be another PR.

Skyaero42 · 2026-04-09T19:14:54Z

GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DVolumetricShadow.h


 		void setRenderObject( RenderObjClass	*robj) {assert(m_robj==nullptr); m_robj=robj;}
- 		void setRenderObjExtent ( Real extent) { m_robjExtent = extent; }
+	void setRenderObjExtent ( Real extent) { m_robjExtent = extent; }


This doesn't look right

Skyaero42 · 2026-04-09T19:16:14Z

GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DDisplay.cpp

+	if ( flagSpikes )
+	{
+		if ( Debug_Statistics::Get_Draw_Calls()>2000 )
+		fprintf( m_fp, "                                                                      DRAWS OUT OF TOLERANCE(2000)\n" );


This doesn't look right

What do you mean? It's preserving that weird string ...DRAWS OUT OF TOLERANCE(2000)\n" ); if you look at main, it's the same there. If we want to remove the leading spaces maybe do it in another PR?

Shouldn't fprintf not have another indent because of the if-statement above it?

Oh you mean the conditional without braces - can fix

Skyaero42 · 2026-04-09T19:16:42Z

GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DScene.cpp

-            if ( ! isVisible )
-              continue;
+						if ( ! isVisible )
+						continue;


This doesn't look right

Yeah, I had to fix these conditionals without braces in another branch too, I'll do that now

Skyaero42 · 2026-04-09T19:17:23Z

GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3dWaypointBuffer.cpp

-  if ( ! TheInGameUI )
-    return;
+	if ( ! TheInGameUI )
+	return;


Doesn't look right

…ipt and re-run

bobtista added 5 commits April 9, 2026 15:08

style: Add tree-sitter based script to convert leading spaces to tabs

06b4b38

style: Remove mixed-whitespace skip to convert all leading spaces to …

a7390ca

…tabs

style: Add macro preprocessing to fix tree-sitter parse errors

432c05d

style: Handle access specifier indentation in formatting script

81f2fe1

style: Convert leading spaces to tabs in GeneralsMD Libraries and Tools

122b712

Skyaero42 reviewed Apr 9, 2026

View reviewed changes

fix: Handle braceless control-flow body indentation in conversion scr…

54af7be

…ipt and re-run

This was referenced Apr 9, 2026

style: Convert continuation lines to tabs in GeneralsMD #2572

Open

style: Convert continuation lines to tabs in Generals #2571

Open

Conversation

bobtista commented Apr 9, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Summary

Script

Uh oh!

greptile-apps bot commented Apr 9, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Greptile Summary

Confidence Score: 5/5

Vulnerabilities

Important Files Changed

Flowchart

Uh oh!

Skyaero42 left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

bobtista commented Apr 9, 2026 •

edited

Loading

greptile-apps bot commented Apr 9, 2026 •

edited

Loading