code-ruby 1.2.7 → 1.4.0

data/lib/code/parser/while.rb

@@ -11,6 +11,10 @@ class Code
         Whitespace
       end
 
+      def whitespace?
+        whitespace.maybe
+      end
+
       def code
         Code
       end
@@ -27,10 +31,31 @@ class Code
         str("end")
       end
 
+      def do_keyword
+        str("do")
+      end
+
+      def begin_keyword
+        str("begin")
+      end
+
       def loop_keyword
         str("loop")
       end
 
+      def opening_curly_bracket
+        str("{")
+      end
+
+      def closing_curly_bracket
+        str("}")
+      end
+
+      def body
+        ((do_keyword | begin_keyword) << code << end_keyword.maybe) |
+          (opening_curly_bracket << code << closing_curly_bracket) | code
+      end
+
       def root
         (
           (
@@ -38,7 +63,7 @@ class Code
               (while_keyword | until_keyword).aka(:operator) << whitespace <<
                 statement.aka(:statement)
             ) | (loop_keyword.aka(:operator) << whitespace)
-          ) << code.aka(:body) << end_keyword.maybe
+          ) << body.aka(:body)
         ).aka(:while) | statement
       end
     end

data/lib/code-ruby.rb

@@ -72,6 +72,18 @@ class Object
   end
 end
 
+class Class
+  def to_code
+    Code::Object::Class.new(self)
+  end
+end
+
+class Module
+  def to_code
+    Code::Object::Class.new(self)
+  end
+end
+
 class NilClass
   def to_code
     Code::Object::Nothing.new(self)

data/lib/code.rb

@@ -1,43 +1,50 @@
 # frozen_string_literal: true
 
 class Code
-  GLOBALS = %i[output error context object].freeze
+  GLOBALS = %i[context error input object output source object].freeze
   DEFAULT_TIMEOUT = 0
 
   def initialize(
-    input,
-    output: StringIO.new,
+    source,
+    context: Object::Context.new,
     error: StringIO.new,
+    input: StringIO.new,
+    object: Object::Global.new,
+    output: StringIO.new,
     timeout: DEFAULT_TIMEOUT
   )
+    @context = context
+    @error = error
     @input = input
+    @object = object
     @output = output
-    @error = error
-    @timeout = timeout || DEFAULT_TIMEOUT
-    @context = Object::Context.new
+    @source = source
+    @timeout = timeout
   end
 
-  def self.parse(input, timeout: DEFAULT_TIMEOUT)
-    Timeout.timeout(timeout) { Parser.parse(input).to_raw }
+  def self.parse(source, timeout: DEFAULT_TIMEOUT)
+    Timeout.timeout(timeout) { Parser.parse(source).to_raw }
   end
 
-  def self.evaluate(
-    input,
-    output: StringIO.new,
-    error: StringIO.new,
-    timeout: DEFAULT_TIMEOUT
-  )
-    new(input, output:, error:, timeout:).evaluate
+  def self.evaluate(...)
+    new(...).evaluate
   end
 
   def evaluate
     Timeout.timeout(timeout) do
-      parsed = Code.parse(input)
-      Node::Code.new(parsed).evaluate(context:, output:, error:)
+      Node::Code.new(Code.parse(source)).evaluate(
+        context:,
+        error:,
+        input:,
+        object:,
+        output:,
+        source:,
+        timeout:
+      )
     end
   end
 
   private
 
-  attr_reader :input, :timeout, :output, :error, :context
+  attr_reader :context, :error, :input, :object, :output, :source, :timeout
 end

data/spec/code_spec.rb

@@ -353,6 +353,8 @@ RSpec.describe Code do
       next if code_input.is_a?(Code::Object::Decimal)
 
       expect(code_input.to_json).to eq(code_expected.to_json)
+      YAML.unsafe_load(code_input.to_yaml)
+      YAML.unsafe_load(code_expected.to_yaml)
     end
   end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: code-ruby
 version: !ruby/object:Gem::Version
-  version: 1.2.7
+  version: 1.4.0
 platform: ruby
 authors:
 - Dorian Marié
 bindir: bin
 cert_chain: []
-date: 2025-03-25 00:00:00.000000000 Z
+date: 2025-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -185,6 +185,7 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- TODO
 - VERSION
 - bin/bundle
 - bin/bundle-audit
@@ -198,6 +199,8 @@ files:
 - code-ruby.gemspec
 - lib/code-ruby.rb
 - lib/code.rb
+- lib/code/concerns.rb
+- lib/code/concerns/shared.rb
 - lib/code/error.rb
 - lib/code/node.rb
 - lib/code/node/base_10.rb