calyx 0.8.1 → 0.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7112f159f70c04c14dac41d8d72276420f7e0337
-  data.tar.gz: 536092ae530d8e076ad77726e00d68c614225bc3
+  metadata.gz: d3f368fca27d4586669e9bf2a681e7af89ffd461
+  data.tar.gz: 54750dca8ee597a148776e4a44eaa86afa1d2d77
 SHA512:
-  metadata.gz: ce5e36865d4235036124e8407eb129e530fffc8f4e7a96bcfadf91f5eda18e6a2ec5a528c04a5f3e0adf40bb85b25fae42797391586fb1e2c3f60764f1b80236
-  data.tar.gz: 05792c2e0581ac250ba9e4007f72ed0442e8ddfa2087b57b86f030a9be84c8d3a4c10d9e4290d90e74e1007f436827b8274fceb293e94830349fdc3e3ee3c71a
+  metadata.gz: b14635a63d51ef8ac38dcb58179e841c275a1665ab7c8421b5f2996b9cc6865a269d469aa3669cfa4995c2ed47c8ab88f6bcff646c97ee8167b9ffa2d7e081ce
+  data.tar.gz: fc8f02424498b81528b605cc42226941d64a79720039d636faed5ef9a949878b665275758fb1d0ce2554db654bc841068822264c5cdae875f158e54320ecb4e2

data/.travis.yml

@@ -2,6 +2,7 @@ language: ruby
 rvm:
   - 2.1
   - 2.2
+  - 2.3.0
   - rbx-2
   - jruby-9
   - jruby-head

data/lib/calyx/grammar/registry.rb

@@ -16,29 +16,29 @@ module Calyx
       end
 
       def expand(symbol)
-        @rules[symbol]
+        @rules[symbol] || @context[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)
+      def evaluate(start_symbol=:start, rules_map={})
+        @context = {}
+
+        rules_map.each do |key, value|
+          if 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)
+          @context[key.to_sym] = if value.is_a?(Array)
+            Production::Choices.parse(value, self)
           else
-            Production::Concat.parse(value.to_s, duplicate_registry)
+            Production::Concat.parse(value.to_s, self)
           end
         end
 
-        duplicate_rules[start_symbol].evaluate
+        expand(start_symbol).evaluate
       end
 
       private

data/lib/calyx/version.rb

@@ -1,3 +1,3 @@
 module Calyx
-  VERSION = '0.8.1'.freeze
+  VERSION = '0.8.2'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: calyx
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.8.2
 platform: ruby
 authors:
 - Mark Rickerby
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-29 00:00:00.000000000 Z
+date: 2016-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler