mutant 0.10.25 → 0.10.26

data/lib/mutant/subject.rb

@@ -3,7 +3,7 @@
 module Mutant
   # Subject of a mutation
   class Subject
-    include AbstractType, Adamantium::Flat, Enumerable
+    include AbstractType, Adamantium, Enumerable
     include Anima.new(:context, :node)
 
     # Mutations for this subject

data/lib/mutant/subject/method/instance.rb

@@ -21,59 +21,22 @@ module Mutant
         class Memoized < self
           include AST::Sexp
 
-          FREEZER_OPTION_VALUES = {
-            Adamantium::Freezer::Deep => :deep,
-            Adamantium::Freezer::Flat => :flat,
-            Adamantium::Freezer::Noop => :noop
-          }.freeze
-
-          private_constant(*constants(false))
-
           # Prepare subject for mutation insertion
           #
           # @return [self]
           def prepare
-            memory.delete(name)
+            scope
+              .instance_variable_get(:@memoized_methods)
+              .delete(name)
+
             super()
           end
 
         private
 
           def wrap_node(mutant)
-            s(:begin, mutant, s(:send, nil, :memoize, s(:sym, name), *options))
+            s(:begin, mutant, s(:send, nil, :memoize, s(:sym, name)))
           end
-
-          # The optional AST node for adamantium memoization options
-          #
-          # @return [Array(Parser::AST::Node), nil]
-          def options
-            # rubocop:disable Style/GuardClause
-            if FREEZER_OPTION_VALUES.key?(freezer)
-              [
-                s(:kwargs,
-                  s(:pair,
-                    s(:sym, :freezer),
-                    s(:sym, FREEZER_OPTION_VALUES.fetch(freezer))))
-              ]
-            end
-            # rubocop:enable Style/GuardClause
-          end
-
-          # The freezer used for memoization
-          #
-          # @return [Object]
-          def freezer
-            memory.fetch(name).instance_variable_get(:@freezer)
-          end
-          memoize :freezer, freezer: :noop
-
-          # The memory used for memoization
-          #
-          # @return [ThreadSafe::Cache]
-          def memory
-            scope.__send__(:memoized_methods).instance_variable_get(:@memory)
-          end
-
         end # Memoized
       end # Instance
     end # Method

data/lib/mutant/variable.rb

@@ -0,0 +1,322 @@
+# frozen_string_literal: true
+
+module Mutant
+  # Lightweight concurrency variables
+  #
+  # These are inspired by Haskells MVar and IVar types.
+  class Variable
+    EMPTY = Class.new do
+      const_set(:INSPECT, 'Variable::EMPTY')
+    end.new.freeze
+
+    TIMEOUT = Class.new do
+      const_set(:INSPECT, 'Variable::TIMEOUT')
+    end.new.freeze
+
+    # Result of operation that may time out
+    class Result
+      include Equalizer.new(:value)
+      attr_reader :value
+
+      # Initialize result
+      #
+      # @return [undefined]
+      def initialize(value)
+        @value = value
+        freeze
+      end
+
+      # Test if take resulted in a timeout
+      #
+      # @return [Boolean]
+      #
+      # @api private
+      def timeout?
+        instance_of?(Timeout)
+      end
+
+      # Instance returned on timeouts
+      class Timeout < self
+        INSTANCE = new(nil)
+
+        # Construct new object
+        #
+        # @return [Timeout]
+        def self.new
+          INSTANCE
+        end
+      end # Timeout
+
+      # Instance returned without timeouts
+      class Value < self
+      end # Value
+    end # Result
+
+    private_constant(*constants(false))
+
+    module Timer
+      # Monotonic elapsed time of block execution
+      #
+      # @return [Float]
+      def self.elapsed
+        start = now
+        yield
+        now - start
+      end
+
+      # The now monotonic time
+      #
+      # @return [Float]
+      def self.now
+        Process.clock_gettime(Process::CLOCK_MONOTONIC)
+      end
+      private_class_method :now
+    end # Timer
+
+    # Initialize object
+    #
+    # @param [Object] value
+    #   the initial value
+    #
+    # @return [undefined]
+    def initialize(condition_variable:, mutex:, value: EMPTY)
+      @full  = condition_variable.new
+      @mutex = mutex.new
+      @value = value
+    end
+
+    # Take value, block on empty
+    #
+    # @return [Object]
+    def take
+      synchronize do
+        wait_full
+        perform_take
+      end
+    end
+
+    # Take value, with timeout
+    #
+    # @param [Float] Timeout
+    #
+    # @return [Result::Timeout]
+    #   in case take resulted in a timeout
+    #
+    # @return [Result::Value]
+    #   in case take resulted in a value
+    def take_timeout(timeout)
+      synchronize do
+        if wait_timeout(@full, timeout, &method(:full?))
+          Result::Timeout.new
+        else
+          Result::Value.new(perform_take)
+        end
+      end
+    end
+
+    # Read value, block on empty
+    #
+    # @return [Object]
+    #   the variable value
+    def read
+      synchronize do
+        wait_full
+        @value
+      end
+    end
+
+    # Try put value into the variable, non blocking
+    #
+    # @param [Object] value
+    #
+    # @return [self]
+    def try_put(value)
+      synchronize do
+        perform_put(value) if empty?
+      end
+
+      self
+    end
+
+    # Execute block with value, blocking
+    #
+    # @yield [Object]
+    #
+    # @return [Object]
+    #   the blocks return value
+    def with
+      synchronize do
+        wait_full
+        yield @value
+      end
+    end
+
+  private
+
+    # Perform the put
+    #
+    # @param [Object] value
+    def perform_put(value)
+      (@value = value).tap { @full.signal }
+    end
+
+    # Execute block under mutex
+    #
+    # @return [self]
+    def synchronize(&block)
+      @mutex.synchronize(&block)
+    end
+
+    # Wait for block predicate
+    #
+    # @param [ConditionVariable] event
+    #
+    # @return [undefined]
+    def wait(event)
+      event.wait(@mutex) until yield
+    end
+
+    # Wait with timeout for block predicate
+    #
+    # @param [ConditionVariable] event
+    #
+    # @return [Boolean]
+    #   if wait was terminated due a timeout
+    #
+    # @return [undefined]
+    #   otherwise
+    def wait_timeout(event, timeout)
+      loop do
+        break true if timeout <= 0
+        break if yield
+        timeout -= Timer.elapsed { event.wait(@mutex, timeout) }
+      end
+    end
+
+    # Wait till mvar is full
+    #
+    # @return [undefined]
+    def wait_full
+      wait(@full, &method(:full?))
+    end
+
+    # Test if state is full
+    #
+    # @return [Boolean]
+    def full?
+      !empty?
+    end
+
+    # Test if state is empty
+    #
+    # @return [Boolean]
+    def empty?
+      @value.equal?(EMPTY)
+    end
+
+    # Shared variable that can be written at most once
+    #
+    # ignore :reek:InstanceVariableAssumption
+    class IVar < self
+
+      # Exception raised on ivar errors
+      class Error < RuntimeError; end
+
+      # Put value, raises if already full
+      #
+      # @param [Object] value
+      #
+      # @return [self]
+      #
+      # @raise Error
+      #   if already full
+      def put(value)
+        synchronize do
+          fail Error, 'is immutable' if full?
+          perform_put(value)
+        end
+
+        self
+      end
+
+      # Populate and return value, use block to compute value if empty
+      #
+      # The block is guaranteed to be executed at max once.
+      #
+      # Subsequent reads are guaranteed to return the block value.
+      #
+      # @return [Object]
+      def populate_with
+        return @value if full?
+
+        synchronize do
+          perform_put(yield) if empty?
+        end
+
+        @value
+      end
+
+    private
+
+      # Perform take operation
+      #
+      # @return [Object]
+      def perform_take
+        @value
+      end
+    end # IVar
+
+    # Shared variable that can be written multiple times
+    #
+    # ignore :reek:InstanceVariableAssumption
+    class MVar < self
+
+      # Initialize object
+      #
+      # @param [Object] value
+      #   the initial value
+      #
+      # @return [undefined]
+      def initialize(condition_variable:, mutex:, value: EMPTY)
+        super
+        @empty = condition_variable.new
+      end
+
+      # Put value, block on full
+      #
+      # @param [Object] value
+      #
+      # @return [self]
+      def put(value)
+        synchronize do
+          wait(@empty, &method(:empty?))
+          perform_put(value)
+        end
+
+        self
+      end
+
+      # Modify value, blocks if empty
+      #
+      # @return [Object]
+      def modify
+        synchronize do
+          wait_full
+          perform_put(yield(@value))
+        end
+      end
+
+    private
+
+      # Empty the variable
+      #
+      # @return [Object]
+      def perform_take
+        @value.tap do
+          @value = EMPTY
+          @empty.signal
+        end
+      end
+    end # MVar
+  end # Variable
+end # Mutant

data/lib/mutant/version.rb

@@ -2,5 +2,5 @@
 
 module Mutant
   # Current mutant version
-  VERSION = '0.10.25'
+  VERSION = '0.10.26'
 end # Mutant

data/lib/mutant/world.rb

@@ -3,7 +3,7 @@
 module Mutant
   # The outer world IO objects mutant does interact with
   class World
-    include Adamantium::Flat, Anima.new(
+    include Adamantium, Anima.new(
       :condition_variable,
       :gem,
       :gem_method,

metadata

@@ -1,85 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: mutant
 version: !ruby/object:Gem::Version
-  version: 0.10.25
+  version: 0.10.26
 platform: ruby
 authors:
 - Markus Schirp
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-03 00:00:00.000000000 Z
+date: 2021-01-16 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: abstract_type
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.0.7
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.0.7
-- !ruby/object:Gem::Dependency
-  name: adamantium
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.2.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.2.0
-- !ruby/object:Gem::Dependency
-  name: anima
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.3.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.3.1
-- !ruby/object:Gem::Dependency
-  name: ast
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.2'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.2'
-- !ruby/object:Gem::Dependency
-  name: concord
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.1.5
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.1.5
 - !ruby/object:Gem::Dependency
   name: diff-lcs
   requirement: !ruby/object:Gem::Requirement
@@ -94,62 +24,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
-- !ruby/object:Gem::Dependency
-  name: equalizer
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.0.9
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.0.9
-- !ruby/object:Gem::Dependency
-  name: ice_nine
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.11.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.11.1
-- !ruby/object:Gem::Dependency
-  name: memoizable
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.4.2
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.4.2
-- !ruby/object:Gem::Dependency
-  name: mprelude
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.1.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.1.0
 - !ruby/object:Gem::Dependency
   name: parser
   requirement: !ruby/object:Gem::Requirement
@@ -164,20 +38,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 3.0.0
-- !ruby/object:Gem::Dependency
-  name: procto
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.0.2
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.0.2
 - !ruby/object:Gem::Dependency
   name: regexp_parser
   requirement: !ruby/object:Gem::Requirement
@@ -204,28 +64,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.6
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.5.6
-- !ruby/object:Gem::Dependency
-  name: variable
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.0.1
+        version: 0.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.1
+        version: 0.6.0
 - !ruby/object:Gem::Dependency
   name: parallel
   requirement: !ruby/object:Gem::Requirement
@@ -337,6 +183,7 @@ files:
 - lib/mutant/cli/command/environment/run.rb
 - lib/mutant/cli/command/environment/show.rb
 - lib/mutant/cli/command/environment/subject.rb
+- lib/mutant/cli/command/environment/test.rb
 - lib/mutant/cli/command/root.rb
 - lib/mutant/cli/command/subscription.rb
 - lib/mutant/config.rb
@@ -428,6 +275,7 @@ files:
 - lib/mutant/mutator/node/regexp/character_type.rb
 - lib/mutant/mutator/node/regexp/end_of_line_anchor.rb
 - lib/mutant/mutator/node/regexp/end_of_string_or_before_end_of_line_anchor.rb
+- lib/mutant/mutator/node/regexp/named_group.rb
 - lib/mutant/mutator/node/regexp/zero_or_more.rb
 - lib/mutant/mutator/node/regopt.rb
 - lib/mutant/mutator/node/resbody.rb
@@ -452,6 +300,7 @@ files:
 - lib/mutant/parallel/worker.rb
 - lib/mutant/parser.rb
 - lib/mutant/pipe.rb
+- lib/mutant/procto.rb
 - lib/mutant/range.rb
 - lib/mutant/registry.rb
 - lib/mutant/reporter.rb
@@ -489,6 +338,7 @@ files:
 - lib/mutant/timer.rb
 - lib/mutant/transform.rb
 - lib/mutant/util.rb
+- lib/mutant/variable.rb
 - lib/mutant/version.rb
 - lib/mutant/world.rb
 - lib/mutant/zombifier.rb