diff options
| author | Jakob Lykke Andersen <jakobandersen@users.noreply.github.com> | 2020-06-02 19:50:49 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-02 19:50:49 +0300 |
| commit | 590408e77cd510b725730373ce0ca605e3dd3d31 (patch) | |
| tree | a98f235688ac8d802e09405c11c54c2c5ed9eb97 /sphinx | |
| parent | b3211318bdd501c4de938cafce8a1a00bba0c050 (diff) | |
| parent | e37d08072978f9cd0172e8e621d1fad3d20b5b1d (diff) | |
Merge pull request #7769 from jakobandersen/c_cpp_display_string_ops
C and C++, don't crash during stringification
Diffstat (limited to 'sphinx')
| -rw-r--r-- | sphinx/domains/c.py | 4 | ||||
| -rw-r--r-- | sphinx/domains/cpp.py | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/sphinx/domains/c.py b/sphinx/domains/c.py index 164a87254..36a8f1f65 100644 --- a/sphinx/domains/c.py +++ b/sphinx/domains/c.py @@ -432,9 +432,9 @@ class ASTUnaryOpExpr(ASTExpression): def _stringify(self, transform: StringifyTransform) -> str: if self.op[0] in 'cn': - return transform(self.op) + " " + transform(self.expr) + return self.op + " " + transform(self.expr) else: - return transform(self.op) + transform(self.expr) + return self.op + transform(self.expr) def describe_signature(self, signode: TextElement, mode: str, env: "BuildEnvironment", symbol: "Symbol") -> None: diff --git a/sphinx/domains/cpp.py b/sphinx/domains/cpp.py index b801f4030..dca69bace 100644 --- a/sphinx/domains/cpp.py +++ b/sphinx/domains/cpp.py @@ -951,12 +951,12 @@ class ASTFoldExpr(ASTExpression): if self.leftExpr: res.append(transform(self.leftExpr)) res.append(' ') - res.append(transform(self.op)) + res.append(self.op) res.append(' ') res.append('...') if self.rightExpr: res.append(' ') - res.append(transform(self.op)) + res.append(self.op) res.append(' ') res.append(transform(self.rightExpr)) res.append(')') @@ -1223,9 +1223,9 @@ class ASTUnaryOpExpr(ASTExpression): def _stringify(self, transform: StringifyTransform) -> str: if self.op[0] in 'cn': - return transform(self.op) + " " + transform(self.expr) + return self.op + " " + transform(self.expr) else: - return transform(self.op) + transform(self.expr) + return self.op + transform(self.expr) def get_id(self, version: int) -> str: return _id_operator_unary_v2[self.op] + self.expr.get_id(version) |