feat: omit system includes from expanded headers by default

Author: KKT89

AGENTS.md

@@ -5,6 +5,7 @@
 - 回答・説明は日本語で簡潔かつ丁寧に行う。
 - このディレクトリは競技プログラミング用 C++ ライブラリ `cpp-lib` である。
 - 既存の構成・文体・整形を優先し、勝手に別方式へ変更しない。
+- 単純な仕様に、既存の例外を救済する自動判定やフォールバックを勝手に追加しない。例外は報告に留める。
 - 次は生成物なので手で編集しない（正典は `.gitignore`）。`bundled/`、`site/`、`docsrc/verify/`（配下すべて）、`docsrc/library/index.md`、`docsrc/note/index.md`。
 - 説明文では受動態を避ける。ライブラリは機能を提供する側なので、「〜される」より「〜する」「〜を返す」「〜を管理する」のように書く。
 

scripts/README.md

@@ -7,7 +7,7 @@
 - `verify.py`
   Verify コードの登録・検証状況の最新化を行う CLI です。Verify 運用を回すときに使用します。
 - `combine.py`
-  提出用の `submit.cpp` を生成し、必要ならクリップボードへコピーします。ライブラリ管理や docs 生成には不要です。
+  提出用の `submit.cpp` を生成し、必要ならクリップボードへコピーします。展開したライブラリ内の標準 `#include` はデフォルトで省略し、`--keep-system-includes` を指定すると残します。
 
 ## `verify.py`
 
@@ -29,15 +29,15 @@ uv run scripts/verify.py mark --all
 ## 内部処理
 
 - `mkdocs_hooks.py`
-  MkDocs のフック本体です。nav 差し替え、`bundled/` 生成、`docsrc/library/` / `docsrc/verify/` の自動生成を行います。
+  MkDocs のフック本体です。nav 差し替え、`bundled/` 生成、`docsrc/library/` / `docsrc/verify/` の自動生成を行います。ライブラリ単体の bundle では標準 `#include` を残し、コピペだけで利用できる形にします。
 - `_internal/docs_catalog.py`
   Library / Note のスキャン、nav / index 生成、ライブラリページ末尾の管理セクション生成を担当します。
 - `_internal/verify_docs.py`
   Verify ページ、Verify index、Verify nav の生成を担当します。
 - `_internal/verify_data.py`
   `verify/status.json` の読み書き、ハッシュ計算、judge URL 解決など Verify 系の共通処理です。
 - `bundle_header.py`
-  `#include` を展開して `bundled/` の単一ファイルを生成します。
+  `#include` を展開して `bundled/` の単一ファイルを生成します。展開したローカルヘッダ内の標準 `#include` はデフォルトで省略し、`--keep-system-includes` を指定すると残します。
 - `_internal/docs_common.py`
   タイトル読取や `write_if_changed` など、docs 系の小さい共通処理です。
 - `_internal/project_paths.py`

scripts/bundle_header.py

@@ -8,6 +8,7 @@
 
 
 INCLUDE_RE = re.compile(r'^\s*#\s*include\s*"([^"]+)"\s*$')
+SYSTEM_INCLUDE_RE = re.compile(r"^\s*#\s*include\s*<[^>]+>\s*$")
 
 
 def resolve_include(
@@ -28,6 +29,8 @@ def bundle_file(
     include_dirs: list[Path],
     visited: set[Path],
     out_lines: list[str],
+    keep_system_includes: bool = False,
+    is_entry: bool = False,
 ) -> None:
     path = path.resolve()
     if path in visited:
@@ -43,14 +46,25 @@ def bundle_file(
     for line in path.read_text(encoding="utf-8").splitlines():
         if line.strip() == "#pragma once":
             continue
+        # Keep includes written in the entry file (for example bits/stdc++.h),
+        # but omit redundant system includes from expanded local headers by default.
+        if SYSTEM_INCLUDE_RE.match(line) and not (is_entry or keep_system_includes):
+            continue
         m = INCLUDE_RE.match(line)
         if m:
             inc = m.group(1)
             inc_path = resolve_include(inc, path.parent, include_dirs)
             if inc_path is None:
                 out_lines.append(line)
             else:
-                bundle_file(inc_path, project_root, include_dirs, visited, out_lines)
+                bundle_file(
+                    inc_path,
+                    project_root,
+                    include_dirs,
+                    visited,
+                    out_lines,
+                    keep_system_includes,
+                )
             continue
         out_lines.append(line)
 
@@ -61,6 +75,7 @@ def _bundle_to_string(
     input_path: Path,
     include_dirs: list[Path] | None = None,
     project_root: Path | None = None,
+    keep_system_includes: bool = False,
 ) -> str:
     """Bundle input_path and return the result as a string."""
     script_dir = Path(__file__).resolve().parent
@@ -78,7 +93,15 @@ def _bundle_to_string(
     out_lines: list[str] = []
     out_lines.append("// bundled by scripts/bundle_header.py")
     out_lines.append("")
-    bundle_file(input_path, project_root, include_dirs, set(), out_lines)
+    bundle_file(
+        input_path,
+        project_root,
+        include_dirs,
+        set(),
+        out_lines,
+        keep_system_includes,
+        is_entry=True,
+    )
     return "\n".join(out_lines).rstrip() + "\n"
 
 
@@ -91,8 +114,14 @@ def bundle_header(
     output_path: Path,
     include_dirs: list[Path] | None = None,
     project_root: Path | None = None,
+    keep_system_includes: bool = False,
 ) -> None:
-    out_text = _bundle_to_string(input_path, include_dirs, project_root)
+    out_text = _bundle_to_string(
+        input_path,
+        include_dirs,
+        project_root,
+        keep_system_includes,
+    )
 
     output_path.parent.mkdir(parents=True, exist_ok=True)
     # Avoid touching timestamps when generated content is unchanged.
@@ -114,11 +143,21 @@ def main() -> int:
         default=[],
         help="additional include directories (repeatable)",
     )
+    parser.add_argument(
+        "--keep-system-includes",
+        action="store_true",
+        help="keep system includes from expanded local headers",
+    )
     args = parser.parse_args()
 
     include_dirs = [d.resolve() for d in args.include_dir]
     try:
-        bundle_header(args.input, args.output, include_dirs)
+        bundle_header(
+            args.input,
+            args.output,
+            include_dirs,
+            keep_system_includes=args.keep_system_includes,
+        )
     except FileNotFoundError:
         print(f"input not found: {args.input}", file=sys.stderr)
         return 1

scripts/combine.py

@@ -65,12 +65,22 @@ def main() -> int:
         default=[],
         help="additional include directories (repeatable)",
     )
+    parser.add_argument(
+        "--keep-system-includes",
+        action="store_true",
+        help="keep system includes from expanded library headers",
+    )
     args = parser.parse_args()
 
     include_dirs: list[Path] = [DEFAULT_INCLUDE_DIR, *args.include_dir]
 
     try:
-        bundle_header(args.input, args.output, include_dirs=include_dirs)
+        bundle_header(
+            args.input,
+            args.output,
+            include_dirs=include_dirs,
+            keep_system_includes=args.keep_system_includes,
+        )
     except FileNotFoundError as e:
         print(f"input not found: {e}", file=sys.stderr)
         return 1

scripts/mkdocs_hooks.py

@@ -70,7 +70,12 @@ def _refresh_nav(config, status: dict) -> None:
 
 def _bundle_generated_sources() -> None:
     for path in INCLUDE_ROOT.rglob("*.hpp"):
-        bundle_header(path, BUNDLE_ROOT / path.relative_to(INCLUDE_ROOT), include_dirs=[INCLUDE_ROOT])
+        bundle_header(
+            path,
+            BUNDLE_ROOT / path.relative_to(INCLUDE_ROOT),
+            include_dirs=[INCLUDE_ROOT],
+            keep_system_includes=True,
+        )
     for path in VERIFY_ROOT.rglob("*.cpp"):
         bundle_header(
             path,

verify/atcoder/abc453_g_copy_query.cpp

@@ -1,8 +1,9 @@
-#include "data_structure/persistent_segtree.hpp"
 #include <bits/stdc++.h>
 using namespace std;
 typedef long long ll;
 
+#include "data_structure/persistent_segtree.hpp"
+
 ll op(ll a, ll b) { return a + b; }
 ll e() { return 0; }
 

verify/library_checker/lowest_common_ancestor.cpp

@@ -1,26 +1,28 @@
-#include <iostream>
+#include <bits/stdc++.h>
+using namespace std;
+typedef long long ll;
 
 #include "tree/lowest_common_ancestor.hpp"
 
 int main() {
-    std::ios::sync_with_stdio(false);
-    std::cin.tie(nullptr);
+    ios::sync_with_stdio(false);
+    cin.tie(nullptr);
 
     int n, q;
-    std::cin >> n >> q;
+    cin >> n >> q;
 
     LowestCommonAncestor lca(n);
     for (int i = 1; i < n; ++i) {
         int p;
-        std::cin >> p;
+        cin >> p;
         lca.add_edge(i, p);
     }
     lca.build(0);
 
     while (q--) {
         int u, v;
-        std::cin >> u >> v;
-        std::cout << lca.lca(u, v) << '\n';
+        cin >> u >> v;
+        cout << lca.lca(u, v) << '\n';
     }
     return 0;
 }

verify/status.json

@@ -1,67 +1,67 @@
 {
   "verify/library_checker/lowest_common_ancestor.cpp": {
-    "bundled_hash": "sha256:31b110d1af977ec86883ef1a5b027a300eb177158bf0461fdda946425804ac90",
-    "verified_at": "2026-06-30T09:24:34+09:00",
+    "bundled_hash": "sha256:2caac6244953b2ec99079a6b9adae5fe580022ef1c52855cac95042f9b218363",
+    "verified_at": "2026-07-22T10:08:32+09:00",
     "judge_url": "https://judge.yosupo.jp/problem/lca",
     "title": "Lowest Common Ancestor"
   },
   "verify/aizu/aoj_3327_beam_beam_beam.cpp": {
-    "bundled_hash": "sha256:424fdd7da609915c3a8166e07560ff5577cd518c42d7bc4c7bae517e021f164c",
-    "verified_at": "2026-06-29T14:43:46+09:00",
+    "bundled_hash": "sha256:a0622055debfb49440a8fc5eb2bd61ceeca24f659cc717d92a17de63114412ed",
+    "verified_at": "2026-07-22T10:02:57+09:00",
     "judge_url": "https://onlinejudge.u-aizu.ac.jp/challenges/sources/VPC/HUPC/3327?year=2023",
     "title": "AOJ 3327 - Beam Beam Beam"
   },
   "verify/library_checker/binomial_coefficient_prime_mod.cpp": {
-    "bundled_hash": "sha256:cc1226803487d6398f2f5840d7f4057b2933db02286e5afe23ba075d8d826cc3",
-    "verified_at": "2026-06-29T14:43:46+09:00",
+    "bundled_hash": "sha256:285e7e4b236a7feea0500bbfcf6c3125ae3fb07ede063ae6804350f337a372b2",
+    "verified_at": "2026-07-22T10:02:57+09:00",
     "judge_url": "https://judge.yosupo.jp/problem/binomial_coefficient_prime_mod",
     "title": "Binomial Coefficient (Prime Mod)"
   },
   "verify/library_checker/z_algorithm.cpp": {
-    "bundled_hash": "sha256:aaebf3c90bad89ac77b9c50dce3c01a9b2ba4dc9fee3de85fae06ee3968a0ecf",
-    "verified_at": "2026-04-03T16:57:44+09:00",
+    "bundled_hash": "sha256:fc3edcef3c4798fb3bce9bdb09ecfbf122002ecd15967e5a58f3f7ab6543bb6c",
+    "verified_at": "2026-07-22T10:02:57+09:00",
     "judge_url": "https://judge.yosupo.jp/problem/zalgorithm",
     "title": "Z Algorithm"
   },
   "verify/atcoder/abc451_g_minimum_xor_walk.cpp": {
-    "bundled_hash": "sha256:e08a909c7ef0970814f07dacec87e4941d303961d25cf2927a26cca3ce149352",
-    "verified_at": "2026-07-06T11:32:44+09:00",
+    "bundled_hash": "sha256:b48d5a49509d6aa4a6ac61dad98a2cf5be4cacefba94701281965a173fed009a",
+    "verified_at": "2026-07-22T10:02:57+09:00",
     "judge_url": "https://atcoder.jp/contests/abc451/tasks/abc451_g",
     "title": "ABC451 G - Minimum XOR Walk"
   },
   "verify/atcoder/abc453_g_copy_query.cpp": {
-    "bundled_hash": "sha256:26d4aa988ac1d9f8d3a5fa7021f50eca0dd0d8b5e0d9ecf4d41b7966421adb48",
-    "verified_at": "2026-06-29T14:43:46+09:00",
+    "bundled_hash": "sha256:9e60728dc55e55ad305ef77c38fd356009cdbf00f90a483714c695a96e5dc36a",
+    "verified_at": "2026-07-22T10:02:57+09:00",
     "judge_url": "https://atcoder.jp/contests/abc453/tasks/abc453_g",
     "title": "ABC453 G - Copy Query"
   },
   "verify/atcoder/abc458_d_chalkboard_median.cpp": {
-    "bundled_hash": "sha256:d4e5b6ce9758d0d7635f9b8c2648e2c951a798017f6c5e402daae7b7cdb1fec8",
-    "verified_at": "2026-07-06T11:32:44+09:00",
+    "bundled_hash": "sha256:7bf5b5119178cff56b7c00be6c3f3d52f5b0915953124d6e6e528d7c7a9918dd",
+    "verified_at": "2026-07-22T10:02:57+09:00",
     "judge_url": "https://atcoder.jp/contests/abc458/tasks/abc458_d",
     "title": "ABC458 D - Chalkboard Median"
   },
   "verify/library_checker/primality_test.cpp": {
-    "bundled_hash": "sha256:183fcbdb3ffd04390c7035a4e5c8fd1d496f92f58238cd17e144b0c138246390",
-    "verified_at": "2026-06-29T14:43:46+09:00",
+    "bundled_hash": "sha256:5abc343080e6b2489927cf08f55e39941a23f2190bd33b722999519ab06e622d",
+    "verified_at": "2026-07-22T10:02:57+09:00",
     "judge_url": "https://judge.yosupo.jp/problem/primality_test",
     "title": "Primality Test"
   },
   "verify/library_checker/factorize.cpp": {
-    "bundled_hash": "sha256:760b9e0fd093a07214fe777313eadf3b2fcfba59d69c07f3391ba8418c4baf50",
-    "verified_at": "2026-06-29T14:43:46+09:00",
+    "bundled_hash": "sha256:518a7501b3505f278c9813c76b86154deb29b916efb9103f081b175265029d2e",
+    "verified_at": "2026-07-22T10:02:57+09:00",
     "judge_url": "https://judge.yosupo.jp/problem/factorize",
     "title": "Factorize"
   },
   "verify/qoj/petrozavodsk_camp_summer_2019_day2_b_bitwise_xor.cpp": {
-    "bundled_hash": "sha256:65a16b5e46419d16337a90ed90a11b46f9cd65a0520841d40b3d3d99a8c93e76",
-    "verified_at": "2026-07-06T11:27:04+09:00",
+    "bundled_hash": "sha256:fc11aeaf5371d942fa1c287d186bc71a506fc8b7f9c7c54b330d4ce8a7719028",
+    "verified_at": "2026-07-22T10:02:57+09:00",
     "judge_url": "https://qoj.ac/contest/1357/problem/7411",
     "title": "Petrozavodsk Camp Summer 2019 Day2 B - Bitwise Xor"
   },
   "verify/library_checker/range_affine_point_get.cpp": {
-    "bundled_hash": "sha256:d8a8d0c803c5be087c4cf08d9f067b08a5d9a51f2b24660dee7de569290d9455",
-    "verified_at": "2026-07-22T09:26:40+09:00",
+    "bundled_hash": "sha256:859dad4ecde63c4793aaa5e3f091f2e92beba46b6436d50484ca11fc6c58111d",
+    "verified_at": "2026-07-22T10:02:57+09:00",
     "judge_url": "https://judge.yosupo.jp/problem/range_affine_point_get",
     "title": "Range Affine Point Get"
   }