rensei 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6cc6cc047b5640e168c637b0dada84c773b645347a66385ad3fb06c7b7e08346
-  data.tar.gz: 70800f0c78fadf6816b9b9762e5f26fd7be3a012515cd7b90149dd2d911149a3
+  metadata.gz: 7f251e1c901c50f3be916dc4adcb01598056cc5c86b0d65e1e592961b0ef3851
+  data.tar.gz: c36df6153e3c75d9f5c568a144d53e985715ab6703e7251c90cad1a16635fb7d
 SHA512:
-  metadata.gz: c7cf2901a240748cfa044253a269a55154d0516829ccab38b166caa2ed8c5f4eed43589ec98aca49e2aaa9f629c7c6ef2736bf878c4de676daf1852d41f97dcc
-  data.tar.gz: bdf5db3fd89679a2c5985b63a2905de5f2a7c42555264a53cb41ea3f24bbb0743fd2ed27a131e477d84c30ca3db6901099aa30242ed577b5bcbbbbefeefd5d53
+  metadata.gz: 8c63d7f42e0e767c21b70a57ef6954056a6f23134366bc84703f2ec2f23d7583dc1a7eb8dcfa64065497fb786209b466d6a48bdcc7258c1089ffdd1f77fe7fbc
+  data.tar.gz: 1a09797bffe2b6bd10cd9c663f54bd4bff56087d0c524e7f038da1da6baae7423b5876c9f750a07fcdc6585975aa24966ac580a0c39d6f830e06b8749455faff

data/.github/workflows/rensei.yml

@@ -0,0 +1,23 @@
+name: Ruby CI
+
+on: [push, pull_request]
+
+jobs:
+  test:
+
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        ruby-version: [2.6.4, 2.7.0, 2.7.2, 3.0.1]
+
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up Ruby ${{ matrix.ruby-version }}
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby-version }}
+      - name: Install dependencies
+        run: bundle install
+      - name: Run tests
+        run: bundle exec rake

data/README.md

@@ -1,6 +1,6 @@
-# Rensei
+[![Ruby CI](https://github.com/osyo-manga/gem-rensei/actions/workflows/rensei.yml/badge.svg)](https://github.com/osyo-manga/gem-rensei/actions/workflows/rensei.yml)
 
-Welcome to your new gem! In this directory, you'll find the files you need to be able to package up your Ruby library into a gem. Put your Ruby code in the file `lib/rensei`. To experiment with that code, run `bin/console` for an interactive prompt.
+# Rensei
 
 Unparse from `RubyVM::AbstractSyntaxTree::Node` to Ruby code.
 
@@ -46,7 +46,7 @@ To install this gem onto your local machine, run `bundle exec rake install`. To
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/rensei.
+Bug reports and pull requests are welcome on GitHub at https://github.com/osyo-manga/gem-rensei.
 
 
 ## License

data/bundle_install_all.sh

@@ -0,0 +1,9 @@
+#!/bin/bash -ex
+RBENV_VERSION=2.6.4 bundle install
+RBENV_VERSION=2.7.0 bundle install
+RBENV_VERSION=2.7.2 bundle install
+RBENV_VERSION=2.7.3 bundle install
+RBENV_VERSION=2.7.4 bundle install
+RBENV_VERSION=3.0.0 bundle install
+RBENV_VERSION=3.0.1 bundle install
+RBENV_VERSION=3.1.0-dev bundle install

data/lib/rensei.rb

@@ -5,7 +5,7 @@ require "rensei/node_to_hash"
 module Rensei
   class Error < StandardError; end
 
-  def self.unparse(code)
-    Unparser.unparse(code)
+  def self.unparse(code, opt = {})
+    Unparser.unparse(code, opt)
   end
 end

data/lib/rensei/node_to_hash.rb

@@ -6,7 +6,7 @@ module Rensei
       using NodeToHash
       using Module.new {
         refine Object do
-          def to_hashable
+          def to_h
             to_s
           end
         end
@@ -14,41 +14,26 @@ module Rensei
           NilClass,
           FalseClass,
           TrueClass,
-          Array,
-          Symbol,
           Numeric,
+          String,
+          Symbol,
+          Array,
           Regexp,
         ].each { |klass|
           refine klass do
-            def to_hashable
+            def to_h
               self
             end
           end
         }
       }
 
-      def to_hashable(ignore_codeposition: true, &block)
-        block = :to_hashable unless block
+      def to_h
         {
           type: type,
-          children: children.map(&block),
-        }.tap { |it|
-          it.merge!(
-            first_column: first_column,
-            last_column:  last_column,
-            first_lineno: first_lineno,
-            last_lineno:  last_lineno
-          ) unless ignore_codeposition
+          children: children.map(&:to_h),
         }
       end
-
-      def to_json(ignore_codeposition: true)
-        to_hashable(ignore_codeposition: ignore_codeposition, &:to_json)
-      end
-
-      def to_h(ignore_codeposition: true)
-        to_hashable(ignore_codeposition: ignore_codeposition)
-      end
     end
   end
 end

data/lib/rensei/unparser.rb

@@ -17,22 +17,36 @@ module Rensei
         end
       end
 
+      refine Array do
+        def type
+          self[0]
+        end
+
+        def children
+          self[1]
+        end
+      end
+
       refine String do
         def bracket(prefix = "(", suffix = ")")
           "#{prefix}#{self}#{suffix}"
         end
 
         def escape
-          dump[1..-2]
+          inspect[1..-2]
         end
       end
     }
 
     module Base
       def unparse(node, opt = {})
-        return node unless RubyVM::AbstractSyntaxTree::Node === node || Hash === node
-        method_name = "NODE_#{node.type}"
-        respond_to?(method_name, true) ? send(method_name, node, opt.dup) : node
+        case node
+        when RubyVM::AbstractSyntaxTree::Node, Hash, Array
+          method_name = "NODE_#{node.type}"
+          respond_to?(method_name, true) ? send(method_name, node, opt.dup) : node
+        else
+          node
+        end
       end
 
       private
@@ -45,18 +59,32 @@ module Rensei
       # format: [nd_head]; ...; [nd_next]
       # example: foo; bar
       def NODE_BLOCK(node, opt = {})
-        node.children.each_slice(2).map { |head, next_|
-          if head&.type == :BEGIN && opt.delete(:NODE_BEGIN_WITHOUT_BEGIN)
-            "#{unparse(next_, opt)}"
-          # Support by BEGIN { foo }
-          elsif next_&.type == :BEGIN
-            "BEGIN { #{unparse(head.children.first, opt)} }"
+        node.children.then { |head, *nexts|
+          if without_BEGIN = opt.fetch(:without_BEGIN, false)
+            begin_ = proc { |str, _| str }
+          else
+            begin_ = proc { |str, semicolon|
+              if semicolon
+                "begin; #{str}; end"
+              else
+                "begin #{str}; end"
+              end
+            }
+          end
+          opt.merge!(within_BEGIN: !without_BEGIN)
+          opt.delete(:without_BEGIN)
+          if head.type == :BEGIN && head.children == [nil]
+            begin_.(nexts.map(&_unparse(opt)).join("; "), true)
           elsif head.type == :BEGIN
-            "begin; #{unparse(next_, opt)}; end"
+            "BEGIN { #{unparse(head, opt)} }; #{nexts.drop(1).map(&_unparse(opt)).join("; ")}"
           else
-            "#{unparse(head, opt)};#{next_ ? " #{unparse(next_, opt)}" : ""}"
+            if nexts.empty?
+              "#{unparse(head, opt)};"
+            else
+              begin_.([head, *nexts].map(&_unparse(opt)).join("; "), false)
+            end
           end
-        }.join("; ")
+        }
       end
 
       # if statement
@@ -65,9 +93,9 @@ module Rensei
       def NODE_IF(node, opt = {})
         node.children.then { |cond, body, else_|
           <<~EOS.chomp
-            if #{unparse(cond, opt)}
+            (if #{unparse(cond, opt)}
               #{unparse(body, opt)}#{else_ ? "\nelse\n  #{unparse(else_, opt)}" : ""}
-            end
+            end)
           EOS
         }
       end
@@ -78,9 +106,9 @@ module Rensei
       def NODE_UNLESS(node, opt = {})
         node.children.then { |cond, body, else_|
           <<~EOS.chomp
-            unless #{unparse(cond, opt)}
+            (unless #{unparse(cond, opt)}
               #{unparse(body, opt)}#{else_ ? "\nelse\n  #{unparse(else_, opt)}" : ""}
-            end
+            end)
           EOS
         }
       end
@@ -117,7 +145,7 @@ module Rensei
       def NODE_WHEN(node, opt = {})
         node.children.then { |head, body, next_|
           <<~EOS.chomp
-          when #{unparse(head, opt.merge(NODE_ARRAY_EXPAND: true))}
+          when #{unparse(head, opt.merge(expand_ARRAY: true))}
             #{unparse(body, opt)}
           #{next_&.type == :WHEN || next_.nil? ? unparse(next_, opt) : "else\n  #{unparse(next_, opt)}"}
           EOS
@@ -247,14 +275,22 @@ module Rensei
       # format: begin; [nd_body]; end
       # example: begin; 1; end
       def NODE_BEGIN(node, opt = {})
-        return "" if node.children.first.nil?
-#         return "begin; end" if node.children.first.nil?
         node.children.then { |body|
-          <<~EOS.chomp
-          begin
-            #{unparse(body, opt)}
+          if opt.delete(:pattern_match_BEGIN)
+            "^(#{body.map(&_unparse(opt)).join("; ")})"
+          elsif opt.delete(:without_BEGIN)
+            "#{body.map(&_unparse(opt)).join("; ")}"
+          elsif opt.delete(:within_BEGIN)
+            "begin #{body.map(&_unparse(opt)).join("; ")} end"
+          elsif body == [nil]
+            ""
+          else
+            <<~EOS.chomp
+            begin
+              #{body.map(&_unparse(opt)).join("; ")}
+            end
+            EOS
           end
-          EOS
         }
       end
 
@@ -277,16 +313,16 @@ module Rensei
       # example: begin; foo; rescue; bar; else; baz; end
       def NODE_RESBODY(node, opt = {})
         node.children.then { |args, body|
-          args_ = args&.then { |it| unparse(it, opt.merge(NODE_ARRAY_EXPAND: true)) + ";" }
+          args_ = args&.then { |it| unparse(it, opt.merge(expand_ARRAY: true)) }
           if body.type == :BLOCK
             if body.children.first&.children[1]&.type == :ERRINFO
-              "rescue #{args_}#{unparse(body, opt)}"
+              "rescue #{args_} #{unparse(body, opt.merge(without_BEGIN: true))}"
             else
-              "rescue #{args_ || ";"}#{unparse(body, opt)}"
+              "rescue #{args_}; #{unparse(body, opt)}"
             end
           else
             # MEMO: Support by `begin; foo; rescue; bar; else; baz; end`
-            "rescue #{args_ || ";"} #{unparse(body, opt)}"
+            "rescue #{args_}; #{unparse(body, opt)}"
           end
         }
       end
@@ -320,7 +356,13 @@ module Rensei
       # example: foo || bar
       def NODE_OR(node, opt = {})
         node.children.then { |args|
-          "(#{args.map { |node| unparse(node, opt) }.join(" || ")})"
+          # Support pattern match
+          # in String | Integer
+          if opt[:pattern_match_OR]
+            "#{args.map { |node| unparse(node, opt) }.join(" | ")}"
+          else
+            "(#{args.map { |node| unparse(node, opt) }.join(" || ")})"
+          end
         }
       end
 
@@ -338,12 +380,12 @@ module Rensei
 
           # Support: (a,) = value
           if _right&.empty?
-            _left = unparse(left, opt.merge(NODE_ARRAY_EXPAND: true)) || "*"
+            _left = unparse(left, opt.merge(expand_ARRAY: true, ignore_equal_NODE_ATTRASGN: true)) || "*"
           elsif left
             if node_masgn && left.children.count <= 2
-              _left = left.children.map(&_unparse(opt.merge(NODE_ARRAY_EXPAND: true))).first
+              _left = left.children.map(&_unparse(opt.merge(expand_ARRAY: true, ignore_equal_NODE_ATTRASGN: true))).first
             else
-              _left = left.children.map(&_unparse(opt.merge(NODE_ARRAY_EXPAND: true))).join(", ")
+              _left = left.children.map(&_unparse(opt.merge(expand_ARRAY: true, ignore_equal_NODE_ATTRASGN: true))).join(", ")
             end
           end
 
@@ -373,13 +415,14 @@ module Rensei
       # example: x = foo
       def NODE_LASGN(node, opt = {})
         node.children.then { |vid, value|
+          _value = unparse(value, opt)
           if value == :NODE_SPECIAL_REQUIRED_KEYWORD
             "#{vid}:"
           elsif opt.delete(:KW_ARG)
             "#{vid}:#{value&.then { |it| " #{unparse(it, opt)}" }}"
-          elsif value.nil? || (_value = unparse(value, opt)).empty?
+          elsif value.nil? || (_value).empty?
             "#{vid}"
-          elsif opt.delete(:NODE_LASGN_EXPAND)
+          elsif opt.delete(:expand_LASGN)
             "#{vid} = #{_value}"
           elsif value.type == :ERRINFO
             "=> #{vid}"
@@ -414,8 +457,10 @@ module Rensei
             "#{vid}:#{value&.then { |it| " #{unparse(it, opt)}" }}"
           elsif value.nil?
             "#{vid}"
-          elsif opt.delete(:NODE_DASGN_CURR_EXPAND)
+          elsif opt.delete(:expand_DASGN_CURR)
             "#{vid} = #{unparse(value, opt)}"
+          elsif value.type == :ERRINFO
+            "=> #{vid}"
           else
             "(#{vid} = #{unparse(value, opt)})"
           end
@@ -484,7 +529,7 @@ module Rensei
       # example: ary[1] += foo
       def NODE_OP_ASGN1(node, opt = {})
         node.children.then { |recv, op, head, mid|
-          "(#{unparse(recv, opt)}[#{unparse(head, opt.merge(NODE_ARRAY_EXPAND: true))}] #{op}= #{unparse(mid, opt.merge(NODE_ARRAY_EXPAND: true))})"
+          "(#{unparse(recv, opt)}[#{unparse(head, opt.merge(expand_ARRAY: true))}] #{op}= #{unparse(mid, opt.merge(expand_ARRAY: true))})"
         }
       end
 
@@ -538,7 +583,8 @@ module Rensei
       # example: obj.foo(1)
       def NODE_CALL(node, opt = {})
         node.children.then { |receiver, mid, args|
-          "#{unparse(receiver, opt)}.#{unparse(mid, opt)}(#{unparse(args, opt.merge(NODE_ARRAY_EXPAND: true))})"
+          opt_flags = _expand_in_XXXCALL(args)
+          "#{unparse(receiver, opt)}.#{unparse(mid, opt)}(#{unparse(args, opt.merge(_expand_in_XXXCALL(args)))})"
         }
       end
 
@@ -551,21 +597,38 @@ module Rensei
           if right == nil
             "(#{op.to_s.delete_suffix("@")}#{unparse(left, opt)})"
           else
-            "(#{unparse(left, opt)} #{op} #{unparse(right, opt.merge(NODE_ARRAY_EXPAND: true))})"
+            "(#{unparse(left, opt)} #{op} #{unparse(right, opt.merge(expand_ARRAY: true))})"
           end
         }
       end
 
+      def _expand_in_XXXCALL(node)
+        case node&.type
+        when :ARRAY, :LIST
+          opt_flags = { expand_ARRAY: true }
+        when :ARGSCAT
+          opt_flags = { expand_ARGSCAT: true }
+        when :ARGSPUSH
+          opt_flags = { expand_ARGSPUSH: true }
+        when :BLOCK_PASS
+          _expand_in_XXXCALL(node.children.first)
+        else
+          opt_flags = { expand_ARRAY: true }
+        end
+      end
+
       # function call
       # format: [nd_mid]([nd_args])
       # example: foo(1)
       def NODE_FCALL(node, opt = {})
         node.children.then { |mid, args|
+          opt_flags = _expand_in_XXXCALL(args)
+
           # Support `self[key]`
           if mid == :[]
-            "self[#{unparse(args, opt.merge(NODE_ARRAY_EXPAND: true))}]"
+            "self[#{unparse(args, opt.merge(opt_flags))}]"
           else
-            "#{unparse(mid, opt)}(#{unparse(args, opt.merge(NODE_ARRAY_EXPAND: true))})"
+            "#{unparse(mid, opt)}(#{unparse(args, opt.merge(opt_flags))})"
           end
         }
       end
@@ -582,7 +645,7 @@ module Rensei
       # example: obj&.foo(1)
       def NODE_QCALL(node, opt = {})
         node.children.then { |receiver, mid, args|
-          "#{unparse(receiver, opt)}&.#{unparse(mid, opt)}(#{unparse(args, opt.merge(NODE_ARRAY_EXPAND: true))})"
+          "#{unparse(receiver, opt)}&.#{unparse(mid, opt)}(#{unparse(args, opt.merge(_expand_in_XXXCALL(args)))})"
         }
       end
 
@@ -591,7 +654,7 @@ module Rensei
       # example: super 1
       def NODE_SUPER(node, opt = {})
         node.children.then { |args, |
-          "super(#{unparse(args, opt.merge(NODE_ARRAY_EXPAND: true))})"
+          "super(#{unparse(args, opt.merge(expand_ARRAY: true))})"
         }
       end
 
@@ -607,8 +670,8 @@ module Rensei
       # example: [1, 2, 3]
       def NODE_ARRAY(node, opt = {})
         node.children.then { |*args, _nil|
-          if opt[:NODE_ARRAY_EXPAND]
-            "#{args.map(&_unparse(opt.except(:NODE_ARRAY_EXPAND))).join(", ")}"
+          if opt[:expand_ARRAY]
+            "#{args.map(&_unparse(opt.except(:expand_ARRAY))).join(", ")}"
           else
             "[#{args.map(&_unparse(opt)).join(", ")}]"
           end
@@ -644,11 +707,21 @@ module Rensei
           elsif head.children.first.nil?
             "**#{unparse(head.children[1], opt)}"
           else
-            "{ #{
-              (head).children[0..-2].map(&_unparse(opt)).each_slice(2).map { |key, value|
-                "#{key} => #{value}"
-              }.join(", ")
-             } }"
+            result = (head).children[0..-2].each_slice(2).map { |key, value|
+              if key.nil?
+                "**#{unparse(value, opt)}"
+              elsif key.type == :LIT && Symbol === key.children.first
+                "#{key.children.first}: #{unparse(value, opt)}"
+              else
+                "#{unparse(key, opt)} => #{unparse(value, opt)}"
+              end
+            }.join(", ")
+
+            if opt[:expand_HASH]
+              "#{result}"
+            else
+              "{ #{result} }"
+            end
           end
         }
       end
@@ -658,7 +731,7 @@ module Rensei
       # example: yield 1
       def NODE_YIELD(node, opt = {})
         node.children.then { |head,|
-          "yield(#{unparse(head, opt.merge(NODE_ARRAY_EXPAND: true))})"
+          "yield(#{unparse(head, opt.merge(expand_ARRAY: true))})"
         }
       end
 
@@ -666,7 +739,13 @@ module Rensei
       # format: [nd_vid](lvar)
       # example: x
       def NODE_LVAR(node, opt = {})
-        node.children.first.to_s
+        # Support pattern match
+        # in ^expr
+        if opt[:pattern_match_LVAR]
+          "^#{node.children.first}"
+        else
+          "#{node.children.first}"
+        end
       end
 
       # dynamic variable reference
@@ -770,11 +849,10 @@ module Rensei
       # format: [nd_lit]
       # example: 'foo'
       def NODE_STR(node, opt = {})
-        node.children.first.dump
-        if opt.delete(:NODE_STR_IGNORE_QUOTE)
+        if opt.delete(:ignore_quote_STR)
           node.children.first.to_s.escape
         else
-          node.children.first.dump
+          node.children.first.inspect
         end
       end
 
@@ -798,15 +876,15 @@ module Rensei
       # format: [nd_lit]
       # example: \"foo#{ bar }baz\"
       def NODE_DSTR(node, opt = {})
-        "\"#{_NODE_DSTR_without_quote(node, opt)}\""
+        "\"#{without_DSTR_quote(node, opt)}\""
       end
-      def _NODE_DSTR_without_quote(node, opt)
+      def without_DSTR_quote(node, opt)
         node.children.then { |prefix, lit, suffix|
           suffix_ = suffix&.children&.compact&.map { |it|
             if it.type == :STR
-              unparse(it, opt.merge(NODE_STR_IGNORE_QUOTE: true))
+              unparse(it, opt.merge(ignore_quote_STR: true))
             else
-              unparse(it, opt.merge(NODE_STR_IGNORE_QUOTE: false))
+              unparse(it, opt.merge(ignore_quote_STR: false))
             end
           }&.join
           "#{prefix&.escape}#{unparse(lit, opt)}#{suffix_}"
@@ -817,7 +895,7 @@ module Rensei
       # format: [nd_lit]
       # example: `foo#{ bar }baz`
       def NODE_DXSTR(node, opt = {})
-        "`#{_NODE_DSTR_without_quote(node, opt)}`"
+        "`#{without_DSTR_quote(node, opt)}`"
       end
 
       # regexp literal with interpolation
@@ -857,10 +935,22 @@ module Rensei
       # example: foo(*ary, post_arg1, post_arg2)
       def NODE_ARGSCAT(node, opt = {})
         node.children.then { |head, body|
-          if body.type == :ARRAY
-            "#{unparse(head, opt)}, #{unparse(body, opt)}"
+          case head.type
+          when :ARRAY, :LIST
+            opt_flags = { expand_ARRAY: true, expand_ARGSCAT: true, expand_ARGSPUSH: false }
+          when :ARGSCAT
+            opt_flags = { expand_ARRAY: true, expand_ARGSCAT: true, expand_ARGSPUSH: false }
+          when :ARGSPUSH
+            opt_flags = { expand_ARRAY: false, expand_ARGSCAT: false, expand_ARGSPUSH: true }
           else
-            "#{unparse(head, opt)}, *#{unparse(body, opt)}"
+            opt_flags = {}
+          end
+
+          star = "*" unless %i(ARRAY LIST).include? body.type
+          if opt.delete(:expand_ARGSCAT)
+            "#{unparse(head, opt.merge(opt_flags))}, #{star}#{unparse(body, opt.merge(expand_ARRAY: true))}"
+          else
+            "[#{unparse(head, opt.merge(opt_flags))}, #{star}#{unparse(body, opt.merge(expand_ARRAY: true))}]"
           end
         }
       end
@@ -870,7 +960,22 @@ module Rensei
       # example: foo(*ary, post_arg)
       def NODE_ARGSPUSH(node, opt = {})
         node.children.then { |head, body|
-          "#{unparse(head, opt)}, #{unparse(body, opt)}"
+          case head.type
+          when :ARRAY, :LIST
+            opt_flags = { expand_ARRAY: true, expand_ARGSCAT: true, expand_ARGSPUSH: false }
+          when :ARGSCAT
+            opt_flags = { expand_ARRAY: false, expand_ARGSCAT: true, expand_ARGSPUSH: false }
+          when :ARGSPUSH
+            opt_flags = { expand_ARRAY: false, expand_ARGSCAT: false, expand_ARGSPUSH: true }
+          else
+            opt_flags = {}
+          end
+
+          if opt.delete(:expand_ARGSPUSH)
+            "#{unparse(head, opt.merge(opt_flags))}, #{unparse(body , opt)}"
+          else
+            "[#{unparse(head, opt.merge(opt_flags))}, #{unparse(body , opt)}]"
+          end
         }
       end
 
@@ -879,7 +984,7 @@ module Rensei
       # example: foo(*ary)
       def NODE_SPLAT(node, opt = {})
         node.children.then { |head,|
-          "*#{unparse(head, opt.merge(NODE_ARRAY_EXPAND: false))}"
+          "*#{unparse(head, opt.merge(expand_ARRAY: false))}"
         }
       end
 
@@ -954,7 +1059,7 @@ module Rensei
         node.children.then { |cpath, super_, body|
           <<~EOS.chomp
           class #{unparse(cpath, opt)}#{super_&.then { |it| " < #{unparse(it, opt)}" } }
-            #{unparse(body, opt.merge(NODE_BEGIN_WITHOUT_BEGIN: true))}
+            #{unparse(body, opt.merge(without_BEGIN: true))}
           end
           EOS
         }
@@ -967,7 +1072,7 @@ module Rensei
         node.children.then { |cpath, body|
           <<~EOS.chomp
           module #{unparse(cpath, opt)}
-            #{unparse(body, opt.merge(NODE_BEGIN_WITHOUT_BEGIN: true))}
+            #{unparse(body, opt.merge(without_BEGIN: true))}
           end
           EOS
         }
@@ -980,7 +1085,7 @@ module Rensei
         node.children.then { |recv, body|
           <<~EOS.chomp
           class << #{unparse(recv, opt)}
-            #{unparse(body, opt.merge(NODE_BEGIN_WITHOUT_BEGIN: true))}
+            #{unparse(body, opt.merge(without_BEGIN: true))}
           end
           EOS
         }
@@ -1098,11 +1203,13 @@ module Rensei
       # example: struct.field = foo
       def NODE_ATTRASGN(node, opt = {})
         node.children.then { |recv, mid, args|
-          if mid == :[]=
+          if opt.delete(:ignore_equal_NODE_ATTRASGN)
+            "#{unparse(recv, opt)}.#{mid.to_s.delete_suffix("=")}"
+          elsif mid == :[]=
             *args_, right, _ = args.children
-            "#{unparse(recv, opt)}[#{args_.map(&_unparse(opt.merge(NODE_ARRAY_EXPAND: true))).join(", ")}] = #{unparse(right, opt.merge(NODE_ARRAY_EXPAND: true))}"
+            "#{unparse(recv, opt)}[#{args_.map(&_unparse(opt.merge(expand_ARRAY: true))).join(", ")}] = #{unparse(right, opt.merge(expand_ARRAY: true))}"
           else
-            "#{unparse(recv, opt)}.#{mid}#{unparse(args, opt.merge(NODE_ARRAY_EXPAND: true))}"
+            "#{unparse(recv, opt)}.#{mid}(#{unparse(args, opt.merge(expand_ARRAY: true))})"
           end
         }
       end
@@ -1121,7 +1228,7 @@ module Rensei
       # format: def method_name([nd_body=some], [nd_next..])
       # example: def foo(a, b=1, c); end
       def NODE_OPT_ARG(node, opt = {})
-        node.children.map(&_unparse(opt.merge(NODE_DASGN_CURR_EXPAND: true, NODE_LASGN_EXPAND: true))).compact.join(", ")
+        node.children.map(&_unparse(opt.merge(expand_DASGN_CURR: true, expand_LASGN: true))).compact.join(", ")
       end
       def unparse_NODE_OPT_ARG(node, opt = {})
         node.children.then { |head, children|
@@ -1146,7 +1253,7 @@ module Rensei
       # example: a, *rest, z = foo
       def NODE_POSTARG(node, opt = {})
         node.children.then { |_1st, _2nd|
-          "#{unparse(_1st, opt)}, #{unparse(_2nd, opt.merge(NODE_ARRAY_EXPAND: true))}"
+          "#{unparse(_1st, opt)}, #{unparse(_2nd, opt.merge(expand_ARRAY: true))}"
         }
       end
 
@@ -1155,16 +1262,16 @@ module Rensei
       # example: def foo(a, b, opt1=1, opt2=2, *rest, y, z, &blk); end
       def NODE_ARGS(node, opt_ = {})
         (
-          pre_num,
-          pre_init,
+          _, # pre_num
+          _, # pre_init
           opt,
-          first_post,
-          post_num,
-          post_init,
-          rest,
-          kw,
-          kwrest,
-          block
+          _, # first_post
+          _, # post_num
+          _, # post_init
+          _, # rest
+          _, # kw
+          _, # kwrest
+          _, # block
         ) = node.children
         "#{unparse(opt, opt_)}#{unparse(kw, opt_)}"
       end
@@ -1188,7 +1295,7 @@ module Rensei
             unparsed_post_init: info[:post_init]&.then { |node|
               node.type == :BLOCK ? node.children.map(&_unparse(opt)) : [unparse(node, opt)]
             } || [],
-            unparsed_opt: info[:opt]&.then { |it| unparse_NODE_OPT_ARG(it, opt.merge(NODE_DASGN_CURR_EXPAND: true, NODE_LASGN_EXPAND: true)) } || [],
+            unparsed_opt: info[:opt]&.then { |it| unparse_NODE_OPT_ARG(it, opt.merge(expand_DASGN_CURR: true, expand_LASGN: true)) } || [],
             unparsed_rest: unparse(info[:rest], opt)&.then { |it|
               if it == :NODE_SPECIAL_EXCESSIVE_COMMA
                 [" "]
@@ -1196,7 +1303,7 @@ module Rensei
                 ["*#{it}"]
               end
             } || [],
-            unparsed_kw: info[:kw]&.then { |it| unparse_NODE_KW_ARG(it, opt.merge(NODE_DASGN_CURR_EXPAND: true, NODE_LASGN_EXPAND: true, KW_ARG: true)) } || [],
+            unparsed_kw: info[:kw]&.then { |it| unparse_NODE_KW_ARG(it, opt.merge(expand_DASGN_CURR: true, expand_LASGN: true, KW_ARG: true)) } || [],
             unparsed_kwrest: info[:kwrest]&.then { |it| "**#{unparse(it, opt)}" },
           )
         }
@@ -1218,52 +1325,56 @@ module Rensei
         node.children.then { |tbl, args, body|
           break { args: "", body: unparse(body, opt) } if args.nil?
 
-  #         info = unparse_NODE_ARGS(args, opt)
           info = unparse_NODE_ARGS(args, opt.merge(_NODE_MASGN: true))
 
           # Support proc { |**| }
           break { args: "**", body: unparse(body, opt) } if tbl == [nil] && info[:kwrest]
 
+          tbl_ = tbl.dup
           pre_args = []
           [info[:pre_num], info[:unparsed_pre_init]&.size || 0].max.times {
-            tbl.shift.then { |it|
+            tbl_.shift.then { |it|
               pre_args << (it ? it : info[:unparsed_pre_init].shift)
             }
           }
 
           # skip to opt args
           # e.g. a = 1, b = 2
-          tbl = tbl.drop(info[:unparsed_opt].count)
+          tbl_ = tbl_.drop(info[:unparsed_opt].count)
 
           # skip to rest args
           # e.g. *a
-          tbl = tbl.drop(info[:unparsed_rest].count)
+          tbl_ = tbl_.drop(info[:unparsed_rest].count)
 
           star = nil
-          tbl.take_while(&:nil?).tap { |nils|
+          tbl_.take_while(&:nil?).tap { |nils|
             if info[:unparsed_post_init].count < nils.count
               star = "*"
-              tbl = tbl.drop(1)
+              tbl_ = tbl_.drop(1)
             end
           }
 
           post_args = []
           [info[:post_num], info[:unparsed_post_init]&.size || 0].max.times {
-            tbl.shift.then { |it|
+            tbl_.shift.then { |it|
               post_args << (it ? it : info[:unparsed_post_init].shift)
             }
           }
 
           # skip to kw args
           # e.g. a:, b: c: 1
-          tbl = tbl.drop(info[:unparsed_kw].count.tap { |count| break count + 1 if count != 0 })
+          tbl_ = tbl_.drop(info[:unparsed_kw].count.tap { |count| break count + 1 if count != 0 })
 
-          if info[:unparsed_kwrest] == "**" && tbl.fetch(0, 1) != nil
+          if info[:unparsed_kwrest] == "**" && tbl_.fetch(0, 1) != nil
             kwrest = ""
           else
             kwrest = info[:unparsed_kwrest]
           end
 
+          if opt.delete(:ignore_numbered_paramters)
+            pre_args -= [:_1, :_2, :_3, :_4, :_5, :_6, :_7, :_8, :_9]
+          end
+
           params = [
             pre_args,
             info[:unparsed_opt].join(", "),
@@ -1302,9 +1413,13 @@ module Rensei
       # format: case [nd_head]; [nd_body]; end
       # example: case x; in 1; foo; in 2; bar; else baz; end
       def NODE_CASE3(node, opt = {})
-        # Ruby 2.7
-        # :TODO:
-        node
+        node.children.then { |head, body, else_|
+          <<~EOS.chomp
+          case #{unparse(head, opt)}
+          #{unparse(body, opt)}#{else_ ? "\nelse\n#{unparse(else_, opt)}" : ""}
+          end
+          EOS
+        }
       end
 
       # list constructor
@@ -1319,18 +1434,28 @@ module Rensei
       end
 
       def NODE_IN(node, opt = {})
-        # TODO
-      end
-
-      # splat argument following arguments
-      # format: ..(*[nd_head], [nd_body..])
-      # example: foo(*ary, post_arg1, post_arg2)
-      def NODE_ARGSCAT(node, opt = {})
-        node.children.then { |head, body|
-          if body.type == :LIST
-            "#{unparse(head, opt)}, #{unparse(body, opt)}"
+        node.children.then { |head, body, next_|
+          in_ = opt.delete(:without_in) ? "" : "in "
+          next__ = next_&.type == :IN || next_.nil? ? unparse(next_, opt) : "else\n  #{unparse(next_, opt)}"
+          case head.type
+          when :IF
+            <<~EOS.chomp
+            #{in_}#{unparse(head.children[1], opt.merge(expand_ARRAY: true))} if #{unparse(head.children[0], opt)}
+              #{unparse(body, opt)}
+            #{next__}
+            EOS
+          when :UNLESS
+            <<~EOS.chomp
+            #{in_}#{unparse(head.children[1], opt.merge(expand_ARRAY: true))} unless #{unparse(head.children[0], opt)}
+              #{unparse(body, opt)}
+            #{next__}
+            EOS
           else
-            "#{unparse(head, opt)}, *#{unparse(body, opt)}"
+            <<~EOS.chomp
+            #{in_}#{unparse(head, opt.merge(expand_ARRAY: true))}
+              #{unparse(body, opt)}
+            #{next__}
+            EOS
           end
         }
       end
@@ -1338,19 +1463,52 @@ module Rensei
       # array pattern
       # format: [nd_pconst]([pre_args], ..., *[rest_arg], [post_args], ...)
       def NODE_ARYPTN(node, opt = {})
-        # :TODO:
-        node
+        node.children.then { |pconst, pre, rest, post|
+          # e.g. in Array[a, b]
+          pconst_ = unparse(pconst, opt) if pconst
+
+          opt_flags = { expand_ARRAY: true, expand_HASH: true, pattern_match_OR: true, pattern_match_LVAR: true, pattern_match_BEGIN: true }
+          pre_ = unparse(pre, opt.merge(opt_flags))
+          if rest == :NODE_SPECIAL_NO_NAME_REST
+            rest_ = "*"
+          elsif rest
+            rest_ = "*#{unparse(rest, opt.merge(opt_flags))}"
+          end
+          post_ = unparse(post, opt.merge(opt_flags))
+          "#{pconst_}[#{[pre_, rest_, post_].compact.join(", ")}]"
+        }
       end
 
+      # hash pattern
+      # format: [nd_pconst]([nd_pkwargs], ..., **[nd_pkwrestarg])
       def NODE_HSHPTN(node, opt = {})
-        # :TODO:
-        node
+        node.children.then { |pconst, pkwargs, pkwrestarg|
+
+          opt_flags = { expand_ARRAY: true, expand_HASH: true, pattern_match_OR: true, pattern_match_LVAR: true, pattern_match_BEGIN: true }
+
+          pkwargs_ = unparse(pkwargs, opt.merge(opt_flags))
+
+          if pkwrestarg == :NODE_SPECIAL_NO_REST_KEYWORD
+            pkwargs_ += ", **nil"
+          elsif pkwrestarg
+            pkwargs_ += ", **#{unparse(pkwrestarg, opt.merge(opt_flags))}"
+          end
+
+          # Support `in A[a: 1, b: 2]`
+          if pconst
+            "#{unparse(pconst, opt)}[#{pkwargs_}]"
+          else
+            "{ #{pkwargs_} }"
+          end
+        }
       end
     end
 
-    module Ruby3_0_0
+    module Ruby2_7_2
       include Ruby2_7_0
 
+      private
+
       # attr assignment with operator
       # format: [nd_recv].[attr] [nd_next->nd_mid]= [nd_value]
       #           where [attr]: [nd_next->nd_vid]
@@ -1360,6 +1518,17 @@ module Rensei
           "#{unparse(recv, opt)}.#{attr} #{op}= #{unparse(mid, opt)}"
         }
       end
+    end
+
+    module Ruby3_0_0
+      include Ruby2_7_2
+
+      # method call with block
+      # format: [nd_iter] { [nd_body] }
+      # example: 3.times { foo }
+      def NODE_ITER(node, opt = {})
+        super(node, opt.merge(ignore_numbered_paramters: true))
+      end
 
       # string literal with interpolation
       # format: [nd_lit]
@@ -1374,15 +1543,94 @@ module Rensei
           end
         }
       end
+
+      # case statement (pattern matching)
+      # format: case [nd_head]; [nd_body]; end
+      # example: case x; in 1; foo; in 2; bar; else baz; end
+      def NODE_CASE3(node, opt = {})
+        node.children.then { |head, body, else_|
+          # Add super `42 => result`
+          if body.children[1].nil?
+            "#{unparse(head, opt)} => #{unparse(body, opt.merge(without_in: true))}"
+          else
+            super
+          end
+        }
+      end
+
+      # find pattern
+      # format: [nd_pconst](*[pre_rest_arg], args, ..., *[post_rest_arg])
+      def NODE_FNDPTN(node, opt = {})
+        node.children.then { |pconst, pre, rest, post|
+          # e.g. in Array[a, b]
+          pconst_ = unparse(pconst, opt) if pconst
+
+          opt_flags = { expand_ARRAY: true, expand_HASH: true, pattern_match_OR: true, pattern_match_LVAR: true }
+
+          if pre == :NODE_SPECIAL_NO_NAME_REST
+            pre_ = "*"
+          elsif pre
+            pre_ = "*#{unparse(pre, opt.merge(opt_flags))}"
+          end
+
+          rest_ = unparse(rest, opt.merge(opt_flags))
+
+          if post == :NODE_SPECIAL_NO_NAME_REST
+            post_ = "*"
+          elsif post
+            post_ = "*#{unparse(post, opt.merge(opt_flags))}"
+          end
+
+          "#{pconst_}[#{[pre_, rest_, post_].compact.join(", ")}]"
+        }
+      end
+
+      # method definition
+      # format: def [nd_mid] [nd_defn]; end
+      # example: def foo; bar; end
+      def NODE_DEFN(node, opt = {})
+        node.children.then { |mid, defn|
+          # Add support `def hoge = 42`
+          if defn.children[1].nil?
+            info = unparse_NODE_SCOPE(defn, opt)
+            "def #{mid} = #{info[:body]}"
+          else
+            super
+          end
+        }
+      end
+
+      # singleton method definition
+      # format: def [nd_recv].[nd_mid] [nd_defn]; end
+      # example: def obj.foo; bar; end
+      def NODE_DEFS(node, opt = {})
+        node.children.then { |recv, mid, defn|
+          # Add support `def obj.hoge = 42`
+          if defn.children[1].nil?
+            info = unparse_NODE_SCOPE(defn, opt)
+            "def #{unparse(recv, opt)}.#{mid} = #{info[:body]}"
+          else
+            super
+          end
+        }
+      end
+    end
+
+    module Ruby3_1_0
+      include Ruby3_0_0
     end
 
     case RUBY_VERSION
     when ("2.6.0"..."2.7.0")
       VERSION = Ruby2_6_0
-    when ("2.7.0"..."3.0.0")
+    when ("2.7.0"..."2.7.2")
       VERSION = Ruby2_7_0
-    when ("3.0.0"...)
+    when ("2.7.2"..."3.0.0")
+      VERSION = Ruby2_7_2
+    when ("3.0.0"..."3.1.0")
       VERSION = Ruby3_0_0
+    when ("3.1.0"...)
+      VERSION = Ruby3_1_0
     else
       railse "Not implemented Ruby version #{RUBY_VERSION}"
     end
@@ -1391,8 +1639,8 @@ module Rensei
       include VERSION
     end
 
-    def self.unparse(node)
-      Caller.new.unparse(node)
+    def self.unparse(node, opt = {})
+      Caller.new.unparse(node, opt)
     end
   end
 end

data/lib/rensei/version.rb

@@ -1,3 +1,3 @@
 module Rensei
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

data/rake_spec_all.sh

@@ -0,0 +1,6 @@
+#!/bin/bash -ex
+RBENV_VERSION=2.6.4 bundle exec rake spec
+RBENV_VERSION=2.7.0 bundle exec rake spec
+RBENV_VERSION=2.7.2 bundle exec rake spec
+RBENV_VERSION=3.0.1 bundle exec rake spec
+RBENV_VERSION=3.1.0-dev bundle exec rake spec

data/rensei.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
   spec.description   = %q{Unparse from `RubyVM::AbstractSyntaxTree::Node` to Ruby code.}
   spec.homepage      = ""
   spec.license       = "MIT"
-  spec.required_ruby_version = Gem::Requirement.new(">= 2.3.0")
+  spec.required_ruby_version = Gem::Requirement.new(">= 2.6.4")
 
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
@@ -20,4 +20,6 @@ Gem::Specification.new do |spec|
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
+
+  spec.add_development_dependency "super_diff"
 end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: rensei
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - manga_osyo
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-11-30 00:00:00.000000000 Z
-dependencies: []
+date: 2021-08-15 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: super_diff
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Unparse from `RubyVM::AbstractSyntaxTree::Node` to Ruby code.
 email:
 - manga.osyo@gmail.com
@@ -17,6 +31,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/rensei.yml"
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"
@@ -26,10 +41,12 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
+- bundle_install_all.sh
 - lib/rensei.rb
 - lib/rensei/node_to_hash.rb
 - lib/rensei/unparser.rb
 - lib/rensei/version.rb
+- rake_spec_all.sh
 - rensei.gemspec
 - sample/bocchi.rb
 - sample/sample.rb
@@ -45,14 +62,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.0
+      version: 2.6.4
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: Unparse from `RubyVM::AbstractSyntaxTree::Node` to Ruby code.