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.

Sign up for GitHub

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

Add option to amalgamate to use std::expected polyfill #75

Closed
wants to merge 2 commits into from
Closed

Add option to amalgamate to use std::expected polyfill #75

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a11e163
Add --polyfill option to amalgamate to modify source to use std::expe…
bottiger1 May 13, 2024
17be414
allow for tl/expected.hpp
bottiger1 May 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 23 additions & 4 deletions amalgamate.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@

import os
import re
import sys
import argparse

SAFETYHOOK_ROOT = Path(__file__).resolve().parent
PUBLIC_INCLUDE_PATHS = [
Expand All @@ -18,6 +20,10 @@
OUTPUT_DIR = SAFETYHOOK_ROOT / 'amalgamated-dist'
FILE_HEADER = ['// DO NOT EDIT. This file is auto-generated by `amalgamate.py`.', '']

parser = argparse.ArgumentParser(description='bundles cpp and hpp files together')
parser.add_argument('--polyfill', action='store_true',
help='replace std::except with a polyfill so it can be compiled on C++20 or older. https://raw.githubusercontent.com/TartanLlama/expected/master/include/tl/expected.hpp')


# Python versions before 3.10 don't have the root_dir argument for glob, so we
# crudely emulate it here.
Expand Down Expand Up @@ -154,8 +160,15 @@ def merge_sources(*, source_dir: Path, covered_headers: Set[Path]):

return output

def do_polyfill(content):
return content.replace('#include <expected>', '#if __has_include("expected.hpp")\n#include <expected.hpp>\n#else\n#include <tl/expected.hpp>\n#endif\n') \
.replace('std::expected', 'tl::expected') \
.replace('std::unexpected', 'tl::unexpected')

def main():
args = parser.parse_args()
polyfill = args.polyfill is True

if OUTPUT_DIR.exists():
print('Output directory exists. Deleting.')
rmtree(OUTPUT_DIR)
Expand All @@ -164,20 +177,26 @@ def main():

covered_headers = set()
with open(OUTPUT_DIR / 'safetyhook.hpp', 'w') as f:
f.write('\n'.join(FILE_HEADER + merge_headers(
content = '\n'.join(FILE_HEADER + merge_headers(
header='safetyhook.hpp',
search_paths=PUBLIC_INCLUDE_PATHS,
covered_headers=covered_headers,
stack=[],
)))
))
if polyfill:
content = do_polyfill(content)
f.write(content)

print(covered_headers)

with open(OUTPUT_DIR / 'safetyhook.cpp', 'w') as f:
f.write('\n'.join(FILE_HEADER + merge_sources(
content = '\n'.join(FILE_HEADER + merge_sources(
source_dir=SAFETYHOOK_ROOT / 'src',
covered_headers=covered_headers,
)))
))
if polyfill:
content = do_polyfill(content)
f.write(content)


if __name__ == '__main__':
Expand Down
Loading