calyx 0.9.0 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 679eb1cd31045fb4f4603dc28566d7d833486c62
-  data.tar.gz: ba1a2640bc31bfc67d5b354576444e901eb1280f
+  metadata.gz: 870b438756c9199fdf30b72058d42ce178cf1b82
+  data.tar.gz: 7c6b71e8512d6a26d3f2643dc5efa126a03212bf
 SHA512:
-  metadata.gz: 1ad76734b34a1e5483b8da959ec2b8d9658c20e174f86cf1f000d2db0a958e7261519731b2bc46059406d38b540c372f278b619fb78c2cc6c77e288a38d059e1
-  data.tar.gz: 85d7f3bfd3236406c0a27c075a427527c8dc48c7d2c212187b5af386227ff39138215b58d7b9284959838461a2d5d37d4cfacbe24d633b040f142641474f424d
+  metadata.gz: 259a6fdcca7b525cbb6fa095e6d7b7be54248c145f34213d8f3a725716cebe93814a76cd054d6f5ef79fd694cf5e2679242289e195510360dba881775d0b95fa
+  data.tar.gz: 5773c867c7364309c162aa5c0de4a02dd72663aea2ff5444a67fad59dcb09cd2afbb9faef0719312ff51642f1e8196e63e7937a6a1c40d8ff08ec8dd2f8270d0

data/README.md

@@ -252,7 +252,7 @@ grammar = Calyx::Grammar.new do
 end
 
 grammar.evaluate
-# => [:start, [:term, "Riddle me ree."]]
+# => [:start, [:choice, [:concat, [[:atom, "Riddle me ree."]]]]]
 ```
 
 __Note: This feature is still experimental. The tree structure is likely to change so it’s probably best not to rely on it for anything big at this stage.__

data/lib/calyx.rb

@@ -1,6 +1,8 @@
 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'

data/lib/calyx/file_converter.rb

@@ -0,0 +1,59 @@
+require 'yaml'
+require 'json'
+
+module Calyx
+  class Grammar
+    class << self
+      def load(filename)
+        file = File.read(filename)
+        extension = File.extname(filename)
+        if extension == ".yml"
+          load_yml(file)
+        elsif extension == ".json"
+          load_json(file)
+        else
+          raise "Cannot convert #{extension} files."
+        end
+      end
+
+      def load_yml(file)
+        yaml = YAML.load(file)
+        create_calyx_class(yaml)
+      end
+
+      def load_json(file)
+        json = JSON.parse(file)
+        json.each do |key, value|
+          if value[0] == ":"
+            json[key] = convert_to_symbol(value)
+          elsif value.is_a?(Array)
+            json[key] = parse_array(value)
+          end
+        end
+        create_calyx_class(json)
+      end
+
+      def create_calyx_class(hash)
+        klass = Class.new(Calyx::Grammar)
+        hash.each do |rule_name, rule_productions|
+          klass.send(rule_name, *rule_productions)
+        end
+        klass.new
+      end
+
+      def parse_array(array)
+        array.map do |element|
+          if element[0] == ":"
+            convert_to_symbol(element)
+          else
+            element
+          end
+        end
+      end
+
+      def convert_to_symbol(value)
+        value[1..-1].to_sym
+      end
+    end
+  end
+end

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

@@ -7,7 +7,11 @@ module Calyx
             if choice.is_a?(String)
               Concat.parse(choice, registry)
             elsif choice.is_a?(Symbol)
-              NonTerminal.new(choice, registry)
+              if choice[0] == Memo::SIGIL
+                Memo.new(choice, registry)
+              else
+                NonTerminal.new(choice, registry)
+              end
             end
           end
           self.new(choices)

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

@@ -0,0 +1,18 @@
+module Calyx
+  class Grammar
+    module Production
+      class Memo
+        SIGIL = '@'.freeze
+
+        def initialize(symbol, registry)
+          @symbol = symbol.slice(1, symbol.length-1).to_sym
+          @registry = registry
+        end
+
+        def evaluate
+          @result ||= [@symbol, @registry.expand(@symbol).evaluate]
+        end
+      end
+    end
+  end
+end

data/lib/calyx/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: calyx
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.1
 platform: ruby
 authors:
 - Mark Rickerby
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-08 00:00:00.000000000 Z
+date: 2016-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -68,10 +68,12 @@ files:
 - README.md
 - calyx.gemspec
 - lib/calyx.rb
+- lib/calyx/file_converter.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/memo.rb
 - lib/calyx/grammar/production/non_terminal.rb
 - lib/calyx/grammar/production/terminal.rb
 - lib/calyx/grammar/production/weighted_choices.rb