code-ruby 3.1.1 → 3.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4fb3de0080323ce38f0bc61db99084820616f9b437d94fbf973a4a0736da7a0b
-  data.tar.gz: 476a64d5bcd78add94f15f25c3d1d086c3263aa66dd4af73443e8ad5e126fc9e
+  metadata.gz: 2495002bb8e1d284386f2a90ff600370cfe0490a356688426682ec106727fbb3
+  data.tar.gz: e8dffdf7d8d0c0e62a091d2a7d305eae48dc74d024aa26c5a8dc393763147f13
 SHA512:
-  metadata.gz: 9851fd43383c19e34984f2124980f788beb59b22e2fd6cd5871a4e3107f62b908770c0b1575b58e1f84cefef574740877f9de9d18bb41ac22eaac531a85136bb
-  data.tar.gz: b620dc0c1eb65e83fe5d8ade6047fc712a1149f258a1275fc46163f4852a7efd2e5107fc979396daaa95672bb2216c43b3796176abf27d6c0f7bd35c9fba1cf4
+  metadata.gz: 55ceb13028c588110d3adec5539995ddd1f2dc4fd7173fd067a8e009a8093610adb150de78be46dfc57e605dbad0f03dd89e5693820be31c6d61c3440fb129ea
+  data.tar.gz: 6ae82061c1a129f1607eb348e18917e75c7d23accf7dca589da00ed3ae34eccf76af79826e430f5267b4a2011ce7c9df8a1709069f95f660c8dff22d16c0c37a

data/Gemfile.lock

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

data/VERSION

@@ -1 +1 @@
-3.1.1
+3.1.2

data/lib/code/format.rb

@@ -706,7 +706,13 @@ class Code
 
       if operator == "loop"
         body = format_code(while_statement[:body], indent: indent + 1)
-        return "#{INDENT * indent}loop {\n#{body}\n#{INDENT * indent}}"
+        parameters =
+          Array(while_statement[:parameters]).map do |parameter|
+            format_parameter(parameter, indent: indent)
+          end
+        header = parameters.empty? ? "loop {" : "loop { |#{parameters.join(", ")}|"
+
+        return "#{INDENT * indent}#{header}\n#{body}\n#{INDENT * indent}}"
       end
 
       statement =

data/lib/code/node/while.rb

@@ -14,6 +14,8 @@ class Code
         @statement = Statement.new(parsed.delete(:statement)) if parsed.key?(
           :statement
         )
+        @parameters = parsed.delete(:parameters) { [] }.presence || []
+        @parameters.map! { |parameter| FunctionParameter.new(parameter) }
         @body = Code.new(parsed.delete(:body).presence)
       end
 
@@ -53,11 +55,15 @@ class Code
 
       def evaluate_infinite_loop(**args)
         last = Object::Nothing.new
+        index = 0
 
         loop do
+          bind_loop_parameters(index, **args)
           last = @body&.evaluate(**args) || Object::Nothing.new
+          index += 1
         rescue Error::Next, Error::Continue => e
           last = e.code_value
+          index += 1
           next
         rescue Error::Retry
           retry
@@ -74,6 +80,21 @@ class Code
 
         condition_truthy ? condition : !condition
       end
+
+      def bind_loop_parameters(index, **args)
+        return if @parameters.blank?
+
+        @parameters.each.with_index do |parameter, parameter_index|
+          value =
+            if parameter_index.zero?
+              Object::Integer.new(index)
+            else
+              Object::Nothing.new
+            end
+
+          args.fetch(:context).code_set(parameter.name, value)
+        end
+      end
     end
   end
 end

data/lib/code/object/dictionary.rb

@@ -576,9 +576,13 @@ class Code
                 )
                 .truthy?
                 .tap { index += 1 }
+            rescue Error::Next => e
+              e.code_value.truthy?.tap { index += 1 }
             end
           )
         end
+      rescue Error::Break => e
+        e.code_value
       end
 
       def code_clear
@@ -605,6 +609,8 @@ class Code
             e.code_value.truthy?
           end
         )
+      rescue Error::Break => e
+        e.code_value
       end
 
       def code_compact!(argument = nil, **globals)
@@ -626,6 +632,8 @@ class Code
         end
 
         self
+      rescue Error::Break => e
+        e.code_value
       end
 
       def code_delete(*arguments, index: 0, **globals)
@@ -650,6 +658,8 @@ class Code
                 **globals
               )
             end
+          rescue Error::Next => e
+            e.code_value
           end
         else
           Dictionary.new(
@@ -676,6 +686,8 @@ class Code
               .to_h
           )
         end
+      rescue Error::Break => e
+        e.code_value
       end
 
       def code_delete_if(argument, **globals)
@@ -690,10 +702,14 @@ class Code
                 List.new([code_key, code_value, Integer.new(index), self]),
               **globals
             ).truthy?
+          rescue Error::Next => e
+            e.code_value.truthy?
           end
         end
 
         self
+      rescue Error::Break => e
+        e.code_value
       end
 
       def code_delete_unless(argument, **globals)
@@ -707,10 +723,14 @@ class Code
               arguments: List.new([key, value, Integer.new(index), self]),
               **globals
             ).falsy?
+          rescue Error::Next => e
+            e.code_value.falsy?
           end
         end
 
         self
+      rescue Error::Break => e
+        e.code_value
       end
 
       def code_dig(*arguments)
@@ -735,9 +755,13 @@ class Code
             arguments: List.new([key, value, Integer.new(index), self]),
             **globals
           )
+        rescue Error::Next => e
+          e.code_value
         end
 
         self
+      rescue Error::Break => e
+        e.code_value
       end
 
       def code_empty?
@@ -771,6 +795,8 @@ class Code
                 **globals
               )
             end
+          rescue Error::Next => e
+            e.code_value
           end
         else
           Dictionary.new(
@@ -797,6 +823,8 @@ class Code
               .to_h
           )
         end
+      rescue Error::Break => e
+        e.code_value
       end
 
       def code_fetch_values(*arguments)
@@ -841,10 +869,14 @@ class Code
               arguments: List.new([key, value, Integer.new(index), self]),
               **globals
             ).truthy?
+          rescue Error::Next => e
+            e.code_value.truthy?
           end
         end
 
         self
+      rescue Error::Break => e
+        e.code_value
       end
 
       def code_keep_unless(argument, **globals)
@@ -864,6 +896,8 @@ class Code
         end
 
         self
+      rescue Error::Break => e
+        e.code_value
       end
 
       def code_key(value, function = nil, **globals)
@@ -876,7 +910,7 @@ class Code
           raw.key(code_value) ||
             function.call(arguments: List.new([code_value, self]), **globals)
         end
-      rescue Error::Next => e
+      rescue Error::Next, Error::Break => e
         e.code_value
       end
 
@@ -921,6 +955,8 @@ class Code
             e.code_value.tap { index += 1 }
           end
         )
+      rescue Error::Break => e
+        e.code_value
       end
 
       def code_merge!(*arguments, **globals)
@@ -960,6 +996,8 @@ class Code
         end
 
         self
+      rescue Error::Break => e
+        e.code_value
       end
 
       def code_select!(argument, **globals)
@@ -980,6 +1018,8 @@ class Code
         end
 
         self
+      rescue Error::Break => e
+        e.code_value
       end
 
       def code_select(argument, **globals)
@@ -1002,6 +1042,8 @@ class Code
             end
           )
         end
+      rescue Error::Break => e
+        e.code_value
       end
 
       def code_set(key, value)
@@ -1045,6 +1087,8 @@ class Code
             end
             .to_h
         )
+      rescue Error::Break => e
+        e.code_value
       end
 
       def code_values

data/lib/code/object/html.rb

@@ -188,10 +188,14 @@ class Code
 
         if code_function.something?
           code_content =
-            code_function.call(
-              arguments: List.new([code_name, code_attributes]),
-              **globals
-            )
+            begin
+              code_function.call(
+                arguments: List.new([code_name, code_attributes]),
+                **globals
+              )
+            rescue Error::Next => e
+              e.code_value
+            end
 
           content =
             if code_content.is_an?(Html)
@@ -206,33 +210,52 @@ class Code
         fragment.add_child(node)
 
         Html.new(fragment)
+      rescue Error::Break => e
+        e.code_value
       end
 
       def self.code_escape(value_or_function = nil, **globals)
         code_value =
           if value_or_function.is_a?(Function)
-            value_or_function.to_code.call(**globals)
+            begin
+              value_or_function.to_code.call(**globals)
+            rescue Error::Next => e
+              e.code_value
+            end
           else
             value_or_function.to_code
           end
 
         String.new(CGI.escapeHTML(code_value.to_s))
+      rescue Error::Break => e
+        e.code_value
       end
 
       def self.code_unescape(value_or_function = nil, **globals)
         code_value =
           if value_or_function.is_a?(Function)
-            value_or_function.to_code.call(**globals)
+            begin
+              value_or_function.to_code.call(**globals)
+            rescue Error::Next => e
+              e.code_value
+            end
           else
             value_or_function.to_code
           end
 
         String.new(Nokogiri::HTML.fragment(code_value.to_s).text)
+      rescue Error::Break => e
+        e.code_value
       end
 
       def self.code_join(first = nil, second = nil, **globals)
         if second.is_a?(Function)
-          code_contents = second.to_code.call(**globals)
+          code_contents =
+            begin
+              second.to_code.call(**globals)
+            rescue Error::Next => e
+              e.code_value
+            end
           code_separator = first.to_code
         else
           code_contents = first.to_code
@@ -264,12 +287,18 @@ class Code
         end
 
         Html.new(fragment)
+      rescue Error::Break => e
+        e.code_value
       end
 
       def self.code_text(value_or_function = nil, **globals)
         code_value =
           if value_or_function.is_a?(Function)
-            value_or_function.to_code.call(**globals)
+            begin
+              value_or_function.to_code.call(**globals)
+            rescue Error::Next => e
+              e.code_value
+            end
           else
             value_or_function.to_code
           end
@@ -280,12 +309,18 @@ class Code
         )
 
         Html.new(fragment)
+      rescue Error::Break => e
+        e.code_value
       end
 
       def self.code_raw(value_or_function = nil, **globals)
         code_value =
           if value_or_function.is_a?(Function)
-            value_or_function.to_code.call(**globals)
+            begin
+              value_or_function.to_code.call(**globals)
+            rescue Error::Next => e
+              e.code_value
+            end
           else
             value_or_function.to_code
           end
@@ -295,6 +330,8 @@ class Code
         else
           Html.new(Nokogiri::HTML::DocumentFragment.parse(code_value.to_s))
         end
+      rescue Error::Break => e
+        e.code_value
       end
 
       def call(**args)
@@ -352,6 +389,8 @@ class Code
             e.code_value
           end
         )
+      rescue Error::Break => e
+        e.code_value
       end
 
       def to_s

data/lib/code/object/integer.rb

@@ -584,9 +584,13 @@ class Code
             arguments: List.new([Integer.new(element), self]),
             **globals
           )
+        rescue Error::Next => e
+          e.code_value
         end
 
         self
+      rescue Error::Break => e
+        e.code_value
       end
 
       def code_truncate(n = nil)

data/lib/code/object/list.rb

@@ -870,6 +870,8 @@ class Code
             e.code_value.tap { index += 1 }
           end
         )
+      rescue Error::Break => e
+        e.code_value
       end
 
       def code_append(other)
@@ -909,6 +911,8 @@ class Code
         rescue Error::Next => e
           e.code_value
         end || Nothing.new
+      rescue Error::Break => e
+        e.code_value
       end
 
       def code_each(argument = nil, **globals)
@@ -928,6 +932,8 @@ class Code
         end
 
         self
+      rescue Error::Break => e
+        e.code_value
       end
 
       def code_first(value = nil)
@@ -1424,6 +1430,8 @@ class Code
             e.code_value
           end
         )
+      rescue Error::Break => e
+        e.code_value
       end
 
       def code_map!(argument = nil, **globals)
@@ -1445,6 +1453,8 @@ class Code
         end
 
         self
+      rescue Error::Break => e
+        e.code_value
       end
 
       def code_max(argument = nil, **globals)
@@ -1462,6 +1472,8 @@ class Code
         rescue Error::Next => e
           e.code_value
         end || Nothing.new
+      rescue Error::Break => e
+        e.code_value
       end
 
       def code_none?(argument = nil, **globals)
@@ -1488,6 +1500,8 @@ class Code
             e.code_value.truthy?.tap { index += 1 }
           end
         )
+      rescue Error::Break => e
+        e.code_value
       end
 
       def code_all?(argument = nil, **globals)
@@ -1514,6 +1528,8 @@ class Code
             e.code_value.truthy?.tap { index += 1 }
           end
         )
+      rescue Error::Break => e
+        e.code_value
       end
 
       def code_reduce(argument = nil, **globals)
@@ -1536,6 +1552,8 @@ class Code
         rescue Error::Next => e
           e.code_value.tap { index += 1 }
         end || Nothing.new
+      rescue Error::Break => e
+        e.code_value
       end
 
       def code_reverse
@@ -1563,6 +1581,8 @@ class Code
             e.code_value.truthy?
           end
         )
+      rescue Error::Break => e
+        e.code_value
       end
 
       def code_compact!(argument = nil, **globals)
@@ -1586,6 +1606,8 @@ class Code
         end
 
         self
+      rescue Error::Break => e
+        e.code_value
       end
 
       def code_select(argument = nil, **globals)
@@ -1607,6 +1629,8 @@ class Code
             e.code_value.truthy?
           end
         )
+      rescue Error::Break => e
+        e.code_value
       end
 
       def code_select!(argument = nil, **globals)
@@ -1628,6 +1652,8 @@ class Code
         end
 
         self
+      rescue Error::Break => e
+        e.code_value
       end
 
       def code_reject(argument = nil, **globals)
@@ -1649,6 +1675,8 @@ class Code
             e.code_value.truthy?
           end
         )
+      rescue Error::Break => e
+        e.code_value
       end
 
       def code_reject!(argument = nil, **globals)
@@ -1670,6 +1698,8 @@ class Code
         end
 
         self
+      rescue Error::Break => e
+        e.code_value
       end
 
       def code_join(separator = nil)
@@ -1695,6 +1725,8 @@ class Code
             e.code_value
           end
         )
+      rescue Error::Break => e
+        e.code_value
       end
 
       def code_size
@@ -1730,6 +1762,8 @@ class Code
             e.code_value.tap { index += 1 }
           end
         )
+      rescue Error::Break => e
+        e.code_value
       end
 
       def code_sum

data/lib/code/object/range.rb

@@ -90,8 +90,12 @@ class Code
               )
               .truthy?
               .tap { index += 1 }
+          rescue Error::Next => e
+            e.code_value.truthy?.tap { index += 1 }
           end
         )
+      rescue Error::Break => e
+        e.code_value
       end
 
       def code_any?(argument, **globals)
@@ -108,8 +112,12 @@ class Code
               )
               .truthy?
               .tap { index += 1 }
+          rescue Error::Next => e
+            e.code_value.truthy?.tap { index += 1 }
           end
         )
+      rescue Error::Break => e
+        e.code_value
       end
 
       def code_each(argument, **globals)
@@ -120,9 +128,13 @@ class Code
             arguments: List.new([code_element, Integer.new(index), self]),
             **globals
           )
+        rescue Error::Next => e
+          e.code_value
         end
 
         self
+      rescue Error::Break => e
+        e.code_value
       end
 
       def code_first
@@ -142,8 +154,12 @@ class Code
               arguments: List.new([code_element, Integer.new(index), self]),
               **globals
             )
+          rescue Error::Next => e
+            e.code_value
           end
         )
+      rescue Error::Break => e
+        e.code_value
       end
 
       def code_select(argument, **globals)
@@ -155,8 +171,12 @@ class Code
               arguments: List.new([code_element, Integer.new(index), self]),
               **globals
             ).truthy?
+          rescue Error::Next => e
+            e.code_value.truthy?
           end
         )
+      rescue Error::Break => e
+        e.code_value
       end
 
       def exclude_end?

data/lib/code/parser.rb

@@ -407,12 +407,26 @@ class Code
       skip_newlines
 
       statement = parse_expression unless operator == "loop"
-      body = parse_body(%w[end])
+
+      if operator == "loop" &&
+           (match?(:punctuation, "{") || match?(:keyword, "do"))
+        block = parse_block(current.value)
+        body = block[:body]
+        parameters = block[:parameters]
+      else
+        body = parse_body(%w[end])
+      end
+
       skip_newlines
       advance if match?(:keyword, "end")
 
       {
-        while: { operator: operator, statement: statement, body: body }.compact
+        while: {
+          operator: operator,
+          statement: statement,
+          parameters: parameters,
+          body: body
+        }.compact
       }
     end
 

data/spec/code_spec.rb

@@ -13,6 +13,74 @@ RSpec.describe Code do
     [result, output.string]
   end
 
+  def control_flow_block_calls
+    [
+      "[1].each { CONTROL }",
+      "[1, 2].any? { CONTROL }",
+      "[1].detect { CONTROL }",
+      "[1].map { CONTROL }",
+      "xs = [1] xs.map! { CONTROL }",
+      "[1].max { CONTROL }",
+      "[1].none? { CONTROL }",
+      "[1].all? { CONTROL }",
+      "[1, 2].reduce { |acc, item| CONTROL }",
+      "[nothing].compact { CONTROL }",
+      "xs = [nothing] xs.compact! { CONTROL }",
+      "[1].select { CONTROL }",
+      "xs = [1] xs.select! { CONTROL }",
+      "[1].reject { CONTROL }",
+      "xs = [1] xs.reject! { CONTROL }",
+      "[1].sort { CONTROL }",
+      "[1].uniq { CONTROL }",
+      "(1..1).all? { CONTROL }",
+      "(1..1).any? { CONTROL }",
+      "(1..1).each { CONTROL }",
+      "(1..1).map { CONTROL }",
+      "(1..1).select { CONTROL }",
+      "{a: 1}.any? { CONTROL }",
+      "{a: 1}.compact { CONTROL }",
+      "hash = {a: 1} hash.compact! { CONTROL }",
+      "{a: 1}.delete(:b) { CONTROL }",
+      "hash = {a: 1} hash.delete_if { CONTROL }",
+      "hash = {a: 1} hash.delete_unless { CONTROL }",
+      "{a: 1}.each { CONTROL }",
+      "{a: 1}.fetch(:b) { CONTROL }",
+      "hash = {a: 1} hash.keep_if { CONTROL }",
+      "hash = {a: 1} hash.keep_unless { CONTROL }",
+      "{a: 1}.key(2) { CONTROL }",
+      "{a: 1}.merge({a: 2}) { CONTROL }",
+      "hash = {a: 1} hash.merge!({a: 2}) { CONTROL }",
+      "{a: 1}.select { CONTROL }",
+      "hash = {a: 1} hash.select! { CONTROL }",
+      "{a: 1}.transform_values { CONTROL }",
+      "1.times { CONTROL }",
+      "Html.p { CONTROL }",
+      "Html.escape { CONTROL }",
+      "Html.unescape { CONTROL }",
+      "Html.join(Html.br) { CONTROL }",
+      "Html.text { CONTROL }",
+      "Html.raw { CONTROL }",
+      "Html.raw(\"<p>a</p>\").css(\"p\").map { CONTROL }"
+    ]
+  end
+
+  %w[return break next continue].each do |control_flow|
+    it "continues after #{control_flow} in block methods" do
+      aggregate_failures do
+        control_flow_block_calls.each do |block_call|
+          input = "#{block_call.sub("CONTROL", control_flow)} puts(:end)"
+          formatted = format_input(input)
+
+          _result, output = evaluate_with_output(input)
+          _formatted_result, formatted_output = evaluate_with_output(formatted)
+
+          expect(output).to eq("end\n"), input
+          expect(formatted_output).to eq("end\n"), formatted
+        end
+      end
+    end
+  end
+
   (
     [
       "{ a: 1, b: 2 }.transform_values { |key| key.upcase }",
@@ -352,6 +420,7 @@ RSpec.describe Code do
       ["[1, 2].map(&:to_string)", '["1", "2"]'],
       ["[1, 2].map(&:to_string)", '["1", "2"]'],
       ["[1].each do end", "[1]"],
+      ["x = [1].each { break(42) } x", "42"],
       ["[[true]]", "[[true]]"],
       ["[]", "[]"],
       ["\r\n", "nothing"],
@@ -362,6 +431,8 @@ RSpec.describe Code do
       ],
       ["a = 0 loop a += 1 break end a", "1"],
       ["x = loop break(42) end x", "42"],
+      ["x = loop { |index| break(index) if index > 3 } x", "4"],
+      ["x = loop do |index| break(index) if index > 3 end x", "4"],
       ["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"],
@@ -541,7 +612,11 @@ RSpec.describe Code do
     end
   end
 
-  [["puts(true)", "true\n"], %w[print(false) false]].each do |input, expected|
+  [
+    ["puts(true)", "true\n"],
+    %w[print(false) false],
+    ["[1].each { break } puts(:end)", "end\n"]
+  ].each do |input, expected|
     it "#{input} prints #{expected}" do
       formatted = format_input(input)
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: code-ruby
 version: !ruby/object:Gem::Version
-  version: 3.1.1
+  version: 3.1.2
 platform: ruby
 authors:
 - Dorian Marié