From 5b1588dffc68d948a529d78d89da0d6946b678e3 Mon Sep 17 00:00:00 2001
From: zy69guqi <richard.angersbach@fau.de>
Date: Mon, 5 May 2025 16:00:07 +0200
Subject: [PATCH] Fix formatting in __cplusplus guards
---
src/pystencilssfg/emission/file_printer.py | 25 +++++++++++-----------
src/pystencilssfg/generator.py | 11 +++++-----
2 files changed, 17 insertions(+), 19 deletions(-)
diff --git a/src/pystencilssfg/emission/file_printer.py b/src/pystencilssfg/emission/file_printer.py
index ebd89cc..68ac4af 100644
--- a/src/pystencilssfg/emission/file_printer.py
+++ b/src/pystencilssfg/emission/file_printer.py
@@ -54,12 +54,11 @@ class SfgFilePrinter:
hybrid_includes += f"#include {incl}\n"
# include different headers and wrap around guard distinguishing C++/C compilations
- code += f"""
- #ifdef __cplusplus\n
- {includes}
- #else\n
- {hybrid_includes}
- #endif\n"""
+ code += "#ifdef __cplusplus\n" \
+ f"{includes}" \
+ "#else\n" \
+ f"{hybrid_includes}" \
+ "#endif\n"
else:
code += includes
@@ -73,7 +72,7 @@ class SfgFilePrinter:
return code
def visit(
- self, elem: SfgNamespaceElement | SfgClassBodyElement, inclass: bool = False
+ self, elem: SfgNamespaceElement | SfgClassBodyElement, inclass: bool = False
) -> str:
match elem:
case str():
@@ -95,9 +94,9 @@ class SfgFilePrinter:
assert False, "illegal code element"
def visit_decl(
- self,
- declared_entity: SfgKernelHandle | SfgFunction | SfgClassMember | SfgClass,
- inclass: bool = False,
+ self,
+ declared_entity: SfgKernelHandle | SfgFunction | SfgClassMember | SfgClass,
+ inclass: bool = False,
) -> str:
match declared_entity:
case SfgKernelHandle(kernel):
@@ -126,9 +125,9 @@ class SfgFilePrinter:
assert False, f"unsupported declared entity: {declared_entity}"
def visit_defin(
- self,
- defined_entity: SfgKernelHandle | SfgFunction | SfgClassMember | SfgClassBody,
- inclass: bool = False,
+ self,
+ defined_entity: SfgKernelHandle | SfgFunction | SfgClassMember | SfgClassBody,
+ inclass: bool = False,
) -> str:
match defined_entity:
case SfgKernelHandle(kernel):
diff --git a/src/pystencilssfg/generator.py b/src/pystencilssfg/generator.py
index 1840c82..0246426 100644
--- a/src/pystencilssfg/generator.py
+++ b/src/pystencilssfg/generator.py
@@ -103,12 +103,11 @@ class SourceFileGenerator:
# TODO: Find a way to not hard-code the 'extern" C"' qualifier in pystencils
self._header_file.elements.append(
- """#ifdef __cplusplus\n
- #define EXTERNC extern \"C\"\n
- #else\n
- #define EXTERNC \n
- #endif\n
- """
+ "#ifdef __cplusplus\n"
+ "#define EXTERNC extern \"C\"\n"
+ "#else\n"
+ "#define EXTERNC \n"
+ "#endif\n"
)
outer_namespace: str | _GlobalNamespace = config.get_option("outer_namespace")
--
GitLab