code-ruby 1.1.1 → 1.2.1

data/lib/code/object.rb

@@ -2,8 +2,20 @@
 
 class Code
   class Object
+    NUMBER_CLASSES = [
+      Integer,
+      Decimal,
+      String,
+      ::Integer,
+      ::Float,
+      ::String,
+      ::BigDecimal
+    ].freeze
+
     attr_reader :raw
 
+    delegate :to_s, :inspect, to: :raw
+
     def initialize(...)
     end
 
@@ -28,38 +40,38 @@ class Code
     end
 
     def self.call(**args)
-      operator = args.fetch(:operator, nil)
-      arguments = args.fetch(:arguments, List.new)
-      value = arguments.code_first
+      code_operator = args.fetch(:operator, nil).to_code
+      code_arguments = args.fetch(:arguments, []).to_code
+      code_value = code_arguments.code_first
 
-      case operator.to_s
+      case code_operator.to_s
       when "new"
         sig(args) { Object.repeat }
-        code_new(*arguments.raw)
+        code_new(*code_arguments.raw)
       when "!", "not"
         sig(args)
         code_exclamation_point
       when "!=", "different"
         sig(args) { Object }
-        code_different(value)
+        code_different(code_value)
       when "&&", "and"
         sig(args) { Object }
-        code_and_operator(value)
+        code_and_operator(code_value)
       when "+", "self"
         sig(args)
         code_self
       when "..", "inclusive_range"
         sig(args) { Object }
-        code_inclusive_range(value)
+        code_inclusive_range(code_value)
       when "...", "exclusive_range"
         sig(args) { Object }
-        code_exclusive_range(value)
+        code_exclusive_range(code_value)
       when "==", "equal"
         sig(args) { Object }
-        code_equal_equal(value)
+        code_equal_equal(code_value)
       when "===", "strict_equal"
         sig(args) { Object }
-        code_equal_equal_equal(value)
+        code_equal_equal_equal(code_value)
       when "falsy?"
         sig(args)
         Boolean.new(falsy?)
@@ -68,7 +80,7 @@ class Code
         Boolean.new(truthy?)
       when "||", "or"
         sig(args) { Object }
-        code_or_operator(value)
+        code_or_operator(code_value)
       when "to_boolean"
         sig(args)
         Boolean.new(self)
@@ -104,58 +116,64 @@ class Code
         String.new(self)
       when "to_time"
         sig(args)
-        Time.zone.local(self)
+        Time.new(self)
       when "as_json"
         sig(args)
         code_as_json
       when "to_json"
         sig(args) { { pretty: Boolean.maybe } }
-        if arguments.any?
-          code_to_json(pretty: value.code_get(String.new(:pretty)))
+
+        if code_arguments.any?
+          code_to_json(pretty: code_value.code_get(:pretty))
         else
           code_to_json
         end
       when /=$/
         sig(args) { Object }
 
-        if operator == "="
-          context = args[:context]
-          context.code_set(self, value)
+        if code_operator.to_s == "="
+          code_context = args.fetch(:context)
+          code_context.code_set(self, value)
         else
-          context = args[:context].lookup!(self)
-          context.code_set(
+          code_context = args.fetch(:context).code_lookup!(self)
+          code_context.code_set(
             self,
-            context.code_fetch(self).call(
+            code_context.code_fetch(self).call(
               **args,
-              operator: operator.chop,
-              arguments: List.new([value])
+              operator: operator.to_s.chop,
+              arguments: List.new([code_value])
             )
           )
         end
 
         context.code_fetch(self)
       else
-        raise(
-          Error::Undefined,
-          "#{operator.inspect} not defined on #{inspect}:Class"
-        )
+        raise(Error, "#{code_operator.inspect} not defined on #{inspect}:Class")
       end
     end
 
-    def self.code_new(*)
-      new(*)
+    def self.code_new(*arguments)
+      code_arguments = arguments.to_code
+
+      new(*code_arguments.raw)
     end
 
     def self.code_and_operator(other)
-      truthy? ? other : self
+      code_other = other.to_code
+
+      truthy? ? code_other : self
     end
 
     def self.code_different(other)
-      Boolean.new(self != other)
+      code_other = other.to_code
+
+      Boolean.new(self != code_other)
     end
 
     def self.code_equal_equal(other)
-      Boolean.new(self == other)
+      code_other = other.to_code
+
+      Boolean.new(self == code_other)
     end
 
     def self.code_exclamation_point
@@ -163,15 +181,21 @@ class Code
     end
 
     def self.code_exclusive_range(value)
-      Range.new(self, value, exclude_end: true)
+      code_value = value.to_code
+
+      Range.new(self, code_value, exclude_end: true)
     end
 
     def self.code_inclusive_range(value)
-      Range.new(self, value, exclude_end: false)
+      code_value = value.to_code
+
+      Range.new(self, code_value, exclude_end: false)
     end
 
     def self.code_or_operator(other)
-      truthy? ? self : other
+      code_other = other.to_code
+
+      truthy? ? self : code_other
     end
 
     def self.code_self
@@ -179,7 +203,9 @@ class Code
     end
 
     def self.code_equal_equal_equal(other)
-      Boolean.new(self === other)
+      code_other = other.to_code
+
+      Boolean.new(self === code_other)
     end
 
     def self.falsy?
@@ -192,7 +218,8 @@ class Code
 
     def self.sig(args, &)
       Type::Sig.sig(args, object: self, &)
-      nil
+
+      Nothing.new
     end
 
     def self.to_s
@@ -224,56 +251,52 @@ class Code
     end
 
     def self.code_as_json
-      Json.to_code(as_json)
+      to_ruby.as_json.to_code
     end
 
     def <=>(other)
-      if respond_to?(:raw)
-        raw <=> (other.respond_to?(:raw) ? other.raw : other)
-      else
-        other <=> self
-      end
+      code_other = other.to_code
+
+      raw <=> code_other.raw
     end
 
     def ==(other)
-      if respond_to?(:raw)
-        raw == (other.respond_to?(:raw) ? other.raw : other)
-      else
-        other == self
-      end
+      code_other = other.to_code
+
+      raw == code_other.raw
     end
     alias eql? ==
 
     def call(**args)
-      operator = args.fetch(:operator, nil)
-      arguments = args.fetch(:arguments, List.new)
-      value = arguments.code_first
+      code_operator = args.fetch(:operator, nil).to_code
+      code_arguments = args.fetch(:arguments, []).to_code
+      code_value = code_arguments.code_first
 
-      case operator.to_s
+      case code_operator.to_s
       when "!", "not"
         sig(args)
         code_exclamation_point
       when "!=", "different"
         sig(args) { Object }
-        code_different(value)
+        code_different(code_value)
       when "&&", "and"
         sig(args) { Object }
-        code_and_operator(value)
+        code_and_operator(code_value)
       when "+", "self"
         sig(args)
         code_self
       when "..", "inclusive_range"
         sig(args) { Object }
-        code_inclusive_range(value)
+        code_inclusive_range(code_value)
       when "...", "exclusive_range"
         sig(args) { Object }
-        code_exclusive_range(value)
+        code_exclusive_range(code_value)
       when "==", "equal"
         sig(args) { Object }
-        code_equal_equal(value)
+        code_equal_equal(code_value)
       when "===", "strict_equal"
         sig(args) { Object }
-        code_equal_equal_equal(value)
+        code_equal_equal_equal(code_value)
       when "falsy?"
         sig(args)
         Boolean.new(falsy?)
@@ -282,7 +305,7 @@ class Code
         Boolean.new(truthy?)
       when "||", "or"
         sig(args) { Object }
-        code_or_operator(value)
+        code_or_operator(code_value)
       when "to_boolean"
         sig(args)
         Boolean.new(self)
@@ -318,54 +341,61 @@ class Code
         String.new(self)
       when "to_time"
         sig(args)
-        Time.zone.local(self)
+        Time.new(self)
       when "as_json"
         sig(args)
         code_as_json
       when "to_json"
         sig(args) { { pretty: Boolean.maybe } }
-        if arguments.any?
-          code_to_json(pretty: value.code_get(String.new(:pretty)))
+
+        if code_arguments.any?
+          code_to_json(pretty: code_value.code_get(:pretty))
         else
           code_to_json
         end
       when /=$/
         sig(args) { Object }
 
-        if operator == "="
-          context = args[:context]
-          context.code_set(self, value)
+        if code_operator.to_s == "="
+          code_context = args.fetch(:context)
+          code_context.code_set(self, code_value)
         else
-          context = args[:context].lookup!(self)
-          context.code_set(
+          code_context = args.fetch(:context).code_lookup!(self)
+          code_context.code_set(
             self,
-            context.code_fetch(self).call(
+            code_context.code_fetch(self).call(
               **args,
-              operator: operator.chop,
-              arguments: List.new([value])
+              operator: code_operator.to_s.chop,
+              arguments: List.new([code_value])
             )
           )
         end
 
-        context.code_fetch(self)
+        code_context.code_fetch(self)
       else
         raise(
-          Error::Undefined,
-          "#{operator.inspect} not defined on #{inspect}:#{self.class.name}"
+          Error,
+          "#{code_operator.inspect} not defined on #{inspect}:#{self.class.name}"
         )
       end
     end
 
     def code_and_operator(other)
-      truthy? ? other : self
+      code_other = other.to_code
+
+      truthy? ? code_other : self
     end
 
     def code_different(other)
-      Boolean.new(self != other)
+      code_other = other.to_code
+
+      Boolean.new(self != code_other)
     end
 
     def code_equal_equal(other)
-      Boolean.new(self == other)
+      code_other = other.to_code
+
+      Boolean.new(self == code_other)
     end
 
     def code_exclamation_point
@@ -373,23 +403,21 @@ class Code
     end
 
     def code_exclusive_range(value)
-      Range.new(
-        self,
-        value,
-        Dictionary.new({ String.new(:exclude_end) => Boolean.new(true) })
-      )
+      code_value = value.to_code
+
+      Range.new(self, code_value, exclude_end: true)
     end
 
     def code_inclusive_range(value)
-      Range.new(
-        self,
-        value,
-        Dictionary.new({ String.new(:exclude_end) => Boolean.new(false) })
-      )
+      code_value = value.to_code
+
+      Range.new(self, code_value, exclude_end: false)
     end
 
     def code_or_operator(other)
-      truthy? ? self : other
+      code_other = other.to_code
+
+      truthy? ? self : code_other
     end
 
     def code_self
@@ -397,7 +425,9 @@ class Code
     end
 
     def code_equal_equal_equal(other)
-      Boolean.new(self === other)
+      code_other = other.to_code
+
+      Boolean.new(self === code_other)
     end
 
     def falsy?
@@ -414,10 +444,9 @@ class Code
 
     def sig(args, &)
       Type::Sig.sig(args, object: self, &)
-      nil
-    end
 
-    delegate :to_s, :inspect, to: :raw
+      Nothing.new
+    end
 
     def truthy?
       true
@@ -440,11 +469,15 @@ class Code
     end
 
     def code_as_json
-      Json.to_code(as_json)
+      as_json.to_code
+    end
+
+    def to_code
+      self
     end
 
     def succ
-      raw.respond_to?(:succ) ? self.class.new(raw.succ) : self.class.new(self)
+      self.class.new(raw.succ)
     end
   end
 end

data/lib/code/parser/string.rb

@@ -36,7 +36,8 @@ class Code
       end
 
       def code_part
-        opening_curly_bracket << code << closing_curly_bracket.maybe
+        opening_curly_bracket.ignore << code <<
+          closing_curly_bracket.maybe.ignore
       end
 
       def single_quoted_text_part

data/lib/code/type/sig.rb

@@ -91,7 +91,7 @@ class Code
         return if expected_range.include?(actual_arguments.size)
 
         raise(
-          Error::ArityError,
+          Error,
           "#{function}: Expected #{expected_count} but got #{actual_count}"
         )
       end
@@ -118,7 +118,7 @@ class Code
               repeat_index = 0
             else
               raise(
-                Error::TypeError,
+                Error,
                 "#{function}: expected #{expected.name}, got #{actual.inspect}"
               )
             end
@@ -127,7 +127,7 @@ class Code
             repeat_index = 0
           else
             raise(
-              Error::TypeError,
+              Error,
               "#{function}: expected #{expected.name}, got #{actual.inspect}"
             )
           end

data/lib/code-ruby.rb

@@ -1,19 +1,138 @@
 # frozen_string_literal: true
 
 require "active_support/all"
+require "base64"
 require "bigdecimal"
 require "bigdecimal/util"
 require "did_you_mean"
 require "json"
 require "language-ruby"
+require "net/http"
 require "stringio"
 require "timeout"
+require "uri"
 require "zeitwerk"
 
 loader = Zeitwerk::Loader.for_gem(warn_on_extra_files: false)
 loader.ignore("#{__dir__}/code-ruby.rb")
 loader.setup
 
+module WordNumberComparaisons
+  def zero?
+    zero?
+  end
+
+  def one?
+    self == 1
+  end
+
+  def two?
+    self == 2
+  end
+
+  def three?
+    self == 3
+  end
+
+  def four?
+    self == 4
+  end
+
+  def five?
+    self == 5
+  end
+
+  def six?
+    self == 6
+  end
+
+  def seven?
+    self == 7
+  end
+
+  def eight?
+    self == 8
+  end
+
+  def nine?
+    self == 9
+  end
+
+  def ten?
+    self == 10
+  end
+end
+
 class Object
   alias is_an? is_a?
+
+  def to_code
+    raise NotImplementedError, "to_code not defined on #{self.class.name}"
+  end
+end
+
+class NilClass
+  def to_code
+    Code::Object::Nothing.new(self)
+  end
+end
+
+class TrueClass
+  def to_code
+    Code::Object::Boolean.new(self)
+  end
+end
+
+class FalseClass
+  def to_code
+    Code::Object::Boolean.new(self)
+  end
+end
+
+class String
+  def to_code
+    Code::Object::String.new(self)
+  end
+end
+
+class Symbol
+  def to_code
+    Code::Object::String.new(self)
+  end
+end
+
+class Integer
+  include WordNumberComparaisons
+
+  def to_code
+    Code::Object::Integer.new(self)
+  end
+end
+
+class Float
+  include WordNumberComparaisons
+
+  def to_code
+    Code::Object::Decimal.new(self)
+  end
+end
+
+class BigDecimal
+  include WordNumberComparaisons
+
+  def to_code
+    Code::Object::Decimal.new(self)
+  end
+end
+
+class Array
+  def to_code
+    Code::Object::List.new(self)
+  end
+end
+
+class Hash
+  def to_code
+    Code::Object::Dictionary.new(self)
+  end
 end

data/package-lock.json

@@ -11,4 +11,4 @@
       }
     }
   }
-}
+}

data/package.json

@@ -4,4 +4,4 @@
     "node": "22.5.1",
     "npm": "10.8.2"
   }
-}
+}