calyx 0.9.3 → 0.9.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 37cdacc0c9a70c27bf6ac43e713e2ee0af8e524f
-  data.tar.gz: 447e59dddca3f7afc50954ae4b3f1c203a50ee6b
+  metadata.gz: bde85e189408ceafef6e5e3c4904a2ee8fb8afde
+  data.tar.gz: 6e806f06faea71b4faf8b5022179a1d4ddafbd0e
 SHA512:
-  metadata.gz: 2af24d9e1bc92e7ca7020ee26accea4227536878ee819c9099309e9c9889e65e325435af4514f0035882ef10b9b1e049da9abf9beae700256567070b474a8525
-  data.tar.gz: a5d36d452cbff0077caf4ce800bd100487002d64004e03fdc34ae54519a97b6a20defef8e3d2fb231b7c84f84dc9605a63255ecdf2ea6b11c4f9f74b61b67a81
+  metadata.gz: c134603b50bdee4656209002a7f967a4e76b5c81ba300bbd36996274ae07f1c2e12bfa26a0a1d003dd1472f8dbb14d5b9ac163a4b264ef03190ebde1ab99496a
+  data.tar.gz: 7e5f60627784213ecfe65b1ba7f3009e1ce282736ee5c2ca0f8510537825ac3c7241304738233da8a1124482c654ee954bacb0aa0e0348fcd870983891ea16cc

data/lib/calyx/file_converter.rb

@@ -18,42 +18,21 @@ module Calyx
 
       def load_yml(file)
         yaml = YAML.load(file)
-        create_calyx_class(yaml)
+        build_grammar(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)
+        build_grammar(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
+      def build_grammar(hash)
+        Calyx::Grammar.new do
+          hash.each do |rule_name, rule_productions|
+            rule(rule_name, *rule_productions)
           end
         end
       end
-
-      def convert_to_symbol(value)
-        value[1..-1].to_sym
-      end
     end
   end
-end
+end

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

@@ -6,6 +6,8 @@ module Calyx
           choices = productions.map do |choice|
             if choice.is_a?(String)
               Concat.parse(choice, registry)
+            elsif choice.is_a?(Fixnum)
+              Terminal.new(choice.to_s)
             elsif choice.is_a?(Symbol)
               if choice[0] == Memo::SIGIL
                 Memo.new(choice, registry)

data/lib/calyx/version.rb

@@ -1,3 +1,3 @@
 module Calyx
-  VERSION = '0.9.3'.freeze
+  VERSION = '0.9.4'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: calyx
 version: !ruby/object:Gem::Version
-  version: 0.9.3
+  version: 0.9.4
 platform: ruby
 authors:
 - Mark Rickerby
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-09 00:00:00.000000000 Z
+date: 2016-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -99,9 +99,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Generate text with declarative recursive grammars
 test_files: []
-has_rdoc: