qlang 0.0.27182110 → 0.0.27182120

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a48ba3d203a109ed171dbbd38e70c404c24b8018
-  data.tar.gz: f461876d32692c407a4333b31909adab2e12917c
+  metadata.gz: 82f393f67556cb1f5e6e37eba4a70f75b5e3357d
+  data.tar.gz: 660f56cb8a0fbae5d321ad3e2b9ca888719fa4c1
 SHA512:
-  metadata.gz: 892ff464ca7f8614b6dbff92114998edb7c355016cfc6c9ba653a27024174fb301304d16cc9f339cc98e596d575af66890d7fa2c06df29fed03f267580d27f8d
-  data.tar.gz: 973791d37093853d5ed9ac0c2d19d171d5efdd2a4d46874093cad82bb1a93bce7eb047af4b94eb0ab406ca6a39bf4dfa67e018b7deb981ed9fd4242933d8a52a
+  metadata.gz: 2e40198040a6e4046a5d8fa0e9dd04fb3c8ee5e2ea7fbac5ad47cc6cd22c3c0fa07a69960dc938ce695aaf22fa93f0260037b539ae5bb9d2703f4e92460cf1da
+  data.tar.gz: 111757064ce64d1048684a1ea79a1cbdaa4c10b8bb81a20c113dbbee5612891c3a51f5e9ec0671c537a3e7c626b371d9b940ac346ecae7fe757b2bbec869937b

data/README.md

@@ -10,6 +10,7 @@
 
 #### Q-language can be.
 
+Q let you know the sense of mathematics with Keyboard same as with a pen.
 
 ```
 +---Discret world---+                    +------mathematics-----+
@@ -19,6 +20,11 @@
 +-------------------+                    +----------------------+
 ```
 
+## Demo
+
+Below code is input and output for interpreter of q-lang
+
+(you can try it by `qlang -i`)
 
 ### Differentiate
 
@@ -85,15 +91,15 @@ Install qlang gme.
 
 ### Compile into R
 
-    $ qlang -R foo.q
+    $ qlang -r foo.q
     
 ### Compile into Ruby
 
-    $ qlang -Ruby foo.q
+    $ qlang -rb foo.q
     
 ### Compile into Python
 
-    $ qlang -Python foo.q
+    $ qlang -py foo.q
 
 
 ## Use as math template within other langs
@@ -114,7 +120,7 @@ Q.E.D
 end
 ```
 
-    $ qlang -Ruby example.rb
+    $ qlang -rb example.rb
     
 
 ```rb
@@ -129,6 +135,11 @@ class ExampleClass
 end
 ```
 
+## Interpreter
+
+    $ qlang -i
+    Q:-> 
+
 ## Contributing
 
 Welcome any your PR or issue.

data/bin/qlang

@@ -15,7 +15,7 @@ when '-i'
     print 'Q:-> '
     begin
       input = $stdin.gets
-      output = Iq.execute(input)
+      output = Qlang::Iq.execute(input)
       $stdout.puts output
     rescue => e
       puts e

data/lib/qlang.rb

@@ -4,11 +4,11 @@ require 'matrix'
 require 'singleton'
 require 'yaml'
 
+$:.unshift(File.dirname(__FILE__))
 # Q core
+require 'qlang/utils/ruby_ext'
 require 'qlang/lexer'
 require 'qlang/parser'
-require 'qlang/utils/ruby_ext'
-require "qlang/version"
 
 module Qlang
   # $meta_info indicate what and how to do.

data/lib/qlang/api.rb

@@ -3,6 +3,8 @@ require 'qlang/api/vector_api'
 require 'qlang/api/list_api'
 require 'qlang/api/func_api'
 require 'qlang/api/integral_api'
+require 'qlang/api/limit_api'
+require 'qlang/api/sigma_api'
 
 module Qlang
   module Api

data/lib/qlang/api/limit_api.rb

@@ -0,0 +1,22 @@
+module Qlang
+  module Api
+    module LimitApi
+      def self.execute(formula, var, close_to)
+        case $meta_info.lang
+        # TODO: I know what you want to say.......!
+        when :ruby
+          case close_to
+          when 'oo'
+            "temp_cal_f(#{var}) <= #{formula};
+             temp_cal_f(100000)"
+          else
+            "temp_cal_f(#{var}) <= #{formula};
+             temp_cal_f(#{close_to} + Float::EPSILON ** 20)"
+          end
+        else
+          fail "List is not implemented for #{$meta_info.lang_str}"
+        end
+      end
+   end
+  end
+end

data/lib/qlang/api/sigma_api.rb

@@ -0,0 +1,16 @@
+module Qlang
+  module Api
+    module SigmaApi
+      def self.execute(formula, var, from, to)
+        case $meta_info.lang
+        # TODO: I know what you want to say.
+        when :ruby
+          "temp_cal_f(#{var}) <= #{formula};
+           (#{from}..#{to}).inject(0) {|sum, i| sum+=temp_cal_f(i) }"
+        else
+          fail "List is not implemented for #{$meta_info.lang_str}"
+        end
+      end
+   end
+  end
+end

data/lib/qlang/lexer/base.rb

@@ -12,7 +12,7 @@ module Qlang
         def rule(pattern, &token)
           token ||= proc { :NULL }
           @token_rule_hash ||= {}
-          @token_rule_hash[token.call] = pattern
+          @token_rule_hash[pattern] = token.call
         end
       end
 
@@ -22,7 +22,7 @@ module Qlang
         until ss.eos?
           scan_rslt, ss = scan(ss)
           if scan_rslt
-            @lexeds << scan_rslt unless scan_rslt == :NULL
+            @lexeds << scan_rslt unless scan_rslt[:token] == :NULL
           else
             fail "I'm so sorry, something wrong. Please feel free to report this."
           end
@@ -31,9 +31,13 @@ module Qlang
 
       def scan(ss)
         scan_rslt = nil
-        token_rule_hash.each do |token, patter|
-          if ss.scan(patter)
-            scan_rslt = (token == :NULL) ? :NULL : {token => ss[0], els: [ss[1],ss[2], ss[3]].compact }
+        token_rule_hash.each do |pattern, token|
+          if ss.scan(pattern)
+            scan_rslt = {
+              token: token,
+              value: ss[0],
+              els: 4.times.inject([]) { |s,i|s << ss[i+1] }.compact
+            }
             break
           end
         end
@@ -42,17 +46,18 @@ module Qlang
 
       # Accessor
       ## GET(without side effect)
-      def [](index)
-        @lexeds[index.to_i]
+      def get_value(num)
+        num = num.to_i
+        @lexeds[num][:value]
       end
 
-      def get_value(num)
+      def get_els(num)
         num = num.to_i
-        @lexeds[num].values.first
+        @lexeds[num][:els]
       end
 
       def token_str
-        @lexeds.map.with_index { |lexed, i| ":#{lexed.keys.first}#{i}" }.join
+        @lexeds.map.with_index { |lexed, i| ":#{lexed[:token]}#{i}" }.join
       end
 
       def token_rule_hash
@@ -75,18 +80,18 @@ module Qlang
         range = (range.first.to_i)..(range.last.to_i)
         value = values[range].join
         range.count.times { @lexeds.delete_at(range.first) }
-        @lexeds.insert(range.first, { token => value })
+        @lexeds.insert(range.first, { token: token, value: value })
       end
 
       # Legacy Accessor
       def values
-        @lexeds.map { |lexed| lexed.values.first }
+        @lexeds.map { |lexed| lexed[:value] }
       end
 
       private
         def parsed_at!(token_position, parsed)
           @lexeds.delete_at(token_position)
-          @lexeds.insert(token_position, { R: parsed })
+          @lexeds.insert(token_position, { token: :R, value: parsed })
         end
 
         def parsed_between!(token_range, parsed)
@@ -94,7 +99,7 @@ module Qlang
           token_range.count.times do
             @lexeds.delete_at(start_pos)
           end
-          @lexeds.insert(start_pos, { R: parsed })
+          @lexeds.insert(start_pos, { token: :R, value: parsed })
         end
 
     end

data/lib/qlang/lexer/main_lexer.rb

@@ -4,10 +4,15 @@ module Qlang
       rule(/(#{FUNCCV})#{ANYSP}#{EQL}#{ANYSP}(#{FORMULA})/) { :def_func }
       rule(/#{ITGRLSYM}#{ANYSP}#{LPRN}(#{ANYSTR})#{RPRN}#{LBRCT}(#{ANYSTR})#{RBRCT}/) { :integral }
       rule(/d\/d(#{VAR}) (#{FORMULA})/) { :differential }
+
+      rule(/lim#{LBRCT}(#{VAR})#{RSARW}(#{VARNUM})#{RBRCT} (#{FORMULA})/) { :limit }
+
       rule(/#{LPRN}(#{NUMS_BY_SP})#{RPRN}/) { :vector }
       rule(/#{LPRN}(#{NUMS_BY_SP_BY_SCLN_OR_NELN})#{RPRN}t/m) { :tmatrix }
       rule(/#{LPRN}(#{NUMS_BY_SP_BY_SCLN_OR_NELN})#{RPRN}/m) { :matrix }
 
+      rule(/∑#{LBRCT}(#{VAR})=(#{INT}),#{ANYSP}(#{INT})#{RBRCT} (#{FORMULA})/) { :sigma }
+
       rule(/#{FUNCCN}/) { :FUNCCN }
 
       rule(/#{LPRN}/) { :LPRN }

data/lib/qlang/lexer/tokens.rb

@@ -6,7 +6,8 @@ module Qlang
       FLO = /[0-9]+\.[0-9]+/
       E = /e/
       PI = /pi/
-      NUM = /(?:#{FLO}|#{INT}|#{E}|#{PI})/
+      INF = /oo/
+      NUM = /(?:#{FLO}|#{INT}|#{E}|#{PI}|#{INF})/
 
       # FUNCTION
       LPRN = /\(/
@@ -55,6 +56,11 @@ module Qlang
       SCLN = /;/
       CMA = /\,/
       EQL = /\=/
+
+      RSARW = '->'
+      LSARW = '<-'
+      RDARW = '=>'
+      LDARW = '<='
       SP = / /
       NLIN = /(\r|\n)/
 

data/lib/qlang/parser.rb

@@ -6,6 +6,9 @@ require 'qlang/parser/vector_parser'
 require 'qlang/parser/list_parser'
 require 'qlang/parser/func_parser'
 require 'qlang/parser/integral_parser'
+require 'qlang/parser/limit_parser'
+require 'qlang/parser/sigma_parser'
+
 require 'qlang/parser/formula_parser'
 
 module Qlang
@@ -19,8 +22,8 @@ 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+)/, /:(differential)(\d+)/
-          token_els = lexed[$2][:els]
+        when /:(vector)(\d+)/, /:(matrix)(\d+)/, /:(tmatrix)(\d+)/, /:(integral)(\d+)/, /:(def_func)(\d+)/, /:(differential)(\d+)/, /:(limit)(\d+)/, /:(sigma)(\d+)/
+          token_els = lexed.get_els($2)
 
           parsed = case $1
           when 'vector'
@@ -29,10 +32,14 @@ module Qlang
             MatrixParser.execute(token_els)
           when 'tmatrix'
             MatrixParser.execute(token_els, trans: true)
+          when 'limit'
+            LimitParser.execute(token_els)
           when 'integral'
             IntegralParser.execute(token_els)
           when 'def_func'
             FuncParser.execute(token_els)
+          when 'sigma'
+            SigmaParser.execute(token_els)
           when 'differential'
             del_var, formula = token_els
             "d/d#{del_var}(#{FormulaParser.execute(formula)})"
@@ -41,13 +48,16 @@ module Qlang
 
         when /:LPRN(\d+):CONT(\d+):RPRN(\d+)/
           tokens_range = $1.to_i..$3.to_i
-          token_val = lexed[$2][:CONT]
+          token_val =
 
-          lexed.parsed!(token_val.parentheses, tokens_range)
+          lexed.parsed!(
+            lexed.get_value($2).parentheses,
+            tokens_range
+          )
 
         when /:LBRCS(\d+):CONT(\d+):RBRCS(\d+)/
           tokens_range = $1.to_i..$3.to_i
-          token_val = lexed[$2][:CONT]
+          token_val = lexed.get_value($2)
 
           cont = case token_val
             when /#{ONEHASH}(#{CMA}#{ONEHASH})*/

data/lib/qlang/parser/limit_parser.rb

@@ -0,0 +1,16 @@
+module Qlang
+  module Parser
+    module LimitParser
+      include Base
+      def self.execute(els)
+        var, close_to, formula = els
+
+        LimitApi.execute(
+          FormulaParser.execute(formula),
+          var,
+          close_to
+        )
+      end
+    end
+  end
+end

data/lib/qlang/parser/sigma_parser.rb

@@ -0,0 +1,17 @@
+module Qlang
+  module Parser
+    module SigmaParser
+      include Base
+      def self.execute(els)
+        var, from, to, formula = els
+
+        SigmaApi.execute(
+          FormulaParser.execute(formula),
+          var,
+          from,
+          to
+        )
+      end
+    end
+  end
+end

data/lib/qlang/utils/ruby_ext.rb

@@ -1,3 +1,11 @@
+# module ::Kernel
+#   def recursive_require(str)
+#     Dir["#{$:.first}/#{str}"].each do |file|
+#       require file
+#     end
+#   end
+# end
+
 class ::String
   def parentheses
     "(#{self})"

data/lib/qlang/version.rb

@@ -1,3 +1,3 @@
 module Qlang
-  VERSION = "0.0.27182110"
+  VERSION = "0.0.27182120"
 end

data/test/interpreter/test_limit.rb

@@ -0,0 +1,28 @@
+require 'minitest_helper'
+
+class TestLimit < TestInterpreterBase
+  def setup
+
+  end
+
+  def assert_iq_equal(output, input)
+    assert_equal(Qlang::Iq.execute(input), output)
+  end
+
+  def test_general
+    assert_iq_equal(
+      'oo',
+      'lim[x->0] 1/x'
+    )
+
+    assert_iq_equal(
+      '10.0',
+      'lim[x->10] x'
+    )
+
+    assert_iq_equal(
+      '2.7182682371744895',
+      'lim[x->oo] (1 + 1/x)^x'
+    )
+  end
+end

data/test/interpreter/test_sigma.rb

@@ -0,0 +1,24 @@
+require 'minitest_helper'
+
+class TestSigma < TestInterpreterBase
+  def setup
+
+  end
+
+  def test_general
+    assert_iq_equal(
+      '∑[x=0,10] x',
+      '55.0'
+    )
+
+    assert_iq_equal(
+      '∑[x=0, 10] x^2',
+      '385.0'
+    )
+
+    assert_iq_equal(
+      '∑[x=0, 10] x^3',
+      '3025.0'
+    )
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: qlang
 version: !ruby/object:Gem::Version
-  version: 0.0.27182110
+  version: 0.0.27182120
 platform: ruby
 authors:
 - gogotanaka
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-27 00:00:00.000000000 Z
+date: 2014-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dydx
@@ -118,8 +118,10 @@ files:
 - lib/qlang/api.rb
 - lib/qlang/api/func_api.rb
 - lib/qlang/api/integral_api.rb
+- lib/qlang/api/limit_api.rb
 - lib/qlang/api/list_api.rb
 - lib/qlang/api/matrix_api.rb
+- lib/qlang/api/sigma_api.rb
 - lib/qlang/api/vector_api.rb
 - lib/qlang/exec.rb
 - lib/qlang/iq.rb
@@ -133,8 +135,10 @@ files:
 - lib/qlang/parser/formula_parser.rb
 - lib/qlang/parser/func_parser.rb
 - lib/qlang/parser/integral_parser.rb
+- lib/qlang/parser/limit_parser.rb
 - lib/qlang/parser/list_parser.rb
 - lib/qlang/parser/matrix_parser.rb
+- lib/qlang/parser/sigma_parser.rb
 - lib/qlang/parser/vector_parser.rb
 - lib/qlang/utils/langs.yml
 - lib/qlang/utils/ruby_ext.rb
@@ -146,7 +150,9 @@ files:
 - test/interpreter/test_function.rb
 - test/interpreter/test_general.rb
 - test/interpreter/test_integral.rb
+- test/interpreter/test_limit.rb
 - test/interpreter/test_matrix.rb
+- test/interpreter/test_sigma.rb
 - test/interpreter/test_vector.rb
 - test/langs/test_r.rb
 - test/langs/test_ruby.rb
@@ -184,7 +190,9 @@ test_files:
 - test/interpreter/test_function.rb
 - test/interpreter/test_general.rb
 - test/interpreter/test_integral.rb
+- test/interpreter/test_limit.rb
 - test/interpreter/test_matrix.rb
+- test/interpreter/test_sigma.rb
 - test/interpreter/test_vector.rb
 - test/langs/test_r.rb
 - test/langs/test_ruby.rb