calyx 0.12.0 → 0.12.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 19046d53109e4dfe958d0e9e4fd3a3ff2d446109
-  data.tar.gz: 4a41b45d945bcb44ea7359db7398d0bdb6c366e8
+  metadata.gz: 5ef3b96315fd2ed6eb9352e21a11a4fe650c06cb
+  data.tar.gz: d5c9cb27ee6626cdae2fe30ceef5c6bdb369e260
 SHA512:
-  metadata.gz: 38527d602bf96335cef8c504612c0d4bfb1fbf17dd459420123ceeb2c088207921e0d68580ec1777cf822476ab4e3a935f8f2b02d2d7834642806a3593f4170c
-  data.tar.gz: e49e3d348caaec3290e6412317f31e29054f4dbecce4dbf35c264c2a952fc36c442e1adeb7af2d6444ca7429f82d59f1b2bf504f15dc6967641a383fa09ca18c
+  metadata.gz: 97709bec536e1f1ea619ec7f882184b4e4ec45c32b29371cd1c2ba30a88bbbcb0c637cce3d52ac5ebc6c37d642c8c51ff9fb47785a8c9775ffee0490d91bcdcd
+  data.tar.gz: 927d4e0ee0380e58299b97f6cffaae351575fbd15fa99e446c48c7a16dff9b90055625460862a533a02476748809aeb9840ce2b872549d0917f19b618b7ccc46

data/examples/tiny_woodland_bot.rb

@@ -10,7 +10,6 @@ tiny_woodland = Calyx::Grammar.new do
   trees "🌲", "🌳"
   foliage "🌿", "🌱"
   flowers "🌷", "🌻", "🌼"
-  creatures "🐗", "🐻", "🐝", "🐦"
   br "\n"
 end
 

data/lib/calyx/grammar.rb

@@ -98,12 +98,12 @@ module Calyx
     # Grammar rules can be constructed on the fly when the passed-in block is
     # evaluated.
     #
-    # @param [Number, Random] seed
-    def initialize(seed=Random.new, &block)
-      if seed.is_a?(Numeric)
-        @rng = Random.new(seed)
+    # @param [Numeric, Random] random
+    def initialize(random=Random.new, &block)
+      if random.is_a?(Numeric)
+        @random = Random.new(random)
       else
-        @rng = seed
+        @random = random
       end
 
       if block_given?
@@ -123,7 +123,7 @@ module Calyx
     def generate(*args)
       start_symbol, rules_map = map_default_args(*args)
 
-      @registry.evaluate(start_symbol, @rng, rules_map).flatten.reject do |obj|
+      @registry.evaluate(start_symbol, @random, rules_map).flatten.reject do |obj|
         obj.is_a?(Symbol)
       end.join(''.freeze)
     end
@@ -137,7 +137,7 @@ module Calyx
     def evaluate(*args)
       start_symbol, rules_map = map_default_args(*args)
 
-      @registry.evaluate(start_symbol, @rng, rules_map)
+      @registry.evaluate(start_symbol, @random, rules_map)
     end
 
     private

data/lib/calyx/production/choices.rb

@@ -34,9 +34,10 @@ module Calyx
 
       # Evaluate the choice by randomly picking one of its possible options.
       #
+      # @param [Random] random
       # @return [Array]
-      def evaluate(rng)
-        [:choice, @collection.sample(random: rng).evaluate(rng)]
+      def evaluate(random)
+        [:choice, @collection.sample(random: random).evaluate(random)]
       end
     end
   end

data/lib/calyx/production/concat.rb

@@ -50,10 +50,11 @@ module Calyx
       # Evaluate all the child nodes of this node and concatenate them together
       # into a single result.
       #
+      # @param [Random] random
       # @return [Array]
-      def evaluate(rng)
+      def evaluate(random)
         concat = @expansion.reduce([]) do |exp, atom|
-          exp << atom.evaluate(rng)
+          exp << atom.evaluate(random)
         end
 
         [:concat, concat]

data/lib/calyx/production/expression.rb

@@ -17,9 +17,10 @@ module Calyx
       # terminal string, then passing it through the given modifier chain and
       # returning the transformed result.
       #
+      # @param [Random] random
       # @return [Array]
-      def evaluate(rng)
-        terminal = @production.evaluate(rng).flatten.reject { |o| o.is_a?(Symbol) }.join(''.freeze)
+      def evaluate(random)
+        terminal = @production.evaluate(random).flatten.reject { |o| o.is_a?(Symbol) }.join(''.freeze)
         expression = @methods.reduce(terminal) do |value, method|
           @registry.transform(method, value)
         end

data/lib/calyx/production/memo.rb

@@ -17,8 +17,9 @@ module Calyx
 
       # Evaluate the memo, using the registry to handle the expansion.
       #
+      # @param [Random] random
       # @return [Array]
-      def evaluate(rng)
+      def evaluate(random)
         [@symbol, @registry.memoize_expansion(@symbol)]
       end
     end

data/lib/calyx/production/non_terminal.rb

@@ -15,9 +15,10 @@ module Calyx
 
       # Evaluate the non-terminal, using the registry to handle the expansion.
       #
+      # @param [Random] random
       # @return [Array]
-      def evaluate(rng)
-        [@symbol, @registry.expand(@symbol).evaluate(rng)]
+      def evaluate(random)
+        [@symbol, @registry.expand(@symbol).evaluate(random)]
       end
     end
   end

data/lib/calyx/production/terminal.rb

@@ -11,8 +11,9 @@ module Calyx
 
       # Evaluate the terminal by returning its identity directly.
       #
+      # @param [Random] random
       # @return [Array]
-      def evaluate(rng)
+      def evaluate(random)
         [:atom, @atom]
       end
     end

data/lib/calyx/production/weighted_choices.rb

@@ -30,7 +30,6 @@ module Calyx
       # Initialize a new choice with a list of child nodes.
       #
       # @param [Array] collection
-      # @param [Random] rng
       def initialize(collection)
         @collection = collection
       end
@@ -41,13 +40,14 @@ module Calyx
       # The method for selecting weighted probabilities is based on a snippet
       # of code recommended in the Ruby standard library documentation.
       #
+      # @param [Random] random
       # @return [Array]
-      def evaluate(rng)
+      def evaluate(random)
         choice = @collection.max_by do |_, weight|
-          rng.rand ** (1.0 / weight)
+          random.rand ** (1.0 / weight)
         end.first
 
-        [:weighted_choice, choice.evaluate(rng)]
+        [:weighted_choice, choice.evaluate(random)]
       end
     end
   end

data/lib/calyx/registry.rb

@@ -1,7 +1,7 @@
 module Calyx
   # Lookup table of all the available rules in the grammar.
   class Registry
-    attr_reader :rng, :rules, :transforms, :modifiers
+    attr_reader :rules, :transforms, :modifiers
 
     # Construct an empty registry.
     def initialize
@@ -78,7 +78,7 @@ module Calyx
     #
     # @param [Symbol] symbol
     def memoize_expansion(symbol)
-      memos[symbol] ||= expand(symbol).evaluate(@rng)
+      memos[symbol] ||= expand(symbol).evaluate(@random)
     end
 
     # Merges the given registry instance with the target registry.
@@ -91,16 +91,19 @@ module Calyx
       @rules = rules.merge(registry.rules)
     end
 
+
+
     # Evaluates the grammar defined in this registry, combining it with rules
     # from the passed in context.
     #
     # Produces a syntax tree of nested list nodes.
     #
     # @param [Symbol] start_symbol
+    # @param [Random] random
     # @param [Hash] rules_map
     # @return [Array]
-    def evaluate(start_symbol=:start, rng=Random.new, rules_map={})
-      reset_evaluation_context(rng)
+    def evaluate(start_symbol=:start, random=Random.new, rules_map={})
+      reset_evaluation_context(random)
 
       rules_map.each do |key, value|
         if rules.key?(key.to_sym)
@@ -117,7 +120,7 @@ module Calyx
       expansion = expand(start_symbol)
 
       if expansion.respond_to?(:evaluate)
-        [start_symbol, expansion.evaluate(rng)]
+        [start_symbol, expansion.evaluate(random)]
       else
         raise Errors::MissingRule.new(start_symbol)
       end
@@ -125,10 +128,10 @@ module Calyx
 
     private
 
-    attr_reader :rng, :memos, :context
+    attr_reader :random, :memos, :context
 
-    def reset_evaluation_context(rng)
-      @rng = rng
+    def reset_evaluation_context(random)
+      @random = random
       @context = {}
       @memos = {}
     end

data/lib/calyx/version.rb

@@ -1,3 +1,3 @@
 module Calyx
-  VERSION = '0.12.0'.freeze
+  VERSION = '0.12.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: calyx
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 0.12.1
 platform: ruby
 authors:
 - Mark Rickerby
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-11 00:00:00.000000000 Z
+date: 2016-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler