lib/qlang/lexer/wrap_lexer.rb in qlang-0.0.27180000 vs lib/qlang/lexer/wrap_lexer.rb in qlang-0.0.27182000

@@ -1,15 +1,14 @@
-require 'pry'
 module Qlang
   module Lexer
     class WrapLexer < Base
-      rule(%r@#{FUNCCV}#{ANYSP}=#{ANYSP}#{NONL}+@) { :def_func }
-      rule(%r@#{FUNCCN}@) { :eval_func }
+      rule(/#{FUNCCV}#{ANYSP}=#{ANYSP}#{FORMULA}+/) { :def_func }
+      rule(/#{FUNCCN}/) { :eval_func }
       rule(/S#{ANYSP}#{LPRN}#{ANYSTR}#{RPRN}\[#{ANYSTR}\]/) { :integral }
-      rule(/d\/d#{VAR} .*/) { :differential }
-      rule(%r@#{LPRN}#{NUMS_BY_SP}#{RPRN}@) { :vector }
-      rule(%r@#{LPRN}#{NUMS_BY_SP_BY_SCLN}#{RPRN}t@) { :tmatrix }
-      rule(%r@#{LPRN}#{NUMS_BY_SP_BY_SCLN}#{RPRN}@) { :matrix }
+      rule(/d\/d#{VAR} #{FORMULA}/) { :differential }
+      rule(/#{LPRN}#{NUMS_BY_SP}#{RPRN}/) { :vector }
+      rule(/#{LPRN}#{NUMS_BY_SP_BY_SCLN}#{RPRN}t/) { :tmatrix }
+      rule(/#{LPRN}#{NUMS_BY_SP_BY_SCLN}#{RPRN}/) { :matrix }
 
 
       rule(/\(/) { :LPRN }
       rule(/\)/) { :RPRN }
       rule(/\{/) { :LBRC }