lib/qlang/lexer/wrap_lexer.rb in qlang-0.0.27 vs lib/qlang/lexer/wrap_lexer.rb in qlang-0.0.141

@@ -1,17 +1,9 @@
-require 'pry'
 module Qlang
   module Lexer
     class WrapLexer < Base
-      rule(%r@#{FUNCCV}#{ANYSP}=#{ANYSP}#{NONL}+@) { :def_func }
-      rule(%r@#{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(/\w\(\w( ?, ?\w)*\) ?= ?[^\r\n]+/) { :FUNC }
+      rule(/S *\(.+\)\[.+\]/) { :ITGL }
       rule(/\(/) { :LPRN }
       rule(/\)/) { :RPRN }
       rule(/\{/) { :LBRC }
       rule(/\}/) { :RBRC }