code-ruby 2.0.0 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f52de5a641a1d879b4ac472d5f291a1c101a42797362019d6a2c3854e6bf90a2
-  data.tar.gz: 32645dbb24c34523d7848852f59a2de98786de33b8f1782ad514c8e8a317ebb7
+  metadata.gz: 26d4b2a42933e4c3b408c6363ecbd343c106e117d469e196f5088c5db5ecfb8f
+  data.tar.gz: a888fd3dc5f2987dae06dffe0df43f00ca3c031404e48390d53d201078224808
 SHA512:
-  metadata.gz: 1dc8fe275e70f5fdc948f082408ae64cb1ab8aaaa73d1f73fb9b8c9eccb180f987dc2d10d7ace3a94ecb85678a9c8ccd95b3c7737c95cd349d6ff3cdb35872a5
-  data.tar.gz: 6317f857f1c7984212ca971650dda29e5d9b6fff92d677c4b6c069041cbfda0f92a2bb78d1345c5f11e5eb51d0f9a9d2285bfb60423ef0dd94fb21344e9bec12
+  metadata.gz: 1c3f838b4cdd9a17c18ad194dd035e281b64d8ff9c536e935f903dfbd8d6a82e64fcb04ae37d8ed0f49e764269f4d70d8f0ca44d3d6314c9bd5fe13864cb88df
+  data.tar.gz: 42435bd8fafc85bdfb3b4fd6af6b033942f7bb4e03e49e6ddc93079e2caeb6bbd08dc33214d79e2324abfb528be1debe6c82600ffebf84601a21e6a54c997e77

data/Gemfile.lock

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

data/VERSION

@@ -1 +1 @@
-2.0.0
+2.0.2

data/lib/code/node/code.rb

@@ -6,6 +6,7 @@ class Code
       def initialize(parsed)
         return if parsed.blank?
 
+        @parsed = parsed.deep_dup
         @statements =
           (parsed.presence || []).map { |statement| Statement.new(statement) }
       end
@@ -57,6 +58,10 @@ class Code
       def to_code
         @statements.blank? ? Object::Nothing.new : Object::Code.new(self)
       end
+
+      def to_raw
+        @parsed.deep_dup
+      end
     end
   end
 end

data/lib/code/object/class.rb

@@ -19,6 +19,10 @@ class Code
       def call(...)
         raw.call(...)
       end
+
+      def code_to_string
+        String.new(raw.name.to_s.split("::")[2..].join("::"))
+      end
     end
   end
 end

data/lib/code/object/function.rb

@@ -152,7 +152,18 @@ class Code
       end
 
       def code_to_string
-        String.new("<#{self.class.name} #{raw}>")
+        String.new(
+          Format.format(
+            [
+              {
+                function: {
+                  parameters: code_parameters.raw.map { |parameter| parameter_to_raw(parameter) },
+                  body: code_body.raw.to_raw
+                }
+              }
+            ]
+          )
+        )
       end
 
       def code_extend(function)
@@ -202,6 +213,29 @@ class Code
 
         nil
       end
+
+      def parameter_to_raw(parameter)
+        code_parameter = parameter.to_code
+        raw_parameter = { name: code_parameter.code_name.to_s }
+
+        if code_parameter.keyword?
+          raw_parameter[:keyword] = ":"
+        elsif code_parameter.keyword_splat?
+          raw_parameter[:keyword_splat] = "**"
+        elsif code_parameter.regular_splat?
+          raw_parameter[:regular_splat] = "*"
+        elsif code_parameter.block?
+          raw_parameter[:block] = "&"
+        elsif code_parameter.spread?
+          raw_parameter[:spread] = "..."
+        end
+
+        unless code_parameter.code_default.nothing?
+          raw_parameter[:default] = code_parameter.code_default.code_to_string.raw == "nothing" ? [] : Code.parse(code_parameter.code_default.to_s)
+        end
+
+        raw_parameter
+      end
     end
   end
 end

data/lib/code/parser/call.rb

@@ -7,6 +7,10 @@ class Code
         Name
       end
 
+      def label_name
+        LabelName
+      end
+
       def whitespace
         Whitespace
       end
@@ -88,7 +92,7 @@ class Code
       end
 
       def keyword_argument
-        name.aka(:name) << whitespace? << colon << code.aka(:value)
+        label_name.aka(:name) << whitespace? << colon << code.aka(:value)
       end
 
       def regular_argument
@@ -114,7 +118,7 @@ class Code
       end
 
       def keyword_parameter
-        name.aka(:name) << whitespace? << colon.aka(:keyword) <<
+        label_name.aka(:name) << whitespace? << colon.aka(:keyword) <<
           code_present.aka(:default).maybe
       end
 

data/lib/code/parser/dictionary.rb

@@ -15,6 +15,10 @@ class Code
         Name
       end
 
+      def label_name
+        LabelName
+      end
+
       def whitespace
         Whitespace
       end
@@ -48,7 +52,7 @@ class Code
       end
 
       def key_value
-        (name.aka(:name) << colon << code_present.aka(:code).maybe).aka(
+        (label_name.aka(:name) << colon << code_present.aka(:code).maybe).aka(
           :name_code
         ) |
           (

data/lib/code/parser/function.rb

@@ -7,6 +7,10 @@ class Code
         Name
       end
 
+      def label_name
+        LabelName
+      end
+
       def code
         Code
       end
@@ -90,7 +94,7 @@ class Code
       end
 
       def keyword_parameter
-        name.aka(:name) << whitespace? << colon.aka(:keyword) <<
+        label_name.aka(:name) << whitespace? << colon.aka(:keyword) <<
           code_present.aka(:default).maybe
       end
 

data/lib/code/parser/label_name.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+class Code
+  class Parser
+    class LabelName < Name
+      def root
+        (
+          (special_name << separator.ignore) |
+            (special_characters.absent << character.repeat(1))
+        )
+      end
+    end
+  end
+end

data/lib/code/parser/string.rb

@@ -11,6 +11,10 @@ class Code
         Name
       end
 
+      def label_name
+        LabelName
+      end
+
       def single_quote
         str("'")
       end
@@ -69,7 +73,7 @@ class Code
       end
 
       def symbol
-        (colon.ignore << name).aka(:text).repeat(1, 1)
+        (colon.ignore << label_name).aka(:text).repeat(1, 1)
       end
 
       def root

data/spec/code/node/call_spec.rb

@@ -1,3 +1,13 @@
 # frozen_string_literal: true
 
 require "spec_helper"
+
+RSpec.describe Code::Parser::Call do
+  [
+    "f(end: 2)"
+  ].each do |input|
+    it "parses #{input}" do
+      Code::Parser.parse(input)
+    end
+  end
+end

data/spec/code/parser/dictionary_spec.rb

@@ -8,7 +8,8 @@ RSpec.describe Code::Parser::Dictionary do
     "{ }",
     "{/* comment */}",
     "{ a: 1, b: 2, c: 3 }",
-    '{ "first_name": "Dorian" }'
+    '{ "first_name": "Dorian" }',
+    "{ end: 2 }"
   ].each do |input|
     it "parses #{input}" do
       Code::Parser.parse(input)

data/spec/code/parser/function_spec.rb

@@ -6,7 +6,8 @@ RSpec.describe Code::Parser::Function do
   [
     "() => {}",
     "(a, b) => { add(a, b) }",
-    "(a:, b:) => { add(a, b) }"
+    "(a:, b:) => { add(a, b) }",
+    "(end:) => { nothing }"
   ].each do |input|
     it "parses #{input}" do
       Code::Parser.parse(input)

data/spec/code_spec.rb

@@ -173,6 +173,7 @@ RSpec.describe Code do
       "(user = { name: :Dorian, age: 31 }).transform_values { user.name }.age",
       ":Dorian"
     ],
+    ["{ end: 2 }.keys.first", ":end"],
     %w[!!1 true],
     %w[!!true true],
     %w[!false true],
@@ -239,6 +240,9 @@ RSpec.describe Code do
     %w[Class(Time) Time],
     %w[Class(nothing) Nothing],
     %w[Class(true) Boolean],
+    %w[String String],
+    %w[Time Time],
+    %w[Class Class],
     %w[Class.new Nothing],
     %w[Class.new Nothing],
     %w[Class.new(2.days.ago) Time],
@@ -331,15 +335,9 @@ RSpec.describe Code do
     ["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"],
@@ -377,7 +375,6 @@ RSpec.describe Code do
     ["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"],
@@ -488,6 +485,7 @@ RSpec.describe Code do
     ["", ""]
   ].each do |input, expected|
     it "#{input} == #{expected}" do
+      puts input
       formatted = format_input(input)
 
       output = StringIO.new

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: code-ruby
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.2
 platform: ruby
 authors:
 - Dorian Marié
@@ -306,6 +306,7 @@ files:
 - lib/code/parser/group.rb
 - lib/code/parser/if.rb
 - lib/code/parser/if_modifier.rb
+- lib/code/parser/label_name.rb
 - lib/code/parser/left_operation.rb
 - lib/code/parser/list.rb
 - lib/code/parser/multiplication.rb
@@ -346,7 +347,6 @@ files:
 - spec/code/object/decimal_spec.rb
 - spec/code/object/dictionary_spec.rb
 - spec/code/object/function_spec.rb
-- spec/code/object/http_spec.rb
 - spec/code/object/identifier_list_spec.rb
 - spec/code/object/integer_spec.rb
 - spec/code/object/list_spec.rb

data/spec/code/object/http_spec.rb

@@ -1,99 +0,0 @@
-# frozen_string_literal: true
-
-require "spec_helper"
-
-RSpec.describe Code::Object::Http do
-  def self.verbs
-    %w[get head post put delete options trace patch]
-  end
-
-  def self.response_codes
-    {
-      continue: 100,
-      switching_protocols: 101,
-      processing: 102,
-      early_hints: 103,
-      ok: 200,
-      created: 201,
-      accepted: 202,
-      non_authoritative_information: 203,
-      no_content: 204,
-      reset_content: 205,
-      partial_content: 206,
-      multi_status: 207,
-      already_reported: 208,
-      im_used: 226,
-      multiple_choices: 300,
-      moved_permanently: 301,
-      found: 302,
-      see_other: 303,
-      not_modified: 304,
-      use_proxy: 305,
-      reserved: 306,
-      temporary_redirect: 307,
-      permanent_redirect: 308,
-      bad_request: 400,
-      unauthorized: 401,
-      payment_required: 402,
-      forbidden: 403,
-      not_found: 404,
-      method_not_allowed: 405,
-      not_acceptable: 406,
-      proxy_authentication_required: 407,
-      request_timeout: 408,
-      conflict: 409,
-      gone: 410,
-      length_required: 411,
-      precondition_failed: 412,
-      request_entity_too_large: 413,
-      request_uri_too_long: 414,
-      unsupported_media_type: 415,
-      requested_range_not_satisfiable: 416,
-      expectation_failed: 417,
-      misdirected_request: 421,
-      unprocessable_entity: 422,
-      locked: 423,
-      failed_dependency: 424,
-      too_early: 425,
-      upgrade_required: 426,
-      precondition_required: 428,
-      too_many_requests: 429,
-      request_header_fields_too_large: 431,
-      unavailable_for_legal_reasons: 451,
-      internal_server_error: 500,
-      not_implemented: 501,
-      bad_gateway: 502,
-      service_unavailable: 503,
-      gateway_timeout: 504,
-      http_version_not_supported: 505,
-      variant_also_negotiates: 506,
-      insufficient_storage: 507,
-      loop_detected: 508,
-      bandwidth_limit_exceeded: 509,
-      not_extended: 510,
-      network_authentication_required: 511
-    }
-  end
-
-  verbs.each do |verb|
-    describe ".#{verb}" do
-      response_codes.each do |status, code|
-        it "returns #{code} as code and #{status} as status" do
-          expect(Code.evaluate(<<~INPUT)).to eq(Code.evaluate(<<~OUTPUT))
-            response = Http.#{verb}("https://httpbin.org/status/#{code}")
-            [response.code, response.status]
-          INPUT
-            [#{code}, "#{status}"]
-          OUTPUT
-
-          expect(Code.evaluate(<<~INPUT)).to eq(Code.evaluate(<<~OUTPUT))
-            response = Http.fetch("#{verb}", "https://httpbin.org/status/#{code}")
-            [response.code, response.status]
-          INPUT
-            [#{code}, "#{status}"]
-          OUTPUT
-        end
-      end
-    end
-  end
-end