ruby_mod_kit 0.0.1 → 0.0.3

data/lib/ruby_mod_kit/node/wrap.rb

@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+# rbs_inline: enabled
+
+require_relative "call_node"
+require_relative "def_node"
+require_relative "def_parent_node"
+require_relative "parameter_node"
+require_relative "statements_node"
+require_relative "symbol_node"
+require_relative "untyped_node"
+
+module RubyModKit
+  # The namespace of transpile node.
+  module Node
+    class << self
+      # @rbs prism_node: Prism::Node
+      # @rbs parent: Node::BaseNode
+      # @rbs prev: Node::BaseNode | nil
+      # @rbs return: Node::BaseNode
+      def wrap(prism_node, parent:, prev: nil)
+        case prism_node
+        when Prism::CallNode
+          Node::CallNode.new(prism_node, parent: parent, prev: prev)
+        when Prism::DefNode
+          Node::DefNode.new(prism_node, parent: parent, prev: prev)
+        when Prism::ClassNode, Prism::ModuleNode
+          Node::DefParentNode.new(prism_node, parent: parent, prev: prev)
+        when Prism::RequiredParameterNode, Prism::OptionalKeywordParameterNode,
+            Prism::OptionalParameterNode, Prism::RequiredKeywordParameterNode,
+            Prism::RestParameterNode
+          Node::ParameterNode.new(prism_node, parent: parent, prev: prev)
+        when Prism::StatementsNode
+          Node::StatementsNode.new(prism_node, parent: parent, prev: prev)
+        when Prism::SymbolNode
+          Node::SymbolNode.new(prism_node, parent: parent, prev: prev)
+        else
+          Node::UntypedNode.new(prism_node, parent: parent, prev: prev)
+        end
+      end
+    end
+  end
+end

data/lib/ruby_mod_kit/node.rb

@@ -3,162 +3,18 @@
 # rbs_inline: enabled
 
 module RubyModKit
-  # The class of transpile node.
-  class Node
-    # @rbs @location: Prism::Location
-    # @rbs @children: Array[Node]
-    # @rbs @ancestors: Array[Node]
-
-    attr_reader :location #: Prism::Location
-
-    # @rbs return: void
-    def initialize
-      @location = prism_node.location
-    end
-
-    # @rbs return: Array[Node]
-    def children
-      return @children if @children
-
-      @children = prism_node.child_nodes.compact.map do |prism_child_node|
-        wrap(prism_child_node)
-      end
-    end
-
-    # @rbs prism_node: Prism::Node
-    # @rbs return: Node
-    def wrap(prism_node)
-      case prism_node
-      when Prism::SymbolNode
-        Node::SymbolNode.new(prism_node, parent: self)
-      when Prism::ClassNode
-        Node::ClassNode.new(prism_node, parent: self)
-      when Prism::DefNode
-        Node::DefNode.new(prism_node, parent: self)
-      when Prism::RequiredParameterNode, Prism::OptionalKeywordParameterNode,
-           Prism::OptionalParameterNode, Prism::RequiredKeywordParameterNode,
-           Prism::RestParameterNode
-        Node::ParameterNode.new(prism_node, parent: self)
-      when Prism::StatementsNode
-        Node::StatementsNode.new(prism_node, parent: self)
-      when Prism::CallNode
-        Node::CallNode.new(prism_node, parent: self)
-      else
-        Node::UntypedNode.new(prism_node, parent: self)
-      end
-    end
-
-    # @rbs return: Array[Node]
-    def ancestors
-      return @ancestors if @ancestors
-
-      parent = @parent
-      @ancestors = if parent
-        [parent] + parent.ancestors
-      else
-        []
-      end
-    end
-
-    # @rbs return: Symbol
-    def name
-      raise(RubyModKit::Error, "Expected ParameterNode but #{self.class}:#{prism_node.inspect}")
-    end
-
-    # @rbs offset: Integer
-    # @rbs return: Node | nil
-    def node_at(offset)
-      return nil unless include?(offset)
-
-      child = children.find { _1.include?(offset) }
-      child&.node_at(offset) || self
-    end
-
-    # @rbs offset: Integer
-    # @rbs return: Node::StatementsNode | nil
-    def statements_node_at(offset)
-      node = node_at(offset) || return
-      [node, *node.ancestors].each { return _1 if _1.is_a?(Node::StatementsNode) }
-      nil
-    end
-
-    # @rbs offset: Integer
-    # @rbs return: Node::DefNode | nil
-    def def_node_at(offset)
-      node = node_at(offset) || return
-      [node, *node.ancestors].each { return _1 if _1.is_a?(Node::DefNode) }
-      nil
-    end
-
-    # @rbs offset: Integer
-    # @rbs return: Node::ParameterNode | nil
-    def parameter_node_at(offset)
-      node = node_at(offset) || return
-      [node, *node.ancestors].each { return _1 if _1.is_a?(Node::ParameterNode) }
-      nil
-    end
-
-    # @rbs offset: Integer
-    # @rbs return: Node::ClassNode | nil
-    def class_node_at(offset)
-      node = node_at(offset) || return
-      [node, *node.ancestors].each { return _1 if _1.is_a?(Node::ClassNode) }
-      nil
-    end
-
-    # @rbs offset: Integer
-    # @rbs return: bool
-    def include?(offset)
-      self.offset <= offset && offset <= prism_node.location.end_offset
-    end
-
-    # @rbs return: Prism::Node & Prism::_Node
-    def prism_node
-      raise RubyModKit::Error
-    end
-
-    # @rbs return: Integer
-    def offset
-      location.start_offset
-    end
-
-    # @rbs return: String
-    def inspect
-      str = +"#<#{self.class} "
-      first = true
-      instance_variables.each do |ivar_name|
-        case ivar_name
-        when :@children, :@ancestors, :@parent
-          next
-        end
-
-        if first
-          first = false
-        else
-          str << ", "
-        end
-        str << "#{ivar_name}="
-        value = instance_variable_get(ivar_name)
-        str << (
-          case value
-          when Prism::Node
-            "#<#{value.class} location=#{value.location.inspect}>"
-          else
-            value.inspect
-          end
-        )
-      end
-      str << ">"
-      str
-    end
+  # The namespace of transpile node.
+  module Node
   end
 end
 
+require_relative "node/base_node"
 require_relative "node/symbol_node"
-require_relative "node/class_node"
+require_relative "node/def_parent_node"
 require_relative "node/call_node"
 require_relative "node/def_node"
 require_relative "node/parameter_node"
 require_relative "node/program_node"
 require_relative "node/statements_node"
 require_relative "node/untyped_node"
+require_relative "node/wrap"

data/lib/ruby_mod_kit/offset_diff.rb

@@ -2,23 +2,24 @@
 
 # rbs_inline: enabled
 
-require "sorted_set"
-
 module RubyModKit
   # The class of offset differences.
   class OffsetDiff
-    # @rbs @diffs: SortedSet[[Integer, Integer, Integer]]
+    # @rbs @diffs: Hash[Integer, Integer]
+    # @rbs @offsets: Array[Integer]
 
     # @rbs return: void
     def initialize
-      @diffs = SortedSet.new
+      @diffs = {}
+      @offsets = []
     end
 
     # @rbs src_offset: Integer
     # @rbs return: Integer
     def [](src_offset)
       dst_offset = src_offset
-      @diffs.each do |(offset, _, diff)|
+      @offsets.each do |offset|
+        diff = @diffs[offset]
         break if offset > src_offset
         break if offset == src_offset && diff < 0
 
@@ -31,7 +32,12 @@ module RubyModKit
     # @rbs new_diff: Integer
     # @rbs return: void
     def insert(src_offset, new_diff)
-      @diffs << [src_offset, @diffs.size, new_diff]
+      if @diffs[src_offset]
+        @diffs[src_offset] += new_diff
+      else
+        @diffs[src_offset] = new_diff
+        @offsets.insert(@offsets.bsearch_index { _1 > src_offset } || -1, src_offset)
+      end
     end
   end
 end

data/lib/ruby_mod_kit/version.rb

@@ -3,5 +3,5 @@
 # rbs_inline: enabled
 
 module RubyModKit
-  VERSION = "0.0.1" #: String
+  VERSION = "0.0.3" #: String
 end

data/lib/ruby_mod_kit.rb

@@ -13,26 +13,36 @@ module RubyModKit
   class << self
     # @rbs file: String
     # @rbs *args: String
+    # @rbs output: String | nil
     # @rbs return: void
-    def execute_file(file, *args)
-      rb_file = transpile_file(file)
-      execute_rb_file(rb_file, *args)
+    def execute_file(file, *args, output: nil)
+      rb_script = transpile_file(file, output: output)
+      if output
+        execute_rb_file(output, *args)
+      else
+        execute_rb(rb_script, *args)
+      end
     end
 
     # @rbs file: String
+    # @rbs output: String | IO | nil
     # @rbs return: String
-    def transpile_file(file)
-      rb_src = transpile(File.read(file), filename: file)
-      rb_path = rb_path(file)
-      File.write(rb_path, rb_src)
-      rb_path
+    def transpile_file(file, output: nil)
+      rb_script = transpile(File.read(file), filename: file)
+      case output
+      when IO
+        output.write(rb_script)
+      when String
+        File.write(output, rb_script)
+      end
+      rb_script
     end
 
     # @rbs src: String
     # @rbs filename: String | nil
     # @rbs return: String
     def transpile(src, filename: nil)
-      Transpiler.new.transpile(src, filename: filename)
+      Generation.resolve(src, filename: filename).script
     end
 
     # @rbs file: String
@@ -47,13 +57,35 @@ module RubyModKit
     def rb_path(path)
       path.sub(/(?:\.rbm)?$/, ".rb")
     end
+
+    # @rbs rb_script: String
+    # @rbs *args: String
+    # @rbs return: void
+    def execute_rb(rb_script, *args)
+      ARGV.replace(args)
+      eval(rb_script, TOPLEVEL_BINDING) # rubocop:disable Security/Eval
+    end
+
+    # @rbs type: String
+    # @rbs return: String
+    def unify_type(type)
+      type[/\A\(([^()]*)\)\z/, 1] || type
+    end
   end
 end
 
 require_relative "ruby_mod_kit/version"
-require_relative "ruby_mod_kit/transpiler"
+require_relative "ruby_mod_kit/corrector"
+require_relative "ruby_mod_kit/corrector_manager"
+require_relative "ruby_mod_kit/feature"
 require_relative "ruby_mod_kit/generation"
 require_relative "ruby_mod_kit/memo"
-require_relative "ruby_mod_kit/node"
+require_relative "ruby_mod_kit/memo_pad"
 require_relative "ruby_mod_kit/mission"
+require_relative "ruby_mod_kit/node"
 require_relative "ruby_mod_kit/offset_diff"
+
+require_relative "ruby_mod_kit/feature/instance_variable_parameter"
+require_relative "ruby_mod_kit/feature/overload"
+require_relative "ruby_mod_kit/feature/type"
+require_relative "ruby_mod_kit/feature/type/rbs_inline"

data/ruby_mod_kit.gemspec

@@ -4,14 +4,10 @@ require_relative "lib/ruby_mod_kit/version"
 
 Gem::Specification.new do |spec|
   spec.name = "ruby_mod_kit"
+  spec.version = RubyModKit::VERSION
   spec.authors = ["wanabe"]
   spec.email = ["s.wanabe@gmail.com"]
 
-  version = RubyModKit::VERSION
-  tag_version = `git tag --points-at HEAD`.chomp.sub("v", "")
-  version += "-#{`git rev-parse --short HEAD`}" if version != tag_version
-  spec.version = version
-
   spec.summary = "ruby_mod_kit"
   spec.description = "ruby_mod_kit"
   spec.homepage = "https://github.com/wanabe/ruby_mod_kit"
@@ -43,7 +39,6 @@ Gem::Specification.new do |spec|
 
   # Uncomment to register a new dependency of your gem
   spec.add_dependency "prism", "~> 1.0"
-  spec.add_dependency "sorted_set", "~> 1.0"
   spec.add_dependency "thor", "~> 1.3"
 
   # For more information and examples about making a new gem, check out our

data/sig/generated/ruby_mod_kit/core_ext/eval.rbs

@@ -0,0 +1,17 @@
+# Generated from lib/ruby_mod_kit/core_ext/eval.rb with RBS::Inline
+
+# Define RubyMotKit.eval
+module RubyModKit
+  module CoreExt
+    # the extension for eval
+    module Eval
+      # @rbs expr: String
+      # @rbs *rest: Object
+      # @rbs transpile: bool
+      # @rbs return: Object
+      def self?.eval: (String expr, *Object rest, ?transpile: bool) -> Object
+    end
+  end
+
+  include CoreExt::Eval
+end

data/sig/generated/ruby_mod_kit/core_ext/load.rbs

@@ -0,0 +1,33 @@
+# Generated from lib/ruby_mod_kit/core_ext/load.rb with RBS::Inline
+
+# Define RubyMotKit.load/require
+module RubyModKit
+  module CoreExt
+    # the extension for load/require
+    module Load
+      LOADABLE_EXTS: Array[String]
+
+      # @rbs path: String
+      # @rbs wrap: bool
+      # @rbs return: bool
+      def self?.load: (String path, ?bool wrap) -> bool
+
+      # @rbs path: String
+      # @rbs return: bool
+      def self?.require: (String path) -> bool
+
+      # @rbs return: Array[String]
+      def self.loaded_features: () -> Array[String]
+
+      # @rbs return: Array[String]
+      def self.load_path: () -> Array[String]
+
+      # @rbs path: String
+      # @rbs expanded: bool
+      # @rbs return: String | nil
+      def self.require_path: (String path, ?expanded: bool) -> (String | nil)
+    end
+  end
+
+  include CoreExt::Load
+end

data/sig/generated/ruby_mod_kit/corrector.rbs

@@ -0,0 +1,16 @@
+# Generated from lib/ruby_mod_kit/corrector.rb with RBS::Inline
+
+module RubyModKit
+  # the base class of corrector
+  class Corrector
+    # @rbs return: Array[Symbol]
+    def correctable_error_types: () -> Array[Symbol]
+
+    # @rbs _parse_error: Prism::ParseError
+    # @rbs _generation: Generation
+    # @rbs _root_node: Node::ProgramNode
+    # @rbs _memo_pad: MemoPad
+    # @rbs return: void
+    def correct: (untyped _parse_error, untyped _generation, untyped _root_node, untyped _memo_pad) -> void
+  end
+end

data/sig/generated/ruby_mod_kit/corrector_manager.rbs

@@ -0,0 +1,26 @@
+# Generated from lib/ruby_mod_kit/corrector_manager.rb with RBS::Inline
+
+module RubyModKit
+  # the class to manege parse error correctors
+  class CorrectorManager
+    @previous_error_messages: Array[String]
+
+    @correctors_error_map: Hash[Symbol, Array[Corrector]]
+
+    # @rbs features: Array[Feature]
+    # @rbs return: void
+    def initialize: (Array[Feature] features) -> void
+
+    # @rbs generation: Generation
+    # @rbs root_node: Node::ProgramNode
+    # @rbs parse_result: Prism::ParseResult
+    # @rbs memo_pad: MemoPad
+    # @rbs return: bool
+    def perform: (Generation generation, Node::ProgramNode root_node, Prism::ParseResult parse_result, MemoPad memo_pad) -> bool
+
+    # @rbs generation: Generation
+    # @rbs parse_result: Prism::ParseResult
+    # @rbs return: void
+    def check_prev_errors: (Generation generation, Prism::ParseResult parse_result) -> void
+  end
+end

data/sig/generated/ruby_mod_kit/feature/instance_variable_parameter/instance_variable_parameter_corrector.rbs

@@ -0,0 +1,20 @@
+# Generated from lib/ruby_mod_kit/feature/instance_variable_parameter/instance_variable_parameter_corrector.rb with RBS::Inline
+
+module RubyModKit
+  class Feature
+    class InstanceVariableParameter
+      # the class to correct `def foo(@bar) ...` -> `def foo(bar) ...`
+      class InstanceVariableParameterCorrector < Corrector
+        # @rbs return: Array[Symbol]
+        def correctable_error_types: () -> Array[Symbol]
+
+        # @rbs parse_error: Prism::ParseError
+        # @rbs generation: Generation
+        # @rbs root_node: Node::ProgramNode
+        # @rbs memo_pad: MemoPad
+        # @rbs return: void
+        def correct: (Prism::ParseError parse_error, Generation generation, Node::ProgramNode root_node, MemoPad memo_pad) -> void
+      end
+    end
+  end
+end

data/sig/generated/ruby_mod_kit/feature/instance_variable_parameter/instance_variable_parameter_mission.rbs

@@ -0,0 +1,21 @@
+# Generated from lib/ruby_mod_kit/feature/instance_variable_parameter/instance_variable_parameter_mission.rb with RBS::Inline
+
+module RubyModKit
+  class Feature
+    class InstanceVariableParameter
+      # The mission for instance variable arguments
+      class InstanceVariableParameterMission < Mission
+        @assignment: String
+
+        attr_reader assignment: String
+
+        # @rbs generation: Generation
+        # @rbs root_node: Node::ProgramNode
+        # @rbs _parse_result: Prism::ParseResult
+        # @rbs memo_pad: MemoPad
+        # @rbs return: bool
+        def perform: (Generation generation, Node::ProgramNode root_node, untyped _parse_result, MemoPad memo_pad) -> bool
+      end
+    end
+  end
+end

data/sig/generated/ruby_mod_kit/feature/instance_variable_parameter.rbs

@@ -0,0 +1,14 @@
+# Generated from lib/ruby_mod_kit/feature/instance_variable_parameter.rb with RBS::Inline
+
+module RubyModKit
+  class Feature
+    # namespace for instance_variable parameter feature
+    class InstanceVariableParameter < Feature
+      # @rbs return: Array[Corrector]
+      def create_correctors: () -> Array[Corrector]
+
+      # @rbs return: Array[Mission]
+      def create_missions: () -> Array[Mission]
+    end
+  end
+end

data/sig/generated/ruby_mod_kit/feature/overload/overload_mission.rbs

@@ -0,0 +1,24 @@
+# Generated from lib/ruby_mod_kit/feature/overload/overload_mission.rb with RBS::Inline
+
+module RubyModKit
+  class Feature
+    class Overload
+      # The mission for overload
+      class OverloadMission < Mission
+        @modified: bool
+
+        OVERLOAD_METHOD_MAP: Hash[Symbol, String]
+
+        # @rbs return: void
+        def initialize: () -> void
+
+        # @rbs generation: Generation
+        # @rbs root_node: Node::ProgramNode
+        # @rbs parse_result: Prism::ParseResult
+        # @rbs memo_pad: MemoPad
+        # @rbs return: bool
+        def perform: (Generation generation, Node::ProgramNode root_node, Prism::ParseResult parse_result, MemoPad memo_pad) -> bool
+      end
+    end
+  end
+end

data/sig/generated/ruby_mod_kit/feature/overload.rbs

@@ -0,0 +1,11 @@
+# Generated from lib/ruby_mod_kit/feature/overload.rb with RBS::Inline
+
+module RubyModKit
+  class Feature
+    # namespace for overload feature
+    class Overload < Feature
+      # @rbs return: Array[Mission]
+      def create_missions: () -> Array[Mission]
+    end
+  end
+end

data/sig/generated/ruby_mod_kit/feature/type/instance_variable_colon_corrector.rbs

@@ -0,0 +1,20 @@
+# Generated from lib/ruby_mod_kit/feature/type/instance_variable_colon_corrector.rb with RBS::Inline
+
+module RubyModKit
+  class Feature
+    class Type
+      # the class to correct `@var: Type` -> `# @rbs @var: Type`
+      class InstanceVariableColonCorrector < Corrector
+        # @rbs return: Array[Symbol]
+        def correctable_error_types: () -> Array[Symbol]
+
+        # @rbs parse_error: Prism::ParseError
+        # @rbs generation: Generation
+        # @rbs root_node: Node::ProgramNode
+        # @rbs memo_pad: MemoPad
+        # @rbs return: void
+        def correct: (Prism::ParseError parse_error, Generation generation, Node::ProgramNode root_node, MemoPad memo_pad) -> void
+      end
+    end
+  end
+end

data/sig/generated/ruby_mod_kit/feature/type/parameter_arrow_corrector.rbs

@@ -0,0 +1,39 @@
+# Generated from lib/ruby_mod_kit/feature/type/parameter_arrow_corrector.rb with RBS::Inline
+
+module RubyModKit
+  class Feature
+    class Type
+      # the class to correct `def foo(Bar => bar, *Buz => buz)` -> `def foo(bar, *buz)`
+      class ParameterArrowCorrector < Corrector
+        # @rbs return: Array[Symbol]
+        def correctable_error_types: () -> Array[Symbol]
+
+        # @rbs parse_error: Prism::ParseError
+        # @rbs generation: Generation
+        # @rbs root_node: Node::ProgramNode
+        # @rbs memo_pad: MemoPad
+        # @rbs return: void
+        def correct: (Prism::ParseError parse_error, Generation generation, Node::ProgramNode root_node, MemoPad memo_pad) -> void
+
+        # @rbs parse_error: Prism::ParseError
+        # @rbs generation: Generation
+        # @rbs root_node: Node::ProgramNode
+        # @rbs memo_pad: MemoPad
+        # @rbs return: void
+        def remove_arrow_before_parameter: (Prism::ParseError parse_error, Generation generation, Node::ProgramNode root_node, MemoPad memo_pad) -> void
+
+        # @rbs parse_error: Prism::ParseError
+        # @rbs generation: Generation
+        # @rbs root_node: Node::ProgramNode
+        # @rbs memo_pad: MemoPad
+        # @rbs return: void
+        def remove_arrow_after_quailifier: (Prism::ParseError parse_error, Generation generation, Node::ProgramNode root_node, MemoPad memo_pad) -> void
+
+        # @rbs parse_error: Prism::ParseError
+        # @rbs generation: Generation
+        # @rbs return: void
+        def wrap_parameter_type_for_next_parse: (Prism::ParseError parse_error, Generation generation) -> void
+      end
+    end
+  end
+end

data/sig/generated/ruby_mod_kit/feature/type/rbs_inline/type_attr_mission.rbs

@@ -0,0 +1,19 @@
+# Generated from lib/ruby_mod_kit/feature/type/rbs_inline/type_attr_mission.rb with RBS::Inline
+
+module RubyModKit
+  class Feature
+    class Type
+      class RbsInline
+        # The mission for parameter types
+        class TypeAttrMission < Mission
+          # @rbs generation: Generation
+          # @rbs root_node: Node::ProgramNode
+          # @rbs _parse_result: Prism::ParseResult
+          # @rbs memo_pad: MemoPad
+          # @rbs return: bool
+          def perform: (Generation generation, Node::ProgramNode root_node, untyped _parse_result, MemoPad memo_pad) -> bool
+        end
+      end
+    end
+  end
+end

data/sig/generated/ruby_mod_kit/feature/type/rbs_inline/type_instance_variable_mission.rbs

@@ -0,0 +1,19 @@
+# Generated from lib/ruby_mod_kit/feature/type/rbs_inline/type_instance_variable_mission.rb with RBS::Inline
+
+module RubyModKit
+  class Feature
+    class Type
+      class RbsInline
+        # The mission for instance variable types
+        class TypeInstanceVariableMission < Mission
+          # @rbs generation: Generation
+          # @rbs root_node: Node::ProgramNode
+          # @rbs parse_result: Prism::ParseResult
+          # @rbs memo_pad: MemoPad
+          # @rbs return: bool
+          def perform: (Generation generation, Node::ProgramNode root_node, Prism::ParseResult parse_result, MemoPad memo_pad) -> bool
+        end
+      end
+    end
+  end
+end