code-ruby 1.6.1 → 1.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9f8a1afa22e9271512b0bef2197c9036cd85cab51dbd9dea4f1c7954ea1b4130
-  data.tar.gz: 5b711b476024c29ec4d9eeb4f6d9d1c741b488b1a9816cd38b9220d6fe093e01
+  metadata.gz: 31de900f45b607432af42419aedea361f2a751aa6d635caaa01edced89a2a591
+  data.tar.gz: 121236f92f037d3ba10b45a8d92dabd08972241262c588cfbe370ff60822f642
 SHA512:
-  metadata.gz: 0af9ea0b81e48d9b7ada87302ca5ff2bd6f4d8264bb9d968baa21173c34f69140ca047bbd5d95f440aa1e4eb50e7347ed9c19ad98f89fe8a9e9d2da0c1730a14
-  data.tar.gz: 61817cefd553d497fe30651d3fb9909c26681207c6831701cf1ab2bc050319c94af9b371e552ac501d880590880b1e47aa1f6dd69d70e595d656dd8778f5424f
+  metadata.gz: f3774304c7976b6295f49c6da4a9ccd473151cb0097f8e3848a58941498a8b3502c477f6095c148811d72b43bbbbbdf869848c4ceeac87515b47fc596a55d1aa
+  data.tar.gz: edb7ff295ed91f0b555f2e8e8bab351a2002ff80db28aaaab037d4d7c22b42d55b3a41712e73a64855c872ad8d7579dee9d4dbe23119a37211c902c870adc165

data/.rubocop.yml

@@ -30,6 +30,8 @@ Lint/MissingSuper:
   Enabled: false
 Lint/PercentStringArray:
   Enabled: false
+Lint/SafeNavigationChain:
+  Enabled: false
 Lint/ShadowingOuterLocalVariable:
   Enabled: false
 Lint/SuppressedException:
@@ -120,8 +122,6 @@ Style/StringLiterals:
   Enabled: false
 Style/StringLiteralsInInterpolation:
   Enabled: false
-Lint/SafeNavigationChain:
-  Enabled: false
 plugins:
 - rubocop-factory_bot
 - rubocop-performance

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    code-ruby (1.6.1)
+    code-ruby (1.6.3)
       activesupport
       base64
       bigdecimal

data/VERSION

@@ -1 +1 @@
-1.6.1
+1.6.3

data/bin/code

@@ -46,7 +46,11 @@ RubyProf.start if profile
 input = 'loop { print("> ") puts(evaluate(read)) }' if input.blank?
 
 if parsed.options.parse
-  pp Code::Parser.parse(input).to_raw
+  begin
+    pp Code::Parser.parse(input).to_raw
+  rescue Exception => e
+    warn e.message
+  end
 else
   begin
     print(
@@ -58,7 +62,7 @@ else
         timeout: parsed.options.timeout
       )
     )
-  rescue Code::Error => e
+  rescue Exception => e
     warn e.message
   end
 end

data/lib/code/node/function_parameter.rb

@@ -8,10 +8,15 @@ class Code
       def initialize(parsed)
         return if parsed.blank?
 
-        @name = parsed.delete(:name).presence
+        @name =
+          parsed.delete(:name).presence || parsed[:regular_splat].presence ||
+            parsed[:keyword_splat].presence || parsed[:spread].presence ||
+            parsed[:block].presence
         @keyword = parsed.delete(:keyword).present?
         @regular_splat = parsed.delete(:regular_splat).present?
         @keyword_splat = parsed.delete(:keyword_splat).present?
+        @spread = parsed.delete(:spread).present?
+        @block = parsed.delete(:block).present?
         @default = Code.new(parsed.delete(:default)) if parsed.key?(:default)
       end
 
@@ -35,6 +40,14 @@ class Code
         !!@keyword_splat
       end
 
+      def spread?
+        !!@spread
+      end
+
+      def block?
+        !!@block
+      end
+
       def to_h
         {
           name: name,
@@ -42,6 +55,8 @@ class Code
           keyword?: keyword?,
           regular_splat?: regular_splat?,
           keyword_splat?: keyword_splat?,
+          spread?: spread?,
+          block?: block?,
           default: default
         }
       end

data/lib/code/object/context.rb

@@ -18,6 +18,7 @@ class Code
         elsif parent?
           parent.code_lookup!(code_identifier)
         else
+          binding.irb
           raise Error, "#{code_identifier} is not defined"
         end
       end

data/lib/code/object/date.rb

@@ -693,18 +693,14 @@ class Code
           week_day.to_code.nothing? ? week_days.to_code : week_day.to_code
         code_week = week.to_code.nothing? ? weeks.to_code : week.to_code
 
-        Date.new(
-          raw.change(
-            year: code_years.code_to_integer.raw + code_year.code_to_integer.raw,
-            month:
-              code_months.code_to_integer.raw + code_month.code_to_integer.raw,
-            day: code_days.code_to_integer.raw + code_day.code_to_integer.raw,
-            wday:
-              code_week_days.code_to_integer.raw +
-                code_week_day.code_to_integer.raw,
-            cweek: code_weeks.code_to_integer.raw + code_week.code_to_integer.raw
-          )
-        )
+        year = code_years.code_to_integer.raw + code_year.code_to_integer.raw
+        month = code_months.code_to_integer.raw + code_month.code_to_integer.raw
+        day = code_days.code_to_integer.raw + code_day.code_to_integer.raw
+        week_day =
+          code_week_days.code_to_integer.raw + code_week_day.code_to_integer.raw
+        week = code_weeks.code_to_integer.raw + code_week.code_to_integer.raw
+
+        code_change(year:, month:, day:, week_day:, week:)
       end
 
       def code_substract(
@@ -726,18 +722,14 @@ class Code
           week_day.to_code.nothing? ? week_days.to_code : week_day.to_code
         code_week = week.to_code.nothing? ? weeks.to_code : week.to_code
 
-        Date.new(
-          raw.change(
-            year: code_years.code_to_integer.raw - code_year.code_to_integer.raw,
-            month:
-              code_months.code_to_integer.raw - code_month.code_to_integer.raw,
-            day: code_days.code_to_integer.raw - code_day.code_to_integer.raw,
-            wday:
-              code_week_days.code_to_integer.raw -
-                code_week_day.code_to_integer.raw,
-            cweek: code_weeks.code_to_integer.raw - code_week.code_to_integer.raw
-          )
-        )
+        year = code_years.code_to_integer.raw - code_year.code_to_integer.raw
+        month = code_months.code_to_integer.raw - code_month.code_to_integer.raw
+        day = code_days.code_to_integer.raw - code_day.code_to_integer.raw
+        week_day =
+          code_week_days.code_to_integer.raw - code_week_day.code_to_integer.raw
+        week = code_weeks.code_to_integer.raw - code_week.code_to_integer.raw
+
+        code_change(year:, month:, day:, week_day:, week:)
       end
 
       def code_change(
@@ -759,23 +751,20 @@ class Code
           week_day.to_code.nothing? ? week_days.to_code : week_day.to_code
         code_week = week.to_code.nothing? ? weeks.to_code : week.to_code
 
-        if code_year.something? || code_month.something? ||
-             code_day.something? || code_week_day.something? ||
-             code_week.something?
-          Date.new(
-            raw.change(
-              **{
-                year: code_year.raw,
-                month: code_month.raw,
-                day: code_day.raw,
-                wday: code_week_day.raw,
-                cweek: code_week.raw
-              }.compact
-            )
-          )
-        else
-          Date.new(self)
-        end
+        year = code_year.raw || code_years.raw
+        month = code_month.raw || code_months.raw
+        day = code_day.raw || code_days.raw
+        wday = code_week_day.raw || code_week_days.raw
+        cweek = code_week.raw || code_weeks.raw
+
+        dup = raw.dup
+        dup += (year - raw.year).years
+        dup += (month - raw.month).months
+        dup += (day - raw.day).days
+        dup += (wday - raw.wday).days
+        dup += (cweek - raw.to_date.cweek).weeks
+
+        Date.new(dup)
       end
     end
   end

data/lib/code/object/function.rb

@@ -38,12 +38,19 @@ class Code
 
         code_parameters.raw.each.with_index do |code_parameter, index|
           code_argument =
-            if code_parameter.regular_splat?
+            if code_parameter.spread?
+              code_arguments
+            elsif code_parameter.regular_splat?
               code_arguments
             elsif code_parameter.keyword_splat?
               code_arguments.raw.detect do |code_argument|
                 code_argument.is_a?(Dictionary)
               end || Dictionary.new
+            elsif code_parameter.block?
+              code_arguments
+                .raw
+                .detect { |code_argument| code_argument.is_a?(Function) }
+                .to_code
             elsif code_parameter.keyword?
               code_arguments
                 .raw
@@ -71,7 +78,11 @@ class Code
         code_parameters
           .raw
           .inject([]) do |signature, code_parameter|
-            if code_parameter.keyword_splat?
+            if code_parameter.spread?
+              signature + [Object.repeat]
+            elsif code_parameter.block?
+              signature + [Function]
+            elsif code_parameter.keyword_splat?
               signature + [Dictionary.maybe]
             elsif code_parameter.regular_splat?
               signature + [Object.repeat]

data/lib/code/object/parameter.rb

@@ -23,6 +23,14 @@ class Code
         Boolean.new(code_get(:keyword_splat?))
       end
 
+      def code_block?
+        Boolean.new(code_get(:block?))
+      end
+
+      def code_spread?
+        Boolean.new(code_get(:spread?))
+      end
+
       def code_required?
         code_default.code_falsy?
       end
@@ -62,6 +70,14 @@ class Code
       def keyword_splat?
         code_keyword_splat?.truthy?
       end
+
+      def spread?
+        code_spread?.truthy?
+      end
+
+      def block?
+        code_block?.truthy?
+      end
     end
   end
 end

data/lib/code/object/time.rb

@@ -831,27 +831,30 @@ class Code
           week_day.to_code.nothing? ? week_days.to_code : week_day.to_code
         code_week = week.to_code.nothing? ? weeks.to_code : week.to_code
         code_hour = hour.to_code.nothing? ? hours.to_code : hour.to_code
-        code_minute =
-          minute.to_code.nothing? ? minutes.to_code : minute.to_code
-        code_second =
-          second.to_code.nothing? ? seconds.to_code : second.to_code
-
-        Time.new(
-          raw.change(
-            year: code_years.code_to_integer.raw + code_year.code_to_integer.raw,
-            month:
-              code_months.code_to_integer.raw + code_month.code_to_integer.raw,
-            day: code_days.code_to_integer.raw + code_day.code_to_integer.raw,
-            wday:
-              code_week_days.code_to_integer.raw +
-                code_week_day.code_to_integer.raw,
-            cweek: code_weeks.code_to_integer.raw + code_week.code_to_integer.raw,
-            hour: code_hours.code_to_integer.raw + code_hour.code_to_integer.raw,
-            min:
-              code_minutes.code_to_integer.raw + code_minute.code_to_integer.raw,
-            sec:
-              code_seconds.code_to_integer.raw + code_second.code_to_integer.raw
-          )
+        code_minute = minute.to_code.nothing? ? minutes.to_code : minute.to_code
+        code_second = second.to_code.nothing? ? seconds.to_code : second.to_code
+
+        year = code_years.code_to_integer.raw + code_year.code_to_integer.raw
+        month = code_months.code_to_integer.raw + code_month.code_to_integer.raw
+        day = code_days.code_to_integer.raw + code_day.code_to_integer.raw
+        week_day =
+          code_week_days.code_to_integer.raw + code_week_day.code_to_integer.raw
+        week = code_weeks.code_to_integer.raw + code_week.code_to_integer.raw
+        hour = code_hours.code_to_integer.raw + code_hour.code_to_integer.raw
+        minute =
+          code_minutes.code_to_integer.raw + code_minute.code_to_integer.raw
+        second =
+          code_seconds.code_to_integer.raw + code_second.code_to_integer.raw
+
+        code_change(
+          year:,
+          month:,
+          day:,
+          week_day:,
+          week:,
+          hour:,
+          minute:,
+          second:
         )
       end
 
@@ -880,27 +883,30 @@ class Code
           week_day.to_code.nothing? ? week_days.to_code : week_day.to_code
         code_week = week.to_code.nothing? ? weeks.to_code : week.to_code
         code_hour = hour.to_code.nothing? ? hours.to_code : hour.to_code
-        code_minute =
-          minute.to_code.nothing? ? minutes.to_code : minute.to_code
-        code_second =
-          second.to_code.nothing? ? seconds.to_code : second.to_code
-
-        Time.new(
-          raw.change(
-            year: code_years.code_to_integer.raw - code_year.code_to_integer.raw,
-            month:
-              code_months.code_to_integer.raw - code_month.code_to_integer.raw,
-            day: code_days.code_to_integer.raw - code_day.code_to_integer.raw,
-            wday:
-              code_week_days.code_to_integer.raw -
-                code_week_day.code_to_integer.raw,
-            cweek: code_weeks.code_to_integer.raw - code_week.code_to_integer.raw,
-            hour: code_hours.code_to_integer.raw - code_hour.code_to_integer.raw,
-            min:
-              code_minutes.code_to_integer.raw - code_minute.code_to_integer.raw,
-            sec:
-              code_seconds.code_to_integer.raw - code_second.code_to_integer.raw
-          )
+        code_minute = minute.to_code.nothing? ? minutes.to_code : minute.to_code
+        code_second = second.to_code.nothing? ? seconds.to_code : second.to_code
+
+        year = code_years.code_to_integer.raw - code_year.code_to_integer.raw
+        month = code_months.code_to_integer.raw - code_month.code_to_integer.raw
+        day = code_days.code_to_integer.raw - code_day.code_to_integer.raw
+        week_day =
+          code_week_days.code_to_integer.raw - code_week_day.code_to_integer.raw
+        week = code_weeks.code_to_integer.raw - code_week.code_to_integer.raw
+        hour = code_hours.code_to_integer.raw - code_hour.code_to_integer.raw
+        minute =
+          code_minutes.code_to_integer.raw - code_minute.code_to_integer.raw
+        second =
+          code_seconds.code_to_integer.raw - code_second.code_to_integer.raw
+
+        code_change(
+          year:,
+          month:,
+          day:,
+          week_day:,
+          week:,
+          hour:,
+          minute:,
+          second:
         )
       end
 
@@ -929,32 +935,29 @@ class Code
           week_day.to_code.nothing? ? week_days.to_code : week_day.to_code
         code_week = week.to_code.nothing? ? weeks.to_code : week.to_code
         code_hour = hour.to_code.nothing? ? hours.to_code : hour.to_code
-        code_minute =
-          minute.to_code.nothing? ? minutes.to_code : minute.to_code
-        code_second =
-          second.to_code.nothing? ? seconds.to_code : second.to_code
-
-        if code_year.something? || code_month.something? ||
-             code_day.something? || code_week_day.something? ||
-             code_week.something? || code_hour.something? ||
-             code_minute.something? || code_second.something?
-          Time.new(
-            raw.change(
-              **{
-                year: code_year.raw,
-                month: code_month.raw,
-                day: code_day.raw,
-                wday: code_week_day.raw,
-                cweek: code_week.raw,
-                hour: code_hour.raw,
-                min: code_minute.raw,
-                sec: code_second.raw
-              }.compact
-            )
-          )
-        else
-          Time.new(self)
-        end
+        code_minute = minute.to_code.nothing? ? minutes.to_code : minute.to_code
+        code_second = second.to_code.nothing? ? seconds.to_code : second.to_code
+
+        year = code_year.raw || code_years.raw
+        month = code_month.raw || code_months.raw
+        day = code_day.raw || code_days.raw
+        wday = code_week_day.raw || code_week_days.raw
+        cweek = code_week.raw || code_weeks.raw
+        hour = code_hour.raw || code_hours.raw
+        min = code_minute.raw || code_minutes.raw
+        sec = code_second.raw || code_seconds.raw
+
+        dup = raw.dup
+        dup += (year - raw.year).years
+        dup += (month - raw.month).months
+        dup += (day - raw.day).days
+        dup += (wday - raw.wday).days
+        dup += (cweek - raw.to_date.cweek).weeks
+        dup += (hour - raw.hour).hours
+        dup += (min - raw.min).minutes
+        dup += (sec - raw.sec).seconds
+
+        Time.new(dup)
       end
     end
   end

data/lib/code/parser/call.rb

@@ -67,6 +67,18 @@ class Code
         str("end")
       end
 
+      def asterisk
+        str("*")
+      end
+
+      def ampersand
+        str("&")
+      end
+
+      def spread_operator
+        str("...") | str("..") | str(".")
+      end
+
       def keyword_argument
         name.aka(:name) << whitespace? << colon << code.aka(:value)
       end
@@ -87,13 +99,19 @@ class Code
           ).repeat << whitespace? << closing_parenthesis.ignore.maybe
       end
 
+      def prefix
+        (asterisk << asterisk).aka(:keyword_splat) |
+          asterisk.aka(:regular_splat) | ampersand.aka(:block) |
+          spread_operator.aka(:spread)
+      end
+
       def keyword_parameter
         name.aka(:name) << whitespace? << colon.aka(:keyword) <<
           code_present.aka(:default).maybe
       end
 
       def regular_parameter
-        name.aka(:name) << whitespace? <<
+        ((prefix.maybe << name.aka(:name)) | prefix) << whitespace? <<
           (equal << whitespace? << code_present.aka(:default)).maybe
       end
 

data/lib/code/parser/function.rb

@@ -35,6 +35,10 @@ class Code
         str("end")
       end
 
+      def spread_operator
+        str("...") | str("..") | str(".")
+      end
+
       def opening_parenthesis
         str("(")
       end
@@ -77,7 +81,8 @@ class Code
 
       def prefix
         (asterisk << asterisk).aka(:keyword_splat) |
-          asterisk.aka(:regular_splat) | ampersand.aka(:block)
+          asterisk.aka(:regular_splat) | ampersand.aka(:block) |
+          spread_operator.aka(:spread)
       end
 
       def keyword_parameter
@@ -86,7 +91,7 @@ class Code
       end
 
       def regular_parameter
-        prefix.maybe << name.aka(:name) << whitespace? <<
+        ((prefix.maybe << name.aka(:name)) | prefix) << whitespace? <<
           (equal << whitespace? << code_present.aka(:default)).maybe
       end
 

data/lib/code/parser/name.rb

@@ -139,6 +139,10 @@ class Code
         str("?")
       end
 
+      def special_name
+        str("...") | str("..") | str(".") | str("**") | str("*") | str("&")
+      end
+
       def reserved_character
         ampersand | equal | pipe | dot | colon | comma | space | newline |
           opening_curly_bracket | closing_curly_bracket | opening_parenthesis |
@@ -167,8 +171,13 @@ class Code
       end
 
       def root
-        (keyword << separator).absent << special_characters.absent <<
-          character.repeat(1)
+        (
+          special_name |
+            (
+              (keyword << separator).absent << special_characters.absent <<
+                character.repeat(1)
+            )
+        )
       end
     end
   end

data/lib/code-ruby.rb

@@ -14,6 +14,7 @@ require "stringio"
 require "timeout"
 require "uri"
 require "zeitwerk"
+require "date"
 
 loader = Zeitwerk::Loader.for_gem(warn_on_extra_files: false)
 loader.ignore("#{__dir__}/code-ruby.rb")

data/spec/code_spec.rb

@@ -268,8 +268,8 @@ RSpec.describe Code do
     ["Class(true, 1)", "Boolean"],
     ["Class.new(Boolean, Time)", "Boolean"],
     ["Class.new(Time, Boolean)", "Time"],
-    ['Date("2024-3-2").to_string', ":2024-03-02"],
-    ['Date("2024-3-2").to_string', ":2024-03-02"],
+    %w[Date("2024-3-2").to_string :2024-03-02],
+    %w[Date("2024-3-2").to_string :2024-03-02],
     ["Decimal(1, :2)", "100"],
     ["Decimal(:1, 2)", "100.0"],
     ["Decimal.new(1, :2)", "100"],

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: code-ruby
 version: !ruby/object:Gem::Version
-  version: 1.6.1
+  version: 1.6.3
 platform: ruby
 authors:
 - Dorian Marié
 bindir: bin
 cert_chain: []
-date: 2025-06-21 00:00:00.000000000 Z
+date: 2025-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport