calyx 0.7.2 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6e0af61453ee9d96b61daf9255a322023510eda0
-  data.tar.gz: 1beb02a6c87b667587fc3cae9e05852e52d253b1
+  metadata.gz: f518207a92db50cec50c78151e39a75e0a58e93f
+  data.tar.gz: f5a4df32c2fa466fc76e583986cedf81ba9f4633
 SHA512:
-  metadata.gz: d844ef847d5a1e7fa00f75d252f666ad183740a39537ff0441df3def2e2768c2daff09399364e794a08c64e03ded3b06ddb1b9fce14fd72d8ec2edfe40b4ea39
-  data.tar.gz: e10899e3abac20855a2a10f616d53ffe75b2f72d9751503cf9e6a17d2e19595c28924ed289b01c1734f7d32e9d53065f83c391842e3680af7784acbb88aec6f2
+  metadata.gz: 8202e1e8c589ef05b98e58ae7ed82efba185c2c8473293e1fbcdba7109b69af9c37dd34b69b2457da779f3c3d6d2be3555b09f1e879d2df695d5488a5d9d98fd
+  data.tar.gz: 8cecb3bd92fbfac27f044cb263ae0bac1cc87253d43831744d8f36c46a1a844dc1c0ee69ecaa0eca2ede5c003f943cc06beecd928ffd7c5a7b1b18b9258a747c

data/README.md

@@ -246,10 +246,10 @@ Rough plan for stabilising the API and features for a `1.0` release.
 |---------|------------------|
 | `0.6`   | ~~block constructor~~ |
 | `0.7`   | ~~support for template context map passed to generate~~ |
-| `0.8`   | return grammar tree from evaluate/generate, with to_s being separate |
-| `0.9`   | support mixin/composition of rule sets rather than inheritance |
-| `0.10`  | support YAML format (and JSON?) |
-| `0.11`  | method missing metaclass API |
+| `0.8`   | ~~method missing metaclass API~~ |
+| `0.9`   | return grammar tree from evaluate/generate, with to_s being separate |
+| `0.10`  | inject custom string functions for parameterised rules, transforms and mappings |
+| `0.11`  | support YAML format (and JSON?) |
 | `1.0`   | API documentation |
 
 ## Credits

data/lib/calyx.rb

@@ -1,221 +1,9 @@
-module Calyx
-  class Grammar
-    class Registry
-      attr_reader :rules
-
-      def initialize
-        @rules = {}
-      end
-
-      def method_missing(name, *arguments)
-        rule(name, *arguments)
-      end
-
-      def rule(name, *productions, &production)
-        @rules[name.to_sym] = construct_rule(productions)
-      end
-
-      def expand(symbol)
-        @rules[symbol]
-      end
-
-      def combine(registry)
-        @rules = rules.merge(registry.rules)
-      end
-
-      def evaluate(start_symbol=:start, context={})
-        duplicate_registry = Marshal.load(Marshal.dump(self))
-        duplicate_rules = duplicate_registry.rules
-        context.each do |key, value|
-          if duplicate_rules.key?(key.to_sym)
-            raise "Rule already declared in grammar: #{key}"
-          end
-
-          duplicate_rules[key.to_sym] = if value.is_a?(Array)
-            Production::Choices.parse(value, duplicate_registry)
-          else
-            Production::Concat.parse(value.to_s, duplicate_registry)
-          end
-        end
-
-        duplicate_rules[start_symbol].evaluate
-      end
-
-      private
-
-      def construct_rule(productions)
-        if productions.first.is_a?(Enumerable)
-          Production::WeightedChoices.parse(productions, self)
-        else
-          Production::Choices.parse(productions, self)
-        end
-      end
-    end
-
-    class << self
-      def registry
-        @registry ||= Registry.new
-      end
-
-      def start(*productions, &production)
-        registry.rule(:start, *productions)
-      end
-
-      def rule(name, *productions, &production)
-        registry.rule(name, *productions)
-      end
-
-      def inherit_registry(child_registry)
-        registry.combine(child_registry) unless child_registry.nil?
-      end
-
-      def inherited(subclass)
-        subclass.inherit_registry(registry)
-      end
-    end
-
-    module Production
-      class NonTerminal
-        def initialize(symbol, registry)
-          @symbol = symbol.to_sym
-          @registry = registry
-        end
-
-        def evaluate
-          @registry.expand(@symbol).evaluate
-        end
-      end
-
-      class Terminal
-        def initialize(atom)
-          @atom = atom
-        end
-
-        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
-        EXPRESSION = /(\{[A-Za-z0-9_\.]+\})/.freeze
-        START_TOKEN = '{'.freeze
-        END_TOKEN = '}'.freeze
-        DEREF_TOKEN = '.'.freeze
-
-        def self.parse(production, registry)
-          expansion = production.split(EXPRESSION).map do |atom|
-            if atom.is_a?(String)
-              if atom.chars.first == START_TOKEN && atom.chars.last == END_TOKEN
-                head, *tail = atom.slice(1, atom.length-2).split(DEREF_TOKEN)
-                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(atom, registry)
-            end
-          end
-
-          self.new(expansion)
-        end
-
-        def initialize(expansion)
-          @expansion = expansion
-        end
-
-        def evaluate
-          @expansion.reduce('') do |exp, atom|
-            exp << atom.evaluate
-          end
-        end
-      end
-
-      class WeightedChoices
-        def self.parse(productions, registry)
-          weights_sum = productions.reduce(0) do |memo, choice|
-            memo += choice.last
-          end
-
-          raise 'Weights must sum to 1' if weights_sum != 1.0
-
-          choices = productions.map do |choice, weight|
-            if choice.is_a?(String)
-              [Concat.parse(choice, registry), weight]
-            elsif choice.is_a?(Symbol)
-              [NonTerminal.new(choice, registry), weight]
-            end
-          end
-
-          self.new(choices)
-        end
-
-        def initialize(collection)
-          @collection = collection
-        end
-
-        def evaluate
-          choice = @collection.max_by do |_, weight|
-            rand ** (1.0 / weight)
-          end.first
-
-          choice.evaluate
-        end
-      end
-
-      class Choices
-        def self.parse(productions, registry)
-          choices = productions.map do |choice|
-            if choice.is_a?(String)
-              Concat.parse(choice, registry)
-            elsif choice.is_a?(Symbol)
-              NonTerminal.new(choice, registry)
-            end
-          end
-          self.new(choices)
-        end
-
-        def initialize(collection)
-          @collection = collection
-        end
-
-        def evaluate
-          @collection.sample.evaluate
-        end
-      end
-    end
-
-    def initialize(seed=nil, &block)
-      @seed = seed || Random.new_seed
-      srand(@seed)
-
-      if block_given?
-        @registry = Registry.new
-        @registry.instance_eval(&block)
-      else
-        @registry = self.class.registry
-      end
-    end
-
-    def generate(context={})
-      @registry.evaluate(:start, context)
-    end
-  end
-end
+require_relative 'calyx/version'
+require_relative 'calyx/grammar'
+require_relative 'calyx/grammar/registry'
+require_relative 'calyx/grammar/production/choices'
+require_relative 'calyx/grammar/production/concat'
+require_relative 'calyx/grammar/production/expression'
+require_relative 'calyx/grammar/production/non_terminal'
+require_relative 'calyx/grammar/production/terminal'
+require_relative 'calyx/grammar/production/weighted_choices'

data/lib/calyx/grammar.rb

@@ -0,0 +1,41 @@
+module Calyx
+  class Grammar
+    class << self
+      def registry
+        @registry ||= Registry.new
+      end
+
+      def rule(name, *productions, &production)
+        registry.rule(name, *productions)
+      end
+
+      def method_missing(name, *productions)
+        registry.rule(name, *productions)
+      end
+
+      def inherit_registry(child_registry)
+        registry.combine(child_registry) unless child_registry.nil?
+      end
+
+      def inherited(subclass)
+        subclass.inherit_registry(registry)
+      end
+    end
+
+    def initialize(seed=nil, &block)
+      @seed = seed || Random.new_seed
+      srand(@seed)
+
+      if block_given?
+        @registry = Registry.new
+        @registry.instance_eval(&block)
+      else
+        @registry = self.class.registry
+      end
+    end
+
+    def generate(context={})
+      @registry.evaluate(:start, context)
+    end
+  end
+end

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

@@ -0,0 +1,26 @@
+module Calyx
+  class Grammar
+    module Production
+      class Choices
+        def self.parse(productions, registry)
+          choices = productions.map do |choice|
+            if choice.is_a?(String)
+              Concat.parse(choice, registry)
+            elsif choice.is_a?(Symbol)
+              NonTerminal.new(choice, registry)
+            end
+          end
+          self.new(choices)
+        end
+
+        def initialize(collection)
+          @collection = collection
+        end
+
+        def evaluate
+          @collection.sample.evaluate
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,44 @@
+module Calyx
+  class Grammar
+    module Production
+      class Concat
+        EXPRESSION = /(\{[A-Za-z0-9_\.]+\})/.freeze
+        START_TOKEN = '{'.freeze
+        END_TOKEN = '}'.freeze
+        DEREF_TOKEN = '.'.freeze
+
+        def self.parse(production, registry)
+          expansion = production.split(EXPRESSION).map do |atom|
+            if atom.is_a?(String)
+              if atom.chars.first == START_TOKEN && atom.chars.last == END_TOKEN
+                head, *tail = atom.slice(1, atom.length-2).split(DEREF_TOKEN)
+                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(atom, registry)
+            end
+          end
+
+          self.new(expansion)
+        end
+
+        def initialize(expansion)
+          @expansion = expansion
+        end
+
+        def evaluate
+          @expansion.reduce('') do |exp, atom|
+            exp << atom.evaluate
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,18 @@
+module Calyx
+  class Grammar
+    module Production
+      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
+    end
+  end
+end

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

@@ -0,0 +1,16 @@
+module Calyx
+  class Grammar
+    module Production
+      class NonTerminal
+        def initialize(symbol, registry)
+          @symbol = symbol.to_sym
+          @registry = registry
+        end
+
+        def evaluate
+          @registry.expand(@symbol).evaluate
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,15 @@
+module Calyx
+  class Grammar
+    module Production
+      class Terminal
+        def initialize(atom)
+          @atom = atom
+        end
+
+        def evaluate
+          @atom
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,37 @@
+module Calyx
+  class Grammar
+    module Production
+      class WeightedChoices
+        def self.parse(productions, registry)
+          weights_sum = productions.reduce(0) do |memo, choice|
+            memo += choice.last
+          end
+
+          raise 'Weights must sum to 1' if weights_sum != 1.0
+
+          choices = productions.map do |choice, weight|
+            if choice.is_a?(String)
+              [Concat.parse(choice, registry), weight]
+            elsif choice.is_a?(Symbol)
+              [NonTerminal.new(choice, registry), weight]
+            end
+          end
+
+          self.new(choices)
+        end
+
+        def initialize(collection)
+          @collection = collection
+        end
+
+        def evaluate
+          choice = @collection.max_by do |_, weight|
+            rand ** (1.0 / weight)
+          end.first
+
+          choice.evaluate
+        end
+      end
+    end
+  end
+end

data/lib/calyx/grammar/registry.rb

@@ -0,0 +1,55 @@
+module Calyx
+  class Grammar
+    class Registry
+      attr_reader :rules
+
+      def initialize
+        @rules = {}
+      end
+
+      def method_missing(name, *arguments)
+        rule(name, *arguments)
+      end
+
+      def rule(name, *productions, &production)
+        @rules[name.to_sym] = construct_rule(productions)
+      end
+
+      def expand(symbol)
+        @rules[symbol]
+      end
+
+      def combine(registry)
+        @rules = rules.merge(registry.rules)
+      end
+
+      def evaluate(start_symbol=:start, context={})
+        duplicate_registry = Marshal.load(Marshal.dump(self))
+        duplicate_rules = duplicate_registry.rules
+        context.each do |key, value|
+          if duplicate_rules.key?(key.to_sym)
+            raise "Rule already declared in grammar: #{key}"
+          end
+
+          duplicate_rules[key.to_sym] = if value.is_a?(Array)
+            Production::Choices.parse(value, duplicate_registry)
+          else
+            Production::Concat.parse(value.to_s, duplicate_registry)
+          end
+        end
+
+        duplicate_rules[start_symbol].evaluate
+      end
+
+      private
+
+      def construct_rule(productions)
+        if productions.first.is_a?(Enumerable)
+          Production::WeightedChoices.parse(productions, self)
+        else
+          Production::Choices.parse(productions, self)
+        end
+      end
+    end
+  end
+end

data/lib/calyx/version.rb

@@ -1,3 +1,3 @@
 module Calyx
-  VERSION = '0.7.2'.freeze
+  VERSION = '0.8.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: calyx
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.8.0
 platform: ruby
 authors:
 - Mark Rickerby
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-25 00:00:00.000000000 Z
+date: 2016-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -68,6 +68,14 @@ files:
 - README.md
 - calyx.gemspec
 - lib/calyx.rb
+- lib/calyx/grammar.rb
+- lib/calyx/grammar/production/choices.rb
+- lib/calyx/grammar/production/concat.rb
+- lib/calyx/grammar/production/expression.rb
+- lib/calyx/grammar/production/non_terminal.rb
+- lib/calyx/grammar/production/terminal.rb
+- lib/calyx/grammar/production/weighted_choices.rb
+- lib/calyx/grammar/registry.rb
 - lib/calyx/version.rb
 homepage: https://github.com/maetl/calyx
 licenses: