qlang 0.0.14142135 → 0.0.27000000

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c30aa1fb72e2893414114bc257f23b14bca455c1
-  data.tar.gz: 49670df56425d1602000a29a4d213ac53ddb900c
+  metadata.gz: a9e53219836ec42b6ef2edb577c24f402f97e49c
+  data.tar.gz: 2cf73154711705aa6b29b1da703b06638f37c01b
 SHA512:
-  metadata.gz: 759375e7548eb379f58146127db4dab90d3eb0f94b604b2819cb2166e023799fd0e401ea5854874075fb5d860444a5853c6118e8c46931bcb10b78d070884638
-  data.tar.gz: a8cae808c035a788c658a5d3b460dd7b832848a8fcddff3f5cffd21ec252d44f1e34f81c0d596d2fb6410ccd5d5c5ca58699268e0f01337f4394ffed0a173e92
+  metadata.gz: 1b1a074dec18140414233546d87d3de94c5ac22524054be77cac955a47ec7ba1f05069a84c63dc88275f0eeb09b5e5c1ba61436aef9d18a34e93cc764077dca7
+  data.tar.gz: f23ae787a6fdcdf7a70e992dfa8db9e51e5f08f24dfdaa9db86f1ef0b3899478afb5ec5818325d68bdb517e45b1f0258e42326c24dc5c607c6784e7e067db588

data/README.md

@@ -13,8 +13,13 @@ d/dx(cos(x))
 d/dx(log(x))
 => ( 1 / x )
 
-d/dy(y ** 2)                        
+# You can omit parentheses
+
+d/dy y^2                        
 => ( 2 * y )
+
+d/dy xy                       
+=> ( x )
 ```
 
 
@@ -47,7 +52,9 @@ S(cos(x)dx)[0..pi]
 
 ### Function
 ```
-f(x, y) = x + y
+f(x, y) = xy
+f(1, 2)
+=> 2
 ```
 
 
@@ -72,7 +79,7 @@ Install it yourself as:
 
 ## Contributing
 
-1. Fork it ( https://github.com/[my-github-username]/qlang/fork )
+1. Fork it ( https://github.com/gogotanaka/Q/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

@@ -24,6 +24,10 @@ module Qlang
         self
       end
 
+      def split_by_sp
+        split(/ +/)
+      end
+
       # FIX:
       def equalize!
         rms!(/\A +/, / +\z/)

data/lib/qlang/iq.rb

@@ -7,9 +7,22 @@ module Qlang
         str.equalize!
       end
     end
-    def execute(code)
-      ruby_obj = eval Q.to_ruby.compile(code)
-      output = case ruby_obj
+
+    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)
+      case ruby_obj
       when Matrix, Vector, Dydx::Algebra::Formula
         ruby_obj.to_q
       when Float::INFINITY
@@ -21,6 +34,6 @@ module Qlang
         str.equalize!
       end
     end
-    module_function :execute
+
   end
 end

data/lib/qlang/lexer/base.rb

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

data/lib/qlang/lexer/func_lexer.rb

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

data/lib/qlang/lexer/tokens.rb

@@ -0,0 +1,45 @@
+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/lexer/wrap_lexer.rb

@@ -1,10 +1,16 @@
+require 'pry'
 module Qlang
   module Lexer
     class WrapLexer < Base
-      rule(/[fgh]\(\w( ?, ?\w)*\) ?= ?[^\r\n]+/) { :FUNC }
-      rule(/[fgh]\( ?\d( *, *\d)* *\)/) { :EFUNC }
-      rule(/S *\(.+\)\[.+\]/) { :ITGL }
-      rule(/d\/d[a-zA-Z] .*/) { :DIFF }
+      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(/\(/) { :LPRN }
       rule(/\)/) { :RPRN }
       rule(/\{/) { :LBRC }

data/lib/qlang/parser/func_parser.rb

@@ -1,14 +1,13 @@
+require 'qlang/lexer/tokens'
 module Qlang
   module Parser
     module FuncParser
       include Base
-      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, FormulaParser.execute(lexed[-1][:FOML]))
+      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))
       end
       module_function :execute
     end

data/lib/qlang/parser/matrix_parser.rb

@@ -2,9 +2,13 @@ module Qlang
   module Parser
     module MatrixParser
       include Base
-      def execute(lexed)
-        rows = lexed.split(';')
+      def execute(lexed_string, trans: false)
+        lexed_string.rms!(')','(', 't')
+        rows = lexed_string.split(/ *; */).map(&:split_by_sp)
         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,8 +2,10 @@ module Qlang
   module Parser
     module VectorParser
       include Base
-      def execute(lexed)
-        VectorApi.execute(lexed.values)
+      def execute(lexed_string)
+        lexed_string.rms!(/ *\( */, / *\) */)
+        elements = lexed_string.split_by_sp
+        VectorApi.execute(elements)
       end
       module_function :execute
     end

data/lib/qlang/parser.rb

@@ -19,18 +19,30 @@ 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))
 
-          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
+          cont = "(#{cont_lexed.values.join(' ')})"
           lexed.squash_with_prn(cont_token_with_num, cont)
 
         when /:LBRC\d(:CONT\d):RBRC\d/
@@ -45,29 +57,12 @@ module Qlang
           end
           lexed.squash_with_prn(cont_token_with_num, cont)
 
-        when /:FUNC\d/
-          cont_token_with_num = $&
-          cont_lexed = Lexer::FuncLexer.new(lexed.get_value(cont_token_with_num))
-
-          case cont_lexed.token_str
-          when /:FDEF\d:EQL\d:FOML\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 = 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 /:EFUNC\d/
+        when /:eval_func\d/
           cont_token_with_num = $&
           cont = lexed.get_value(cont_token_with_num)
           lexed.squash_with_prn(cont_token_with_num, cont)
 
-        when /:DIFF\d/
+        when /:differential\d/
           cont_token_with_num = $&
           cont = lexed.get_value(cont_token_with_num)
           cont =~ /(d\/d[a-zA-Z]) (.*)/
@@ -81,6 +76,7 @@ module Qlang
 
         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/version.rb

@@ -1,3 +1,3 @@
 module Qlang
-  VERSION = "0.0.14142135"
+  VERSION = "0.0.27000000"
 end

data/spec/iq_spec.rb

@@ -15,15 +15,52 @@ describe Qlang do
       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
-      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
+      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)'
+      )
     end
 
     describe 'Vector' do
@@ -67,7 +104,7 @@ describe Qlang 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')
+      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 )')

data/spec/objects/function_spec.rb

@@ -7,7 +7,7 @@ describe Qlang do
         expect(
           Q.to_r.compile('f(x, y) = x + y')
         ).to eq(
-          "f <- function(x ,y) x + y"
+          "f <- function(x, y) x + y"
         )
 
         expect(
@@ -25,7 +25,7 @@ describe Qlang do
         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"
+          "h <- function(a, b, c) a ^ 2 + b ^ 2 + c ^ 2"
         )
       end
     end

data/spec/objects/list_spec.rb

@@ -3,11 +3,11 @@ 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('{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 }')
@@ -21,11 +21,11 @@ describe Qlang do
         "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)"
-      )
+      # 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(

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: qlang
 version: !ruby/object:Gem::Version
-  version: 0.0.14142135
+  version: 0.0.27000000
 platform: ruby
 authors:
 - gogotanaka
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-18 00:00:00.000000000 Z
+date: 2014-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dydx
@@ -97,6 +97,7 @@ 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
@@ -137,7 +138,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.1
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Enjoy MATH!