calyx 0.4.2 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 833328ded64a82edb7997b924f740a458d179215
-  data.tar.gz: bfca7e43959b79427ecfed6116344bd82aa79e95
+  metadata.gz: 3d9b72d66ec75106a9818da21e7f192c319dfa0d
+  data.tar.gz: 7f60dbb2787d4bf248a90b09bbf8639f8ce9afbc
 SHA512:
-  metadata.gz: 79b97a8dbb5ded857a14f61f687ff2e93ba6c65f75b2f9acbab74c5b34803d2bfd6f5c2b26eeda52640037ba60d56926d849dd0de2d7a1db84ecde9ffbe37c0c
-  data.tar.gz: 7f846571bdefe5c2e922e00218d7f64b79c343344cce9e0395dfe1f7ced7d8cf79ddd71c9be1d061d95d07de09c35ae8ce73954fbcdda000433b358eac6bec15
+  metadata.gz: e686317e43831dfb82e03b387d396be5dc86d440d8238772cda8ccefb9da10991ddacbb49954cea3c16815207d5b3a501c2505df40dca57fad564ee767c326be
+  data.tar.gz: c1ceddb0cb1c347a7365c07c18f5978035132ac5242de1a063d4e564008b96f666431b5cf499bcb900f788d8c5d2b5c5ca18fd5da89b8fc721ccb8ffcc61035c

data/lib/calyx.rb

@@ -22,21 +22,22 @@ module Calyx
 
       def construct_rule(productions)
         if productions.first.is_a?(Enumerable)
-          Production::WeightedChoices.parse(productions)
+          Production::WeightedChoices.parse(productions, registry)
         else
-          Production::Choices.parse(productions)
+          Production::Choices.parse(productions, registry)
         end
       end
     end
 
     module Production
       class NonTerminal
-        def initialize(expansion)
+        def initialize(expansion, registry)
           @expansion = expansion.to_sym
+          @registry = registry
         end
 
-        def evaluate(registry)
-          registry[@expansion].evaluate(registry)
+        def evaluate
+          @registry[@expansion].evaluate
         end
       end
 
@@ -45,24 +46,44 @@ module Calyx
           @atom = atom
         end
 
-        def evaluate(registry)
+        def evaluate
           @atom
         end
       end
 
+      class Expression
+        def initialize(production, methods)
+          @production = production
+          @methods = methods.map { |m| m.to_sym }
+        end
+
+        def evaluate
+          @methods.reduce(@production.evaluate) do |value,method|
+            value.send(method)
+          end
+        end
+      end
+
       class Concat
         DELIMITER = /(\{[A-Za-z0-9_]+\})/.freeze
+        DEREF = '.'.freeze
 
-        def self.parse(production)
+        def self.parse(production, registry)
           expansion = production.split(DELIMITER).map do |atom|
             if atom.is_a?(String)
               if atom.chars.first == '{' && atom.chars.last == '}'
-                NonTerminal.new(atom.slice(1, atom.length-2))
+                head, *tail = atom.slice(1, atom.length-2).split(DEREF)
+                rule = NonTerminal.new(head, registry)
+                unless tail.empty?
+                  Expression.new(rule, tail)
+                else
+                  rule
+                end
               else
                 Terminal.new(atom)
               end
             elsif atom.is_a?(Symbol)
-              NonTerminal.new
+              NonTerminal.new(atom, registry)
             end
           end
 
@@ -73,15 +94,15 @@ module Calyx
           @expansion = expansion
         end
 
-        def evaluate(registry)
+        def evaluate
           @expansion.reduce('') do |exp, atom|
-            exp << atom.evaluate(registry)
+            exp << atom.evaluate
           end
         end
       end
 
       class WeightedChoices
-        def self.parse(productions)
+        def self.parse(productions, registry)
           weights_sum = productions.reduce(0) do |memo, choice|
             memo += choice.last
           end
@@ -90,9 +111,9 @@ module Calyx
 
           choices = productions.map do |choice, weight|
             if choice.is_a?(String)
-              [Concat.parse(choice), weight]
+              [Concat.parse(choice, registry), weight]
             elsif choice.is_a?(Symbol)
-              [NonTerminal.new(choice), weight]
+              [NonTerminal.new(choice, registry), weight]
             end
           end
 
@@ -103,22 +124,22 @@ module Calyx
           @collection = collection
         end
 
-        def evaluate(registry)
+        def evaluate
           choice = @collection.max_by do |_, weight|
             rand ** (1.0 / weight)
           end.first
 
-          choice.evaluate(registry)
+          choice.evaluate
         end
       end
 
       class Choices
-        def self.parse(productions)
+        def self.parse(productions, registry)
           choices = productions.map do |choice|
             if choice.is_a?(String)
-              Concat.parse(choice)
+              Concat.parse(choice, registry)
             elsif choice.is_a?(Symbol)
-              NonTerminal.new(choice)
+              NonTerminal.new(choice, registry)
             end
           end
           self.new(choices)
@@ -128,8 +149,8 @@ module Calyx
           @collection = collection
         end
 
-        def evaluate(registry)
-          @collection.sample.evaluate(registry)
+        def evaluate
+          @collection.sample.evaluate
         end
       end
     end
@@ -145,7 +166,7 @@ module Calyx
     end
 
     def generate
-      registry[:start].evaluate(registry)
+      registry[:start].evaluate
     end
   end
 end

data/lib/calyx/version.rb

@@ -1,3 +1,3 @@
 module Calyx
-  VERSION = '0.4.2'.freeze
+  VERSION = '0.5.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: calyx
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.5.0
 platform: ruby
 authors:
 - Mark Rickerby
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-24 00:00:00.000000000 Z
+date: 2015-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler