language-ruby 0.6.2 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f4baad3490a61d7414a3010ae28d7ebe15678cf7155d6fa733d6db38e69a6f15
-  data.tar.gz: 498e238afd5c1fdee3eb7d43d6416deda5c4af0a7ea3e7be7b16b3c52f35fc08
+  metadata.gz: 1fa93a1100450c8e70de898e1de91c49194fe5f140f5a72bcccf63617dba9c31
+  data.tar.gz: 2c91243be68269482a432d1d41469019f74e2e6c1b20746c4ea70f83fee90216
 SHA512:
-  metadata.gz: b51659b87522dbe212304842b3d8af561e6caf86ce78cef0ed0bfd732123736961736750fe603073398e50150b03d4be328c858754a7d4d2e6bd3926377878da
-  data.tar.gz: 740130b9f8e3a5c5e6ac8e09b8adbb5c0bd75074fbc0c94b1bac6a58276bed37b818a82d98e4cfe6953bb3e6f318a222790ddfe6089ffe6c01aae97f4ea605d1
+  metadata.gz: abd34ca928437348691865067cf26f3735bb4e89b49589dd44e448f8a300b3bdb41f9a0108fa7abc0d81b6c1edb29f7afc46d52c88939528a6932e86c047322c
+  data.tar.gz: 281b2d88b13acbab58914bdbb5bacefc00307b8b68f83d27bc7bee83f4408bb3e6ad355f3ac691847fef953560b83628e5206b0a1576e5d3315d0dabf4b12ac7

data/Gemfile.lock

@@ -1,27 +1,27 @@
 PATH
   remote: .
   specs:
-    language-ruby (0.6.2)
+    language-ruby (0.7.0)
       zeitwerk (~> 2)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    diff-lcs (1.5.0)
-    rspec (3.12.0)
-      rspec-core (~> 3.12.0)
-      rspec-expectations (~> 3.12.0)
-      rspec-mocks (~> 3.12.0)
-    rspec-core (3.12.2)
-      rspec-support (~> 3.12.0)
-    rspec-expectations (3.12.3)
+    diff-lcs (1.5.1)
+    rspec (3.13.0)
+      rspec-core (~> 3.13.0)
+      rspec-expectations (~> 3.13.0)
+      rspec-mocks (~> 3.13.0)
+    rspec-core (3.13.0)
+      rspec-support (~> 3.13.0)
+    rspec-expectations (3.13.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.12.0)
-    rspec-mocks (3.12.6)
+      rspec-support (~> 3.13.0)
+    rspec-mocks (3.13.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.12.0)
-    rspec-support (3.12.1)
-    zeitwerk (2.6.12)
+      rspec-support (~> 3.13.0)
+    rspec-support (3.13.1)
+    zeitwerk (2.6.13)
 
 PLATFORMS
   arm64-darwin-22

data/lib/language/atom/then.rb

@@ -10,7 +10,12 @@ class Language
 
       def parse(parser)
         @parent.parse(parser)
-        parser.output = Output.from_raw(@block.call(parser.output.to_raw))
+
+        if parser.output.nil?
+          parser.buffer = @block.call(parser.buffer)
+        else
+          parser.output = Output.from_raw(@block.call(parser.output.to_raw))
+        end
       end
 
       def to_s

data/lib/language/output.rb

@@ -18,6 +18,23 @@ class Language
       end
     end
 
+    def nil?
+      raw.nil?
+    end
+
+    def empty?
+      case @raw
+      when NilClass
+        true
+      when String
+        raw.empty?
+      when Array
+        raw.empty?
+      when Hash
+        raw.empty?
+      end
+    end
+
     def to_raw
       if raw.is_a?(Array)
         raw.map(&:to_raw)
@@ -33,7 +50,7 @@ class Language
     end
 
     def present?
-      @raw != nil
+      !nil? && !empty?
     end
 
     def ==(other)

data/lib/language/parser.rb

@@ -19,7 +19,7 @@ class Language
         raise NotEndOfInput, self
       end
 
-      @output.present? ? @output : Output.new(@buffer)
+      @output.present? ? @output : Output.new(@buffer.empty? ? nil : @buffer)
     end
 
     def consume(n)

data/lib/language/version.rb

@@ -2,4 +2,4 @@
 
 require_relative "../language"
 
-Language::Version = Gem::Version.new("0.6.2")
+Language::Version = Gem::Version.new("0.8.0")

data/spec/language_spec.rb

@@ -11,11 +11,43 @@ class Code
         nothing_keyword.aka(:nothing)
       end
     end
+
+    class ThenWithBuffer < Language
+      def root
+        any.repeat(1).then { "something-else" }
+      end
+    end
+
+    class ThenWithBufferTransformed < Language
+      def root
+        any.repeat(1).then { |buffer| buffer.upcase }
+      end
+    end
+
+    class ThenWithOutput < Language
+      def root
+        any.repeat(1).aka(:something).then do |output|
+          output[:something].upcase
+        end
+      end
+    end
   end
 end
 
 RSpec.describe Language do
-  it "works" do
+  it "works with nothing" do
     expect(Code::Parser::Nothing.parse("nothing")).to eq({ nothing: "nothing" })
   end
+
+  it "works with then with buffer" do
+    expect(Code::Parser::ThenWithBuffer.parse("something")).to eq("something-else")
+  end
+
+  it "works with then with buffer transformed" do
+    expect(Code::Parser::ThenWithBufferTransformed.parse("something")).to eq("SOMETHING")
+  end
+
+  it "works with then with output" do
+    expect(Code::Parser::ThenWithOutput.parse("value")).to eq("VALUE")
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: language-ruby
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.8.0
 platform: ruby
 authors:
 - Dorian Marié
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-02-08 00:00:00.000000000 Z
+date: 2024-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: zeitwerk