From c15c5cf3ee2157c5ae55a01ad4be147a780fe0e7 Mon Sep 17 00:00:00 2001 From: Jakob Lykke Andersen Date: Mon, 28 Jun 2021 17:09:50 +0200 Subject: [PATCH 1/2] C++, update env version due to recent changes --- sphinx/domains/cpp.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sphinx/domains/cpp.py b/sphinx/domains/cpp.py index c94f1d06da0..a3e0ae35c7f 100644 --- a/sphinx/domains/cpp.py +++ b/sphinx/domains/cpp.py @@ -7895,7 +7895,7 @@ def initStuff(app): return { 'version': 'builtin', - 'env_version': 3, + 'env_version': 4, 'parallel_read_safe': True, 'parallel_write_safe': True, } From 358efdd8f3bed92cac0177fb8f527a43e2e93fe1 Mon Sep 17 00:00:00 2001 From: Jakob Lykke Andersen Date: Mon, 28 Jun 2021 19:30:59 +0200 Subject: [PATCH 2/2] C++, fix name mangling of literals with digit seps --- sphinx/domains/cpp.py | 2 +- tests/test_domain_cpp.py | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/sphinx/domains/cpp.py b/sphinx/domains/cpp.py index a3e0ae35c7f..09f938401c7 100644 --- a/sphinx/domains/cpp.py +++ b/sphinx/domains/cpp.py @@ -869,7 +869,7 @@ def _stringify(self, transform: StringifyTransform) -> str: def get_id(self, version: int) -> str: # TODO: floats should be mangled by writing the hex of the binary representation - return "L%sE" % self.data + return "L%sE" % self.data.replace("'", "") def describe_signature(self, signode: TextElement, mode: str, env: "BuildEnvironment", symbol: "Symbol") -> None: diff --git a/tests/test_domain_cpp.py b/tests/test_domain_cpp.py index 1ad216e5ade..e02cd8c1c59 100644 --- a/tests/test_domain_cpp.py +++ b/tests/test_domain_cpp.py @@ -182,9 +182,9 @@ class Config: for u in unsignedSuffix: for l in longSuffix: expr = i + u + l - exprCheck(expr, 'L' + expr + 'E') + exprCheck(expr, 'L' + expr.replace("'", "") + 'E') expr = i + l + u - exprCheck(expr, 'L' + expr + 'E') + exprCheck(expr, 'L' + expr.replace("'", "") + 'E') decimalFloats = ['5e42', '5e+42', '5e-42', '5.', '5.e42', '5.e+42', '5.e-42', '.5', '.5e42', '.5e+42', '.5e-42', @@ -200,10 +200,10 @@ class Config: for suffix in ['', 'f', 'F', 'l', 'L']: for e in decimalFloats: expr = e + suffix - exprCheck(expr, 'L' + expr + 'E') + exprCheck(expr, 'L' + expr.replace("'", "") + 'E') for e in hexFloats: expr = "0x" + e + suffix - exprCheck(expr, 'L' + expr + 'E') + exprCheck(expr, 'L' + expr.replace("'", "") + 'E') exprCheck('"abc\\"cba"', 'LA8_KcE') # string exprCheck('this', 'fpT') # character literals @@ -216,13 +216,13 @@ class Config: exprCheck("{}'{}'".format(p, c), t + val) # user-defined literals for i in ints: - exprCheck(i + '_udl', 'clL_Zli4_udlEL' + i + 'EE') - exprCheck(i + 'uludl', 'clL_Zli5uludlEL' + i + 'EE') + exprCheck(i + '_udl', 'clL_Zli4_udlEL' + i.replace("'", "") + 'EE') + exprCheck(i + 'uludl', 'clL_Zli5uludlEL' + i.replace("'", "") + 'EE') for f in decimalFloats: - exprCheck(f + '_udl', 'clL_Zli4_udlEL' + f + 'EE') - exprCheck(f + 'fudl', 'clL_Zli4fudlEL' + f + 'EE') + exprCheck(f + '_udl', 'clL_Zli4_udlEL' + f.replace("'", "") + 'EE') + exprCheck(f + 'fudl', 'clL_Zli4fudlEL' + f.replace("'", "") + 'EE') for f in hexFloats: - exprCheck('0x' + f + '_udl', 'clL_Zli4_udlEL0x' + f + 'EE') + exprCheck('0x' + f + '_udl', 'clL_Zli4_udlEL0x' + f.replace("'", "") + 'EE') for p, t in charPrefixAndIds: for c, val in chars: exprCheck("{}'{}'_udl".format(p, c), 'clL_Zli4_udlE' + t + val + 'E')