cont 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8739034c6f68ad3a14a32a8f0e859733ed63274ac90c29f767c1c49fe36b6888
-  data.tar.gz: 7bb14f99e671d1cdc81eeaa65d4b6dc8bd1d13eb77bcb4e445fa6667b44717a4
+  metadata.gz: adab10aeca75132c8499d155eca42e44d00fdf7b29761625dcf9b7c0165c2b68
+  data.tar.gz: 7f3a66c63732fe21ffec879ca170a4e552ccf378c5cb3bfd80c3bf12d5f1dd85
 SHA512:
-  metadata.gz: 55d76ee5f0eaa73ec7a01348f8e0edc0190ab249ffa9261d07a6a0365f4e2de5baeae1b96e9d9da82827bc5dec61d990f57f1066b644ab43bcdb9a2577c2770d
-  data.tar.gz: a23081e62ad4ba26205cefbdba8a6e6a6f5df69c5618fe8731a6894e5356789b7e52d385a5985fd06aa08644d22944729baa5b6cdd50febd07435055d92c8df3
+  metadata.gz: 3f70edef9b1d408f5f14e648971aea3bf9fe307e35f489b94caf6228939cf507d7575f3945e3db0c99a37adfe58ff1abda177a3439155ba59132465366361c68
+  data.tar.gz: 28eae38504964fb72bc261411b4a4b87dc47e64694f8ea779fccbac1495530546687ef09de3c5b6909529324ec4eb02a096d8475d6f087ee7066a2cdf71a4768

data/README.md

@@ -1,4 +1,6 @@
-# Cont Library
+# Cont
+
+[![Gem Version](https://badge.fury.io/rb/cont.svg)](https://badge.fury.io/rb/cont)
 
 ## Overview
 
@@ -28,7 +30,6 @@ It takes a block of code and returns the result of that block.
 
 ```ruby
 result = Cont.reset do
-  # Your code here
   42
 end
 puts result # => 42
@@ -43,8 +44,38 @@ It takes a block of code, which should call a lambda to resume the continuation.
 
 ```ruby
 result = Cont.reset do
-  Cont.shift do |cont|
-    cont.call(42) + 1
+  Cont.shift do |k|
+    k.call(42) + 1
+  end
+end
+puts result # => 43
+```
+
+### `Cont.reset_at`
+
+`Cont.reset_at` limits the continuation to the current block and assigns it a tag.
+It takes a tag and a block of code, allowing you to manage multiple continuation points.
+
+#### Example
+
+```ruby
+result = Cont.reset_at(:x) do
+  1 + Cont.shift_at(:x) { |cont| cont.call(2) }
+end
+puts result # => 3
+```
+
+### `Cont.shift_at`
+
+`Cont.shift_at` captures the current continuation associated with a specific tag and allows you to resume it.
+It takes a tag and a block of code, enabling more complex control flow by using multiple continuations.
+
+#### Example
+
+```ruby
+result = Cont.reset_at(:x) do
+  Cont.shift_at(:x) do |k|
+    k.call(42) + 1
   end
 end
 puts result # => 43

data/lib/cont/multi_prompt.rb

@@ -0,0 +1,65 @@
+module MultiPrompt
+
+  # The 'fiber' library is required for the implementation of continuations.
+  require 'fiber'
+
+  # Exception for handling dead continuation
+  class DeadContinuationError < StandardError; end
+
+  # Exception for handling unexpected statuses
+  class UnexpectedStatusError < StandardError; end
+
+  # Limit the continuation to the current block.
+  #
+  # @yield [block] The block of code to be run
+  # @return [Object] The result of the block.
+  def reset_at(tag, &block)
+    prompt0_at(tag, &block)
+  end
+
+  # Capture the current continuation.
+  #
+  # @yield [block] The block of code to be run
+  # @return [Object] The result of the block.
+  def shift_at(tag, &block)
+    control0_at(tag) do |fiber|
+      prompt0_at(tag) do
+        block.call lambda { |value|
+          prompt0_at(tag) do
+            raise DeadContinuationError.new unless fiber.alive?
+            run_at(nil, fiber, :resume, lambda { value })
+          end
+        }
+      end
+    end
+  end
+
+  def run_at(tag, fiber, *args)
+    case fiber.resume(*args)
+    in :return, value
+      value
+    in :capture, ^tag, value
+      value.call(fiber)
+    in :capture, other_tag, value
+        run_at(tag, fiber, Fiber.yield(:capture, other_tag, value))
+    else
+      raise UnexpectedStatusError.new("unexpected status: #{status}")
+    end
+  end
+
+  def prompt0_at(tag, &block)
+    fiber = Fiber.new do
+      Fiber.yield(:return, block.call())
+    end
+    run_at(tag, fiber)
+  end
+
+  def control0_at(tag, &block)
+    status, f = Fiber.yield(:capture, tag, block)
+    raise UnexpectedStatusError.new("unexpected status: #{status}") \
+      unless status == :resume
+    f.call()
+  end
+
+  module_function :reset_at, :shift_at, :run_at, :prompt0_at, :control0_at
+end

data/lib/cont/single_prompt.rb

@@ -13,7 +13,7 @@ module SinglePrompt
   #
   # @yield [block] The block of code to be run
   # @return [Object] The result of the block.
-  def self.reset(&block)
+  def reset(&block)
     prompt0(&block)
   end
 
@@ -21,7 +21,7 @@ module SinglePrompt
   #
   # @yield [block] The block of code to be run
   # @return [Object] The result of the block.
-  def self.shift(&block)
+  def shift(&block)
     control0 do |fiber|
       prompt0 do
         block.call lambda { |value|
@@ -34,31 +34,30 @@ module SinglePrompt
     end
   end
 
-  private
-
-  def self.run(fiber, *args)
-    status, value = fiber.resume(*args)
-    case status
-    when :return
+  def run(fiber, *args)
+    case fiber.resume(*args)
+    in :return, value
       value
-    when :capture
+    in :capture, value
       value.call(fiber)
     else
       raise UnexpectedStatusError.new("unexpected status: #{status}")
     end
   end
 
-  def self.prompt0(&block)
+  def prompt0(&block)
     fiber = Fiber.new do
       Fiber.yield(:return, block.call())
     end
     run(fiber)
   end
 
-  def self.control0(&block)
+  def control0(&block)
     status, f = Fiber.yield(:capture, block)
     raise UnexpectedStatusError.new("unexpected status: #{status}") \
       unless status == :resume
     f.call()
   end
+
+  module_function :reset, :shift, :run, :prompt0, :control0
 end

data/lib/cont/version.rb

@@ -1,3 +1,3 @@
 module Cont
-  VERSION = '0.1.1'.freeze
+  VERSION = '0.2.0'.freeze
 end

data/lib/cont.rb

@@ -20,12 +20,11 @@
 # This software is released under the MIT License.
 
 require_relative 'cont/single_prompt'
+require_relative 'cont/multi_prompt'
 
 module Cont
-  def self.reset(&block)
-    SinglePrompt.reset(&block)
-  end
-  def self.shift(&block)
-    SinglePrompt.shift(&block)
-  end
+  include SinglePrompt
+  include MultiPrompt
+  module_function :reset, :shift, :run, :prompt0, :control0
+  module_function :reset_at, :shift_at, :run_at, :prompt0_at, :control0_at
 end

metadata

@@ -1,29 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: cont
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Masaya Taniguchi
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-06-09 00:00:00.000000000 Z
+date: 2024-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.10'
+        version: '5.23'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 5.23.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.10'
+        version: '5.23'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 5.23.1
 description: |
   The Cont module provides methods for working with continuations.
   Continuations are a way to save the execution state of a program
@@ -47,6 +53,7 @@ files:
 - LICENSE.txt
 - README.md
 - lib/cont.rb
+- lib/cont/multi_prompt.rb
 - lib/cont/single_prompt.rb
 - lib/cont/version.rb
 homepage: https://github.com/tani/ruby-cont
@@ -68,7 +75,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.25
+rubygems_version: 3.5.9
 signing_key:
 specification_version: 4
 summary: Cont provides methods for working with continuation