code-ruby 0.9.2 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2a15136e1a9999fb8cba9a433f0e72d6bd237b8de8d0c948477824944853da2d
-  data.tar.gz: 98a7b20d9225d717865eaa8fa461fa660e970a281f9de464725fd3923c0dee9f
+  metadata.gz: af513b1ba26657cd202191bd69f97e6018c0bdc42ca5b518bc2f1de4800d9cf1
+  data.tar.gz: 73f15cd6414c7908118c0f78e5f18f6407f5e6f947fa470110f5d7777f3ebc83
 SHA512:
-  metadata.gz: 998e06a88b8d4bfb4cd1529c01a5ea347b3f1874c5c11ddbe9952942db999cb25bba645c5f49bfdb40ff7f17a217af035561ad58fcb06dd8c4383d8906362947
-  data.tar.gz: b9a5b0703efca344bdd1f1f0b972ddabad86746cbd6745eb71c2a82ef61fc4a30370bd7052dfe703e1a44055926f17c9a57005ff5b353057dc462078c148ea80
+  metadata.gz: 88094db69266fed8e2a9ff8f435406ebb623e815dfb85de6087a95ad3352da6dfd53162a3f457773a62247199a38b4ffdede637741d8dcc2e29707c6a5070ff4
+  data.tar.gz: 3568647377cc4049c042aee130e6d409e1d4cfa6d556ba3179696bbab7d71a70744ce2e50cb5104dfd564b4bbb417154a22ae08c4e52aba4f797e11cecf67a22

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    code-ruby (0.9.0)
+    code-ruby (0.9.3)
       activesupport (~> 7)
       bigdecimal (~> 3)
       json (~> 2)

data/bin/code

@@ -9,64 +9,67 @@ options = {
   profile: false,
   profiler: "text",
   input: "",
-  context: "",
   parse: false
 }
 
-OptionParser
-  .new do |opts|
-    opts.banner = "Usage: code [options]"
-
-    opts.on("-v", "--version", "Version of template") do |_input|
-      puts Code::Version
-      exit
-    end
-
-    opts.on(
-      "-i INPUT",
-      "--input INPUT",
-      "Input in the code language (String or File)"
-    ) do |input|
-      input = File.read(input) if File.exist?(input)
-
-      options[:input] = input
-    end
-
-    opts.on(
-      "-c CONTEXT",
-      "--context CONTEXT",
-      "Context in the code language (String or File)"
-    ) do |context|
-      context = File.read(context) if File.exist?(context)
-
-      options[:context] = context
-    end
-
-    opts.on("-p", "--parse", "Get parser results for input") do |parse|
-      options[:parse] = parse
+argv =
+  OptionParser
+    .new do |opts|
+      opts.banner = "Usage: code INPUT\n\n"
+
+      opts.on("-v", "--version", "Version of Code") do |_input|
+        puts Code::Version
+        exit
+      end
+
+      opts.on(
+        "-i INPUT",
+        "--input INPUT",
+        "Input in the Code language (String or File)"
+      ) do |input|
+        input = File.read(input) if File.exist?(input)
+
+        options[:input] = input
+      end
+
+      opts.on("-p", "--parse", "Parser tree for input") do |parse|
+        options[:parse] = parse
+      end
+
+      opts.on(
+        "-t TIMEOUT",
+        "--timeout TIMEOUT",
+        "Set timeout in seconds"
+      ) { |timeout| options[:timeout] = timeout.to_f }
+
+      opts.on("--profile", "Profile Ruby code") do |_timeout|
+        require "ruby-prof"
+        options[:profile] = true
+      end
+
+      opts.on(
+        "--profiler TYPE",
+        "Profiler output type (text (default) or html)"
+      ) do |profiler|
+        require "ruby-prof"
+        options[:profile] = true
+        options[:profiler] = profiler
+      end
     end
+    .parse!
 
-    opts.on(
-      "-t TIMEOUT",
-      "--timeout TIMEOUT",
-      "Set timeout in seconds"
-    ) { |timeout| options[:timeout] = timeout.to_f }
+options[:input] = argv.join(" ") if options[:input].empty?
 
-    opts.on("--profile", "Profile Ruby code") do |_timeout|
-      require "ruby-prof"
-      options[:profile] = true
-    end
+abort <<~HELP if options[:input].empty?
+  Usage: code INPUT
 
-    opts.on(
-      "--profiler TYPE",
-      "Profiler output type (text (default) or html)"
-    ) do |profiler|
-      require "ruby-prof"
-      options[:profile] = true
-      options[:profiler] = profiler
-    end
-  end
-  .parse!
+    -v, --version                    Version of Code
+    -i, --input INPUT                Input in the Code language (String or File)
+    -p, --parse                      Parser tree for input
+    -t, --timeout TIMEOUT            Set timeout in seconds
+        --profile                    Profile Ruby code
+        --profiler TYPE              Profiler output type (text (default) or html)
+HELP
 
 RubyProf.start if options[:profile]
 
@@ -75,7 +78,6 @@ if options[:parse]
 else
   print Code.evaluate(
           options[:input],
-          options[:context],
           output: $stdout,
           error: $stderr,
           timeout: options[:timeout]

data/lib/code/error.rb

@@ -25,5 +25,21 @@ class Code
 
     class KeyNotFound < Error
     end
+
+    class Break < Error
+      attr_reader :value
+
+      def initialize(value = nil)
+        @value = value || Object::Nothing.new
+      end
+    end
+
+    class Next < Error
+      attr_reader :value
+
+      def initialize(value = nil)
+        @value = value || Object::Nothing.new
+      end
+    end
   end
 end

data/lib/code/node/base_10.rb

@@ -6,10 +6,9 @@ class Code
       def initialize(parsed)
         @whole = parsed.delete(:whole)
 
-        @exponent =
-          Node::Statement.new(parsed.delete(:exponent)) if parsed.key?(
-          :exponent
-        )
+        if parsed.key?(:exponent)
+          @exponent = Node::Statement.new(parsed.delete(:exponent))
+        end
 
         super(parsed)
       end

data/lib/code/node/decimal.rb

@@ -6,10 +6,9 @@ class Code
       def initialize(parsed)
         @decimal = parsed.delete(:decimal)
 
-        @exponent =
-          Node::Statement.new(parsed.delete(:exponent)) if parsed.key?(
-          :exponent
-        )
+        if parsed.key?(:exponent)
+          @exponent = Node::Statement.new(parsed.delete(:exponent))
+        end
 
         super(parsed)
       end

data/lib/code/node/while.rb

@@ -5,32 +5,39 @@ class Code
     class While < Node
       WHILE_KEYWORD = "while"
       UNTIL_KEYWORD = "until"
+      LOOP_KEYWORD = "loop"
 
       def initialize(parsed)
         @operator = parsed.delete(:operator)
-        @statement = Node::Statement.new(parsed.delete(:statement))
-        @body = Node::Code.new(parsed.delete(:body))
+        @statement = Statement.new(parsed.delete(:statement)) if parsed[:statement]
+        @body = Code.new(parsed.delete(:body))
         super(parsed)
       end
 
       def evaluate(**args)
-        if @operator == WHILE_KEYWORD
-          last = ::Code::Object::Nothing.new
+        case @operator
+        when WHILE_KEYWORD
+          last = Object::Nothing.new
 
           last = @body.evaluate(**args) while @statement.evaluate(
             **args
           ).truthy?
 
           last
-        elsif @operator == UNTIL_KEYWORD
-          last = ::Code::Object::Nothing.new
+        when UNTIL_KEYWORD
+          last = Object::Nothing.new
 
           last = @body.evaluate(**args) while @statement.evaluate(**args).falsy?
 
           last
+        when LOOP_KEYWORD
+          loop { @body.evaluate(**args) }
+          raise NotImplementedError
         else
           raise NotImplementedError, @operator
         end
+      rescue Error::Break => e
+        e.value || Object::Nothing.new
       end
     end
   end

data/lib/code/node.rb

@@ -3,7 +3,7 @@
 class Code
   class Node
     def initialize(parsed)
-      return unless parsed.any?
+      return if parsed.nil? || parsed.empty?
 
       raise NotImplementedError, "#{self.class.name}: #{parsed.inspect}"
     end

data/lib/code/object/boolean.rb

@@ -6,11 +6,7 @@ class Code
       attr_reader :raw
 
       def initialize(raw)
-        if raw.is_a?(Object)
-          @raw = raw.truthy?
-        else
-          @raw = !!raw
-        end
+        @raw = (raw.is_a?(Object) ? raw.truthy? : !!raw)
       end
 
       def self.name

data/lib/code/object/dictionary.rb

@@ -470,6 +470,8 @@ class Code
               ],
               **globals
             ).falsy?
+          rescue Error::Next => e
+            (e.value || Nothing.new).falsy?
           end
         end
 
@@ -486,6 +488,8 @@ class Code
         else
           raw.key(value) || Nothing.new
         end
+      rescue Error::Next => e
+        e.value || Nothing.new
       end
 
       def code_keys
@@ -522,6 +526,9 @@ class Code
             else
               new_value.tap { index += 1 }
             end
+          rescue Error::Next => e
+            index += 1
+            e.value || Nothing.new
           end
         )
       end
@@ -548,6 +555,8 @@ class Code
               ],
               **globals
             ).truthy?
+          rescue Error::Next => e
+            (e.value || Nothing.new).truthy?
           end
         end
 
@@ -569,6 +578,8 @@ class Code
                 ],
                 **globals
               ).truthy?
+            rescue Error::Next => e
+              (e.value || Nothing.new).truthy?
             end
           )
         end
@@ -626,6 +637,8 @@ class Code
               ],
               **globals
             )
+          rescue Error::Next => e
+            e.value || Nothing.new
           end
         )
       end

data/lib/code/object/global.rb

@@ -19,6 +19,12 @@ class Code
         when "Boolean"
           sig(args) { Object.maybe }
           value ? value.code_to_boolean : Class.new(Boolean)
+        when "break"
+          sig(args) { Object.maybe }
+          raise Error::Break, value || Nothing.new
+        when "next"
+          sig(args) { Object.maybe }
+          raise Error::Next, value || Nothing.new
         when "Class"
           sig(args) { Object.maybe }
           value ? value.code_to_class : Class.new(Class)

data/lib/code/object/integer.rb

@@ -9,6 +9,7 @@ class Code
         whole = whole.raw if whole.is_a?(Integer)
         @raw = whole.to_i
         return unless exponent
+
         exponent = exponent.raw if exponent.is_a?(Number)
         @raw *= 10**exponent
       end

data/lib/code/object/list.rb

@@ -69,6 +69,9 @@ class Code
         when "select"
           sig(args) { Function }
           code_select(value, **globals)
+        when "select!"
+          sig(args) { Function }
+          code_select!(value, **globals)
         when "size"
           sig(args)
           code_size
@@ -87,6 +90,8 @@ class Code
         Boolean.new(
           raw.any? do |element|
             argument.call(arguments: [Argument.new(element)], **globals).truthy?
+          rescue Error::Next => e
+            e.value || Nothing.new
           end
         )
       end
@@ -99,12 +104,16 @@ class Code
       def code_detect(argument, **globals)
         raw.detect do |element|
           argument.call(arguments: [Argument.new(element)], **globals).truthy?
+        rescue Error::Next => e
+          e.value || Nothing.new
         end || Nothing.new
       end
 
       def code_each(argument, **globals)
         raw.each do |element|
           argument.call(arguments: [Argument.new(element)], **globals)
+        rescue Error::Next => e
+          e.value || Nothing.new
         end
         self
       end
@@ -146,6 +155,8 @@ class Code
         List.new(
           raw.map do |element|
             argument.call(arguments: [Argument.new(element)], **globals)
+          rescue Error::Next => e
+            e.value || Nothing.new
           end
         )
       end
@@ -157,6 +168,8 @@ class Code
       def code_max_by(argument, **globals)
         raw.max_by do |element|
           argument.call(arguments: [Argument.new(element)], **globals)
+        rescue Error::Next => e
+          e.value || Nothing.new
         end || Nothing.new
       end
 
@@ -164,6 +177,8 @@ class Code
         Boolean.new(
           raw.none? do |element|
             argument.call(arguments: [Argument.new(element)], **globals).truthy?
+          rescue Error::Next => e
+            (e.value || Nothing.new).truthy?
           end
         )
       end
@@ -174,6 +189,8 @@ class Code
             arguments: [Argument.new(acc), Argument.new(element)],
             **globals
           )
+        rescue Error::Next => e
+          e.value || Nothing.new
         end || Nothing.new
       end
 
@@ -185,10 +202,23 @@ class Code
         List.new(
           raw.select do |element|
             argument.call(arguments: [Argument.new(element)], **globals).truthy?
+          rescue Error::Next => e
+            (e.value || Nothing.new).truthy?
           end
         )
       end
 
+      def code_select!(argument, **globals)
+        raw.select! do |element|
+          argument.call(arguments: [Argument.new(element)], **globals).truthy?
+        rescue Error::Next => e
+          p e.value
+          (e.value || Nothing.new).truthy?
+        end
+
+        self
+      end
+
       def code_sort
         List.new(raw.sort)
       end

data/lib/code/object/range.rb

@@ -8,7 +8,7 @@ class Code
       def initialize(left, right, exclude_end: false)
         @left = left
         @right = right
-        @exclude_end = !!exclude_end
+        @exclude_end = !exclude_end.nil?
         @raw = ::Range.new(left, right, exclude_end)
       end
 

data/lib/code/object.rb

@@ -176,7 +176,7 @@ class Code
         other == self
       end
     end
-    alias_method :eql?, :==
+    alias eql? ==
 
     def call(**args)
       operator = args.fetch(:operator, nil)

data/lib/code/parser/bitwise_and.rb

@@ -7,6 +7,10 @@ class Code
         Shift
       end
 
+      def whitespace?
+        whitespace
+      end
+
       def ampersand
         str("&")
       end

data/lib/code/parser/chained_call.rb

@@ -7,14 +7,6 @@ class Code
         SquareBracket
       end
 
-      def whitespace
-        Whitespace
-      end
-
-      def whitespace?
-        whitespace.maybe
-      end
-
       def dot
         str(".")
       end
@@ -27,6 +19,10 @@ class Code
         str(":")
       end
 
+      def right_statement
+        Rescue
+      end
+
       def operator
         dot | (colon << colon) | (ampersand << dot)
       end

data/lib/code/parser/equal.rb

@@ -55,6 +55,10 @@ class Code
         str(".")
       end
 
+      def right_statement
+        OrKeyword
+      end
+
       def operator
         equal | (plus << equal) | (minus << equal) | (asterisk << equal) |
           (slash << equal) | (percent << equal) |

data/lib/code/parser/equality.rb

@@ -27,6 +27,10 @@ class Code
         str("~")
       end
 
+      def right_statement
+        Greater
+      end
+
       def operator
         (equal << equal << equal) | (equal << equal) |
           (lesser << equal << greater) | (exclamation_point << equal) |

data/lib/code/parser/left_operation.rb

@@ -19,11 +19,15 @@ class Code
         raise NotImplementedError
       end
 
+      def right_statement
+        Statement
+      end
+
       def root
         (
           statement.aka(:first) << (
             whitespace? << operator.aka(:operator) << whitespace? <<
-              statement.aka(:statement)
+              right_statement.aka(:statement)
           ).repeat(1).aka(:others).maybe
         )
           .aka(:left_operation)

data/lib/code/parser/multiplication.rb

@@ -27,6 +27,10 @@ class Code
         str("÷")
       end
 
+      def right_statement
+        Negation
+      end
+
       def operator
         asterisk | slash | percent | multiplication_sign | division_sign
       end

data/lib/code/parser/right_operation.rb

@@ -19,11 +19,15 @@ class Code
         raise NotImplementedError
       end
 
+      def right_statement
+        Statement
+      end
+
       def root
         (
           statement.aka(:left) << (
             whitespace? << operator.aka(:operator) << whitespace? <<
-              self.class.aka(:right)
+              right_statement.aka(:right)
           ).maybe
         )
           .aka(:right_operation)

data/lib/code/parser/string.rb

@@ -20,7 +20,7 @@ class Code
       end
 
       def backslash
-        str("\\")
+        str('\\')
       end
 
       def opening_curly_bracket

data/lib/code/parser/while.rb

@@ -27,10 +27,18 @@ class Code
         str("end")
       end
 
+      def loop_keyword
+        str("loop")
+      end
+
       def root
         (
-          (while_keyword | until_keyword).aka(:operator) << whitespace <<
-            statement.aka(:statement) << code.aka(:body) << end_keyword.maybe
+          (
+            (
+              (while_keyword | until_keyword).aka(:operator) << whitespace <<
+                statement.aka(:statement)
+            ) | (loop_keyword.aka(:operator) << whitespace)
+          ) << code.aka(:body) << end_keyword.maybe
         ).aka(:while) | statement
       end
     end

data/lib/code/type/repeat.rb

@@ -21,7 +21,7 @@ class Code
 
       def max_arguments
         max_arguments = max_arguments_of(clazz)
-        (max_arguments.nil? || maximum.nil?) ? nil : maximum * max_arguments
+        max_arguments.nil? || maximum.nil? ? nil : maximum * max_arguments
       end
 
       def name

data/lib/code/version.rb

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

data/spec/code/object/string_spec.rb

@@ -1,11 +1,13 @@
+# frozen_string_literal: true
+
 require "spec_helper"
 
 RSpec.describe Code::Object::String do
   [
     %w[:a a],
     %w[:a_b_c_0123 a_b_c_0123],
-    %w["Hello" Hello],
-    %w['Hello' Hello],
+    %w[:Hello Hello],
+    %w[:Hello Hello],
     ['"Hello\nWorld"', "Hello\nWorld"],
     ["'Hello\\nWorld'", "Hello\nWorld"]
   ].each do |input, expected|

data/spec/code_spec.rb

@@ -141,14 +141,20 @@ RSpec.describe Code do
     ['"Hello {1}"', '"Hello 1"'],
     ['user = {} user.name = "Dorian" user.name', ":Dorian"],
     ['user = {} user[:name] = "Dorian" user[:name]', ":Dorian"],
-    ['{ "first_name": "Dorian" }', '{"first_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]"]
   ].each do |input, expected|
     it "#{input} == #{expected}" do
       expect(Code.evaluate(input)).to eq(Code.evaluate(expected))
     end
 
     it "#{input} converts to json like #{expected}" do
-      expect(Code.evaluate(input).to_json).to eq(Code.evaluate(expected).to_json)
+      expect(Code.evaluate(input).to_json).to eq(
+        Code.evaluate(expected).to_json
+      )
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: code-ruby
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 0.10.0
 platform: ruby
 authors:
 - Dorian Marié
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-02-27 00:00:00.000000000 Z
+date: 2024-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport