compiletools 7.0.0__tar.gz → 7.0.2__tar.gz

{compiletools-7.0.0 → compiletools-7.0.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: compiletools
-Version: 7.0.0
+Version: 7.0.2
 Summary: Tools to make compiling C/C++ projects easy
 Keywords: c++,make,development
 Author: DrGeoff
@@ -24,7 +24,7 @@ Requires-Dist: rich-rst>=1.1.7
 Requires-Dist: stringzilla>=3.0.0
 Requires-Dist: bump-my-version>=0.26.0 ; extra == 'dev'
 Requires-Dist: twine>=5.0.0 ; extra == 'dev'
-Requires-Dist: pytest>=7.0.0 ; extra == 'dev'
+Requires-Dist: pytest>=7.0.2 ; extra == 'dev'
 Requires-Dist: pytest-xdist>=3.5 ; extra == 'dev'
 Requires-Dist: ruff>=0.12.9 ; extra == 'dev'
 Requires-Python: >=3.9
@@ -50,7 +50,7 @@ C/C++ build tools that requires almost no configuration.
 
 :Author: drgeoffathome@gmail.com
 :Date:   2025-12-17
-:Version: 7.0.0
+:Version: 7.0.2
 :Manual section: 1
 :Manual group: developers
 

{compiletools-7.0.0 → compiletools-7.0.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "compiletools"
-version = "7.0.0"
+version = "7.0.2"
 description = "Tools to make compiling C/C++ projects easy"
 readme = "src/compiletools/README.ct-doc.rst"
 requires-python = ">=3.9"
@@ -34,7 +34,7 @@ dependencies = [
 dev = [
     "bump-my-version>=0.26.0",
     "twine>=5.0.0",
-    "pytest>=7.0.0",
+    "pytest>=7.0.2",
     "pytest-xdist>=3.5",
     "ruff>=0.12.9",
 ]
@@ -79,7 +79,7 @@ include = [
 ]
 
 [tool.bumpversion]
-current_version = "7.0.0"
+current_version = "7.0.2"
 parse = "(?P<major>\\d+)\\.(?P<minor>\\d+)\\.(?P<patch>\\d+)"
 serialize = ["{major}.{minor}.{patch}"]
 search = "{current_version}"

{compiletools-7.0.0 → compiletools-7.0.2}/src/compiletools/README.ct-cake.rst

@@ -9,7 +9,7 @@ Swiss army knife for building a C/C++ project
 :Author: drgeoffathome@gmail.com
 :Date:   2018-02-06
 :Copyright: Copyright (C) 2011-2016 Zomojo Pty Ltd
-:Version: 7.0.0
+:Version: 7.0.2
 :Manual section: 1
 :Manual group: developers
 

{compiletools-7.0.0 → compiletools-7.0.2}/src/compiletools/README.ct-cleanup-locks.rst

@@ -8,7 +8,7 @@ Clean up stale lock directories in shared object caches
 
 :Author: drgeoffathome@gmail.com
 :Date:   2025-10-16
-:Version: 7.0.0
+:Version: 7.0.2
 :Manual section: 1
 :Manual group: developers
 

{compiletools-7.0.0 → compiletools-7.0.2}/src/compiletools/README.ct-commandline.rst

@@ -9,7 +9,7 @@ This document describes the command line arguments that are common across ct-* p
 :Author: drgeoffathome@gmail.com
 :Date:   2017-07-06
 :Copyright: Copyright (C) 2011-2016 Zomojo Pty Ltd
-:Version: 7.0.0
+:Version: 7.0.2
 :Manual section: 1
 :Manual group: developers
 

{compiletools-7.0.0 → compiletools-7.0.2}/src/compiletools/README.ct-compilation-database.rst

@@ -8,7 +8,7 @@ Generate compile_commands.json for clang tooling and IDE integration
 
 :Author: drgeoffathome@gmail.com
 :Date:   2025-10-08
-:Version: 7.0.0
+:Version: 7.0.2
 :Manual section: 1
 :Manual group: developers
 

{compiletools-7.0.0 → compiletools-7.0.2}/src/compiletools/README.ct-config.rst

@@ -9,7 +9,7 @@ Helper tool for examining ct-* configuration
 :Author: drgeoffathome@gmail.com
 :Date:   2016-08-16
 :Copyright: Copyright (C) 2011-2016 Zomojo Pty Ltd
-:Version: 7.0.0
+:Version: 7.0.2
 :Manual section: 1
 :Manual group: developers
 

{compiletools-7.0.0 → compiletools-7.0.2}/src/compiletools/README.ct-cppdeps.rst

@@ -9,7 +9,7 @@ C/C++ dependency analysis using the preprocessor
 :Author: drgeoffathome@gmail.com
 :Date:   2022-06-05
 :Copyright: Copyright (C) Geoffery Ericksson
-:Version: 7.0.0
+:Version: 7.0.2
 :Manual section: 1
 :Manual group: developers
 

{compiletools-7.0.0 → compiletools-7.0.2}/src/compiletools/README.ct-doc.rst

@@ -15,7 +15,7 @@ C/C++ build tools that requires almost no configuration.
 
 :Author: drgeoffathome@gmail.com
 :Date:   2025-12-17
-:Version: 7.0.0
+:Version: 7.0.2
 :Manual section: 1
 :Manual group: developers
 

{compiletools-7.0.0 → compiletools-7.0.2}/src/compiletools/README.ct-filelist.rst

@@ -9,7 +9,7 @@ Determine header and source dependencies of a C/C++ file by following headers an
 :Author: drgeoffathome@gmail.com
 :Date:   2017-07-06
 :Copyright: Copyright (C) 2011-2016 Zomojo Pty Ltd
-:Version: 7.0.0
+:Version: 7.0.2
 :Manual section: 1
 :Manual group: developers
 

{compiletools-7.0.0 → compiletools-7.0.2}/src/compiletools/README.ct-findtargets.rst

@@ -9,7 +9,7 @@ Find executable and test targets in a C/C++ project
 :Author: drgeoffathome@gmail.com
 :Date:   2018-04-17
 :Copyright: Copyright (C) 2011-2018 Zomojo Pty Ltd
-:Version: 7.0.0
+:Version: 7.0.2
 :Manual section: 1
 :Manual group: developers
 

{compiletools-7.0.0 → compiletools-7.0.2}/src/compiletools/README.ct-gitroot.rst

@@ -9,7 +9,7 @@ Display the git repository root directory
 :Author: drgeoffathome@gmail.com
 :Date:   2017-09-28
 :Copyright: Copyright (C) 2011-2016 Zomojo Pty Ltd
-:Version: 7.0.0
+:Version: 7.0.2
 :Manual section: 1
 :Manual group: developers
 

{compiletools-7.0.0 → compiletools-7.0.2}/src/compiletools/README.ct-headertree.rst

@@ -9,7 +9,7 @@ Create a tree of header dependencies starting at the given C/C++ file
 :Author: drgeoffathome@gmail.com
 :Date:   2018-07-26
 :Copyright: Copyright (C) 2011-2018 Zomojo Pty Ltd
-:Version: 7.0.0
+:Version: 7.0.2
 :Manual section: 1
 :Manual group: developers
 

{compiletools-7.0.0 → compiletools-7.0.2}/src/compiletools/README.ct-jobs.rst

@@ -9,7 +9,7 @@ Determine optimal parallel job count for builds
 :Author: drgeoffathome@gmail.com
 :Date:   2017-04-28
 :Copyright: Copyright (C) 2011-2016 Zomojo Pty Ltd
-:Version: 7.0.0
+:Version: 7.0.2
 :Manual section: 1
 :Manual group: developers
 

{compiletools-7.0.0 → compiletools-7.0.2}/src/compiletools/README.ct-list-variants.rst

@@ -9,7 +9,7 @@ List available build variants
 :Author: drgeoffathome@gmail.com
 :Date:   2016-08-16
 :Copyright: Copyright (C) 2011-2016 Zomojo Pty Ltd
-:Version: 7.0.0
+:Version: 7.0.2
 :Manual section: 1
 :Manual group: developers
 

{compiletools-7.0.0 → compiletools-7.0.2}/src/compiletools/README.ct-magicflags.rst

@@ -9,7 +9,7 @@ Show the magic flags / magic comments that a file exports
 :Author: drgeoffathome@gmail.com
 :Date:   2018-02-23
 :Copyright: Copyright (C) 2011-2018 Zomojo Pty Ltd
-:Version: 7.0.0
+:Version: 7.0.2
 :Manual section: 1
 :Manual group: developers
 

{compiletools-7.0.0 → compiletools-7.0.2}/src/compiletools/apptools.py

@@ -579,7 +579,6 @@ def extract_command_line_macros_sz(args, flag_sources_sz, verbose=0):
 def clear_cache():
     """Clear any caches for macro extraction and pkg-config."""
     cached_pkg_config.cache_clear()
-    cached_pkg_config_sz.cache_clear()
     _get_functional_cxx_compiler_cached.cache_clear()
 
 
@@ -772,20 +771,73 @@ def cached_pkg_config(package, option):
     return result.stdout.rstrip()
 
 
-@functools.lru_cache(maxsize=None)
-def cached_pkg_config_sz(package_sz, option):
-    """StringZilla-aware version of cached_pkg_config with separate cache"""
-    import stringzilla as sz
-    result = cached_pkg_config(package_sz.decode('utf-8'), option)
-    return sz.Str(result)
+def filter_pkg_config_cflags(cflags_str, verbose=0):
+    """
+    Process pkg-config cflags output.
+    Converts -I to -isystem, except for default system include paths
+    which are dropped to prevent include order issues (e.g. with libc++).
+    Uses shlex for robust shell tokenization and quoting.
+    """
+    if not cflags_str:
+        return ""
+
+    # Standard system include paths
+    system_include_paths = set(['/usr/include'])
+    prefix = os.environ.get('PREFIX')
+    if prefix:
+        system_include_paths.add(os.path.normpath(os.path.join(prefix, 'include')))
+
+    # Use shlex to correctly handle quoted paths in flags
+    try:
+        flags = split_command_cached(cflags_str)
+    except ValueError:
+        # Fallback for malformed strings
+        flags = cflags_str.split()
+
+    flag_iter = iter(flags)
+    processed_flags = []
+
+    for flag in flag_iter:
+        if flag.startswith("-I"):
+            path = None
+            if flag == "-I":
+                # Detached -I
+                try:
+                    path = next(flag_iter)
+                except StopIteration:
+                    # Trailing -I at end of string, preserve as-is
+                    processed_flags.append(shlex.quote(flag))
+                    break
+            else:
+                # Attached -Ipath
+                path = flag[2:]
+
+            # Normalize and check
+            normalized_path = os.path.normpath(path)
+            is_system = False
+            for sys_path in system_include_paths:
+                if normalized_path == sys_path:
+                    is_system = True
+                    break
+
+            if is_system:
+                if verbose >= 6:
+                    print(f"Dropping default system include path from pkg-config: {path}")
+                continue
+
+            # Reconstruct as -isystem, quoting path for shell safety
+            processed_flags.append(f"-isystem {shlex.quote(path)}")
+        else:
+            # Re-quote other flags to preserve them correctly in the output string
+            processed_flags.append(shlex.quote(flag))
+
+    return " ".join(processed_flags)
 
 
 def _add_flags_from_pkg_config(args):
     for pkg in args.pkg_config:
-        cflags = (
-            cached_pkg_config(pkg, "--cflags")
-            .replace("-I", "-isystem ")
-        )  # This helps the CppHeaderDeps avoid searching packages
+        raw_cflags = cached_pkg_config(pkg, "--cflags")
+        cflags = filter_pkg_config_cflags(raw_cflags, args.verbose)
 
         if cflags:
             args.CPPFLAGS += f" {cflags}"

{compiletools-7.0.0 → compiletools-7.0.2}/src/compiletools/file_analyzer.py

@@ -594,8 +594,13 @@ def analyze_file(content_hash: str) -> 'FileAnalysisResult':
                                     'value': value_trimmed
                                 })
 
+    # Sort directives by line number for correct guard detection
+    # The directives list is built by iterating directive_positions.items()
+    # which processes by directive TYPE, not line number order
+    directives_sorted = sorted(directives, key=lambda d: d.line_num)
+
     # Detect include guard first so we can exclude it from defines
-    include_guard = detect_include_guard(directives)
+    include_guard = detect_include_guard(directives_sorted)
 
     # Extract defines with full information (excluding include guard)
     defines = []
@@ -922,14 +927,16 @@ def detect_include_guard(directives: List[PreprocessorDirective]) -> Optional['s
 
             guard_candidate = directive.macro_name
 
-            # Check if the next directive is #define with the same name
-            if (i + 1 < len(directives) and
-                directives[i + 1].directive_type == 'define' and
-                directives[i + 1].macro_name and
-                directives[i + 1].macro_name == guard_candidate):
+            # Look ahead up to 5 positions for the matching #define
+            # This handles cases where comments or other directives appear between
+            # the #ifndef and the matching #define
+            for j in range(i + 1, min(i + 6, len(directives))):
+                if (directives[j].directive_type == 'define' and
+                    directives[j].macro_name and
+                    directives[j].macro_name == guard_candidate):
 
-                # guard_candidate is already sz.Str from PreprocessorDirective.macro_name
-                return guard_candidate
+                    # guard_candidate is already sz.Str from PreprocessorDirective.macro_name
+                    return guard_candidate
 
     return None
 

{compiletools-7.0.0 → compiletools-7.0.2}/src/compiletools/magicflags.py

@@ -1,4 +1,5 @@
 import sys
+import os
 import re
 import functools
 from collections import defaultdict
@@ -16,7 +17,6 @@ import compiletools.apptools
 import compiletools.compiler_macros
 import compiletools.namer
 from compiletools.preprocessing_cache import get_or_compute_preprocessing, MacroState
-from compiletools.apptools import cached_pkg_config_sz
 from compiletools.stringzilla_utils import strip_sz
 from compiletools.file_analyzer import FileAnalysisResult
 
@@ -211,22 +211,30 @@ class MagicFlagsBase:
 
     def _handle_pkg_config(self, flag):
         flagsforfilename = defaultdict(list)
-        for pkg in flag.split():
-            cflags_raw = cached_pkg_config_sz(pkg, "--cflags")
-            # Replace -I flags with -isystem to help CppHeaderDeps avoid searching packages
-            from compiletools.stringzilla_utils import replace_sz
-            cflags = replace_sz(cflags_raw, '-I', '-isystem')
-            libs = cached_pkg_config_sz(pkg, "--libs")
+        
+        # Convert to string for splitting, as we need to iterate over packages
+        flag_str = str(flag)
+
+        for pkg in flag_str.split():
+            # pkg is str. Call cached_pkg_config directly to avoid unnecessary sz conversions
+            cflags_raw = compiletools.apptools.cached_pkg_config(pkg, "--cflags")
+            
+            # Use the shared filtering logic from apptools
+            cflags_str = compiletools.apptools.filter_pkg_config_cflags(cflags_raw, self._args.verbose)
+            cflags_list = compiletools.utils.split_command_cached_sz(sz.Str(cflags_str))
+            
+            libs_raw = compiletools.apptools.cached_pkg_config(pkg, "--libs")
+            libs_list = compiletools.utils.split_command_cached_sz(sz.Str(libs_raw))
 
             # Add cflags to all C/C++ flag categories
             for key in (sz.Str("CPPFLAGS"), sz.Str("CFLAGS"), sz.Str("CXXFLAGS")):
-                flagsforfilename[key].append(cflags)
-            flagsforfilename[sz.Str("LDFLAGS")].append(libs)
+                flagsforfilename[key].extend(cflags_list)
+            flagsforfilename[sz.Str("LDFLAGS")].extend(libs_list)
 
             if self._args.verbose >= 9:
                 print(f"Magic PKG-CONFIG = {pkg}:")
-                print(f"\tadded {cflags} to CPPFLAGS, CFLAGS, and CXXFLAGS")
-                print(f"\tadded {libs} to LDFLAGS")
+                print(f"\tadded {cflags_list} to CPPFLAGS, CFLAGS, and CXXFLAGS")
+                print(f"\tadded {libs_list} to LDFLAGS")
         return flagsforfilename
 
     def _resolve_readmacros_path(self, flag, source_filename):

compiletools-7.0.2/src/compiletools/samples/header_guard_bug/README.md

@@ -0,0 +1,57 @@
+# Accurate Header Guard Detection
+
+## Overview
+
+This sample demonstrates a bug in ct-magicflags where non-standard header guards
+cause Pass 2 to skip transitive dependencies, resulting in missing magic flags.
+
+## The Bug
+
+### Pass 1: Initial Discovery
+- Processes main.cpp → header_a.hpp → header_b.hpp
+- Discovers all dependencies (2 headers)
+- Macro convergence defines HEADER_A_HPP_GUARD (non-standard pattern prevents detection)
+
+### Pass 2: Re-discovery with Converged Macros
+- FileAnalyzer fails to detect HEADER_A_HPP_GUARD as a header guard
+- Guard macro enters Pass 2 macro state
+- Preprocessor evaluates `#ifndef HEADER_A_HPP_GUARD` as FALSE
+- Skips entire header_a.hpp contents (including `#include "header_b.hpp"`)
+- Only discovers 1 header instead of 2
+
+### Result
+- header_b.hpp not rediscovered in Pass 2
+- Magic flags lost: `//#PKG-CONFIG=zlib`, `//#LDFLAGS=-lm`
+- Game engine missing critical dependencies
+
+## Non-Standard Guard Pattern
+
+header_a.hpp uses a guard pattern that breaks FileAnalyzer detection:
+
+```cpp
+#ifndef HEADER_A_HPP_GUARD
+#define SOME_OTHER_MACRO 1  // This breaks detection!
+#define HEADER_A_HPP_GUARD
+```
+
+FileAnalyzer expects `#define HEADER_A_HPP_GUARD` immediately after `#ifndef`,
+but the intermediate `#define SOME_OTHER_MACRO 1` causes it to miss the guard.
+
+## Testing
+
+```bash
+cd /home/gericksson/compiletools
+pytest src/compiletools/test_magicflags.py::TestMagicFlagsModule::test_header_guard_bug_transitive_magic_flags -v
+```
+
+**Before fix**: Test FAILS (weapon dependencies missing)
+**After fix**: Test PASSES (all dependencies discovered)
+
+## Fix
+
+**File**: `/home/gericksson/compiletools/src/compiletools/file_analyzer.py`
+
+1. **Line ~598**: Sort directives by line number before guard detection
+2. **Line ~930-939**: Look ahead 5 positions for matching #define (not just next)
+
+This allows FileAnalyzer to correctly detect non-standard guard patterns.

compiletools-7.0.2/src/compiletools/samples/header_guard_bug/header_a.hpp

@@ -0,0 +1,34 @@
+// Player entity for game engine
+//
+// This header demonstrates the guard bug:
+// - Has a non-standard guard pattern (SOME_OTHER_MACRO between #ifndef and #define)
+// - Includes header_b.hpp for weapon equipment system
+// - After Pass 1, HEADER_A_HPP_GUARD is defined in macro state
+// - Pass 2 skips this header's contents, missing header_b.hpp and its dependencies
+
+#ifndef HEADER_A_HPP_GUARD
+#define SOME_OTHER_MACRO 1  // Breaks FileAnalyzer guard detection.  A comment also broke the pattern.
+#define HEADER_A_HPP_GUARD
+
+// Feature macro to trigger Pass 2 analysis (macro convergence)
+#define PLAYER_HAS_INVENTORY 1
+
+// Include weapon system - this will be SKIPPED in Pass 2 due to guard bug
+#include "header_b.hpp"
+
+namespace game {
+
+class player {
+public:
+    void equip_weapon();
+    void attack();
+    void take_damage(int amount);
+
+private:
+    int health_;
+    int damage_;
+};
+
+} // namespace game
+
+#endif // HEADER_A_HPP_GUARD

compiletools-7.0.2/src/compiletools/samples/header_guard_bug/header_b.hpp

@@ -0,0 +1,32 @@
+// Weapon system for game engine
+//
+// This header contains magic flags for external dependencies:
+// - zlib: Compress weapon asset data
+// - libm: Math library for damage calculations
+//
+// Bug: These magic flags are NOT discovered when Pass 2 skips header_a.hpp
+
+#ifndef HEADER_B_HPP_GUARD
+// Break guard detection pattern
+#define HEADER_B_HPP_GUARD
+
+// Magic flags that should be discovered by ct-magicflags
+//#PKG-CONFIG=zlib
+//#LDFLAGS=-lm
+
+namespace game {
+
+class weapon {
+public:
+    void deal_damage();
+    int calculate_critical_strike();
+    void compress_weapon_data();  // Requires zlib
+
+private:
+    int base_damage_;
+    float critical_multiplier_;  // Requires libm for calculations
+};
+
+} // namespace game
+
+#endif // HEADER_B_HPP_GUARD

compiletools-7.0.2/src/compiletools/samples/header_guard_bug/main.cpp

@@ -0,0 +1,17 @@
+// Game engine initialization test
+//
+// This test demonstrates a header guard bug where Pass 2 macro convergence
+// causes transitive dependencies to be missed in the game's equipment system.
+//
+// Bug Impact: Weapon system dependencies (zlib compression, math library) are
+// not discovered because Pass 2 skips header_a.hpp after its guard is defined.
+
+#include "header_a.hpp"
+
+int main() {
+    // Initialize game with player and equipment
+    game::player hero;
+    hero.equip_weapon();
+    hero.attack();
+    return 0;
+}

{compiletools-7.0.0 → compiletools-7.0.2}/src/compiletools/samples/macro_deps/feature_header.hpp

@@ -4,6 +4,6 @@
 #endif
 
 #ifdef USE_FEATURE_Y
-//#PKG-CONFIG=libcrypt
+//#PKG-CONFIG=nested
 //#SOURCE=feature_y_impl.cpp
 #endif

compiletools-7.0.2/src/compiletools/samples/macro_deps/feature_y_impl.cpp

@@ -0,0 +1,5 @@
+#include <vector>
+
+void feature_y_function() {
+    // Implementation using nested package
+}

{compiletools-7.0.0 → compiletools-7.0.2}/src/compiletools/samples/magic_processing_order/complex_test.cpp

@@ -1,4 +1,4 @@
-//#PKG-CONFIG=zlib libcrypt
+//#PKG-CONFIG=zlib nested
 
 #include "complex_header.h"
 #include <iostream>

{compiletools-7.0.0 → compiletools-7.0.2}/src/compiletools/test_findtargets.py

@@ -49,6 +49,7 @@ class TestFindTargetsModule:
             "parse_order_macro_bug/libs/entry_point_2.cpp",
             "transitive_cache_bug/engine/a-game.cpp",
             "transitive_cache_bug/engine/b-game.cpp",
+            "header_guard_bug/main.cpp",
         }
         relativeexpectedtests = {
             "cross_platform/test_source.cpp",

{compiletools-7.0.0 → compiletools-7.0.2}/src/compiletools/test_magicflags.py

@@ -90,7 +90,7 @@ class TestMagicFlagsModule(tb.BaseCompileToolsTestCase):
         assert sz.Str("CXXFLAGS") in result
 
     @uth.requires_functional_compiler
-    def test_direct_and_cpp_magic_generate_same_results(self):
+    def test_direct_and_cpp_magic_generate_same_results(self, pkgconfig_env):
         """Test that DirectMagicFlags and CppMagicFlags produce identical results on conditional compilation samples"""
 
         # Test files with optional expected values for correctness verification
@@ -156,7 +156,7 @@ class TestMagicFlagsModule(tb.BaseCompileToolsTestCase):
                 fail_msg = "\n\nDirectMagicFlags vs CppMagicFlags equivalence failures:\n" + "\n".join(failures)
                 assert False, fail_msg
 
-    def test_macro_deps_cross_file(self):
+    def test_macro_deps_cross_file(self, pkgconfig_env):
         """Test that macros defined in source files affect header magic flags"""
         source_file = "macro_deps/main.cpp"
         
@@ -169,7 +169,7 @@ class TestMagicFlagsModule(tb.BaseCompileToolsTestCase):
         # Should only contain feature X dependencies, not feature Y
         assert sz.Str("PKG-CONFIG") in result_direct
         assert "zlib" in [str(x) for x in result_direct[sz.Str("PKG-CONFIG")]]
-        assert "libcrypt" not in [str(x) for x in result_direct.get(sz.Str("PKG-CONFIG"), [])]
+        assert "nested" not in [str(x) for x in result_direct.get(sz.Str("PKG-CONFIG"), [])]
         
         assert sz.Str("SOURCE") in result_direct
         feature_x_source = self._get_sample_path("macro_deps/feature_x_impl.cpp")
@@ -256,7 +256,7 @@ class TestMagicFlagsModule(tb.BaseCompileToolsTestCase):
                 "All versions should have common MYAPP flags"
 
     @uth.requires_functional_compiler
-    def test_magic_processing_order_bug(self):
+    def test_magic_processing_order_bug(self, pkgconfig_env):
         """Test that DirectMagicFlags and CppMagicFlags produce identical results - should expose the processing order bug"""
         
         source_file = "magic_processing_order/complex_test.cpp"
@@ -282,7 +282,7 @@ class TestMagicFlagsModule(tb.BaseCompileToolsTestCase):
             f"This indicates a magic processing order bug in DirectMagicFlags!"
 
     @uth.requires_functional_compiler
-    def test_conditional_magic_comments_with_complex_headers(self):
+    def test_conditional_magic_comments_with_complex_headers(self, pkgconfig_env):
         """Test conditional magic comments work correctly with header dependencies"""
         
         source_file = "magic_processing_order/complex_test.cpp"
@@ -681,3 +681,49 @@ class TestMagicFlagsModule(tb.BaseCompileToolsTestCase):
         # Verify results are identical
         assert sz.Str('-ltest') in result2.get(sz.Str("LDFLAGS"), [])
 
+    def test_header_guard_bug_transitive_magic_flags(self):
+        """Test for include guard detection with non-standard guard patterns.
+
+        This test verifies the fix for a bug where include guards were not detected
+        when other directives appeared between #ifndef and #define. The sample uses
+        header_a.hpp with a non-standard pattern:
+            #ifndef HEADER_A_HPP_GUARD
+            #define SOME_OTHER_MACRO 1  // Breaks simple sequential detection
+            #define HEADER_A_HPP_GUARD
+
+        File structure:
+            main.cpp -> header_a.hpp (non-standard guard) -> header_b.hpp (has magic flags)
+
+        The bug: directives were processed by TYPE (all #ifndef, then all #define, etc.)
+        rather than by LINE NUMBER, causing guard detection to fail. This resulted in:
+        - Guard macro incorrectly included in defines list
+        - Transitive dependencies possibly missing due to stale guard macros in cache
+
+        Fixed in file_analyzer.py by:
+        - Sorting directives by line number before guard detection (line 597-603)
+        - Robust lookahead pattern (up to 5 directives) instead of strict next-directive check
+
+        This test now passes and validates magic flags are correctly discovered from
+        transitive headers even with non-standard guard patterns.
+        """
+
+        source_file = "header_guard_bug/main.cpp"
+
+        # Parse with DirectMagicFlags
+        result = self._parse_with_magic("direct", source_file)
+
+        # Verify magic flags from transitive header (header_b.hpp) are discovered
+        assert sz.Str("PKG-CONFIG") in result, \
+            "PKG-CONFIG not found - transitive header magic flags not discovered"
+
+        pkg_config_values = [str(x) for x in result.get(sz.Str("PKG-CONFIG"), [])]
+        assert "zlib" in pkg_config_values, \
+            f"Expected zlib in PKG-CONFIG from header_b.hpp, got: {pkg_config_values}"
+
+        assert sz.Str("LDFLAGS") in result, \
+            "LDFLAGS not found - transitive header magic flags not discovered"
+
+        ldflags_values = [str(x) for x in result.get(sz.Str("LDFLAGS"), [])]
+        assert "-lm" in ldflags_values, \
+            f"Expected -lm in LDFLAGS from header_b.hpp, got: {ldflags_values}"
+