Rename Prism::Node to Prism::ProgramNode

1. Makes it clear that it represents the program node, not nodes in general 2. Makes it easier to distinguish from Sorbet parser's Node class
Shopify · Feb 18, 2025 · 5886740 · 5886740
1 parent fc831c6
commit 5886740
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 12 deletions.
diff --git a/main/pipeline/pipeline.cc b/main/pipeline/pipeline.cc
@@ -138,7 +138,7 @@ unique_ptr<parser::Node> runPrismParser(core::GlobalState &gs, core::FileRef fil
     core::UnfreezeNameTable nameTableAccess(gs);
 
     Prism::Parser parser{source};
-    Prism::Node root = parser.parse_root();
+    Prism::ProgramNode root = parser.parse_root();
 
     if (stopAfterParser) {
         return std::unique_ptr<parser::Node>();

diff --git a/parser/prism/Parser.cc b/parser/prism/Parser.cc
@@ -6,9 +6,9 @@ pm_parser_t *Parser::get_raw_parser_pointer() {
     return &storage->parser;
 }
 
-Node Parser::parse_root() {
+ProgramNode Parser::parse_root() {
     pm_node_t *root = pm_parse(get_raw_parser_pointer());
-    return Node{*this, root};
+    return ProgramNode{*this, root};
 };
 
 core::LocOffsets Parser::translateLocation(pm_location_t location) {

diff --git a/parser/prism/Parser.h b/parser/prism/Parser.h
@@ -13,7 +13,7 @@ extern "C" {
 
 namespace sorbet::parser::Prism {
 
-class Node;
+class ProgramNode;
 
 class ParseError {
 public:
@@ -51,7 +51,7 @@ struct ParserStorage {
 };
 
 class Parser final {
-    friend class Node;
+    friend class ProgramNode;
     friend struct NodeDeleter;
 
     std::shared_ptr<ParserStorage> storage;
@@ -64,7 +64,7 @@ class Parser final {
     Parser(const Parser &) = default;
     Parser &operator=(const Parser &) = default;
 
-    Node parse_root();
+    ProgramNode parse_root();
     core::LocOffsets translateLocation(pm_location_t location);
     std::string_view resolveConstant(pm_constant_id_t constant_id);
     std::string_view extractString(pm_string_t *string);
@@ -75,7 +75,7 @@ class Parser final {
     pm_parser_t *get_raw_parser_pointer();
 };
 
-class Node final {
+class ProgramNode final {
     struct NodeDeleter {
         Parser parser;
 
@@ -90,10 +90,10 @@ class Node final {
     Parser parser;
     std::unique_ptr<pm_node_t, NodeDeleter> node;
 
-    Node(Parser parser, pm_node_t *node) : parser{parser}, node{node, NodeDeleter{parser}} {}
+    ProgramNode(Parser parser, pm_node_t *node) : parser{parser}, node{node, NodeDeleter{parser}} {}
 
-    Node(const Node &) = delete;            // Copy constructor
-    Node &operator=(const Node &) = delete; // Copy assignment
+    ProgramNode(const ProgramNode &) = delete;            // Copy constructor
+    ProgramNode &operator=(const ProgramNode &) = delete; // Copy assignment
 
     pm_node_t *get_raw_node_pointer() const {
         return node.get();

diff --git a/parser/prism/Translator.cc b/parser/prism/Translator.cc
@@ -1365,7 +1365,7 @@ unique_ptr<parser::Node> Translator::translate(pm_node_t *node) {
     }
 }
 
-unique_ptr<parser::Node> Translator::translate(const Node &node) {
+unique_ptr<parser::Node> Translator::translate(const ProgramNode &node) {
     return translate(node.get_raw_node_pointer());
 }
 

diff --git a/parser/prism/Translator.h b/parser/prism/Translator.h
@@ -47,7 +47,7 @@ class Translator final {
 
     // Translates the given AST from Prism's node types into the equivalent AST in Sorbet's legacy parser node types.
     std::unique_ptr<parser::Node> translate(pm_node_t *node);
-    std::unique_ptr<parser::Node> translate(const Node &node);
+    std::unique_ptr<parser::Node> translate(const ProgramNode &node);
 
 private:
     // Private constructor used only for creating child translators
-Original file line number
+Diff line change
@@ Expand Up @@
         }
     }
-    unique_ptr<parser::Node> Translator::translate(const Node &node) {
+    unique_ptr<parser::Node> Translator::translate(const ProgramNode &node) {
         return translate(node.get_raw_node_pointer());
     }
@@ Expand Down @@