qlang 0.0.141421 → 0.0.1414213

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5cd27fe1e7d111bcb1fb356c5b981b8b141c67a0
-  data.tar.gz: 56d3cea8d211ddf39f9f9ee7ea80d57a4885ac66
+  metadata.gz: 087827187ce756b6d28e8305ce2512ddfbc78797
+  data.tar.gz: 37c2844006f797e71138379e69a6001f0d5b64ab
 SHA512:
-  metadata.gz: 05b9aae4ef17bfb8724fbdf3383c66ca4e4f44a811221793a0e99ad1e585f9ce56c111cb142fd84b58a24087785e87c21a6fc4e4cc12650cbae546ce3edef506
-  data.tar.gz: 81f79ee745b10ed0cd90e0680094e9ffdcfc41d630593c846bc5baca21fe3d3bf43d735624be7f09e638dba8a65b304fed5de613a676d05fb3f54a7acb715da0
+  metadata.gz: 9f655efba3cd208fab88a65eb55fec2177e172655c5b22c6fd2f9b941604f9a190fdcec7747a9ceb8da37cf4b8cbdfd97bcb6c01c4564807de8db1cedf21911d
+  data.tar.gz: 407d8151bd533ecdc10a704db91f32e8f740ef122e09ab0b157ec0e27af73a9c91a506a7e7b7c459434c760d9e5dcd26871416641ffe6d4f74d6b658862d8ee2

data/lib/qlang/lexer/wrap_lexer.rb

@@ -4,6 +4,7 @@ module Qlang
       rule(/[fgh]\(\w( ?, ?\w)*\) ?= ?[^\r\n]+/) { :FUNC }
       rule(/[fgh]\( ?\d( *, *\d)* *\)/) { :EFUNC }
       rule(/S *\(.+\)\[.+\]/) { :ITGL }
+      rule(/d\/d[a-zA-Z] .*/) { :DIFF }
       rule(/\(/) { :LPRN }
       rule(/\)/) { :RPRN }
       rule(/\{/) { :LBRC }

data/lib/qlang/parser.rb

@@ -9,6 +9,7 @@ require 'qlang/parser/vector_parser'
 require 'qlang/parser/list_parser'
 require 'qlang/parser/func_parser'
 require 'qlang/parser/integral_parser'
+require 'qlang/parser/formula_parser'
 
 module Qlang
   module Parser
@@ -65,6 +66,15 @@ module Qlang
           cont_token_with_num = $&
           cont = lexed.get_value(cont_token_with_num)
           lexed.squash_with_prn(cont_token_with_num, cont)
+
+        when /:DIFF\d/
+          cont_token_with_num = $&
+          cont = lexed.get_value(cont_token_with_num)
+          cont =~ /(d\/d[a-zA-Z]) (.*)/
+          cont = "#{$1}(#{FormulaParser.execute($2)})"
+          # FIX: Refactor
+          #cont.gsub!(/(d\/d[a-zA-Z]) (.*)/, "\1(\2)")
+          lexed.squash_with_prn(cont_token_with_num, cont)
         when /:CONT\d/
           lexed.ch_token($&, :R)
         end

data/lib/qlang/parser/formula_parser.rb

@@ -0,0 +1,36 @@
+module Qlang
+  module Parser
+    # FIX:
+    module FormulaParser
+      def execute(lexed)
+        ss = StringScanner.new(lexed)
+        result = ''
+        until ss.eos?
+          { EXP: /\^/, BFUNC: /sin|cos|tan|log/, MUL: /(pi|[1-9a-z]){2,}/, SNGL: /(pi|[1-9a-z])/, OTHER: /([^\^1-9a-z]|^pi)+/ }.each do |token , rgx|
+            if ss.scan(rgx)
+              item = case token
+              when :EXP
+                $type == :Ruby ? '**' : '^'
+              when :MUL
+                sss = StringScanner.new(ss[0])
+                ary = []
+                until sss.eos?
+                  [/pi/, /[1-9a-z]/].each do |rgx2|
+                    ary << sss[0] if sss.scan(rgx2)
+                  end
+                end
+                ary.join(' * ')
+              else
+                ss[0]
+              end
+              result += item
+              break
+            end
+          end
+        end
+        result
+      end
+      module_function :execute
+    end
+  end
+end

data/lib/qlang/parser/func_parser.rb

@@ -8,42 +8,9 @@ module Qlang
         func_name = fdef_ary.shift
         args = fdef_ary.join.rms!('(', ')', ',', ' ').split('')
 
-        FuncApi.execute(func_name, args, FomlParser.execute(lexed[-1][:FOML]))
+        FuncApi.execute(func_name, args, FormulaParser.execute(lexed[-1][:FOML]))
       end
       module_function :execute
-
-      # FIX:
-      module FomlParser
-        def execute(lexed)
-          ss = StringScanner.new(lexed)
-          result = ''
-          until ss.eos?
-            { EXP: /\^/, BFUNC: /sin|cos|tan|log/, MUL: /(pi|[1-9a-z]){2,}/, SNGL: /(pi|[1-9a-z])/, OTHER: /([^\^1-9a-z]|^pi)+/ }.each do |token , rgx|
-              if ss.scan(rgx)
-                item = case token
-                when :EXP
-                  $type == :Ruby ? '**' : '^'
-                when :MUL
-                  sss = StringScanner.new(ss[0])
-                  ary = []
-                  until sss.eos?
-                    [/pi/, /[1-9a-z]/].each do |rgx2|
-                      ary << sss[0] if sss.scan(rgx2)
-                    end
-                  end
-                  ary.join(' * ')
-                else
-                  ss[0]
-                end
-                result += item
-                break
-              end
-            end
-          end
-          result
-        end
-        module_function :execute
-      end
     end
   end
 end

data/lib/qlang/parser/integral_parser.rb

@@ -7,7 +7,7 @@ module Qlang
 
         integrated.rm!(' ')
 
-        IntegralApi.execute(integrated[0..-3], integrated[-2..-1], range)
+        IntegralApi.execute(FormulaParser.execute(integrated[0..-3]), integrated[-2..-1], range)
       end
       module_function :execute
     end

data/lib/qlang/version.rb

@@ -1,3 +1,3 @@
 module Qlang
-  VERSION = "0.0.141421"
+  VERSION = "0.0.1414213"
 end

data/spec/iq_spec.rb

@@ -2,6 +2,19 @@ require 'spec_helper'
 
 describe Qlang do
   describe Iq do
+    def self.def_test(name, input, output)
+      it name + '_def' do
+        expect(Iq.execute(input)).to eq(output)
+      end
+    end
+
+    def self.cal_test(name, input, output)
+      it name + '_cal' do
+        expect(Iq.execute(input)).to eq(output)
+        reset
+      end
+    end
+
     describe 'Matrix' do
       it do
         expect(Iq.execute('(1 2 3; 4 5 6)')).to eq('(1 2 3; 4 5 6)')
@@ -35,6 +48,8 @@ describe Qlang do
         expect(Iq.execute('d/dx( sin(x) )')).to eq('cos( x )')
         expect(Iq.execute('d/dx(log( x ))')).to eq('1 / x')
       end
+      cal_test('ex1', 'd/dx cos(x)', '- sin( x )')
+      cal_test('ex2', 'd/dx xx', '2x')
     end
 
     describe 'Integral' do
@@ -44,22 +59,10 @@ describe Qlang do
         expect(Iq.execute('S( cos(x)dx )[0..pi]')).to eq('0.0')
         expect(Iq.execute('S( cos(x)dx )[0..pi]')).to eq('0.0')
       end
+      cal_test('ex1', 'S(xx dx)[0..1]', '0.33333333')
+      cal_test('ex2', 'S(2pi dx)[0..1]', '6.28318531')
     end
 
-    def self.def_test(name, input, output)
-      it name + '_def' do
-        expect(Iq.execute(input)).to eq(output)
-      end
-    end
-
-    def self.cal_test(name, input, output)
-      it name + '_cal' do
-        expect(Iq.execute(input)).to eq(output)
-        reset
-      end
-    end
-
-
     describe 'Function' do
       def_test('ex1', 'f(x, y) = x + y', 'x + y')
       cal_test('ex1', 'f( 4, 5 )', '9.0')

data/spec/lexer/regular_expressions_spec.rb

@@ -0,0 +1,18 @@
+require 'spec_helper'
+
+describe 'Regular expressions' do
+  def self.should_match(num, rgx, str)
+    it 'ex' + num.to_s do
+      expect(rgx =~ str).to eq(0)
+    end
+  end
+  describe 'function' do
+    should_match(1, /[fgh]\(\w( ?, ?\w)*\) ?= ?[^\r\n]+/, 'f(x) = xy')
+  end
+
+  describe 'differentiate' do
+    rgx = /d\/d[a-zA-Z] .*/
+    should_match(1, rgx, 'd/dx sin(x)')
+    should_match(2, rgx, 'd/dz z^2')
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: qlang
 version: !ruby/object:Gem::Version
-  version: 0.0.141421
+  version: 0.0.1414213
 platform: ruby
 authors:
 - gogotanaka
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-15 00:00:00.000000000 Z
+date: 2014-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dydx
@@ -100,6 +100,7 @@ files:
 - lib/qlang/lexer/wrap_lexer.rb
 - lib/qlang/parser.rb
 - lib/qlang/parser/base.rb
+- lib/qlang/parser/formula_parser.rb
 - lib/qlang/parser/func_parser.rb
 - lib/qlang/parser/integral_parser.rb
 - lib/qlang/parser/list_parser.rb
@@ -108,6 +109,7 @@ files:
 - lib/qlang/version.rb
 - q_lang.gemspec
 - spec/iq_spec.rb
+- spec/lexer/regular_expressions_spec.rb
 - spec/objects/function_spec.rb
 - spec/objects/integral_spec.rb
 - spec/objects/list_spec.rb
@@ -141,6 +143,7 @@ specification_version: 4
 summary: Enjoy MATH!
 test_files:
 - spec/iq_spec.rb
+- spec/lexer/regular_expressions_spec.rb
 - spec/objects/function_spec.rb
 - spec/objects/integral_spec.rb
 - spec/objects/list_spec.rb