code-ruby 0.11.0 → 0.12.0

data/lib/code/object.rb

@@ -2,6 +2,12 @@
 
 class Code
   class Object
+    attr_reader :raw
+
+    def initialize(*_args, **_kargs, &_block)
+      @raw = nil unless defined?(@raw)
+    end
+
     def self.maybe
       Type::Maybe.new(self)
     end
@@ -29,6 +35,9 @@ class Code
       value = arguments.first&.value
 
       case operator.to_s
+      when "new"
+        sig(args) { Object.repeat }
+        code_new(*arguments.map(&:value))
       when "!", "not"
         sig(args)
         code_exclamation_point
@@ -65,6 +74,42 @@ class Code
       when "||", "or"
         sig(args) { Object }
         code_or_operator(value)
+      when "to_boolean"
+        sig(args)
+        Boolean.new(self)
+      when "to_class"
+        sig(args)
+        Class.new(self)
+      when "to_date"
+        sig(args)
+        Date.new(self)
+      when "to_decimal"
+        sig(args)
+        Decimal.new(self)
+      when "to_dictionary"
+        sig(args)
+        Dictionary.new(self)
+      when "to_duration"
+        sig(args)
+        Duration.new(self)
+      when "to_integer"
+        sig(args)
+        Integer.new(self)
+      when "to_list"
+        sig(args)
+        List.new(self)
+      when "to_nothing"
+        sig(args)
+        Nothing.new(self)
+      when "to_range"
+        sig(args)
+        Range.new(self)
+      when "to_string"
+        sig(args)
+        String.new(self)
+      when "to_time"
+        sig(args)
+        Time.new(self)
       when /=$/
         sig(args) { Object }
 
@@ -86,12 +131,16 @@ class Code
         context.code_fetch(self)
       else
         raise(
-          Code::Error::Undefined,
+          Error::Undefined,
           "#{operator} not defined on #{inspect}:Class"
         )
       end
     end
 
+    def self.code_new(*arguments)
+      new(*arguments)
+    end
+
     def self.code_and_operator(other)
       truthy? ? other : self
     end
@@ -220,6 +269,42 @@ class Code
       when "||", "or"
         sig(args) { Object }
         code_or_operator(value)
+      when "to_boolean"
+        sig(args)
+        Boolean.new(self)
+      when "to_class"
+        sig(args)
+        Class.new(self)
+      when "to_date"
+        sig(args)
+        Date.new(self)
+      when "to_decimal"
+        sig(args)
+        Decimal.new(self)
+      when "to_duration"
+        sig(args)
+        Duration.new(self)
+      when "to_dictionary"
+        sig(args)
+        Dictionary.new(self)
+      when "to_integer"
+        sig(args)
+        Integer.new(self)
+      when "to_list"
+        sig(args)
+        List.new(self)
+      when "to_nothing"
+        sig(args)
+        Nothing.new(self)
+      when "to_range"
+        sig(args)
+        Range.new(self)
+      when "to_string"
+        sig(args)
+        String.new(self)
+      when "to_time"
+        sig(args)
+        Time.new(self)
       when /=$/
         sig(args) { Object }
 
@@ -241,8 +326,8 @@ class Code
         context.code_fetch(self)
       else
         raise(
-          Code::Error::Undefined,
-          "#{operator} not defined on #{inspect}:#{self.class.name}"
+          Error::Undefined,
+          "#{operator.inspect} not defined on #{inspect}:#{self.class.name}"
         )
       end
     end
@@ -264,11 +349,23 @@ class Code
     end
 
     def code_exclusive_range(value)
-      Range.new(self, value, exclude_end: true)
+      Range.new(
+        self,
+        value,
+        Dictionary.new({
+          String.new(:exclude_end) => Boolean.new(true)
+        })
+      )
     end
 
     def code_inclusive_range(value)
-      Range.new(self, value, exclude_end: false)
+      Range.new(
+        self,
+        value,
+        Dictionary.new({
+          String.new(:exclude_end) => Boolean.new(false)
+        })
+      )
     end
 
     def code_or_operator(other)

data/lib/code/parser.rb

@@ -2,7 +2,7 @@
 
 class Code
   class Parser
-    class Error < ::Code::Error
+    class Error < Error
     end
 
     def initialize(input)

data/lib/code/type.rb

@@ -2,8 +2,16 @@
 
 class Code
   class Type
-    def name
-      "Type"
+    def maybe
+      Maybe.new(self)
+    end
+
+    def repeat(minimum = 0, maximum = nil)
+      Repeat.new(self, minimum:, maximum:)
+    end
+
+    def |(other)
+      Or.new(self, other)
     end
 
     def valid?(_argument)

data/lib/code/version.rb

@@ -2,4 +2,4 @@
 
 require_relative "../code"
 
-Code::Version = Gem::Version.new("0.11.0")
+Code::Version = Gem::Version.new("0.12.0")

data/lib/code-ruby.rb

@@ -5,7 +5,9 @@ require "active_support/core_ext/date/conversions"
 require "active_support/core_ext/numeric/time"
 require "active_support/core_ext/object/json"
 require "active_support/core_ext/object/blank"
+require "active_support/core_ext/array/access"
 require "bigdecimal"
+require "bigdecimal/util"
 require "json"
 require "language-ruby"
 require "stringio"
@@ -15,3 +17,7 @@ require "zeitwerk"
 loader = Zeitwerk::Loader.for_gem(warn_on_extra_files: false)
 loader.ignore("#{__dir__}/code-ruby.rb")
 loader.setup
+
+class Object
+  alias is_an? is_a?
+end

data/lib/code.rb

@@ -17,6 +17,12 @@ class Code
     @context = Object::Context.new
   end
 
+  def self.parse(input, timeout: DEFAULT_TIMEOUT)
+    Timeout.timeout(timeout) do
+      Parser.parse(input).to_raw
+    end
+  end
+
   def self.evaluate(
     input,
     output: StringIO.new,
@@ -28,11 +34,8 @@ class Code
 
   def evaluate
     Timeout.timeout(timeout) do
-      Node::Code.new(::Code::Parser.parse(input).to_raw).evaluate(
-        context:,
-        output:,
-        error:
-      )
+      parsed = Code.parse(input)
+      Node::Code.new(parsed).evaluate(context:, output:, error:)
     end
   end
 

data/spec/code/object/dictionary_spec.rb

@@ -76,10 +76,8 @@ RSpec.describe Code::Object::Dictionary do
     ["{ a: nothing }.compact", "{}"],
     ["{ age: 31 }.delete_unless { |key| key == :age }", "{ age: 31 }"],
     ["{ age: 31 }.delete_unless(Integer)", "{ age: 31 }"],
-    ["{ age: 31 }.delete_unless(Number)", "{ age: 31 }"],
     ["{ age: 31 }.keep_unless { |key| key == :age }", "{}"],
     ["{ age: 31 }.keep_unless(Integer)", "{}"],
-    ["{ age: 31 }.keep_unless(Number)", "{}"],
     ["{ first_name: :Dorian } < dictionary", "true"],
     ["{ first_name: :Dorian }.any? { |_, value| value == :Dorian }", "true"],
     ["{ first_name: :Dorian }.delete_if { |_, value| value == :Dorian }", "{}"],

data/spec/code_spec.rb

@@ -31,13 +31,65 @@ RSpec.describe Code do
     %w[0x10 16],
     %w[1.0e1 10.0],
     %w[1.1 1.1],
+    %w[1.day.ago.after? false],
+    %w[1.day.ago.after?(1.day.from_now) false],
+    %w[1.day.ago.before? true],
+    %w[1.day.ago.before?(1.day.from_now) true],
+    %w[1.day.from_now.after? true],
+    %w[1.day.from_now.after?(1.day.ago) true],
+    %w[1.day.from_now.before? false],
+    %w[1.day.from_now.before?(1.day.ago) false],
     %w[10e1.0 100.0],
     %w[1e1 10],
+    %w[2.days.ago.future? false],
+    %w[2.days.ago.past? true],
+    %w[2.days.from_now.future? true],
+    %w[2.days.from_now.past? false],
     %w[9975×14÷8 17456.25],
     %w[:Hello.include?(:H) true],
     %w[:admin? :admin?],
     %w[:hello :hello],
     %w[:update!.to_string :update!],
+    %w[Boolean(1) true],
+    %w[Boolean(2.days.ago) true],
+    %w[Boolean(2.days.ago) true],
+    %w[Boolean(false) false],
+    %w[Boolean(nothing) false],
+    %w[Boolean(true) true],
+    %w[Boolean({}) true],
+    %w[Boolean.new false],
+    %w[Boolean.new(1) true],
+    %w[Boolean.new(2.days.ago) true],
+    %w[Boolean.new(2.days.ago) true],
+    %w[Boolean.new(false) false],
+    %w[Boolean.new(nothing) false],
+    %w[Boolean.new(true) true],
+    %w[Boolean.new({}) true],
+    %w[Class(2.days.ago) Time],
+    %w[Class(Boolean) Boolean],
+    %w[Class(Time) Time],
+    %w[Class(nothing) Nothing],
+    %w[Class(true) Boolean],
+    %w[Class.new Nothing],
+    %w[Class.new Nothing],
+    %w[Class.new(2.days.ago) Time],
+    %w[Class.new(Boolean) Boolean],
+    %w[Class.new(Date) Date],
+    %w[Class.new(Time) Time],
+    %w[Class.new(nothing) Nothing],
+    %w[Class.new(true) Boolean],
+    %w[Date Date],
+    %w[Date("0001-01-01").to_string :0001-01-01],
+    %w[Date("2024-03-02").to_string :2024-03-02],
+    %w[Decimal(1) 1.0],
+    %w[Decimal(1) 1],
+    %w[Decimal(:1) 1.0],
+    %w[Decimal(:1) 1],
+    %w[Decimal.new 0],
+    %w[Decimal.new(1) 1.0],
+    %w[Decimal.new(1) 1],
+    %w[Decimal.new(:1) 1.0],
+    %w[Decimal.new(:1) 1],
     %w[false false],
     %w[true true],
     %w[{} {}],
@@ -57,14 +109,6 @@ RSpec.describe Code do
     ["1 >> 1", "0"],
     ["1 ^ 2", "3"],
     ["1 | 2", "3"],
-    %w[1.day.ago.after?(1.day.from_now) false],
-    %w[1.day.ago.before?(1.day.from_now) true],
-    %w[1.day.from_now.after?(1.day.ago) true],
-    %w[1.day.from_now.before?(1.day.ago) false],
-    %w[1.day.ago.after? false],
-    %w[1.day.ago.before? true],
-    %w[1.day.from_now.after? true],
-    %w[1.day.from_now.before? false],
     ["2 * 3 + 2", "8"],
     ["2 * 3", "6"],
     ["2 ** 3 ** 2", "512"],
@@ -73,6 +117,20 @@ RSpec.describe Code do
     ["2 / 4", "0.5"],
     ["3.times {}", "3"],
     ["4 % 3", "1"],
+    ["Boolean([])", "true"],
+    ["Boolean(true, false)", "true"],
+    ["Boolean.new([])", "true"],
+    ["Boolean.new(false, true)", "false"],
+    ["Boolean.new(true, false)", "true"],
+    ["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"],
+    ["Decimal(1, :2)", "100"],
+    ["Decimal(:1, 2)", "100.0"],
+    ["Decimal.new(1, :2)", "100"],
+    ["Decimal.new(:1, 2)", "100.0"],
     ["[,,].include?(4)", "false"],
     ["[,].include?(4)", "false"],
     ["[1, 2, 3,  \n  ].include?(4)", "false"],
@@ -80,6 +138,8 @@ RSpec.describe Code do
     ["[1, 2, 3]", "[1, 2, 3]"],
     ["[1, 2, 3].include?(2)", "true"],
     ["[1, 2, 3].include?(4)", "false"],
+    ["[1, 2, 3].map { |i| next if i == 2 i ** 2}", "[1, nothing, 9]"],
+    ["[1, 2, 3].map { |i| next(0) if i.even? i ** 2}", "[1, 0, 9]"],
     ["[1, 2, 3].select { |n| n.even? }", "[2]"],
     ["[1, 2, 3].select { |n| n.even? }.select { |n| n.odd? }", "[]"],
     ["[1, 2].map(&:to_string)", "[:1, :2]"],
@@ -89,6 +149,8 @@ RSpec.describe Code do
     ["[[true]]", "[[true]]"],
     ["[]", "[]"],
     ["\r\n", "nothing"],
+    ["a = 0 [1, 2, 3].each { |i| next if i == 2 a += i } a", "4"],
+    ["a = 0 loop a += 1 break end a", "1"],
     ["a = 0\nuntil a > 10 a += 1 end a", "11"],
     ["a = 0\nwhile a < 10 a += 1 end a", "10"],
     ["a = 1 3.times { a += 1 } a", "4"],
@@ -142,14 +204,7 @@ RSpec.describe Code do
     ['user = {} user.name = "Dorian" user.name', ":Dorian"],
     ['user = {} user[:name] = "Dorian" user[:name]', ":Dorian"],
     ['{ "first_name": "Dorian" }', '{"first_name" => "Dorian"}'],
-    ["a = 0 loop a += 1 break end a", "1"],
-    ["a = 0 [1, 2, 3].each { |i| next if i == 2 a += i } a", "4"],
-    ["[1, 2, 3].map { |i| next if i == 2 i ** 2}", "[1, nothing, 9]"],
-    ["[1, 2, 3].map { |i| next(0) if i.even? i ** 2}", "[1, 0, 9]"],
-    %w[2.days.ago.past? true],
-    %w[2.days.from_now.past? false],
-    %w[2.days.ago.future? false],
-    %w[2.days.from_now.future? true]
+    ["", ""]
   ].each do |input, expected|
     it "#{input} == #{expected}" do
       expect(Code.evaluate(input)).to eq(Code.evaluate(expected))
@@ -168,8 +223,59 @@ RSpec.describe Code do
     2.days.from_now
     2.hours.ago
     2.hours.from_now
+    Boolean.new
+    Boolean.new(true)
+    Boolean.new(false)
+    Class.new
+    Class.new(Boolean)
+    Class.new(Class)
+    Context.new
+    Context.new(a:1)
+    Date.new
+    Date.new("2024-03-05")
+    Date.today
+    Date.yesterday
     Date.tomorrow
+    Decimal.new
+    Decimal.new(0)
+    Decimal.new(1.2)
+    Dictionary.new
+    Dictionary.new(a:1)
+    Duration.new
+    Duration.new(1.day)
+    Duration.new("P1D")
+    Function.new
+    Integer.new
+    Integer.new(0)
+    Integer.new(1)
+    Integer.new(1.2)
+    List.new
+    List.new([])
+    List.new([1,2])
+    Nothing.new
+    Nothing.new(1)
+    Object.new
+    Object.new(1)
+    Range.new
+    Range.new(1,2)
+    Range.new(-1)
+    Range.new(1,2,exclude_end:false)
+    Range.new(1,2,exclude_end:true)
+    String.new
+    String.new(:hello)
+    Time.new
+    Time.new("2024-03-05.06:10:59.UTC")
+    Time.now
+    Time.tomorrow
+    Time.yesterday
     Time.tomorrow
+    Code.new
+    Parameter.new
+    Argument.new
+    Argument.new(1)
+    Argument.new(1,name:"index")
+    IdentifierList.new
+    IdentifierList.new([])
   ].each { |input| it(input) { Code.evaluate(input) } }
 
   [["puts(true)", "true\n"], %w[print(false) false]].each do |input, expected|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: code-ruby
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.12.0
 platform: ruby
 authors:
 - Dorian Marié
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-03-02 00:00:00.000000000 Z
+date: 2024-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -132,6 +132,7 @@ files:
 - lib/code/object/argument.rb
 - lib/code/object/boolean.rb
 - lib/code/object/class.rb
+- lib/code/object/code.rb
 - lib/code/object/context.rb
 - lib/code/object/date.rb
 - lib/code/object/decimal.rb
@@ -143,7 +144,7 @@ files:
 - lib/code/object/integer.rb
 - lib/code/object/list.rb
 - lib/code/object/nothing.rb
-- lib/code/object/number.rb
+- lib/code/object/parameter.rb
 - lib/code/object/range.rb
 - lib/code/object/string.rb
 - lib/code/object/time.rb

data/lib/code/object/number.rb

@@ -1,11 +0,0 @@
-# frozen_string_literal: true
-
-class Code
-  class Object
-    class Number < Object
-      def self.name
-        "Number"
-      end
-    end
-  end
-end