qlang 0.0.27 → 0.0.141

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 805e11f0c327e3f7fd63d3d5a0de10c34d7f120b
-  data.tar.gz: 420cbcdcc4461907c7092a8405cf85d6e1af40d2
+  metadata.gz: 717677209dfcc71bdf36cce50db8ec22692dd7f8
+  data.tar.gz: 46f9c75f916b1975e03075db0410b64769078ff3
 SHA512:
-  metadata.gz: f08fd5daf625fcde5decd4504267fdc05e57688ac716440f71c3d0a6ab01f5b94d3a4f56ec7a0476f5892aadbf2ee69163bfc4b094655415f14ba309a8228059
-  data.tar.gz: e4f188b8714777ea728bbb8e7e8ab23e745867b09fe96a2f40d1fc1fa178e4d406df11aa38650e71f969d6917ec6551fa01b31f96421d19081ba52b2901a9d0b
+  metadata.gz: 22d87e8c71f5e87481488d58fe6fcda5269e983437fb4cdb830b954f4b25942eee41e1be4efdcdbd50d2668f84d0e9c6d49648fb75a4707c946a2e7888949017
+  data.tar.gz: 675be6320a08b8c72a0950aead7c353cfdebe92b37b08111957e7dee88ecc4c2b22f160bef7bd44b29a1d03547faa191433d19cafc9f5594abc78e2b1cfc4425

data/Gemfile

@@ -1,7 +1,9 @@
 source 'https://rubygems.org'
+ruby '2.1.2'
+
+gem 'dydx', '0.1.412'
 
 gem 'rubocop'
-gem 'coveralls', require: false
 gem 'pry'
 
 gemspec

data/README.md

@@ -1,60 +1,42 @@
 # Qlang
 
-[![Gem Version](https://badge.fury.io/rb/qlang.svg)](http://badge.fury.io/rb/qlang) [![Build Status](https://travis-ci.org/gogotanaka/Q.svg?branch=master)](https://travis-ci.org/gogotanaka/Q) [![Coverage Status](https://coveralls.io/repos/gogotanaka/Q/badge.png?branch=master)](https://coveralls.io/r/gogotanaka/Q?branch=master) [![Code Climate](https://codeclimate.com/github/gogotanaka/Q/badges/gpa.svg)](https://codeclimate.com/github/gogotanaka/Q) [![Dependency Status](https://gemnasium.com/gogotanaka/Q.svg)](https://gemnasium.com/gogotanaka/Q)
-
 Enjoy MATH with Keyboard.
 
-### Differentiate
 
 ```
-d/dx(cos(x))
-=> ( - sin( x ) )
-
-d/dx(log(x))
-=> ( 1 / x )
+# Differentiate
 
-# You can omit parentheses
+Q:-> d/dx(cos(x))
+( - sin( x ) )
 
-d/dy y^2                        
-=> ( 2 * y )
+Q:-> d/dx(log(x))
+( 1 / x )
 
-d/dy xy                       
-=> ( x )
-```
+Q:-> d/dy(y ** 2)                        
+( 2 * y )
 
 
-### Integrate
-
-```
-S(log(x)dx)[0..1]
-=> - oo
+# Integrate
 
-S(sin(x)dx)[0..pi]
-=> 2.0
+Q:-> S(log(x)dx)[0..1]
+( - sin( x ) )
 
-S(cos(x)dx)[0..pi]                       
-=> 0.0
-```
+Q:-> d/dx(log(x))
+( 1 / x )
 
+Q:-> d/dy(y ** 2)                        
+( 2 * y )
 
 ### Matrix
-
-```
+Q:->(1 2 3; 4 5 6)
 (1 2 3; 4 5 6)
-=> (1 2 3; 4 5 6)
 
-(1 2 3; 4 5 6) + (1 2 3; 4 5 6)
-=> (2 4 6; 8 10 12)
+Q:-> (1 2 3; 4 5 6) + (1 2 3; 4 5 6)
+(2 4 6; 8 10 12)
 
-(1 2 3; 4 5 6) * (1 2 3)
-=> (14 32)
-```
+Q:-> (1 2 3; 4 5 6) * (1 2 3)
+(14 32)
 
-### Function
-```
-f(x, y) = xy
-f(1, 2)
-=> 2
 ```
 
 
@@ -79,7 +61,7 @@ Install it yourself as:
 
 ## Contributing
 
-1. Fork it ( https://github.com/gogotanaka/Q/fork )
+1. Fork it ( https://github.com/[my-github-username]/qlang/fork )
 2. Create your feature branch (`git checkout -b my-new-feature`)
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)

data/lib/qlang/api.rb

@@ -9,35 +9,15 @@ module Qlang
     # TODO:
     class ::String
       def rm(str_or_rgx)
-        gsub(str_or_rgx, '')
-      end
-
-      def rm!(str_or_rgx)
         gsub!(str_or_rgx, '')
-        self
       end
 
-      def rms!(*str_or_rgxs)
+      def rms(*str_or_rgxs)
         str_or_rgxs.each do |str_or_rgx|
-          rm!(str_or_rgx)
+          rm(str_or_rgx)
         end
         self
       end
-
-      def split_by_sp
-        split(/ +/)
-      end
-
-      # FIX:
-      def equalize!
-        rms!(/\A +/, / +\z/)
-        if self =~ /\A\(/ && self =~ /\)\z/
-          rms!(/\A\(/, /\)\z/)
-          rms!(/\A +/, / +\z/)
-        else
-          self
-        end
-      end
     end
 
     class ::Matrix

data/lib/qlang/api/list_api.rb

@@ -2,14 +2,8 @@ module Qlang
   module Api
     module ListApi
       def execute(arys)
-        case $type
-        when :R
-          combineds_by_equal = arys.map { |ary| "#{ary[0]}=#{ary[1]}" }.join(', ')
-          "list(#{combineds_by_equal})"
-        when :Ruby
-          fail 'List is not implemented for Ruby'
-        end
-
+        combineds_by_equal = arys.map { |ary| "#{ary[0]}=#{ary[1]}" }.join(', ')
+        "list(#{combineds_by_equal})"
       end
       module_function :execute
     end

data/lib/qlang/exec.rb

@@ -19,36 +19,34 @@ module Qlang
         exit 0
       end
 
-      private
-
-        def ch_compile_type(lang)
-          case lang
-          when '-Ruby'
-            Qlang.to_ruby
-          when '-R'
-            Qlang.to_r
-          else
-            print 'Q support Ruby and R now.'
-          end
+      private def ch_compile_type(lang)
+        case lang
+        when '-Ruby'
+          Qlang.to_ruby
+        when '-R'
+          Qlang.to_r
+        else
+          print 'Q support Ruby and R now.'
         end
+      end
 
-        def parse
-          raise '#{@args[0]} is unsupported option' unless @args[0] == '-q'
-          filename = @args[1]
-          file = open_file(filename)
-          string = read_file(file)
-          print(Kconv.tosjis(Qlang.compile(string)), '\n')
-          file.close
-        end
+      private def parse
+        raise '#{@args[0]} is unsupported option' unless @args[0] == '-q'
+        filename = @args[1]
+        file = open_file(filename)
+        string = read_file(file)
+        print(Kconv.tosjis(Qlang.compile(string)), '\n')
+        file.close
+      end
 
-        def open_file(filename, flag = 'r')
-          return if filename.nil?
-          File.open(filename, flag)
-        end
+      private def open_file(filename, flag = 'r')
+        return if filename.nil?
+        File.open(filename, flag)
+      end
 
-        def read_file(file)
-          file.read
-        end
+      private def read_file(file)
+        file.read
+      end
     end
   end
 end

data/lib/qlang/iq.rb

@@ -1,39 +1,18 @@
 module Qlang
   module Iq
-    class Dydx::Algebra::Formula
-      # FIX:
-      def to_q
-        str = to_s.gsub(/\*\*/, '^').rm(' * ')
-        str.equalize!
-      end
-    end
-
-    def self.execute(code)
-      ruby_code = Q.to_ruby.compile(code)
-      ruby_obj = eval(ruby_code)
-
-      optimize_output(ruby_obj)
-    rescue SyntaxError
-      # TODO: emergency
-      case ruby_code
-      when /(\d)+(\w)/
-        execute("#{$1} * #{$2}")
-      end
-    end
-
-    def self.optimize_output(ruby_obj)
+    def execute(code)
+      ruby_obj = eval Q.to_ruby.compile(code)
       case ruby_obj
-      when Matrix, Vector, Dydx::Algebra::Formula
+      when Matrix, Vector
         ruby_obj.to_q
       when Float::INFINITY
         'oo'
       when - Float::INFINITY
         '-oo'
       else
-        str = ruby_obj.to_s
-        str.equalize!
+        ruby_obj
       end
     end
-
+    module_function :execute
   end
 end

data/lib/qlang/lexer/base.rb

@@ -1,12 +1,8 @@
 require 'strscan'
-require 'qlang/lexer/tokens'
-
 
 module Qlang
   module Lexer
     class Base
-      attr_accessor :lexeds
-      include Tokens
       class << self
         attr_reader :token_hash
 
@@ -100,18 +96,10 @@ module Qlang
         end
       end
 
-      # NEW APIs
-      def parsed!(token_position, parsed)
-        @lexeds.delete_at(token_position)
-        @lexeds.insert(token_position, { R: parsed })
+      private def to_num(token_with_num)
+        token_with_num =~ /\d+/
+        $&.to_i
       end
-
-      private
-
-        def to_num(token_with_num)
-          token_with_num =~ /\d+/
-          $&.to_i
-        end
     end
   end
 end

data/lib/qlang/lexer/func_lexer.rb

@@ -1,13 +1,13 @@
 module Qlang
   module Lexer
     class FuncLexer < Base
-      rule(%r@#{FUNCCV}@) { :FDEF }
+      rule(/\w\(\w( ?, ?\w)*\)/) { :FDEF }
       rule(/\=/) { :EQL }
 
       rule(/[ \t\f]/)
 
       rule(/\r\n/) { :NLIN }
-      rule(/[\w\(].*/) { :FOML }
+      rule(/\w.*/) { :OTHER }
     end
   end
 end

data/lib/qlang/lexer/wrap_lexer.rb

@@ -1,16 +1,8 @@
-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 }

data/lib/qlang/parser.rb

@@ -9,7 +9,6 @@ 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
@@ -19,30 +18,18 @@ module Qlang
         fail "I'm so sorry, something wrong. Please feel free to report this." if Time.now > time + 10
 
         case lexed.token_str
-        when /(:vector)(\d)/, /(:matrix)(\d)/, /(:tmatrix)(\d)/, /(:integral)(\d)/, /(:def_func)(\d)/
-          token_sym = $1.delete(':').to_sym
-          token_position = $2.to_i
-          token_val = lexed.lexeds[token_position][token_sym]
-
-          parsed = case token_sym
-          when :vector
-            VectorParser.execute(token_val)
-          when :matrix
-            MatrixParser.execute(token_val)
-          when :tmatrix
-            MatrixParser.execute(token_val, trans: true)
-          when :integral
-            IntegralParser.execute(token_val)
-          when :def_func
-            FuncParser.execute(token_val)
-          end
-          lexed.parsed!(token_position, parsed)
-
         when /:LPRN\d(:CONT\d):RPRN\d/
           cont_token_with_num = $1
           cont_lexed = Lexer::ContLexer.new(lexed.get_value(cont_token_with_num))
 
-          cont = "(#{cont_lexed.values.join(' ')})"
+          case cont_lexed.token_str
+          when /(:NUM\d)+(:SCLN\d|:NLIN\d)(:NUM\d)/
+            cont = MatrixParser.execute(cont_lexed)
+          when /(:NUM\d)+/
+            cont = VectorParser.execute(cont_lexed)
+          else
+            cont = "(#{cont_lexed.values.join(' ')})"
+          end
           lexed.squash_with_prn(cont_token_with_num, cont)
 
         when /:LBRC\d(:CONT\d):RBRC\d/
@@ -57,26 +44,29 @@ module Qlang
           end
           lexed.squash_with_prn(cont_token_with_num, cont)
 
-        when /:eval_func\d/
+        when /:FUNC\d/
           cont_token_with_num = $&
-          cont = lexed.get_value(cont_token_with_num)
-          lexed.squash_with_prn(cont_token_with_num, cont)
+          cont_lexed = Lexer::FuncLexer.new(lexed.get_value(cont_token_with_num))
 
-        when /:differential\d/
+          case cont_lexed.token_str
+          when /:FDEF\d:EQL\d:OTHER\d/
+            cont = FuncParser.execute(cont_lexed)
+            lexed.ch_value(cont_token_with_num, cont)
+            lexed.ch_token(cont_token_with_num, :R)
+          end
+
+        when /:ITGL\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)
+          cont = IntegralParser.execute(lexed.get_value(cont_token_with_num))
+          lexed.ch_value(cont_token_with_num, cont)
+          lexed.ch_token(cont_token_with_num, :R)
+
         when /:CONT\d/
           lexed.ch_token($&, :R)
         end
 
         lexed.squash_to_cont($1, 2) if lexed.token_str =~ /(:CONT\d|:R\d)(:CONT\d|:R\d)/
       end
-
       lexed.fix_r_txt!
       lexed.values.join
     end

data/lib/qlang/parser/func_parser.rb

@@ -1,13 +1,14 @@
-require 'qlang/lexer/tokens'
 module Qlang
   module Parser
     module FuncParser
       include Base
-      include Lexer::Tokens
-      def execute(string)
-        def_func, formula = string.split(/ *= */)
-        def_func =~ %r@(#{FUNCV})#{LPRN}#{ANYSP}(#{VARS_BY_CMA})#{ANYSP}#{RPRN}@
-        FuncApi.execute($1, $2.split(' *,'), FormulaParser.execute(formula))
+      def execute(lexed)
+        lexed.fix_r_txt!
+        fdef_ary = lexed[0][:FDEF].split('')
+        func_name = fdef_ary.shift
+        args = fdef_ary.join.rms('(', ')', ',', ' ').split('')
+
+        FuncApi.execute(func_name, args, lexed[-1][:OTHER])
       end
       module_function :execute
     end

data/lib/qlang/parser/integral_parser.rb

@@ -5,9 +5,9 @@ module Qlang
       def execute(string)
         integrated, range = string.scan(/S *\((.+)\)\[(.+)\]/).first
 
-        integrated.rm!(' ')
+        integrated.rm(' ')
 
-        IntegralApi.execute(FormulaParser.execute(integrated[0..-3]), integrated[-2..-1], range)
+        IntegralApi.execute(integrated[0..-3], integrated[-2..-1], range)
       end
       module_function :execute
     end

data/lib/qlang/parser/matrix_parser.rb

@@ -2,13 +2,9 @@ module Qlang
   module Parser
     module MatrixParser
       include Base
-      def execute(lexed_string, trans: false)
-        lexed_string.rms!(')','(', 't')
-        rows = lexed_string.split(/ *; */).map(&:split_by_sp)
+      def execute(lexed)
+        rows = lexed.split(';')
         rows.all? { |row| row.count == rows.first.count }
-        if trans
-          rows = rows.transpose
-        end
         MatrixApi.execute(rows)
       end
       module_function :execute

data/lib/qlang/parser/vector_parser.rb

@@ -2,10 +2,8 @@ module Qlang
   module Parser
     module VectorParser
       include Base
-      def execute(lexed_string)
-        lexed_string.rms!(/ *\( */, / *\) */)
-        elements = lexed_string.split_by_sp
-        VectorApi.execute(elements)
+      def execute(lexed)
+        VectorApi.execute(lexed.values)
       end
       module_function :execute
     end

data/lib/qlang/version.rb

@@ -1,3 +1,3 @@
 module Qlang
-  VERSION = "0.0.27"
+  VERSION = "0.0.141"
 end

data/q_lang.gemspec

@@ -18,9 +18,8 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_dependency "dydx", '~> 0.1.41421'
-
   spec.add_development_dependency "bundler", "~> 1.6"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec"
+  spec.add_development_dependency "dydx", '0.1.412'
 end

data/spec/function_spec.rb

@@ -0,0 +1,31 @@
+require 'spec_helper'
+
+describe Qlang do
+  describe 'Function' do
+    it do
+      expect(
+        Q.compile('f(x, y) = x + y')
+      ).to eq(
+        "f <- function(x ,y) x + y"
+      )
+
+      expect(
+        Q.compile('g(x) = x ** 2')
+      ).to eq(
+        "g <- function(x) x ** 2"
+      )
+
+      expect(
+        Q.compile('g(x) = x ** (2 + 2)')
+      ).to eq(
+        "g <- function(x) x ** (2 + 2)"
+      )
+
+      expect(
+        Q.compile('h(a, b, c) = a ** 2 + b ** 2 + c ** 2')
+      ).to eq(
+        "h <- function(a ,b ,c) a ** 2 + b ** 2 + c ** 2"
+      )
+    end
+  end
+end

data/spec/{objects/integral_spec.rb → integral_spec.rb}

@@ -7,7 +7,6 @@ describe Qlang do
 
       end
     end
-
     context 'into Ruby' do
       it do
         expect(

data/spec/iq_spec.rb

@@ -2,65 +2,15 @@ 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 'General' do
-      cal_test('ex1', '2x', '2x')
-      cal_test('ex2', 'x + x', '2x')
-      cal_test('ex3', 'x * y', 'xy')
-    end
-
     describe 'Matrix' do
-      cal_test('ex1',
-        '(1 2 3; 4 5 6)',
-        '(1 2 3; 4 5 6)'
-      )
-
-      cal_test('ex2',
-        '(1 2 3; 4 5 6) + (1 2 3; 4 5 6)',
-        '(2 4 6; 8 10 12)'
-      )
-
-      cal_test('ex3',
-        '(1 2 3; 4 5 6) - (2 4 1; 8 3 9)',
-        '(-1 -2 2; -4 2 -3)'
-      )
-
-      cal_test('ex4',
-        '(1 2; 3 4) * (1 2; 3 4)',
-        '(7 10; 15 22)'
-      )
-
-      cal_test('ex5',
-        '(1 2; 3 4) ** 2',
-        '(7 10; 15 22)'
-      )
-
-      cal_test('ex6',
-        '(1 2; 3 4) ** 2',
-        '(7 10; 15 22)'
-      )
-
-      cal_test('ex7',
-        '(1 2; 3 4) * (1 2)',
-        '(5 11)'
-      )
-
-      cal_test('ex8',
-        '(1 2 3; 4 5 6)t',
-        '(1 4; 2 5; 3 6)'
-      )
+      it do
+        expect(Iq.execute('(1 2 3; 4 5 6)')).to eq('(1 2 3; 4 5 6)')
+        expect(Iq.execute('(1 2 3; 4 5 6) + (1 2 3; 4 5 6)')).to eq('(2 4 6; 8 10 12)')
+        expect(Iq.execute('(1 2 3; 4 5 6) - (2 4 1; 8 3 9)')).to eq('(-1 -2 2; -4 2 -3)')
+        expect(Iq.execute('(1 2; 3 4) * (1 2; 3 4)')).to eq('(7 10; 15 22)')
+        expect(Iq.execute('(1 2; 3 4) ** 2')).to eq('(7 10; 15 22)')
+        expect(Iq.execute('(1 2; 3 4) * (1 2)')).to eq('(5 11)')
+      end
     end
 
     describe 'Vector' do
@@ -79,63 +29,27 @@ describe Qlang do
 
     describe 'Diff' do
       it do
-        expect(Iq.execute('d/dx(e ** x)')).to eq('e ^ x')
-        expect(Iq.execute('d/dx(x ** 2)')).to eq('2x')
-        expect(Iq.execute('d/dx(x * 2)')).to eq('2')
-        expect(Iq.execute('d/dx( sin(x) )')).to eq('cos( x )')
-        expect(Iq.execute('d/dx(log( x ))')).to eq('1 / x')
+        expect(Iq.execute('d/dx(e ** x)')).to eq(e ** x)
+        expect(Iq.execute('d/dx(x ** 2)')).to eq(2 * x)
+        expect(Iq.execute('d/dx(x * 2)')).to eq(2)
+        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
       it do
         expect(Iq.execute('S( log(x)dx )[0..1]')).to eq('-oo')
-        expect(Iq.execute('S( sin(x)dx )[0..pi]')).to eq('2.0')
-        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')
+        expect(Iq.execute('S( sin(x)dx )[0..pi]')).to eq(2.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
 
     describe 'Function' do
-      def_test('ex1', 'f(x, y) = x + y', 'x + y')
-      cal_test('ex1', 'f( 4, 5 )', '9.0')
-
-      def_test('ex2', 'f( x     ,    y) = xy', 'x * y')
-      cal_test('ex2', 'f( 3, 9 )', '27.0')
-
-      def_test('ex3', 'f(x, y) = xy^2', 'x * ( y ** 2 )')
-      cal_test('ex3', 'f( 3, 2 )', '12.0')
-
-      def_test('ex4', 'f(x, y) = xy^2', 'x * ( y ** 2 )')
-      cal_test('ex4', 'df/dx', 'y ^ 2')
-
-      def_test('ex5', 'g(x) = x ^ 2', 'x ** 2')
-      cal_test('ex5', 'g(2)', '4.0')
-
-      def_test('ex6', 'h(x) = e ^ 2', 'e ** 2')
-      cal_test('ex6', 'h(2)', '7.3890560989306495')
-
-      def_test('ex7', 'h(x) = pix', 'pi * x')
-      cal_test('ex7', 'h(3)', '9.42477796076938')
-
-      def_test('ex8', 'h(x) = pie', 'pi * e')
-      cal_test('ex8', 'h(2)', '8.539734222673566')
-
-      def_test('ex9', 'h(x) = ( 1 / ( 2pi ) ^ ( 1 / 2.0 ) ) * e ^ ( - x ^ 2 / 2 )', '( ( 4503599627370496 / 6369051672525773 ) / ( pi ** 0.5 ) ) * ( e ** ( ( - ( x ** 2 ) ) / 2 ) )')
-      cal_test('ex9', 'S( h(x)dx )[-oo..oo]', '1.0')
-
-      def_test('ex10', 'f(x) = sin(x)', 'sin( x )')
-      cal_test('ex10', 'f(pi)', '0.0')
-
-      def_test('ex11', 'f(x) = cos(x)', 'cos( x )')
-      cal_test('ex11', 'f(pi)', '-1.0')
-
-      def_test('ex11', 'f(x) = log(x)', 'log( x )')
-      cal_test('ex11', 'f(e)', '1.0')
+      it do
+        expect(Iq.execute('f(x, y) = x + y')).to eq(f(x, y) <= x + y)
+        expect(Iq.execute('g(x) = x ** 2')).to eq(g(x) <= x ** 2)
+      end
     end
   end
 end

data/spec/list_spec.rb

@@ -0,0 +1,31 @@
+require 'spec_helper'
+
+describe Qlang do
+  describe 'List' do
+    it do
+      expect(
+        Q.to_r.compile('{name: "Gogotanaka", age:  21, birth: (1992 8 10) }')
+      ).to eq(
+        "list(name=\"Gogotanaka\", age=21, birth=c(1992, 8, 10))"
+      )
+
+      expect(
+        Q.to_r.compile('{key1: 234234, key2: 387342 }')
+      ).to eq(
+        "list(key1=234234, key2=387342)"
+      )
+
+      expect(
+        Q.to_r.compile('{key1:234234,key2:387342,key3:38733242}')
+      ).to eq(
+        "list(key1=234234, key2=387342, key3=38733242)"
+      )
+
+      expect(
+        Q.to_r.compile('{key1:(1 3 2; 8 2 3),key2:387342,key3:38733242}')
+      ).to eq(
+        "list(key1=matrix(c(1, 3, 2, 8, 2, 3), 2, 3, byrow = TRUE), key2=387342, key3=38733242)"
+      )
+    end
+  end
+end

data/spec/q_lang_spec.rb

@@ -28,7 +28,7 @@ describe Qlang do
       expect(
         Q.to_ruby.compile('f(x, y) = x + y')
       ).to eq(
-        "f(x, y) <= x + y"
+        "f(x ,y) <= x + y"
       )
 
       expect(

data/spec/spec_helper.rb

@@ -1,8 +1,4 @@
 $LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
 require 'qlang'
 include Qlang
-
-require 'coveralls'
-Coveralls.wear!
-
 require 'pry'

data/tanaka.rb

@@ -0,0 +1,4 @@
+loop do
+print 'P:-> '
+puts eval gets
+end

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: qlang
 version: !ruby/object:Gem::Version
-  version: 0.0.27
+  version: 0.0.141
 platform: ruby
 authors:
 - gogotanaka
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-15 00:00:00.000000000 Z
+date: 2014-08-11 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: dydx
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.1.41421
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.1.41421
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -66,6 +52,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: dydx
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.1.412
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.1.412
 description: Enjoy MATH!
 email:
 - mail@tanakakazuki.com
@@ -74,7 +74,6 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".coveralls.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
@@ -97,11 +96,9 @@ files:
 - lib/qlang/lexer/base.rb
 - lib/qlang/lexer/cont_lexer.rb
 - lib/qlang/lexer/func_lexer.rb
-- lib/qlang/lexer/tokens.rb
 - 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
@@ -109,15 +106,15 @@ files:
 - lib/qlang/parser/vector_parser.rb
 - lib/qlang/version.rb
 - q_lang.gemspec
+- spec/function_spec.rb
+- spec/integral_spec.rb
 - 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
-- spec/objects/matrix_spec.rb
-- spec/objects/vector_spec.rb
+- spec/list_spec.rb
+- spec/matrix_spec.rb
 - spec/q_lang_spec.rb
 - spec/spec_helper.rb
+- spec/vector_spec.rb
+- tanaka.rb
 homepage: http://q-language.org/
 licenses:
 - MIT
@@ -143,12 +140,11 @@ signing_key:
 specification_version: 4
 summary: Enjoy MATH!
 test_files:
+- spec/function_spec.rb
+- spec/integral_spec.rb
 - 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
-- spec/objects/matrix_spec.rb
-- spec/objects/vector_spec.rb
+- spec/list_spec.rb
+- spec/matrix_spec.rb
 - spec/q_lang_spec.rb
 - spec/spec_helper.rb
+- spec/vector_spec.rb

data/.coveralls.yml

@@ -1,2 +0,0 @@
-repo_token: ZdXKADwEPNW5PJkIaC76yjqq4w04dIpuZ
-service_name: travis-ci

data/lib/qlang/lexer/tokens.rb

@@ -1,45 +0,0 @@
-module Qlang
-  module Lexer
-    module Tokens
-      # FIRST TOKEN
-      NUM = '[0-9]+'
-      VAR = '[a-z]'
-      FUNCV = '[a-zA-Z]'
-      VARNUM = '[0-9a-z]'
-      ANYSP = ' *'
-      ANYSTR = '.+'
-      NONL = '[^\r\n]'
-      LPRN = '\('
-      RPRN = '\)'
-      LBRC = '\{'
-      RBRC = '\}'
-      CLN = '\:'
-      SCLN = ';'
-      CMA = '\,'
-      SP = ' '
-
-      # SECOND TOKEN
-      class ::String
-        def line_by(char)
-          "#{ANYSP}#{self}(#{ANYSP}#{char}#{ANYSP}#{self})*#{ANYSP}"
-        end
-      end
-      NUMS_BY_CMA = NUM.line_by(CMA)
-      VARS_BY_CMA = VAR.line_by(CMA)
-      VARNUMS_BY_CMA = VARNUM.line_by(CMA)
-      NUMS_BY_SP = NUM.line_by(SP)
-
-      # THIRD TOKEN
-      class ::String
-        def func_call
-          "#{FUNCV}#{LPRN}#{ANYSP}#{self}*#{ANYSP}#{RPRN}"
-        end
-      end
-      FUNCCN =  NUMS_BY_CMA.func_call
-      FUNCCV = VARS_BY_CMA.func_call
-      FUNCCVN =  VARNUMS_BY_CMA.func_call
-
-      NUMS_BY_SP_BY_SCLN = NUMS_BY_SP.line_by(SCLN)
-    end
-  end
-end

data/lib/qlang/parser/formula_parser.rb

@@ -1,36 +0,0 @@
-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/spec/lexer/regular_expressions_spec.rb

@@ -1,18 +0,0 @@
-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

data/spec/objects/function_spec.rb

@@ -1,33 +0,0 @@
-require 'spec_helper'
-
-describe Qlang do
-  describe 'Function' do
-    context 'into R' do
-      it do
-        expect(
-          Q.to_r.compile('f(x, y) = x + y')
-        ).to eq(
-          "f <- function(x, y) x + y"
-        )
-
-        expect(
-          Q.to_r.compile('g(x) = x ^ 2')
-        ).to eq(
-          "g <- function(x) x ^ 2"
-        )
-
-        expect(
-          Q.to_r.compile('g(x) = x ^ (2 + 2)')
-        ).to eq(
-          "g <- function(x) x ^ (2 + 2)"
-        )
-
-        expect(
-          Q.to_r.compile('h(a, b, c) = a ^ 2 + b ^ 2 + c ^ 2')
-        ).to eq(
-          "h <- function(a, b, c) a ^ 2 + b ^ 2 + c ^ 2"
-        )
-      end
-    end
-  end
-end

data/spec/objects/list_spec.rb

@@ -1,31 +0,0 @@
-require 'spec_helper'
-
-describe Qlang do
-  describe 'List' do
-    it do
-      # expect(
-      #   Q.to_r.compile('{name: "Gogotanaka", age:  21, birth: (1992 8 10) }')
-      # ).to eq(
-      #   "list(name=\"Gogotanaka\", age=21, birth=c(1992, 8, 10))"
-      # )
-
-      expect(
-        Q.to_r.compile('{key1: 234234, key2: 387342 }')
-      ).to eq(
-        "list(key1=234234, key2=387342)"
-      )
-
-      expect(
-        Q.to_r.compile('{key1:234234,key2:387342,key3:38733242}')
-      ).to eq(
-        "list(key1=234234, key2=387342, key3=38733242)"
-      )
-
-      # expect(
-      #   Q.to_r.compile('{key1:(1 3 2; 8 2 3),key2:387342,key3:38733242}')
-      # ).to eq(
-      #   "list(key1=matrix(c(1, 3, 2, 8, 2, 3), 2, 3, byrow = TRUE), key2=387342, key3=38733242)"
-      # )
-    end
-  end
-end