Uniform initialization & Sorbet header guard prefix

Author: KaanOzkan

rbs/prism/SignatureTranslatorPrism.cc

@@ -30,7 +30,7 @@ SignatureTranslatorPrism::translateAssertionType(absl::Span<pair<core::LocOffset
         return nullptr;
     }
 
-    auto typeToParserNodePrism = TypeToParserNodePrism(ctx, typeParams, move(rbsParser), *prismParser);
+    auto typeToParserNodePrism = TypeToParserNodePrism{ctx, typeParams, move(rbsParser), *prismParser};
     return typeToParserNodePrism.toPrismNode(rbsType, assertion);
 }
 
@@ -46,7 +46,7 @@ pm_node_t *SignatureTranslatorPrism::translateType(const RBSDeclaration &declara
         return nullptr;
     }
 
-    auto typeTranslator = TypeToParserNodePrism(ctx, {}, move(rbsParser), *prismParser);
+    auto typeTranslator = TypeToParserNodePrism{ctx, {}, move(rbsParser), *prismParser};
     return typeTranslator.toPrismNode(rbsType, declaration);
 }
 
@@ -74,7 +74,7 @@ pm_node_t *SignatureTranslatorPrism::translateAttrSignature(pm_call_node_t *call
         return nullptr;
     }
 
-    auto methodTypeToParserNode = MethodTypeToParserNodePrism(ctx, move(rbsParser), *prismParser);
+    auto methodTypeToParserNode = MethodTypeToParserNodePrism{ctx, move(rbsParser), *prismParser};
     return methodTypeToParserNode.attrSignature(call, rbsType, declaration, annotations);
 }
 
@@ -91,7 +91,7 @@ pm_node_t *SignatureTranslatorPrism::translateMethodSignature(pm_node_t *methodD
         return nullptr;
     }
 
-    auto methodTypeToParserNodePrism = MethodTypeToParserNodePrism(ctx, move(rbsParser), *prismParser);
+    auto methodTypeToParserNodePrism = MethodTypeToParserNodePrism{ctx, move(rbsParser), *prismParser};
     return methodTypeToParserNodePrism.methodSignature(methodDef, rbsMethodType, declaration, annotations);
 }
 
@@ -107,7 +107,7 @@ vector<pm_node_t *> SignatureTranslatorPrism::translateTypeParams(const RBSDecla
         return {};
     }
 
-    TypeParamsToParserNodesPrism typeParamsTranslator(ctx, rbsParser, *prismParser);
+    TypeParamsToParserNodesPrism typeParamsTranslator{ctx, rbsParser, *prismParser};
     return typeParamsTranslator.typeParams(rbsTypeParams, declaration);
 }
 

rbs/prism/SignatureTranslatorPrism.h

@@ -1,5 +1,5 @@
-#ifndef RBS_SIGNATURE_TRANSLATOR_PRISM_H
-#define RBS_SIGNATURE_TRANSLATOR_PRISM_H
+#ifndef SORBET_RBS_SIGNATURE_TRANSLATOR_PRISM_H
+#define SORBET_RBS_SIGNATURE_TRANSLATOR_PRISM_H
 
 #include "parser/parser.h"
 #include "parser/prism/Parser.h"
@@ -16,9 +16,9 @@ namespace sorbet::rbs {
 
 class SignatureTranslatorPrism final {
 public:
-    SignatureTranslatorPrism(core::MutableContext ctx) : ctx(ctx), prismParser(nullptr){};
+    SignatureTranslatorPrism(core::MutableContext ctx) : ctx(ctx), prismParser{nullptr} {}
     SignatureTranslatorPrism(core::MutableContext ctx, parser::Prism::Parser &prismParser)
-        : ctx(ctx), prismParser(&prismParser){};
+        : ctx(ctx), prismParser{&prismParser} {}
 
     pm_node_t *translateMethodSignature(pm_node_t *methodDef, const RBSDeclaration &declaration,
                                         absl::Span<const Comment> annotations);
@@ -40,4 +40,4 @@ class SignatureTranslatorPrism final {
 
 } // namespace sorbet::rbs
 
-#endif // RBS_SIGNATURE_TRANSLATOR_PRISM_H
+#endif // SORBET_RBS_SIGNATURE_TRANSLATOR_PRISM_H

rbs/prism/TypeParamsToParserNodesPrism.cc

@@ -9,7 +9,7 @@ namespace sorbet::rbs {
 
 vector<pm_node_t *> TypeParamsToParserNodesPrism::typeParams(const rbs_node_list_t *rbsTypeParams,
                                                              const RBSDeclaration &declaration) {
-    vector<pm_node_t *> result;
+    vector<pm_node_t *> result{};
     result.reserve(rbsTypeParams->length);
 
     for (auto *listNode = rbsTypeParams->head; listNode != nullptr; listNode = listNode->next) {
@@ -25,7 +25,7 @@ vector<pm_node_t *> TypeParamsToParserNodesPrism::typeParams(const rbs_node_list
         auto nameStr = parser.resolveConstant(rbsTypeParam->name);
         auto nameConstant = ctx.state.enterNameConstant(nameStr);
 
-        absl::InlinedVector<pm_node_t *, 1> args;
+        absl::InlinedVector<pm_node_t *, 1> args{};
         if (rbsTypeParam->variance) {
             auto variance = parser.resolveKeyword(rbsTypeParam->variance);
             if (variance == "covariant") {
@@ -41,8 +41,8 @@ vector<pm_node_t *> TypeParamsToParserNodesPrism::typeParams(const rbs_node_list
 
         pm_node_t *block = nullptr;
         if (defaultType || upperBound || lowerBound) {
-            auto typeTranslator = TypeToParserNodePrism(ctx, {}, parser, prismParser);
-            absl::InlinedVector<pm_node_t *, 3> pairs;
+            auto typeTranslator = TypeToParserNodePrism{ctx, {}, parser, prismParser};
+            absl::InlinedVector<pm_node_t *, 3> pairs{};
 
             if (defaultType) {
                 auto key = prism.Symbol(loc, core::Names::fixed().show(ctx.state));

rbs/prism/TypeParamsToParserNodesPrism.h

@@ -1,5 +1,5 @@
-#ifndef RBS_TYPE_PARAMS_TO_PARSER_NODES_PRISM_H
-#define RBS_TYPE_PARAMS_TO_PARSER_NODES_PRISM_H
+#ifndef SORBET_RBS_TYPE_PARAMS_TO_PARSER_NODES_PRISM_H
+#define SORBET_RBS_TYPE_PARAMS_TO_PARSER_NODES_PRISM_H
 
 #include "parser/prism/Factory.h"
 #include "parser/prism/Parser.h"
@@ -20,11 +20,11 @@ class TypeParamsToParserNodesPrism {
 
 public:
     TypeParamsToParserNodesPrism(core::MutableContext ctx, const Parser &parser, parser::Prism::Parser &prismParser)
-        : ctx(ctx), parser(parser), prismParser(prismParser), prism(prismParser) {}
+        : ctx(ctx), parser(parser), prismParser(prismParser), prism{prismParser} {}
 
     std::vector<pm_node_t *> typeParams(const rbs_node_list_t *rbsTypeParams, const RBSDeclaration &declaration);
 };
 
 } // namespace sorbet::rbs
 
-#endif // RBS_TYPE_PARAMS_TO_PARSER_NODES_PRISM_H
+#endif // SORBET_RBS_TYPE_PARAMS_TO_PARSER_NODES_PRISM_H