qlang 0.0.14 → 0.0.27

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a994c4d36e4047ddd0e73fcd767404e2705de2d3
-  data.tar.gz: 2cd5585e470142c5f0b54851944e9ebe85821006
+  metadata.gz: 805e11f0c327e3f7fd63d3d5a0de10c34d7f120b
+  data.tar.gz: 420cbcdcc4461907c7092a8405cf85d6e1af40d2
 SHA512:
-  metadata.gz: f3d04413323acf98d1a7521fa755ab9945ce86252ba2f453bd68112cb7965462cb1fec60211df1f007c35abfe0f05a21639cea9f4846ac0abc85f5a454fe4df7
-  data.tar.gz: 924e5bd208a209883ed4f7df5f6e0e01977a5c85c30029326c7ebd77285cfffbf8c276bafd349781bf5c62e9be14f8b993142d11e5595e714310c1e6ec3c11be
+  metadata.gz: f08fd5daf625fcde5decd4504267fdc05e57688ac716440f71c3d0a6ab01f5b94d3a4f56ec7a0476f5892aadbf2ee69163bfc4b094655415f14ba309a8228059
+  data.tar.gz: e4f188b8714777ea728bbb8e7e8ab23e745867b09fe96a2f40d1fc1fa178e4d406df11aa38650e71f969d6917ec6551fa01b31f96421d19081ba52b2901a9d0b

data/.coveralls.yml

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

data/Gemfile

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

data/README.md

@@ -1,28 +1,85 @@
 # Qlang
 
-TODO: Write a gem description
+[![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)
 
-## Installation
+Enjoy MATH with Keyboard.
 
-Add this line to your application's Gemfile:
+### Differentiate
 
-    gem 'qlang'
+```
+d/dx(cos(x))
+=> ( - sin( x ) )
 
-And then execute:
+d/dx(log(x))
+=> ( 1 / x )
 
-    $ bundle
+# You can omit parentheses
 
-Or install it yourself as:
+d/dy y^2                        
+=> ( 2 * y )
+
+d/dy xy                       
+=> ( x )
+```
+
+
+### Integrate
+
+```
+S(log(x)dx)[0..1]
+=> - oo
+
+S(sin(x)dx)[0..pi]
+=> 2.0
+
+S(cos(x)dx)[0..pi]                       
+=> 0.0
+```
+
+
+### Matrix
+
+```
+(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)
+
+(1 2 3; 4 5 6) * (1 2 3)
+=> (14 32)
+```
+
+### Function
+```
+f(x, y) = xy
+f(1, 2)
+=> 2
+```
+
+
+## How to use
+
+Install it yourself as:
 
     $ gem install qlang
 
-## Usage
+### Compiler into R
+
+    $ qlang -c -R foo.q
+    
+### Compiler into Ruby
+
+    $ qlang -c -Ruby foo.q
+
+### Interpreter
+
+    $ qlang -i
 
-TODO: Write usage instructions here
 
 ## 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/bin/qlang

@@ -0,0 +1,20 @@
+#!/usr/bin/env ruby
+require 'qlang'
+include Qlang
+
+case ARGV.shift
+when '-i'
+  loop do
+    print 'Q:-> '
+    begin
+      input = $stdin.gets
+      output = Iq.execute(input)
+      $stdout.puts output
+    rescue => e
+      puts e
+    end
+  end
+when '-c'
+  compiler = Qlang::Exec::Compiler.new(ARGV)
+  compiler.parse!
+end

data/lib/qlang.rb

@@ -8,9 +8,10 @@ require 'qlang/parser'
 
 require 'qlang/exec'
 
-require 'qlang/q_on_irb'
+require 'qlang/iq'
 
-require "kconv"
+require 'kconv'
+require 'matrix'
 
 module Qlang
   # compiles into R as default.

data/lib/qlang/api.rb

@@ -2,8 +2,55 @@ require 'qlang/api/matrix_api'
 require 'qlang/api/vector_api'
 require 'qlang/api/list_api'
 require 'qlang/api/func_api'
+require 'qlang/api/integral_api'
 
 module Qlang
   module Api
+    # 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)
+        str_or_rgxs.each do |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
+      def to_q
+        q_rows = rows.map { |row| row.join(' ') }.join('; ')
+        "(#{q_rows})"
+      end
+    end
+
+    class ::Vector
+      def to_q
+        "(#{elements.join(' ')})"
+      end
+    end
   end
 end

data/lib/qlang/api/func_api.rb

@@ -2,7 +2,13 @@ module Qlang
   module Api
     module FuncApi
       def execute(func_name, args, contents)
-        "#{func_name} <- function(#{ args.join(' ,') }) #{contents}"
+        case $type
+        when :R
+          "#{func_name} <- function(#{ args.join(' ,') }) #{contents}"
+        when :Ruby
+          "#{func_name}(#{ args.join(' ,') }) <= #{contents}"
+        end
+
       end
       module_function :execute
     end

data/lib/qlang/api/integral_api.rb

@@ -0,0 +1,17 @@
+module Qlang
+  module Api
+    module IntegralApi
+      def execute(func, delta, range)
+        a, b = range.split('..')
+        case $type
+        when :R
+          fail 'Integral is not implemented for R'
+        when :Ruby
+          "S(#{func}, #{delta})[#{a}, #{b}]"
+        end
+
+      end
+      module_function :execute
+    end
+  end
+end

data/lib/qlang/api/list_api.rb

@@ -2,8 +2,14 @@ module Qlang
   module Api
     module ListApi
       def execute(arys)
-        combineds_by_equal = arys.map { |ary| "#{ary[0]}=#{ary[1]}" }.join(', ')
-        "list(#{combineds_by_equal})"
+        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
+
       end
       module_function :execute
     end

data/lib/qlang/exec.rb

@@ -6,6 +6,7 @@ module Qlang
       end
 
       def parse!
+        ch_compile_type(ARGV.shift)
         parse
       rescue Exception => e
         raise e if @options[:trace] || e.is_a?(SystemExit)
@@ -18,23 +19,36 @@ module Qlang
         exit 0
       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
+      private
 
-      private def open_file(filename, flag = 'r')
-        return if filename.nil?
-        File.open(filename, flag)
-      end
+        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
 
-      private def read_file(file)
-        file.read
-      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
+
+        def open_file(filename, flag = 'r')
+          return if filename.nil?
+          File.open(filename, flag)
+        end
+
+        def read_file(file)
+          file.read
+        end
     end
   end
 end

data/lib/qlang/iq.rb

@@ -0,0 +1,39 @@
+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)
+      case ruby_obj
+      when Matrix, Vector, Dydx::Algebra::Formula
+        ruby_obj.to_q
+      when Float::INFINITY
+        'oo'
+      when - Float::INFINITY
+        '-oo'
+      else
+        str = ruby_obj.to_s
+        str.equalize!
+      end
+    end
+
+  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,10 +100,18 @@ module Qlang
         end
       end
 
-      private def to_num(token_with_num)
-        token_with_num =~ /\d+/
-        $&.to_i
+      # 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)
+          token_with_num =~ /\d+/
+          $&.to_i
+        end
     end
   end
 end

data/lib/qlang/lexer/cont_lexer.rb

@@ -11,7 +11,10 @@ module Qlang
       rule(/[ \t\f]/)
 
       rule(/\r\n/) { :NLIN }
-      rule(/\w+/) { :OTHER }
+
+      rule(/\w+/) { :SYM }
+
+      rule(/.+/) { :OTHER }
     end
   end
 end

data/lib/qlang/lexer/func_lexer.rb

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

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