calyx 0.8.2 → 0.8.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d3f368fca27d4586669e9bf2a681e7af89ffd461
-  data.tar.gz: 54750dca8ee597a148776e4a44eaa86afa1d2d77
+  metadata.gz: b3e641762dd894b48936eb9e945531b94be732b4
+  data.tar.gz: 0875b1def9d94ae12c2685f92a1fabd418b27853
 SHA512:
-  metadata.gz: b14635a63d51ef8ac38dcb58179e841c275a1665ab7c8421b5f2996b9cc6865a269d469aa3669cfa4995c2ed47c8ab88f6bcff646c97ee8167b9ffa2d7e081ce
-  data.tar.gz: fc8f02424498b81528b605cc42226941d64a79720039d636faed5ef9a949878b665275758fb1d0ce2554db654bc841068822264c5cdae875f158e54320ecb4e2
+  metadata.gz: 735ff80c2e8c154c07aa3344c4717c91212a5734ae79c03289d7b741b87e0b60a1c813fa5294733db6697e96fb443b2dce7938565893ab9744bbfb721aebd00b
+  data.tar.gz: abcfc630585f97fb81753f9fd77fbba90e3cc1399a396626c468d3ab30fe50dcb70829525962e527212ee174f60005aa2dc3fed440f5c82934f8b9dd4de4d823

data/lib/calyx/grammar.rb

@@ -43,7 +43,9 @@ module Calyx
         rules_map = arg if arg.class == Hash
       end
 
-      @registry.evaluate(start_symbol, rules_map)
+      @registry.evaluate(start_symbol, rules_map).flatten.reject do |obj|
+        obj.is_a?(Symbol)
+      end.join(''.freeze)
     end
   end
 end

data/lib/calyx/grammar/production/choices.rb

@@ -18,7 +18,7 @@ module Calyx
         end
 
         def evaluate
-          @collection.sample.evaluate
+          [:choice, @collection.sample.evaluate]
         end
       end
     end

data/lib/calyx/grammar/production/concat.rb

@@ -34,9 +34,11 @@ module Calyx
         end
 
         def evaluate
-          @expansion.reduce('') do |exp, atom|
+          concat = @expansion.reduce([]) do |exp, atom|
             exp << atom.evaluate
           end
+
+          [:concat, concat]
         end
       end
     end

data/lib/calyx/grammar/production/expression.rb

@@ -8,9 +8,12 @@ module Calyx
         end
 
         def evaluate
-          @methods.reduce(@production.evaluate) do |value,method|
+          terminal = @production.evaluate.flatten.reject { |o| o.is_a?(Symbol) }.join(''.freeze)
+          expression = @methods.reduce(terminal) do |value,method|
             value.send(method)
           end
+
+          [:expression, expression]
         end
       end
     end

data/lib/calyx/grammar/production/non_terminal.rb

@@ -8,7 +8,7 @@ module Calyx
         end
 
         def evaluate
-          @registry.expand(@symbol).evaluate
+          [@symbol, @registry.expand(@symbol).evaluate]
         end
       end
     end

data/lib/calyx/grammar/production/terminal.rb

@@ -7,7 +7,7 @@ module Calyx
         end
 
         def evaluate
-          @atom
+          [:atom, @atom]
         end
       end
     end

data/lib/calyx/grammar/production/weighted_choices.rb

@@ -29,7 +29,7 @@ module Calyx
             rand ** (1.0 / weight)
           end.first
 
-          choice.evaluate
+          [:weighted_choice, choice.evaluate]
         end
       end
     end

data/lib/calyx/grammar/registry.rb

@@ -38,7 +38,7 @@ module Calyx
           end
         end
 
-        expand(start_symbol).evaluate
+        [start_symbol, expand(start_symbol).evaluate]
       end
 
       private

data/lib/calyx/version.rb

@@ -1,3 +1,3 @@
 module Calyx
-  VERSION = '0.8.2'.freeze
+  VERSION = '0.8.3'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: calyx
 version: !ruby/object:Gem::Version
-  version: 0.8.2
+  version: 0.8.3
 platform: ruby
 authors:
 - Mark Rickerby
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-06 00:00:00.000000000 Z
+date: 2016-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler