code-ruby 1.9.10 → 1.9.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5d0ceecc686aef6964768b675a3be83b75127a0b425bd452745ed06101d4cc2b
-  data.tar.gz: 5778826718ab6614081ad28e008cd885d2f1c4ddeb303d5fafa87a67befa63d8
+  metadata.gz: 192c4afdcb1d4a87d146ef92fe6241fb510b61b564843c62d07420a2f53caa44
+  data.tar.gz: b081b22d57f5582fea6de13e5c24f9c1f33b86a28cd1da97f37449cad40dc5f9
 SHA512:
-  metadata.gz: 531f8de970b16632012ea7cdb0836974d3333c24f506026e128ad317b02845fb5576c10529d833b8223cbc099366c9bddff96b794595939c7afdf7944b2c02f1
-  data.tar.gz: 4ca6148814db2b2e3dce20ccc122f96edbbec1cd1c217ae3700c089159df388b98dbde7e85e897045e136688f0ec9fb2520b02b88b913c7e7dc5a8ca80e359e9
+  metadata.gz: ae5c1a1146088cea5f5c0bf7c871bfeb1f89f863960eb4be68944ce273498f578abba6c2b7fcf990ef4208c9cb936fa8a7f9c8d2bb5c7dcb7490497cb69cfdae
+  data.tar.gz: cab243aa74f149e2a4e7b7c3523a14aa74e42bf55b9ca11e751682b359377447ac5c3ce5da5b3f29c4c4124d793fad6a2d126a6721979900e443e887f2a4f17d

data/Gemfile.lock

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

data/VERSION

@@ -1 +1 @@
-1.9.10
+1.9.11

data/lib/code/error.rb

@@ -2,7 +2,7 @@
 
 class Code
   class Error < StandardError
-    class Break < Error
+    class ControlFlow < Error
       attr_reader :code_value
 
       def initialize(value = nil)
@@ -10,12 +10,14 @@ class Code
       end
     end
 
-    class Next < Error
-      attr_reader :code_value
+    class Break < ControlFlow; end
 
-      def initialize(value = nil)
-        @code_value = value.to_code
-      end
-    end
+    class Next < ControlFlow; end
+
+    class Continue < Next; end
+
+    class Return < ControlFlow; end
+
+    class Retry < ControlFlow; end
   end
 end

data/lib/code/format.rb

@@ -318,7 +318,7 @@ class Code
 
     def format_call(call, indent:)
       name = call[:name]
-      raw_arguments = Array(call[:arguments])
+      raw_arguments = call[:arguments].presence || []
       arguments = raw_arguments.map { |arg| format_call_argument(arg) }
       statement =
         if arguments.empty?
@@ -336,6 +336,8 @@ class Code
     end
 
     def format_call_argument(argument)
+      return format_code_inline(Array(argument), indent: 0) unless argument.is_a?(Hash)
+
       value = format_code_inline(argument[:value], indent: 0)
       return value unless argument.key?(:name)
 

data/lib/code/node/code.rb

@@ -11,13 +11,37 @@ class Code
       end
 
       def evaluate(**args)
+        global_control_flow_root = args.fetch(:global_control_flow_root, false)
+        control_flow_scope = args.fetch(:control_flow_scope, nil)
+        statement_args =
+          if global_control_flow_root
+            args.merge(global_control_flow_root: false)
+          else
+            args
+          end
         last = Object::Nothing.new
 
-        (@statements || []).each do |statement|
-          last = statement.evaluate(**args, object: Object::Global.new)
+        begin
+          (@statements || []).each do |statement|
+            last = statement.evaluate(**statement_args, object: Object::Global.new)
+          end
+        rescue Error::Retry
+          retry if control_flow_scope == :group
+
+          raise
+        rescue Error::Break => e
+          return e.code_value if control_flow_scope == :group
+
+          raise
         end
 
         last
+      rescue Error::ControlFlow => e
+        raise unless global_control_flow_root
+
+        retry if e.is_a?(Error::Retry)
+
+        e.code_value
       end
 
       def resolve(**args)

data/lib/code/node/right_operation.rb

@@ -28,21 +28,9 @@ class Code
             @left.evaluate(**args)
           end
         when "while"
-          left = Object::Nothing.new
-
-          left = @left&.evaluate(**args) || Object::Nothing.new while (
-            @right&.evaluate(**args) || Object::Nothing.new
-          ).truthy?
-
-          left
+          evaluate_conditional_loop(condition_truthy: true, **args)
         when "until"
-          left = Object::Nothing.new
-
-          left = @left&.evaluate(**args) || Object::Nothing.new while (
-            @right&.evaluate(**args) || Object::Nothing.new
-          ).falsy?
-
-          left
+          evaluate_conditional_loop(condition_truthy: false, **args)
         when "rescue"
           begin
             @left&.evaluate(**args) || Object::Nothing.new
@@ -69,6 +57,32 @@ class Code
           )
         end
       end
+
+      private
+
+      def evaluate_conditional_loop(condition_truthy:, **args)
+        left = Object::Nothing.new
+
+        while loop_condition_truthy?(condition_truthy, **args)
+          begin
+            left = @left&.evaluate(**args) || Object::Nothing.new
+          rescue Error::Next, Error::Continue => e
+            left = e.code_value
+            next
+          rescue Error::Retry
+            retry
+          rescue Error::Break => e
+            return e.code_value
+          end
+        end
+
+        left
+      end
+
+      def loop_condition_truthy?(condition_truthy, **args)
+        condition = (@right&.evaluate(**args) || Object::Nothing.new).truthy?
+        condition_truthy ? condition : !condition
+      end
     end
   end
 end

data/lib/code/node/statement.rb

@@ -11,6 +11,7 @@ class Code
         elsif parsed.key?(:boolean)
           @statement = Boolean.new(parsed.delete(:boolean))
         elsif parsed.key?(:group)
+          @control_flow_scope = :group
           @statement = Code.new(parsed.delete(:group))
         elsif parsed.key?(:call)
           @statement = Call.new(parsed.delete(:call))
@@ -56,7 +57,12 @@ class Code
       end
 
       def evaluate(**args)
-        @statement&.evaluate(**args) || Object::Nothing.new
+        if @control_flow_scope == :group
+          @statement&.evaluate(**args, control_flow_scope: @control_flow_scope) ||
+            Object::Nothing.new
+        else
+          @statement&.evaluate(**args) || Object::Nothing.new
+        end
       end
 
       def resolve(**args)

data/lib/code/node/while.rb

@@ -20,29 +20,61 @@ class Code
       def evaluate(**args)
         case @operator
         when WHILE_KEYWORD
-          last = Object::Nothing.new
-
-          last = @body&.evaluate(**args) || Object::Nothing.new while (
-            @statement&.evaluate(**args) || Object::Nothing.new
-          ).truthy?
-
-          last
+          evaluate_conditional_loop(condition_truthy: true, **args)
         when UNTIL_KEYWORD
-          last = Object::Nothing.new
-
-          last = @body&.evaluate(**args) || Object::Nothing.new while (
-            @statement&.evaluate(**args) || Object::Nothing.new
-          ).falsy?
-
-          last
+          evaluate_conditional_loop(condition_truthy: false, **args)
         when LOOP_KEYWORD
-          loop { @body&.evaluate(**args) || Object::Nothing.new }
-          Object::Nothing.new
+          evaluate_infinite_loop(**args)
         else
           Object::Nothing.new
         end
-      rescue Error::Break => e
-        e.code_value
+      end
+
+      private
+
+      def evaluate_conditional_loop(condition_truthy:, **args)
+        last = Object::Nothing.new
+
+        while loop_condition_truthy?(condition_truthy, **args)
+          begin
+            last = @body&.evaluate(**args) || Object::Nothing.new
+          rescue Error::Next, Error::Continue => e
+            last = e.code_value
+            next
+          rescue Error::Retry
+            retry
+          rescue Error::Break => e
+            return e.code_value
+          end
+        end
+
+        last
+      end
+
+      def evaluate_infinite_loop(**args)
+        last = Object::Nothing.new
+
+        loop do
+          begin
+            last = @body&.evaluate(**args) || Object::Nothing.new
+          rescue Error::Next, Error::Continue => e
+            last = e.code_value
+            next
+          rescue Error::Retry
+            retry
+          rescue Error::Break => e
+            return e.code_value
+          end
+        end
+
+        last
+      end
+
+      def loop_condition_truthy?(condition_truthy, **args)
+        condition =
+          (@statement&.evaluate(**args) || Object::Nothing.new).truthy?
+
+        condition_truthy ? condition : !condition
       end
     end
   end

data/lib/code/object/function.rb

@@ -72,6 +72,8 @@ class Code
         end
 
         code_body.code_evaluate(**globals, context: code_context)
+      rescue Error::Return => e
+        e.code_value
       end
 
       def signature_for_call

data/lib/code/object/global.rb

@@ -23,9 +23,18 @@ class Code
         when "break"
           sig(args) { Object.repeat }
           raise Error::Break, code_value || Nothing.new
+        when "continue"
+          sig(args) { Object.repeat }
+          raise Error::Continue, code_value || Nothing.new
         when "next"
           sig(args) { Object.repeat }
           raise Error::Next, code_value || Nothing.new
+        when "redo", "retry"
+          sig(args) { Object.repeat }
+          raise Error::Retry, code_value || Nothing.new
+        when "return"
+          sig(args) { Object.repeat }
+          raise Error::Return, code_value || Nothing.new
         when "Class"
           sig(args) { Object.repeat }
           if code_arguments.any?

data/lib/code.rb

@@ -49,6 +49,7 @@ class Code
       Node::Code.new(Code.parse(source)).evaluate(
         context: context,
         error: error,
+        global_control_flow_root: true,
         input: input,
         object: object,
         output: output,

data/spec/code_spec.rb

@@ -313,6 +313,7 @@ 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| continue(0) if i.even? i ** 2}", "[1, 0, 9]"],
     ["[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]"],
@@ -328,9 +329,17 @@ RSpec.describe Code do
     ["[]", "[]"],
     ["\r\n", "nothing"],
     ["a = 0 [1, 2, 3].each { |i| next if i == 2 a += i } a", "4"],
+    ["a = 0\nb = 0\nwhile a < 4\n  a += 1\n  continue if a == 2\n  b += a\nend\nb", "8"],
     ["a = 0 loop a += 1 break end a", "1"],
+    ["a = 1\nbegin\n  a += 1\n  break if a > 3\n  retry\nend\na", "4"],
+    ["x = loop break(42) end x", "42"],
+    ["a = 0 a += 1 retry if a < 3 a", "3"],
     ["a = 0\nuntil a > 10 a += 1 end a", "11"],
     ["a = 0\nwhile a < 10 a += 1 end a", "10"],
+    [
+      "a = 0\nretried = false\nwhile a < 2\n  a += 1\n  retry if a == 1 && !retried && (retried = true)\nend\na",
+      "2"
+    ],
     ["a = 1 3.times { a += 1 } a", "4"],
     ["a = 1 a *= 2 a", "2"],
     ["a = 1 a += 1 a", "2"],
@@ -360,9 +369,15 @@ RSpec.describe Code do
     ["if false 1 elsif false 2", "nothing"],
     ["if false 1 elsif true 2", "2"],
     ["if false 1", "nothing"],
+    ["break(5)", "5"],
+    ["continue(6)", "6"],
     ["if true 1", "1"],
+    ["next(7)", "7"],
     ["not not false", "false"],
     ["not true", "false"],
+    ["retry(8)", "8"],
+    ["return(9)", "9"],
+    ["f = () => { return(3) 4 } f()", "3"],
     ["a = 1 orirginal = 2 orirginal", "2"],
     ["a = 1 andy = 2 andy", "2"],
     ["ifonly = 1 ifonly", "1"],

metadata

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