t-ruby 0.0.41 → 0.0.42

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6a7c7a93e1498a150b541ea7f7838c08435a33ead72774b7e4c0b8ead951e9d3
-  data.tar.gz: 1fbfb9ea6b276e130ef04891f39d691e362d5352dc4f0209b00009105f13c3a0
+  metadata.gz: 75019794a577853cf5a7e704febef3868a1ddd06776e43f50dc684d7dde87e3c
+  data.tar.gz: 89a255f7e7b68e2becd6314be09470424d5f418324c40bcc77a7311e6006d9f0
 SHA512:
-  metadata.gz: 82cbc96204194f51b65f484aeda25383e285ce902c325e269766e77871e9dccacc548111e864ba2bfb27ca48fc69c7e22c5a0b1eee8e7c25e4763417ffe2c8fe
-  data.tar.gz: ed5f8ad72344e624e8a95d1e9a48078e0f6679d914f978974e0117b75bbc11ce2fbe08ece39360b20ce777ef5c5c333f37376f216272c1e6aa983eb18585fc92
+  metadata.gz: 4000a38df6e83591a15f453af3b4d5f759b1af8e869478737c1d7711e34c7e1d65c89df34e56a6575d41e2f120e951970fde1ac444bf24d73c1167a24de875c4
+  data.tar.gz: 9273b4bf7d8a9af3ccbe0fa0d93914b13c9ce09f464902a4974749780871516c8fbaeb33a60d1dca754914dde09e498148ec080ff31fef3b11a0a88d96642eee

data/lib/t_ruby/cli.rb

@@ -135,7 +135,7 @@ module TRuby
           compiler:
             strictness: standard  # strict | standard | permissive
             generate_rbs: true
-            target_ruby: "3.0"
+            target_ruby: "#{RubyVersion.current.major}.#{RubyVersion.current.minor}"
             # experimental: []
             # checks:
             #   no_implicit_any: false

data/lib/t_ruby/code_emitter.rb

@@ -0,0 +1,254 @@
+# frozen_string_literal: true
+
+module TRuby
+  # Version-specific code transformation strategies
+  #
+  # @example
+  #   emitter = CodeEmitter.for_version("4.0")
+  #   result = emitter.transform(source)
+  #
+  module CodeEmitter
+    # Factory method to get appropriate emitter for target Ruby version
+    #
+    # @param target_ruby [String] target Ruby version (e.g., "3.0", "4.0")
+    # @return [Base] appropriate emitter instance
+    def self.for_version(target_ruby)
+      version = RubyVersion.parse(target_ruby)
+
+      if version.numbered_parameters_raise_error?
+        Ruby40.new(version)
+      elsif version.supports_it_parameter?
+        Ruby34.new(version)
+      elsif version.supports_anonymous_block_forwarding?
+        Ruby31.new(version)
+      else
+        Ruby30.new(version)
+      end
+    end
+
+    # Base class for version-specific code emitters
+    class Base
+      attr_reader :version
+
+      def initialize(version)
+        @version = version
+      end
+
+      # Apply all transformations for this version
+      #
+      # @param source [String] source code to transform
+      # @return [String] transformed source code
+      def transform(source)
+        result = source.dup
+        result = transform_numbered_params(result)
+        transform_block_forwarding(result)
+      end
+
+      # Transform numbered block parameters (_1, _2, etc.)
+      # Default: no transformation
+      #
+      # @param source [String] source code
+      # @return [String] transformed source code
+      def transform_numbered_params(source)
+        source
+      end
+
+      # Transform block forwarding syntax
+      # Default: no transformation
+      #
+      # @param source [String] source code
+      # @return [String] transformed source code
+      def transform_block_forwarding(source)
+        source
+      end
+
+      # Check if this version supports the `it` implicit block parameter
+      #
+      # @return [Boolean]
+      def supports_it?
+        false
+      end
+
+      # Check if numbered parameters raise NameError in this version
+      #
+      # @return [Boolean]
+      def numbered_params_error?
+        false
+      end
+    end
+
+    # Ruby 3.0 emitter - baseline, no transformations
+    class Ruby30 < Base
+      # Ruby 3.0 uses standard syntax, no transformations needed
+    end
+
+    # Ruby 3.1+ emitter - supports anonymous block forwarding
+    class Ruby31 < Base
+      # Transform `def foo(&block) ... bar(&block)` to `def foo(&) ... bar(&)`
+      #
+      # Only transforms when the block parameter is ONLY used for forwarding,
+      # not when it's called directly (e.g., block.call)
+      def transform_block_forwarding(source)
+        result = source.dup
+
+        # Find method definitions with block parameters
+        # Pattern: def method_name(&block_name)
+        result.gsub!(/def\s+(\w+[?!=]?)\s*\(([^)]*?)&(\w+)\s*\)/) do |_match|
+          method_name = ::Regexp.last_match(1)
+          other_params = ::Regexp.last_match(2)
+          block_name = ::Regexp.last_match(3)
+
+          # Find the method body to check block usage
+          method_start = ::Regexp.last_match.begin(0)
+          remaining = result[method_start..]
+
+          # Check if block is only used for forwarding (not called directly)
+          if block_only_forwarded?(remaining, block_name)
+            "def #{method_name}(#{other_params}&)"
+          else
+            "def #{method_name}(#{other_params}&#{block_name})"
+          end
+        end
+
+        # Replace block forwarding calls with anonymous forwarding
+        # This is a simplified approach - in practice we'd need proper scope tracking
+        result.gsub!(/(\w+)\s*\(\s*&(\w+)\s*\)/) do |match|
+          call_name = ::Regexp.last_match(1)
+          ::Regexp.last_match(2)
+
+          # Check if this block name was converted to anonymous
+          if result.include?("def ") && result.include?("(&)")
+            "#{call_name}(&)"
+          else
+            match
+          end
+        end
+
+        result
+      end
+
+      private
+
+      # Check if a block parameter is only used for forwarding
+      def block_only_forwarded?(method_body, block_name)
+        # Simple heuristic: if block_name appears with .call or without &, it's not just forwarding
+        # Look for patterns like: block_name.call, block_name.(), yield
+
+        # Extract method body (until next def or end of class)
+        lines = method_body.lines
+        depth = 0
+        body_lines = []
+
+        lines.each do |line|
+          depth += 1 if line.match?(/\b(def|class|module|do|begin|case|if|unless|while|until)\b/)
+          depth -= 1 if line.match?(/\bend\b/)
+          body_lines << line
+          break if depth <= 0 && body_lines.length > 1
+        end
+
+        body = body_lines.join
+
+        # Check for direct block usage
+        return false if body.match?(/\b#{block_name}\s*\./)     # block.call, block.(), etc.
+        return false if body.match?(/\b#{block_name}\s*\[/)     # block[args]
+        return false if body.match?(/\byield\b/)                # yield instead of forwarding
+
+        # Only &block_name patterns - this is forwarding
+        true
+      end
+    end
+
+    # Ruby 3.4+ emitter - supports `it` implicit block parameter
+    class Ruby34 < Ruby31
+      def supports_it?
+        true
+      end
+
+      # Ruby 3.4 still supports _1 syntax, so no transformation needed by default
+      # Users can opt-in to using `it` style if they want
+    end
+
+    # Ruby 4.0+ emitter - _1 raises NameError, must use `it`
+    class Ruby40 < Ruby34
+      def numbered_params_error?
+        true
+      end
+
+      # Transform numbered parameters to appropriate syntax
+      #
+      # - Single _1 → it
+      # - Multiple (_1, _2) → explicit |k, v| params
+      def transform_numbered_params(source)
+        result = source.dup
+
+        # Simple approach: replace all _1 with it when it's the only numbered param in scope
+        # For complex cases with _2+, we'd need proper parsing
+        # For now, do a global replacement if _2 etc are not present
+        if result.match?(/\b_[2-9]\b/)
+          # Has multiple numbered params - need to convert to explicit params
+          # This is a complex case that requires proper block parsing
+          transform_multi_numbered_params(result)
+        else
+          # Only _1 is used - simple replacement
+          result.gsub(/\b_1\b/, "it")
+        end
+      end
+
+      private
+
+      def transform_multi_numbered_params(source)
+        result = source.dup
+
+        # Find blocks and transform them
+        # Use a recursive approach with placeholder replacement
+
+        # Replace innermost blocks first
+        loop do
+          changed = false
+          result = result.gsub(/\{([^{}]*)\}/) do |block|
+            content = ::Regexp.last_match(1)
+            max_param = find_max_numbered_param(content)
+
+            if max_param > 1
+              # Multiple params - convert to explicit
+              param_names = generate_param_names(max_param)
+              new_content = content.dup
+              (1..max_param).each do |i|
+                new_content.gsub!(/\b_#{i}\b/, param_names[i - 1])
+              end
+              changed = true
+              "{ |#{param_names.join(", ")}| #{new_content.strip} }"
+            elsif max_param == 1
+              # Single _1 - convert to it
+              changed = true
+              "{ #{content.gsub(/\b_1\b/, "it").strip} }"
+            else
+              block
+            end
+          end
+          break unless changed
+        end
+
+        result
+      end
+
+      def find_max_numbered_param(content)
+        max = 0
+        content.scan(/\b_(\d+)\b/) do |match|
+          num = match[0].to_i
+          max = num if num > max
+        end
+        max
+      end
+
+      def generate_param_names(count)
+        # Generate simple parameter names: a, b, c, ... or k, v for 2
+        if count == 2
+          %w[k v]
+        else
+          ("a".."z").take(count)
+        end
+      end
+    end
+  end
+end

data/lib/t_ruby/compiler.rb

@@ -380,8 +380,8 @@ module TRuby
         ir_program = result[:program]
       end
 
-      # Generate Ruby code using IR-aware generator
-      generator = IRCodeGenerator.new
+      # Generate Ruby code using IR-aware generator with target Ruby version
+      generator = IRCodeGenerator.new(target_ruby: @config.target_ruby)
       generator.generate_with_source(ir_program, source)
     end
 
@@ -434,8 +434,12 @@ module TRuby
 
   # IR-aware code generator for source-preserving transformation
   class IRCodeGenerator
-    def initialize
+    attr_reader :emitter
+
+    # @param target_ruby [String] target Ruby version (e.g., "3.0", "4.0")
+    def initialize(target_ruby: "3.0")
       @output = []
+      @emitter = CodeEmitter.for_version(target_ruby)
     end
 
     # Generate Ruby code from IR program
@@ -471,6 +475,9 @@ module TRuby
       # Remove return type annotations
       result = erase_return_types(result)
 
+      # Apply version-specific transformations
+      result = @emitter.transform(result)
+
       # Clean up extra blank lines
       result.gsub(/\n{3,}/, "\n\n")
     end
@@ -545,6 +552,14 @@ module TRuby
       param = param.strip
       return nil if param.empty?
 
+      # 0. 블록 파라미터: &name: Type -> &name
+      if param.start_with?("&")
+        match = param.match(/^&(\w+)(?::\s*.+)?$/)
+        return "&#{match[1]}" if match
+
+        return param
+      end
+
       # 1. 더블 스플랫: **name: Type -> **name
       if param.start_with?("**")
         match = param.match(/^\*\*(\w+)(?::\s*.+)?$/)

data/lib/t_ruby/config.rb

@@ -25,7 +25,7 @@ module TRuby
         "strictness" => "standard",
         "generate_rbs" => true,
         "type_check" => true,
-        "target_ruby" => "3.0",
+        "target_ruby" => nil, # Auto-detect from current Ruby version
         "experimental" => [],
         "checks" => {
           "no_implicit_any" => false,
@@ -97,9 +97,24 @@ module TRuby
     end
 
     # Get target Ruby version
-    # @return [String] target Ruby version (e.g., "3.0", "3.2")
+    # If not specified in config, auto-detects from current Ruby environment
+    # @return [String] target Ruby version (e.g., "3.0", "3.2", "4.0")
+    # @raise [UnsupportedRubyVersionError] if detected version is not supported
     def target_ruby
-      (@compiler["target_ruby"] || "3.0").to_s
+      configured = @compiler["target_ruby"]
+      if configured
+        RubyVersion.parse(configured).validate!
+        configured.to_s
+      else
+        version = RubyVersion.current.validate!
+        "#{version.major}.#{version.minor}"
+      end
+    end
+
+    # Get target Ruby version as RubyVersion object
+    # @return [RubyVersion] target Ruby version object
+    def target_ruby_version
+      RubyVersion.parse(target_ruby)
     end
 
     # Get list of enabled experimental features

data/lib/t_ruby/ruby_version.rb

@@ -0,0 +1,112 @@
+# frozen_string_literal: true
+
+module TRuby
+  # Error raised when an unsupported Ruby version is detected
+  class UnsupportedRubyVersionError < StandardError; end
+
+  # Value object representing a Ruby version with comparison and feature detection
+  #
+  # @example
+  #   version = RubyVersion.parse("3.4")
+  #   version.supports_it_parameter? # => true
+  #   version >= RubyVersion.parse("3.0") # => true
+  #
+  class RubyVersion
+    include Comparable
+
+    # Supported version range
+    MIN_VERSION = [3, 0].freeze
+    MAX_MAJOR = 4
+
+    # Version string pattern: major.minor or major.minor.patch
+    VERSION_REGEX = /\A(\d+)\.(\d+)(?:\.(\d+))?\z/
+
+    attr_reader :major, :minor, :patch
+
+    # @param major [Integer] major version number
+    # @param minor [Integer] minor version number
+    # @param patch [Integer] patch version number (default: 0)
+    def initialize(major, minor, patch = 0)
+      @major = major
+      @minor = minor
+      @patch = patch
+    end
+
+    # Parse a version string into a RubyVersion object
+    #
+    # @param version_string [String, Numeric] version string (e.g., "3.4", "3.4.1")
+    # @return [RubyVersion] parsed version object
+    # @raise [ArgumentError] if version format is invalid
+    def self.parse(version_string)
+      str = version_string.to_s
+      match = VERSION_REGEX.match(str)
+
+      raise ArgumentError, "Invalid version: #{version_string}" unless match
+
+      new(match[1].to_i, match[2].to_i, (match[3] || 0).to_i)
+    end
+
+    # Get the current Ruby version from the environment
+    #
+    # @return [RubyVersion] current Ruby version
+    def self.current
+      parse(RUBY_VERSION)
+    end
+
+    # Compare two versions
+    #
+    # @param other [RubyVersion] version to compare with
+    # @return [Integer] -1, 0, or 1
+    def <=>(other)
+      [major, minor, patch] <=> [other.major, other.minor, other.patch]
+    end
+
+    # Convert to string representation
+    #
+    # @return [String] version string (e.g., "3.4" or "3.4.1")
+    def to_s
+      patch.zero? ? "#{major}.#{minor}" : "#{major}.#{minor}.#{patch}"
+    end
+
+    # Check if this version is within the supported range (3.0 ~ 4.x)
+    #
+    # @return [Boolean] true if version is supported
+    def supported?
+      self >= self.class.parse("#{MIN_VERSION[0]}.#{MIN_VERSION[1]}") && major <= MAX_MAJOR
+    end
+
+    # Validate that this version is supported, raising an error if not
+    #
+    # @return [RubyVersion] self if valid
+    # @raise [UnsupportedRubyVersionError] if version is not supported
+    def validate!
+      unless supported?
+        raise UnsupportedRubyVersionError,
+              "Ruby #{self}는 지원되지 않습니다. 지원 범위: #{MIN_VERSION.join(".")} ~ #{MAX_MAJOR}.x"
+      end
+
+      self
+    end
+
+    # Check if this version supports the `it` implicit block parameter (Ruby 3.4+)
+    #
+    # @return [Boolean] true if `it` parameter is supported
+    def supports_it_parameter?
+      self >= self.class.parse("3.4")
+    end
+
+    # Check if this version supports anonymous block forwarding `def foo(&) ... end` (Ruby 3.1+)
+    #
+    # @return [Boolean] true if anonymous block forwarding is supported
+    def supports_anonymous_block_forwarding?
+      self >= self.class.parse("3.1")
+    end
+
+    # Check if numbered parameters (_1, _2, etc.) raise NameError (Ruby 4.0+)
+    #
+    # @return [Boolean] true if numbered parameters cause errors
+    def numbered_parameters_raise_error?
+      self >= self.class.parse("4.0")
+    end
+  end
+end

data/lib/t_ruby/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module TRuby
-  VERSION = "0.0.41"
+  VERSION = "0.0.42"
 end

data/lib/t_ruby/watcher.rb

@@ -1,6 +1,13 @@
 # frozen_string_literal: true
 
-require "listen"
+# listen gem is optional - only required for watch mode
+# This allows T-Ruby core functionality to work on Ruby 4.0+ where listen/ffi may not be available
+begin
+  require "listen"
+  LISTEN_AVAILABLE = true
+rescue LoadError
+  LISTEN_AVAILABLE = false
+end
 
 module TRuby
   class Watcher
@@ -52,6 +59,14 @@ module TRuby
     end
 
     def watch
+      unless LISTEN_AVAILABLE
+        puts colorize(:red, "Error: Watch mode requires the 'listen' gem.")
+        puts colorize(:yellow, "The 'listen' gem is not available (possibly due to Ruby 4.0+ ffi compatibility).")
+        puts colorize(:dim, "Install with: gem install listen")
+        puts colorize(:dim, "Or run without watch mode: trc")
+        exit 1
+      end
+
       print_start_message
 
       # Initial compilation

data/lib/t_ruby.rb

@@ -2,6 +2,8 @@
 
 require_relative "t_ruby/version"
 require_relative "t_ruby/version_checker"
+require_relative "t_ruby/ruby_version"
+require_relative "t_ruby/code_emitter"
 require_relative "t_ruby/config"
 
 # Core infrastructure (must be loaded first)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: t-ruby
 version: !ruby/object:Gem::Version
-  version: 0.0.41
+  version: 0.0.42
 platform: ruby
 authors:
 - Y. Fred Kim
@@ -10,19 +10,19 @@ cert_chain: []
 date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: listen
+  name: benchmark
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.8'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.8'
+        version: '0'
 description: t-ruby compiles .trb files with type annotations to executable Ruby (.rb)
   and optional type signature files (.rbs)
 email:
@@ -42,6 +42,7 @@ files:
 - lib/t_ruby/bundler_integration.rb
 - lib/t_ruby/cache.rb
 - lib/t_ruby/cli.rb
+- lib/t_ruby/code_emitter.rb
 - lib/t_ruby/compiler.rb
 - lib/t_ruby/config.rb
 - lib/t_ruby/constraint_checker.rb
@@ -59,6 +60,7 @@ files:
 - lib/t_ruby/package_manager.rb
 - lib/t_ruby/parser.rb
 - lib/t_ruby/parser_combinator.rb
+- lib/t_ruby/ruby_version.rb
 - lib/t_ruby/runtime_validator.rb
 - lib/t_ruby/smt_solver.rb
 - lib/t_ruby/string_utils.rb