mini_kraken 0.1.04 → 0.1.05

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9ef423350ba09d43e77f4fbd981cfb9387f74c0581d19cda817b4db907501de3
-  data.tar.gz: de34208e9dba617b72435c552d4628be97808db2e0b2db27b12b8c31ab865d16
+  metadata.gz: e4ce5f0f43f5e84f377cf90e2ed49d6ff54de93b66641655fb41dd6b8feef277
+  data.tar.gz: 2081e486f8beba0b0073461464c632fa63af83cec27a48fb3d84c1a972b821f9
 SHA512:
-  metadata.gz: dca643b61f43edb431aa3773f9da8e41381823cc0d8af2bb4401d8851cdc5c63994eb0c927e2daf8698b670236db42f4ca9a45d7abcaccd884f51ec9b72f2ac6
-  data.tar.gz: eebe8f8c53bc43c6d26704de26067644a225ad780b1d2aba601dd1a24641a58eaef1b502efba6d37dcf77ea36213145d1be8122f15b5ad48d154012f970bd618
+  metadata.gz: ea0580c9219f1a1fd586d024f06e11cf6dd1f979182c6f5a15473c65b78fa7244ba01ca9191f31e73de78b20d7aa88c60d86afa1207dbaab246c64c6650f0d1f
+  data.tar.gz: 9af43ee21606cac23d2512002491d0264fcbc7a74b9974edbd70c23f4bcbf25c7cc7010845aad88dee2d507a1f6d070dd402cd9a6f2abe0234999617b3ae7b68

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+## [0.1.05] - 2020-05-09
+- Changed implementation of fused variables  
+- Magic comments for frozen string literal
+- Code re-styling to please Rubocop 0.82
+
+### Changed
+- File `README.md` Added "What is mini_kraken" text.
+- File `README.md` Added badges (CI Travis build status, Gem version, license)
+
 ## [0.1.04] - 2020-05-02
 ### Changed
 - File `README.md` Added "What is mini_kraken" text.

data/Gemfile

@@ -1,4 +1,6 @@
-source "https://rubygems.org"
+# frozen_string_literal: true
+
+source 'https://rubygems.org'
 
 # Specify your gem's dependencies in mini_kraken.gemspec
 gemspec

data/README.md

@@ -11,14 +11,14 @@ Daniel P. Friedman, William E. Byrd, Oleg Kiselyov, and Jason Hemann: "The Reaso
 ISBN: 9780262535519, (2018), MIT Press.
 
 ### Features
-[X] ==  
-[X] run\*  
-[X] fresh  
+- [X] ==  
+- [X] run\*  
+- [X] fresh  
 
 ### TODO
-[-] disj2  
-[-] conj2  
-[-] conde  
+- [ ] disj2  
+- [ ] conj2  
+- [ ] conde  
 
 ## Installation
 

data/Rakefile

@@ -1,6 +1,8 @@
-require "bundler/gem_tasks"
-require "rspec/core/rake_task"
+# frozen_string_literal: true
+
+require 'bundler/gem_tasks'
+require 'rspec/core/rake_task'
 
 RSpec::Core::RakeTask.new(:spec)
 
-task :default => :spec
+task default: :spec

data/lib/mini_kraken/core/any_value.rb

@@ -1,31 +1,33 @@
+# frozen_string_literal: true
+
 module MiniKraken
   module Core
     class AnyValue
       attr_reader :rank
-      
+
       # @param aName [String]
       # @param anEnv [Vocabulary]
       def initialize(aName, anEnv, alternate_names = [])
         @rank = anEnv.get_rank(aName, alternate_names)
       end
-      
+
       def ==(other)
         rank == other.rank
       end
-      
+
       # Use same text representation as in Reasoned Schemer.
       def to_s
         "_#{rank}"
       end
-      
+
       def ground?(_env)
         false
       end
-      
+
       # @return [AnyValue]
       def quote(_env)
         self
-      end      
+      end
     end # class
   end # module
-end # module
+end # module

data/lib/mini_kraken/core/association.rb

@@ -1,21 +1,34 @@
+# frozen_string_literal: true
+
 module MiniKraken
   module Core
     # A record that a given vairable is associated with a value.
     class Association
-      # @return [String] name of the variable beig association the value.
-      attr_reader :var_name
-      
+      # @return [String] internal name of variable being associated the value.
+      attr_accessor :i_name
+
       # @return [Term] the MiniKraken value associated with the variable
       attr_reader :value
-      
-      
+
+
       # @param aVariable [Variable, String] A variable or its name.
       # @param aValue [Term] value being associated to the variable.
       def initialize(aVariable, aValue)
-        @var_name = aVariable.respond_to?(:name) ? aVariable.name : aVariable
+        a_name = aVariable.respond_to?(:name) ? aVariable.i_name : aVariable
+        @i_name = validated_name(a_name)
         @value = aValue
       end
-      
+
+      private
+
+      def validated_name(aName)
+        raise StandardError, 'Name cannot be nil' if aName.nil?
+
+        cleaned = aName.strip
+        raise StandardError, 'Name cannot be empty or consists of spaces' if cleaned.empty?
+
+        cleaned
+      end
     end # class
   end # module
 end # module

data/lib/mini_kraken/core/association_walker.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'set'
 require_relative 'atomic_term'
 require_relative 'composite_term'
@@ -23,6 +25,7 @@ module MiniKraken
       def walk_assocs(assocs, anEnv)
         # Treat easy cases first...
         return nil if assocs.empty?
+
         assoc_atomic = assocs.find { |assc| assc.value.kind_of?(AtomicTerm) }
         return assoc_atomic.value if assoc_atomic
 
@@ -43,6 +46,7 @@ module MiniKraken
 
       def walk_value(aTerm, anEnv)
         return aTerm if aTerm.kind_of?(AtomicTerm) || aTerm.kind_of?(AnyValue)
+
         result = nil
 
         if aTerm.kind_of?(CompositeTerm)
@@ -176,4 +180,4 @@ module MiniKraken
       end
     end # class
   end # module
-end # module
+end # module

data/lib/mini_kraken/core/atomic_term.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'term'
 require_relative 'freshness'
 
@@ -22,14 +24,14 @@ module MiniKraken
       def freshness(_env)
         Freshness.new(:ground, self)
       end
-      
+
       # An atomic term is a ground term: by definition it doesn't contain
       # any fresh variable.
       # @param _env [Vocabulary]
       # @return [FalseClass]
       def fresh?(_env)
         false
-      end      
+      end
 
       # An atomic term is a ground term: by definition it doesn't contain
       # any fresh variable.
@@ -61,4 +63,4 @@ module MiniKraken
       end
     end # class
   end # module
-end # module
+end # module

data/lib/mini_kraken/core/binary_relation.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'relation'
 require_relative 'composite_term'
 
@@ -5,20 +7,20 @@ module MiniKraken
   module Core
     class BinaryRelation < Relation
       # @param aName [String] Name of the relation.
-      # @param alternateName [String, NilClass] Alternative name (optional).    
+      # @param alternateName [String, NilClass] Alternative name (optional).
       def initialize(aName, alternateName = nil)
         super(aName, alternateName)
         freeze
       end
-      
+
       # Number of arguments for the relation.
       # @return [Integer]
       def arity
         2
       end
-      
+
       protected
-      
+
       # table: Commute
       # |arg1                | arg2               | arg2.ground? || Commute |
       # | isa? Atomic        | isa? Atomic        | dont_care    || Yes     |
@@ -55,7 +57,7 @@ module MiniKraken
         else
           [arg1, arg2]
         end
-      end      
+      end
     end # class
   end # module
-end # module
+end # module

data/lib/mini_kraken/core/composite_term.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'term'
 require_relative 'freshness'
 
@@ -6,17 +8,16 @@ module MiniKraken
     # An composite term is an Minikraken term that can be
     # decomposed into simpler MiniKraken data value(s).
     class CompositeTerm < Term
-
       def children
         raise NotImplementedError, 'This method must re-defined in subclass(es).'
       end
 
       # A composite term is fresh when all its members are nil or all non-nil members
       # are all fresh
-      # A composite term is bound when it is not fresh and not ground      
+      # A composite term is bound when it is not fresh and not ground
       # A composite term is a ground term when all its non-nil members are ground.
       # @param _env [Vocabulary]
-      # @return [Freshness]      
+      # @return [Freshness]
       def freshness(_env)
          env.freshness_composite(self)
       end
@@ -33,22 +34,6 @@ module MiniKraken
           child.nil? || child.ground?(anEnv)
         end
       end
-
-      # # Data equality testing
-      # # @return [Boolean]
-      # def ==(other)
-        # if other.respond_to?(:value)
-          # value == other.value
-        # else
-          # value == other
-        # end
-      # end
-
-      # # Type and data equality testing
-      # # @return [Boolean]
-      # def eql?(other)
-        # (self.class == other.class) && value.eql?(other.value)
-      # end
     end # class
   end # module
-end # module
+end # module

data/lib/mini_kraken/core/cons_cell.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'composite_term'
 
 module MiniKraken
@@ -23,17 +25,19 @@ module MiniKraken
 
       def ==(other)
         return false unless other.respond_to?(:car)
+
         (car == other.car) && (cdr == other.cdr)
       end
 
       def eql?(other)
         (self.class == other.class) && car.eql?(other.car) && cdr.eql?(other.cdr)
       end
-      
+
       def quote(anEnv)
         return self if null?
+
         new_car = car.nil? ? nil : car.quote(anEnv)
-        new_cdr = cdr.nil? ? nil : cdr.quote(anEnv)        
+        new_cdr = cdr.nil? ? nil : cdr.quote(anEnv)
         ConsCell.new(new_car, new_cdr)
       end
     end # class
@@ -41,4 +45,4 @@ module MiniKraken
     # Constant representing the null (empty) list.
     NullList = ConsCell.new(nil, nil).freeze
   end # module
-end # module
+end # module

data/lib/mini_kraken/core/duck_fiber.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'outcome'
 
 module MiniKraken
@@ -28,7 +30,7 @@ module MiniKraken
           return nil
         end
       end
-      
+
       def valid_outcome(outcomeKind)
         case outcomeKind
           when :failure

data/lib/mini_kraken/core/environment.rb

@@ -1,17 +1,26 @@
+# frozen_string_literal: true
+
+require 'set'
 require_relative 'vocabulary'
 
 module MiniKraken
   module Core
     class Environment
-      include Vocabulary  # Use mix-in module
+      include Vocabulary # Use mix-in module
 
+      # Mapping from user-defined name to Variable instance
       # @return [Hash] Pairs of the kind {String => Variable}
       attr_reader :vars
 
+      # Mapping from internal name to user-defined name(s)
+      # @return [Hash] Pairs of the kind {String => Set<String>}
+      attr_reader :ivars
+
       # @param aParent [Environment, NilClass] Parent environment to this one.
       def initialize(aParent = nil)
         init_vocabulary(aParent)
         @vars = {}
+        @ivars = {}
       end
 
       # @param aVariable [Variable]
@@ -22,6 +31,13 @@ module MiniKraken
           raise StandardError, err_msg
         end
         vars[name] = aVariable
+        i_name = aVariable.i_name
+        if ivars.include?(i_name)
+          set = ivars[i_name]
+          set.add(name)
+        else
+          ivars[i_name] = Set.new([i_name])
+        end
       end
 
       # Handler for the event: an outcome has been produced.
@@ -33,21 +49,19 @@ module MiniKraken
         begin
           env = walker.resume
           break if env.nil?
-          env.do_propagate(descendent) if env.kind_of?(Environment) 
+
+          env.do_propagate(descendent) if env.kind_of?(Environment)
         end until env.equal?(self)
       end
 
-      # Move associations from descendent outcome object
+      # Roll up associations from descendent outcome object
+      # @param descendent [Outcome]
       def do_propagate(descendent)
-        return unless descendent.successful? 
+        return unless descendent.successful?
 
         vars.each_key do |var_name|
           assocs = descendent[var_name]
-          assocs.each do |assoc|
-            own = self[var_name]
-            add_assoc(assoc) unless assoc.equal?(own)
-          end
-          descendent.associations.delete(var_name) unless assocs.empty?
+          move_assocs(var_name, descendent)
         end
       end
 
@@ -56,4 +70,4 @@ module MiniKraken
       end
     end # class
   end # module
-end # module
+end # module