Skip to content

Commit a6c90d0

Browse files
committed
Fix a bug that failed to find namespaces with tildes.
1 parent 8b17dbf commit a6c90d0

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

.github/workflows/cpp-packaging.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -617,6 +617,7 @@ jobs:
617617
shell: bash
618618
run: |
619619
set -x
620+
set +e
620621
if [[ "${{ matrix.sdk_platform }}" == "darwin" ]]; then
621622
nm=bin/llvm-nm
622623
else

scripts/merge_libraries.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -416,7 +416,7 @@ def get_top_level_namespaces(demangled_symbols):
416416
# It will specifically not match second-level or deeper namespaces:
417417
# matched_namespace::unmatched_namespace::Class::Method()
418418
regex_top_level_namespaces = re.compile(
419-
r"(?<![a-zA-Z0-9_])(?<!::)([a-zA-Z_][a-zA-Z0-9_]*)::(?=[a-zA-Z_])")
419+
r"(?<![a-zA-Z0-9_])(?<!::)([a-zA-Z_~][a-zA-Z0-9_]*)::(?=[a-zA-Z_])")
420420
found_namespaces = set()
421421
for cppsymbol in demangled_symbols:
422422
m = regex_top_level_namespaces.findall(cppsymbol)

0 commit comments

Comments
 (0)