fix: more code formatting

common-workflow-language · Dec 18, 2024 · 859fe2e · 859fe2e
1 parent 342058a
commit 859fe2e
Show file tree

Hide file tree

Showing 6 changed files with 48 additions and 26 deletions.
diff --git a/schema_salad/cpp_codegen.py b/schema_salad/cpp_codegen.py
@@ -149,7 +149,8 @@ def writeDefinition(
             target.write(f"{fullInd}{ind}{virtual}~{self.classname}(){override} = default;\n")
 
         target.write(
-            f"{fullInd}{ind}{virtual}auto toYaml([[maybe_unused]] {common_namespace}::store_config const& config) const -> YAML::Node{override};\n"
+            f"{fullInd}{ind}{virtual}auto toYaml([[maybe_unused]] "
+            f"{common_namespace}::store_config const& config) const -> YAML::Node{override};\n"
         )
         target.write(f"{fullInd}{ind}{virtual}void fromYaml(YAML::Node const& n){override};\n")
         target.write(f"{fullInd}}};\n")
@@ -169,7 +170,8 @@ def writeImplDefinition(
 
         # Write toYaml function
         target.write(
-            f"{fullInd}inline auto {self.namespace}::{self.classname}::toYaml([[maybe_unused]] ::{common_namespace}::store_config const& config) const -> YAML::Node {{\n"
+            f"{fullInd}inline auto {self.namespace}::{self.classname}::toYaml([[maybe_unused]] "
+            f"::{common_namespace}::store_config const& config) const -> YAML::Node {{\n"
             f"{fullInd}{ind}using ::{common_namespace}::toYaml;\n"
             f"{fullInd}{ind}auto n = YAML::Node{{}};\n"
             f"{fullInd}{ind}if (config.generateTags) {{\n"
@@ -187,7 +189,8 @@ def writeImplDefinition(
             if field.typeDSL:
                 target.write(f"{fullInd}{ind}{ind} member = simplifyType(member, config);\n")
             target.write(
-                f"{fullInd}{ind}{ind} member = convertListToMap(member, {q(field.mapSubject)}, {q(field.mapPredicate)}, config);\n"
+                f"{fullInd}{ind}{ind} member = convertListToMap(member, "
+                f"{q(field.mapSubject)}, {q(field.mapPredicate)}, config);\n"
             )
             target.write(f"{fullInd}{ind}{ind}addYamlField(n, {q(field.name)}, member);\n")
             target.write(f"{fullInd}{ind}}}\n")
@@ -211,7 +214,8 @@ def writeImplDefinition(
 
             target.write(
                 f"{fullInd}{ind}{{\n"
-                f"{fullInd}{ind}{ind}auto nodeAsList = convertMapToList(n[{q(field.name)}], {q(field.mapSubject)}, {q(field.mapPredicate)});\n"
+                f"{fullInd}{ind}{ind}auto nodeAsList = convertMapToList("
+                f"n[{q(field.name)}], {q(field.mapSubject)}, {q(field.mapPredicate)});\n"
                 f"{fullInd}{ind}{ind}auto expandedNode = {expandType}(nodeAsList);\n"
                 f"{fullInd}{ind}{ind}fromYaml(expandedNode, *{fieldname});\n"
                 f"{fullInd}{ind}}}\n"
@@ -233,13 +237,14 @@ def writeImplDefinition(
             for field in self.fields:
                 fieldname = safename(field.name)
                 target.write(
-                    f"        if constexpr (::{common_namespace}::IsConstant<decltype(res.{fieldname})::value_t>::value) try {{\n"
+                    f"        if constexpr (::{common_namespace}::IsConstant<"
+                    f"decltype(res.{fieldname})::value_t>::value) try {{\n"
                     f"            fromYaml(n[{q(field.name)}], *res.{fieldname});\n"
-                    f"            fromYaml(n, res);\n"
-                    f"            return res;\n"
+                    "            fromYaml(n, res);\n"
+                    "            return res;\n"
                     f"        }} catch(...) {{}}\n\n"
                 )
-            target.write(f"        return std::nullopt;\n" f"    }}\n" f"}};\n")
+            target.write("        return std::nullopt;\n    }\n};\n")
 
 
 class FieldDefinition:
@@ -300,7 +305,8 @@ def writeDefinition(self, target: IO[str], ind: str, common_namespace: str) -> N
         target.write(f"struct {self.classname} {{\n")
         target.write(f"{ind}heap_object<std::map<std::string, {valueType}>> value;\n")
         target.write(
-            f"{ind}auto toYaml([[maybe_unused]] ::{common_namespace}::store_config const& config) const -> YAML::Node;\n"
+            f"{ind}auto toYaml([[maybe_unused]] "
+            f"::{common_namespace}::store_config const& config) const -> YAML::Node;\n"
         )
         target.write(f"{ind}void fromYaml(YAML::Node const& n);\n")
         target.write("};\n")
@@ -313,7 +319,8 @@ def writeImplDefinition(
         # Write toYaml function
         functionname = f"{self.namespace}::{self.classname}::toYaml"
         target.write(
-            f"{fullInd}inline auto {functionname}([[maybe_unused]] ::{common_namespace}::store_config const& config) const -> YAML::Node {{\n"
+            f"{fullInd}inline auto {functionname}([[maybe_unused]] "
+            f"::{common_namespace}::store_config const& config) const -> YAML::Node {{\n"
             f"{fullInd}{ind}using ::{common_namespace}::toYaml;\n"
             f"{fullInd}{ind}return toYaml(*value, config);\n"
             f"{fullInd}}}\n"
@@ -358,7 +365,8 @@ def writeDefinition(self, target: IO[str], ind: str, common_namespace: str) -> N
         target.write(f"{ind}{self.classname}();\n")
         target.write(f"{ind}~{self.classname}();\n")
         target.write(
-            f"{ind}auto toYaml([[maybe_unused]] ::{common_namespace}::store_config const& config) const -> YAML::Node;\n"
+            f"{ind}auto toYaml([[maybe_unused]] "
+            f"::{common_namespace}::store_config const& config) const -> YAML::Node;\n"
         )
         target.write(f"{ind}void fromYaml(YAML::Node const& n);\n")
         target.write("};\n")
@@ -390,7 +398,8 @@ def writeImplDefinition(
         # Write toYaml function
         functionname = f"{self.namespace}::{self.classname}::toYaml"
         target.write(
-            f"{fullInd}inline auto {functionname}([[maybe_unused]] ::{common_namespace}::store_config const& config) const -> YAML::Node {{\n"
+            f"{fullInd}inline auto {functionname}([[maybe_unused]] "
+            f"::{common_namespace}::store_config const& config) const -> YAML::Node {{\n"
             f"{fullInd}{ind}using ::{common_namespace}::toYaml;\n"
             f"{fullInd}{ind}return toYaml(*value, config);\n"
             f"{fullInd}}}\n"
@@ -458,7 +467,8 @@ def writeDefinition(self, target: IO[str], ind: str, common_namespace: str) -> N
         # Write toYaml function
         target.write(f"namespace {common_namespace} {{\n")
         target.write(
-            f"inline auto toYaml({name} v, [[maybe_unused]] ::{common_namespace}::store_config const& config) {{\n"
+            f"inline auto toYaml({name} v, [[maybe_unused]] "
+            f"::{common_namespace}::store_config const& config) {{\n"
         )
         target.write(f"{ind}auto n = YAML::Node{{std::string{{to_string(v)}}}};\n")
         target.write(f'{ind}if (config.generateTags) n.SetTag("{name}");\n')
@@ -917,7 +927,8 @@ def epilogue(self, root_loader: Optional[TypeDef]) -> None:
     }
 }
 
-inline auto convertListToMap(YAML::Node list, std::string const& mapSubject, std::string const& mapPredicate, store_config const& config) {
+inline auto convertListToMap(YAML::Node list, std::string const& mapSubject,
+                             std::string const& mapPredicate, store_config const& config) {
     if (!config.transformListsToMaps) return list;
     if (mapSubject.empty()) return list;
     if (list.size() == 0) return list;
@@ -933,7 +944,8 @@ def epilogue(self, root_loader: Optional[TypeDef]) -> None:
     }
     return map;
 }
-inline auto convertMapToList(YAML::Node map, std::string const& mapSubject, std::string const& mapPredicate) {
+inline auto convertMapToList(YAML::Node map, std::string const& mapSubject,
+                             std::string const& mapPredicate) {
     if (mapSubject.empty()) return map;
     if (!map.IsDefined()) return map;
     if (!map.IsMap()) return map;
@@ -1273,7 +1285,7 @@ class heap_object {
         rootTypes = []
         for cd in self.documentRootTypes:
             rootTypes.append(f"{cd.namespace}::{cd.classname}")
-        documentRootType = f", ".join(rootTypes)
+        documentRootType = ", ".join(rootTypes)
 
         self.target.write(f"using DocumentRootType = std::variant<{documentRootType}>;")
         self.target.write(

diff --git a/schema_salad/tests/cpp_tests/01_single_record.h b/schema_salad/tests/cpp_tests/01_single_record.h
@@ -181,7 +181,8 @@ inline void addYamlField(YAML::Node& node, std::string const& key, YAML::Node va
     }
 }
 
-inline auto convertListToMap(YAML::Node list, std::string const& mapSubject, std::string const& mapPredicate, store_config const& config) {
+inline auto convertListToMap(YAML::Node list, std::string const& mapSubject,
+                             std::string const& mapPredicate, store_config const& config) {
     if (!config.transformListsToMaps) return list;
     if (mapSubject.empty()) return list;
     if (list.size() == 0) return list;
@@ -197,7 +198,8 @@ inline auto convertListToMap(YAML::Node list, std::string const& mapSubject, std
     }
     return map;
 }
-inline auto convertMapToList(YAML::Node map, std::string const& mapSubject, std::string const& mapPredicate) {
+inline auto convertMapToList(YAML::Node map, std::string const& mapSubject,
+                             std::string const& mapPredicate) {
     if (mapSubject.empty()) return map;
     if (!map.IsDefined()) return map;
     if (!map.IsMap()) return map;

diff --git a/schema_salad/tests/cpp_tests/02_two_records.h b/schema_salad/tests/cpp_tests/02_two_records.h
@@ -181,7 +181,8 @@ inline void addYamlField(YAML::Node& node, std::string const& key, YAML::Node va
     }
 }
 
-inline auto convertListToMap(YAML::Node list, std::string const& mapSubject, std::string const& mapPredicate, store_config const& config) {
+inline auto convertListToMap(YAML::Node list, std::string const& mapSubject,
+                             std::string const& mapPredicate, store_config const& config) {
     if (!config.transformListsToMaps) return list;
     if (mapSubject.empty()) return list;
     if (list.size() == 0) return list;
@@ -197,7 +198,8 @@ inline auto convertListToMap(YAML::Node list, std::string const& mapSubject, std
     }
     return map;
 }
-inline auto convertMapToList(YAML::Node map, std::string const& mapSubject, std::string const& mapPredicate) {
+inline auto convertMapToList(YAML::Node map, std::string const& mapSubject,
+                             std::string const& mapPredicate) {
     if (mapSubject.empty()) return map;
     if (!map.IsDefined()) return map;
     if (!map.IsMap()) return map;

diff --git a/schema_salad/tests/cpp_tests/03_simple_inheritance.h b/schema_salad/tests/cpp_tests/03_simple_inheritance.h
@@ -181,7 +181,8 @@ inline void addYamlField(YAML::Node& node, std::string const& key, YAML::Node va
     }
 }
 
-inline auto convertListToMap(YAML::Node list, std::string const& mapSubject, std::string const& mapPredicate, store_config const& config) {
+inline auto convertListToMap(YAML::Node list, std::string const& mapSubject,
+                             std::string const& mapPredicate, store_config const& config) {
     if (!config.transformListsToMaps) return list;
     if (mapSubject.empty()) return list;
     if (list.size() == 0) return list;
@@ -197,7 +198,8 @@ inline auto convertListToMap(YAML::Node list, std::string const& mapSubject, std
     }
     return map;
 }
-inline auto convertMapToList(YAML::Node map, std::string const& mapSubject, std::string const& mapPredicate) {
+inline auto convertMapToList(YAML::Node map, std::string const& mapSubject,
+                             std::string const& mapPredicate) {
     if (mapSubject.empty()) return map;
     if (!map.IsDefined()) return map;
     if (!map.IsMap()) return map;

diff --git a/schema_salad/tests/cpp_tests/04_abstract_inheritance.h b/schema_salad/tests/cpp_tests/04_abstract_inheritance.h
@@ -181,7 +181,8 @@ inline void addYamlField(YAML::Node& node, std::string const& key, YAML::Node va
     }
 }
 
-inline auto convertListToMap(YAML::Node list, std::string const& mapSubject, std::string const& mapPredicate, store_config const& config) {
+inline auto convertListToMap(YAML::Node list, std::string const& mapSubject,
+                             std::string const& mapPredicate, store_config const& config) {
     if (!config.transformListsToMaps) return list;
     if (mapSubject.empty()) return list;
     if (list.size() == 0) return list;
@@ -197,7 +198,8 @@ inline auto convertListToMap(YAML::Node list, std::string const& mapSubject, std
     }
     return map;
 }
-inline auto convertMapToList(YAML::Node map, std::string const& mapSubject, std::string const& mapPredicate) {
+inline auto convertMapToList(YAML::Node map, std::string const& mapSubject,
+                             std::string const& mapPredicate) {
     if (mapSubject.empty()) return map;
     if (!map.IsDefined()) return map;
     if (!map.IsMap()) return map;

diff --git a/schema_salad/tests/cpp_tests/05_specialization.h b/schema_salad/tests/cpp_tests/05_specialization.h
@@ -181,7 +181,8 @@ inline void addYamlField(YAML::Node& node, std::string const& key, YAML::Node va
     }
 }
 
-inline auto convertListToMap(YAML::Node list, std::string const& mapSubject, std::string const& mapPredicate, store_config const& config) {
+inline auto convertListToMap(YAML::Node list, std::string const& mapSubject,
+                             std::string const& mapPredicate, store_config const& config) {
     if (!config.transformListsToMaps) return list;
     if (mapSubject.empty()) return list;
     if (list.size() == 0) return list;
@@ -197,7 +198,8 @@ inline auto convertListToMap(YAML::Node list, std::string const& mapSubject, std
     }
     return map;
 }
-inline auto convertMapToList(YAML::Node map, std::string const& mapSubject, std::string const& mapPredicate) {
+inline auto convertMapToList(YAML::Node map, std::string const& mapSubject,
+                             std::string const& mapPredicate) {
     if (mapSubject.empty()) return map;
     if (!map.IsDefined()) return map;
     if (!map.IsMap()) return map;