code-ruby 3.0.0 → 3.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c4aec10b766ce32c39c533055ec8a17e8463551a11e83c995028dbf43b67d42e
-  data.tar.gz: 8f88527a8964da7c61fef7990f29582c56c542d59d33e11700c2ea0801be6749
+  metadata.gz: b61a40e84c1815a9437f6127c4db28d7327982671aa1a602e11ccc85e467861f
+  data.tar.gz: 796e46b1fbd2443799bd4cba9fcd7513c462bc9b605d31d17a2d1197ee7d6fd1
 SHA512:
-  metadata.gz: da6c39843bfc479cfd66f965f9eacb6c80b002beda34c30128f2e5db4ac7bc787b0c002406385089ebeb3fd640896005cb2f54ba4e87c232600ed7275a7b43f6
-  data.tar.gz: 457cba3cadc88d3a4a1520ec4b7dfbdb0c2088e16be3b6097be26d9cf6aab4f83cc33ad178baaea42895143c0867bc3e70dc9424e60f0dfeb8f807c72c5d7ff1
+  metadata.gz: 4d131863a968fa7e02711182c37840bd7743770d32da91f031bdc8e6ccd42aedea8312c1521c1095205eca46ed87f2b663a0622cc97706beb6383b5998bba097
+  data.tar.gz: 9b17fa0e159d1472929fd284020e538937ed1465cfeb0e36dce1f079044e657920edfd2d000aedee61a2e2a9f5eaabdf3ac3503833d162d3693efcccc594ffbd

data/Gemfile.lock

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

data/VERSION

@@ -1 +1 @@
-3.0.0
+3.0.2

data/lib/code/node/square_bracket.rb

@@ -22,7 +22,12 @@ class Code
       def resolve(**args)
         left = @left&.resolve(**args) || Object::Nothing.new
 
-        list = Object::IdentifierList.new([left])
+        list =
+          if left.is_an?(Object::IdentifierList)
+            Object::IdentifierList.new(left.raw.dup)
+          else
+            Object::IdentifierList.new([left])
+          end
 
         (@statements || []).each do |statement|
           list.code_append(statement.evaluate(**args))

data/lib/code/parser.rb

@@ -64,6 +64,8 @@ class Code
       =>
     ].sort_by(&:length).reverse.freeze
 
+    ASSIGNMENT_RHS_MIN_BP = 20
+
     INFIX_PRECEDENCE = {
       "if" => [10, 9],
       "unless" => [10, 9],
@@ -293,7 +295,13 @@ class Code
       when "=", "+=", "-=", "*=", "/=", "%=", "<<=", ">>=", "&=", "|=",
            "^=", "||=", "&&="
         skip_newlines
-        { right_operation: { left: left, operator: operator, right: parse_expression(right_bp) } }
+        {
+          right_operation: {
+            left: left,
+            operator: operator,
+            right: parse_expression(ASSIGNMENT_RHS_MIN_BP)
+          }
+        }
       when "if", "unless", "while", "until", "rescue"
         skip_newlines
         { right_operation: { left: left, operator: operator, right: parse_expression(right_bp) } }
@@ -816,6 +824,7 @@ class Code
     def continuation_after_newline?(token)
       return false if token.type == :eof
       return true if token.type == :operator && INFIX_PRECEDENCE.key?(token.value)
+      return true if token.type == :keyword && %w[or and rescue].include?(token.value)
       return true if token.type == :punctuation && token.value == "?"
 
       token.type == :operator && [".", "::", "&."].include?(token.value)

data/spec/code_spec.rb

@@ -401,6 +401,7 @@ RSpec.describe Code do
     ["true ? 1", "1"],
     ["true and false", "false"],
     ["true or false", "true"],
+    ["weekday? = false\n  or true\nweekday?", "true"],
     ["true || false", "true"],
     ["unless false 1", "1"],
     ["unless true 1", "nothing"],
@@ -412,6 +413,7 @@ RSpec.describe Code do
     ['"Hello {1}"', '"Hello 1"'],
     ['user = {} user.name = "Dorian" user.name', ":Dorian"],
     ['user = {} user[:name] = "Dorian" user[:name]', ":Dorian"],
+    ['value = {} email = "a" calendar_id = "c" value[email] ||= {} value[email][calendar_id] ||= {} value[email][calendar_id]', "{}"],
     ['{ "first_name": "Dorian" }', '{"first_name" => "Dorian"}'],
     ['{ "first_name": "Dorian" }.as_json', '{"first_name" => "Dorian"}'],
     %w[nothing.to_json :null],

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: code-ruby
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.0.2
 platform: ruby
 authors:
 - Dorian Marié
@@ -306,7 +306,6 @@ files:
 - spec/code/object/decimal_spec.rb
 - spec/code/object/dictionary_spec.rb
 - spec/code/object/function_spec.rb
-- spec/code/object/identifier_list_spec.rb
 - spec/code/object/integer_spec.rb
 - spec/code/object/list_spec.rb
 - spec/code/object/nothing_spec.rb

data/spec/code/object/identifier_list_spec.rb

@@ -1,60 +0,0 @@
-# frozen_string_literal: true
-
-require "spec_helper"
-
-RSpec.describe Code::Object::IdentifierList do
-  it "assigns square bracket keys in parent context from nested scopes" do
-    parent_context = Code::Object::Context.new
-    child_context = Code::Object::Context.new({}, parent_context)
-    code_identifier = Code::Object::String.new("github")
-    code_index = Code::Object::Integer.new(1)
-
-    parent_context.code_set(code_identifier, Code::Object::Dictionary.new(a: 1))
-
-    identifier_list = described_class.new([code_identifier, code_index])
-
-    identifier_list.call(
-      operator: "=",
-      arguments: Code::Object::List.new([Code::Object::Integer.new(2)]),
-      context: child_context,
-      error: StringIO.new,
-      input: StringIO.new,
-      object: Code::Object::Global.new,
-      output: StringIO.new,
-      source: ""
-    )
-
-    expect(parent_context.code_fetch(code_identifier).code_fetch(code_index)).to eq(
-      Code::Object::Integer.new(2)
-    )
-  end
-
-  it "keeps context for ||= assignments in nested context receivers" do
-    code_context = Code::Object::Context.new
-    code_identifier = Code::Object::String.new("value")
-    code_key = Code::Object::String.new("key")
-
-    code_context.code_set(
-      code_identifier,
-      Code::Object::Dictionary.new(code_key => Code::Object::Dictionary.new(a: 1))
-    )
-
-    identifier_list = described_class.new([code_identifier, code_key])
-
-    expect do
-      identifier_list.send(
-        :assign_in_context,
-        context: code_context,
-        assignment_operator: "||=",
-        code_value: Code::Object::Dictionary.new(b: 2),
-        arguments: Code::Object::List.new([Code::Object::Dictionary.new(b: 2)]),
-        operator: "||=",
-        error: StringIO.new,
-        input: StringIO.new,
-        object: Code::Object::Global.new,
-        output: StringIO.new,
-        source: ""
-      )
-    end.not_to raise_error
-  end
-end