eqn 1.6.1 → 1.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a04c182e84dafb070744df14445241b94a232e0a
-  data.tar.gz: 124f04f06e496e94e589a766f18cef67c5f2ed13
+  metadata.gz: 7a298576c822eca16cdaf7281ec1344ea37f19a4
+  data.tar.gz: 3408ed487ad7cae4ff268559d1e71bf769221d90
 SHA512:
-  metadata.gz: be2664a0662c2237af3b3ab6d23446d5cf267345edc122270ee5553474ea82589f7430b38c0afbfb12f8c031d9e170fab2b28ebcd70774f40a72a5586825b3aa
-  data.tar.gz: 50ae4a06be0cc9d955207521bd8f09c8ef58c61461ffda847e901e6c85d9d41535c937ed0da03d01d15539272b829fd11d0b839322423faa3e7bb0cfacf953d0
+  metadata.gz: 2898eec4da5863b38c44460eb4d4fd980f4e71b9f481a92f5f09d14581399c313525dc324b3a5e2bf55768073e5b300c97687be4e8355132301d8ac1e4d9f1b0
+  data.tar.gz: 372020127e6141058da57c09fdccde57d8332a930dc0a59d9b76621b8f033d7b4b2f602d495af541dc8a1d311081d2e6610753fb95173bd52cea84efcf39dfff

data/lib/eqn.rb

@@ -1,2 +1,7 @@
 require 'treetop'
+
+# Load the parser from the Treetop grammar.
+Treetop.load(File.join(__dir__, 'eqn.treetop'))
+
+# Load eqn classes.
 Dir.glob File.join(__dir__, 'eqn', '**', '*.rb'), &method(:require)

data/lib/eqn.treetop

@@ -126,4 +126,4 @@ grammar Eqn
   rule space
     ("\s" / "\t")*
   end
-end
+end

data/lib/eqn/parser.rb

@@ -1,16 +1,14 @@
 module Eqn
   class Parser
-    # Load the Treetop grammar from the grammar.
-    Treetop.load(File.join(File.dirname(__dir__), 'eqn.treetop'))
-    @@parser = EqnParser.new
-
     class << self
       def parse(data)
+        parser = EqnParser.new
+
         # Pass the data over to the parser instance.
-        tree = @@parser.parse(data.downcase)
+        tree = parser.parse(data)
 
         # Raise any errors.
-        raise ParseError, "Parse error at offset: #{@@parser.index}" + @@parser.failure_reason if tree.nil?
+        raise ParseError, "Parse error at offset: #{parser.index} -- #{parser.failure_reason}" if tree.nil?
 
         # Remove extraneous nodes and return tree.
         clean_tree(tree)
@@ -21,7 +19,7 @@ module Eqn
       def clean_tree(root_node)
         return if root_node.elements.nil?
         root_node.elements.delete_if { |node| node.class == Treetop::Runtime::SyntaxNode }
-        root_node.elements.each { |node| clean_tree(node) }
+        root_node.elements.each(&method(:clean_tree))
         root_node
       end
     end

data/lib/eqn/version.rb

@@ -1,3 +1,3 @@
 module Eqn
-  VERSION = '1.6.1'.freeze
+  VERSION = '1.6.2'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: eqn
 version: !ruby/object:Gem::Version
-  version: 1.6.1
+  version: 1.6.2
 platform: ruby
 authors:
 - Zach Schneider