calyx 0.9.1 → 0.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 870b438756c9199fdf30b72058d42ce178cf1b82
-  data.tar.gz: 7c6b71e8512d6a26d3f2643dc5efa126a03212bf
+  metadata.gz: 96d0d3ad96525f74b2526c8ef7d2011655773cb4
+  data.tar.gz: e6c01ff177c34a1768e215fc2294494689cdf731
 SHA512:
-  metadata.gz: 259a6fdcca7b525cbb6fa095e6d7b7be54248c145f34213d8f3a725716cebe93814a76cd054d6f5ef79fd694cf5e2679242289e195510360dba881775d0b95fa
-  data.tar.gz: 5773c867c7364309c162aa5c0de4a02dd72663aea2ff5444a67fad59dcb09cd2afbb9faef0719312ff51642f1e8196e63e7937a6a1c40d8ff08ec8dd2f8270d0
+  metadata.gz: 9ac277b2883c2e2e68ac44bdae1387d2c61ad55353fc0c227f38f70f551916e6a9d3987f40e4ef0815af5eec19082de19596671d516d00593e6884be9ed7057c
+  data.tar.gz: ab1d40f0c27cabf7064fe39e1c6775e85a6e78592b3c74467fdd43780db4f69c39f4e631442761834f63a297b59d2c0f8f21ce07abc23fd67bcb67e082a8ccbe

data/examples/tiny_woodland.rb

@@ -0,0 +1,15 @@
+require "calyx"
+
+tiny_woodland = Calyx::Grammar.new do
+  start :field
+  field (0..7).map { "{row}{br}" }.join
+  row (0..18).map { "{point}" }.join
+  point [:trees, 0.2], [:foliage, 0.25], [:flowers, 0.05], [:space, 0.5]
+  trees "🌲", "🌳"
+  foliage "🌿", "🌱"
+  flowers "🌷", "🌻", "🌼"
+  space " "
+  br "\n"
+end
+
+puts tiny_woodland.generate

data/lib/calyx.rb

@@ -1,11 +1,11 @@
-require_relative 'calyx/version'
-require_relative 'calyx/grammar'
-require_relative 'calyx/file_converter'
-require_relative 'calyx/grammar/registry'
-require_relative 'calyx/grammar/production/memo'
-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'
+require 'calyx/version'
+require 'calyx/grammar'
+require 'calyx/file_converter'
+require 'calyx/grammar/registry'
+require 'calyx/grammar/production/memo'
+require 'calyx/grammar/production/choices'
+require 'calyx/grammar/production/concat'
+require 'calyx/grammar/production/expression'
+require 'calyx/grammar/production/non_terminal'
+require 'calyx/grammar/production/terminal'
+require 'calyx/grammar/production/weighted_choices'

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

@@ -2,7 +2,7 @@ module Calyx
   class Grammar
     module Production
       class Concat
-        EXPRESSION = /(\{[A-Za-z0-9_\.]+\})/.freeze
+        EXPRESSION = /(\{[A-Za-z0-9_@\.]+\})/.freeze
         START_TOKEN = '{'.freeze
         END_TOKEN = '}'.freeze
         DEREF_TOKEN = '.'.freeze
@@ -12,7 +12,11 @@ module Calyx
             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)
+                if head[0] == Memo::SIGIL
+                  rule = Memo.new(head, registry)
+                else
+                  rule = NonTerminal.new(head, registry)
+                end
                 unless tail.empty?
                   Expression.new(rule, tail)
                 else
@@ -21,8 +25,6 @@ module Calyx
               else
                 Terminal.new(atom)
               end
-            elsif atom.is_a?(Symbol)
-              NonTerminal.new(atom, registry)
             end
           end
 

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

@@ -10,7 +10,7 @@ module Calyx
         end
 
         def evaluate
-          @result ||= [@symbol, @registry.expand(@symbol).evaluate]
+          [@symbol, @registry.memoize_expansion(@symbol)]
         end
       end
     end

data/lib/calyx/grammar/registry.rb

@@ -1,10 +1,11 @@
 module Calyx
   class Grammar
     class Registry
-      attr_reader :rules
+      attr_reader :rules, :memos
 
       def initialize
         @rules = {}
+        @memos = {}
       end
 
       def method_missing(name, *arguments)
@@ -19,6 +20,10 @@ module Calyx
         @rules[symbol] || @context[symbol]
       end
 
+      def memoize_expansion(symbol)
+        memos[symbol] ||= expand(symbol).evaluate
+      end
+
       def combine(registry)
         @rules = rules.merge(registry.rules)
       end

data/lib/calyx/version.rb

@@ -1,3 +1,3 @@
 module Calyx
-  VERSION = '0.9.1'.freeze
+  VERSION = '0.9.2'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: calyx
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.9.2
 platform: ruby
 authors:
 - Mark Rickerby
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-12 00:00:00.000000000 Z
+date: 2016-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -67,6 +67,7 @@ files:
 - LICENSE
 - README.md
 - calyx.gemspec
+- examples/tiny_woodland.rb
 - lib/calyx.rb
 - lib/calyx/file_converter.rb
 - lib/calyx/grammar.rb