Drop the value attribute from Redo and Retry

Author: kddnewton

CHANGELOG.md

@@ -18,7 +18,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a
   - `DefEndless` and `Defs` have both been folded into the `Def` node. The `Def` node now has the `target` and `operator` fields which originally came from `Defs` which can both be `nil`. It also now has an `endless?` method on it to tell if the original node was found in the endless form. Finally the `bodystmt` field can now either be a `BodyStmt` as it was or any other kind of node since that was the body of the `DefEndless` node. The `visit_defs` and `visit_def_endless` methods on the visitor have therefore been removed.
   - `DoBlock` and `BraceBlock` have now been folded into a `Block` node. The `Block` node now has a `keywords?` method on it that returns true if the block was constructed with the `do`..`end` keywords. The `visit_do_block` and `visit_brace_block` methods on the visitor have therefore been removed and replaced with the `visit_block` method.
   - `Return0` is no longer a node. Instead if has been folded into the `Return` node. The `Return` node can now have its `arguments` field be `nil`. Consequently, the `visit_return0` method has been removed from the visitor interface. If you were previously using this method, you should now use `visit_return` instead.
-- The `ZSuper` node no longer has a `value` field associated with it (which was always a "super" string literal).
+- The `Redo`, `Retry`, and `ZSuper` nodes no longer have `value` fields associated with them (which were always string literals corresponding to the keyword being used).
 
 ## [4.3.0] - 2022-10-28
 

lib/syntax_tree/node.rb

@@ -7199,14 +7199,10 @@ def deconstruct_keys(_keys)
   #     redo
   #
   class Redo < Node
-    # [String] the value of the keyword
-    attr_reader :value
-
     # [Array[ Comment | EmbDoc ]] the comments attached to this node
     attr_reader :comments
 
-    def initialize(value:, location:)
-      @value = value
+    def initialize(location:)
       @location = location
       @comments = []
     end
@@ -7222,11 +7218,11 @@ def child_nodes
     alias deconstruct child_nodes
 
     def deconstruct_keys(_keys)
-      { value: value, location: location, comments: comments }
+      { location: location, comments: comments }
     end
 
     def format(q)
-      q.text(value)
+      q.text("redo")
     end
   end
 
@@ -7710,14 +7706,10 @@ def format(q)
   #     retry
   #
   class Retry < Node
-    # [String] the value of the keyword
-    attr_reader :value
-
     # [Array[ Comment | EmbDoc ]] the comments attached to this node
     attr_reader :comments
 
-    def initialize(value:, location:)
-      @value = value
+    def initialize(location:)
       @location = location
       @comments = []
     end
@@ -7733,11 +7725,11 @@ def child_nodes
     alias deconstruct child_nodes
 
     def deconstruct_keys(_keys)
-      { value: value, location: location, comments: comments }
+      { location: location, comments: comments }
     end
 
     def format(q)
-      q.text(value)
+      q.text("retry")
     end
   end
 

lib/syntax_tree/parser.rb

@@ -2903,7 +2903,7 @@ def on_rbracket(value)
     def on_redo
       keyword = consume_keyword(:redo)
 
-      Redo.new(value: keyword.value, location: keyword.location)
+      Redo.new(location: keyword.location)
     end
 
     # :call-seq:
@@ -3069,7 +3069,7 @@ def on_rest_param(name)
     def on_retry
       keyword = consume_keyword(:retry)
 
-      Retry.new(value: keyword.value, location: keyword.location)
+      Retry.new(location: keyword.location)
     end
 
     # :call-seq:

lib/syntax_tree/visitor/field_visitor.rb

@@ -723,7 +723,7 @@ def visit_rbracket(node)
       end
 
       def visit_redo(node)
-        visit_token(node, "redo")
+        node(node, "redo") { comments(node) }
       end
 
       def visit_regexp_beg(node)
@@ -779,7 +779,9 @@ def visit_rest_param(node)
       end
 
       def visit_retry(node)
-        visit_token(node, "retry")
+        node(node, "retry") do
+          comments(node)
+        end
       end
 
       def visit_return(node)