Merge pull request #412 from Shopify/address-small-feedbacks

Address small feedbacks
Shopify · Feb 18, 2025 · d213fa7 · d213fa7
2 parents fc831c6 + e231b43
commit d213fa7
Show file tree

Hide file tree

Showing 7 changed files with 27 additions and 27 deletions.
diff --git a/main/options/options.h b/main/options/options.h
@@ -121,13 +121,6 @@ const std::vector<ParserOptions> parser_options({
     {"prism", Parser::PRISM},
 });
 
-struct AutogenConstCacheConfig {
-    // A file which contains a cache that can be used to potentially skip autogen
-    std::string cacheFile;
-    // A list of files which have changed since the last autogen run.
-    std::vector<std::string> changedFiles;
-};
-
 namespace {
 
 #if !defined(EMSCRIPTEN)

diff --git a/main/pipeline/pipeline.cc b/main/pipeline/pipeline.cc
@@ -239,11 +239,14 @@ ast::ParsedFile indexOne(const options::Options &opts, core::GlobalState &lgs, c
 
             bool stopAfterParser = opts.stopAfterPhase == options::Phase::PARSER;
 
-            if (parser == options::Parser::SORBET) {
-                parseTree = runParser(lgs, file, print, opts.traceLexer, opts.traceParser);
-            } else if (parser == options::Parser::PRISM) {
-                parseTree = runPrismParser(lgs, file, stopAfterParser, print);
-            } // Any other option would have been handled in the options parser
+            switch (parser) {
+                case options::Parser::SORBET:
+                    parseTree = runParser(lgs, file, print, opts.traceLexer, opts.traceParser);
+                    break;
+                case options::Parser::PRISM:
+                    parseTree = runPrismParser(lgs, file, stopAfterParser, print);
+                    break;
+            }
 
             if (stopAfterParser) {
                 return emptyParsedFile(file);

diff --git a/parser/prism/Parser.cc b/parser/prism/Parser.cc
@@ -2,12 +2,12 @@
 
 namespace sorbet::parser::Prism {
 
-pm_parser_t *Parser::get_raw_parser_pointer() {
+pm_parser_t *Parser::getRawParserPointer() {
     return &storage->parser;
 }
 
 Node Parser::parse_root() {
-    pm_node_t *root = pm_parse(get_raw_parser_pointer());
+    pm_node_t *root = pm_parse(getRawParserPointer());
     return Node{*this, root};
 };
 

diff --git a/parser/prism/Parser.h b/parser/prism/Parser.h
@@ -72,15 +72,15 @@ class Parser final {
     void collectErrors();
 
 private:
-    pm_parser_t *get_raw_parser_pointer();
+    pm_parser_t *getRawParserPointer();
 };
 
 class Node final {
     struct NodeDeleter {
         Parser parser;
 
         void operator()(pm_node_t *node) {
-            pm_node_destroy(parser.get_raw_parser_pointer(), node);
+            pm_node_destroy(parser.getRawParserPointer(), node);
         }
     };
 
@@ -95,7 +95,7 @@ class Node final {
     Node(const Node &) = delete;            // Copy constructor
     Node &operator=(const Node &) = delete; // Copy assignment
 
-    pm_node_t *get_raw_node_pointer() const {
+    pm_node_t *getRawNodePointer() const {
         return node.get();
     }
 };

diff --git a/parser/prism/Translator.cc b/parser/prism/Translator.cc
@@ -1366,7 +1366,7 @@ unique_ptr<parser::Node> Translator::translate(pm_node_t *node) {
 }
 
 unique_ptr<parser::Node> Translator::translate(const Node &node) {
-    return translate(node.get_raw_node_pointer());
+    return translate(node.getRawNodePointer());
 }
 
 core::LocOffsets Translator::translateLoc(pm_location_t loc) {

diff --git a/parser/prism/Translator.h b/parser/prism/Translator.h
@@ -1,8 +1,8 @@
 #ifndef SORBET_PARSER_PRISM_TRANSLATOR_H
 #define SORBET_PARSER_PRISM_TRANSLATOR_H
 
-#include "../Node.h" // To clarify: these are Sorbet Parser nodes, not Prism ones.
 #include "core/errors/parser.h"
+#include "parser/Node.h" // To clarify: these are Sorbet Parser nodes, not Prism ones.
 #include "parser/prism/Parser.h"
 #include <memory>
 

diff --git a/test/pipeline_test_runner.cc b/test/pipeline_test_runner.cc
@@ -222,15 +222,19 @@ vector<ast::ParsedFile> index(unique_ptr<core::GlobalState> &gs, absl::Span<core
         }
 
         unique_ptr<parser::Node> nodes;
-        if (parser == realmain::options::Parser::SORBET) {
-            std::cout << "Parsing with sorbet" << std::endl;
-            core::UnfreezeNameTable nameTableAccess(*gs); // enters original strings
+        switch (parser) {
+            case realmain::options::Parser::SORBET: {
+                std::cout << "Parsing with sorbet" << std::endl;
+                core::UnfreezeNameTable nameTableAccess(*gs); // enters original strings
 
-            auto settings = parser::Parser::Settings{};
-            nodes = parser::Parser::run(*gs, file, settings);
-        } else if (parser == realmain::options::Parser::PRISM) {
-            std::cout << "Parsing with prism" << std::endl;
-            nodes = realmain::pipeline::runPrismParser(*gs, file, false, {});
+                auto settings = parser::Parser::Settings{};
+                nodes = parser::Parser::run(*gs, file, settings);
+                break;
+            }
+            case realmain::options::Parser::PRISM:
+                std::cout << "Parsing with prism" << std::endl;
+                nodes = realmain::pipeline::runPrismParser(*gs, file, false, {});
+                break;
         }
 
         handler.drainErrors(*gs);