qlang 0.0.27182000 → 0.0.27182100

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3dd94575327cfcb2be0c2ba95bf28013810f0b44
-  data.tar.gz: 62e55299ddd4fef4e9cf9ab24bdfe245b1657c36
+  metadata.gz: 2cd845cb653f28d2e83507b793e3c18d4df0c0b5
+  data.tar.gz: 3318e7abc75c676cbd3e56713202f284e2905b81
 SHA512:
-  metadata.gz: 2fd9b76b752cc9195600692e8074365f1a1294138477a891add49d8201c1e4208abdc05fa0a927bb87427c2fa4936852f01caefc082f80ca0354b91b2f1787b9
-  data.tar.gz: cffff8e5cbc59a18ba9fa7ad62f905d1bfc9e85c67b6f2713c27db0af3d3827965104c791c40f2066f1305a77461819cd94092088a50b4fda64085b987233fc0
+  metadata.gz: 1229fcf0b4fa7f8ef90eda3550d34924c0a137480361aae09cee032c865d536af56d7bc271723e3fb63db13cc22c33db7ebb39a5af4bb78b389f8ab86bb65800
+  data.tar.gz: 3b9c3ffcd9591895f342f0828e96665538c24c3aa9920ffdb739f9a1388772ae83bc78c75890c9ec272f47e4e1029cf71944f53ca0ca8e2739eaed7bfeebc762

data/.travis.yml

@@ -1,3 +1,5 @@
 language: ruby
 rvm:
   - 2.1.2
+  - 2.0.0
+  - 1.9.3

data/README.md

@@ -2,7 +2,23 @@
 
 [![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.
+## Do you know one of the best language in this world?
+
+#### I belive mathematics is that one absolutely.
+
+## How can we deal such a great mathematics in discret world?
+
+#### Q-language can be.
+
+
+```
++---Discret world---+                    +------mathematics-----+
+|        Ruby       |                    |        axiom         |
+|        TeX        |<------   Q  ------>|    Uncountable noun  |
+|       Pyhthon     |                    |  real number topology|
++-------------------+                    +----------------------+
+```
+
 
 ### Differentiate
 

data/Rakefile

@@ -1,7 +1,20 @@
 require "bundler/gem_tasks"
-require "rspec/core/rake_task"
+require "rake/testtask"
 
-RSpec::Core::RakeTask.new(:spec)
+Rake::TestTask.new(:test) do |t|
+  t.libs << "test"
+  t.test_files = FileList['test/**/test_*.rb']
+end
 
-task :default => :spec
+require "rake/extensiontask"
 
+Rake::ExtensionTask.new("qlang") do |ext|
+  ext.lib_dir = "lib/qlang"
+end
+
+task :compile_and_test do
+  Rake::Task["compile"].invoke
+  Rake::Task["test"].invoke
+end
+
+task default: :compile_and_test

data/bin/qlang

@@ -1,6 +1,12 @@
 #!/usr/bin/env ruby
+
 require 'qlang'
-include Qlang
+
+# Q command line
+require 'qlang/exec'
+
+# Q interpreter
+require 'qlang/iq'
 
 # TODO: There are vanch of todo ..
 case ARGV.first

data/ext/qlang/extconf.rb

@@ -0,0 +1,3 @@
+require "mkmf"
+
+create_makefile("qlang/qlang")

data/ext/qlang/qlang.c

@@ -0,0 +1,65 @@
+#include "qlang.h"
+#include <stdio.h>
+#define Need_Float(x) do {if (!RB_TYPE_P(x, T_FLOAT)) {(x) = rb_to_float(x);}} while(0)
+#define GET_FLOAT(x) Need_Float(x);(x) = RFLOAT_VALUE(x)
+
+double func(double x)
+{
+  return((x * x) * 3);
+}
+
+static VALUE
+rb_func(VALUE self, VALUE x)
+{
+  GET_FLOAT(x);
+  return(DBL2NUM((x * x)/2));
+}
+
+
+static VALUE
+execute(VALUE self, VALUE a, VALUE b, VALUE n)
+{
+  GET_FLOAT(a);
+  GET_FLOAT(b);
+  GET_FLOAT(n);
+
+  int i;
+  double s1=0.0, s2=0.0, d;
+  double x, y[n+1];
+  d=(b-a)/(double)n;
+  for(i=0; i<=n; i++)
+  {
+    x=(double)i*d+a;
+    y[i]=func(x);
+  }
+  for(i=1; i<=n-1; i+=2)
+  {
+    s1+=y[i];
+  }
+  for(i=2; i<=n-2; i+=2)
+  {
+    s2+=y[i];
+  }
+
+  double s=(y[0]+4.0*s1+2.0*s2+y[n])*d/3.0;
+
+  return DBL2NUM(s);
+}
+
+
+
+void
+Init_qlang(void)
+{
+  VALUE rb_mQMatrix = rb_define_class("QMatrix", rb_cObject);
+  rb_define_method(rb_mQMatrix, "execute", execute, 3);
+  rb_define_method(rb_mQMatrix, "func", rb_func, 1);
+}
+
+// VALUE rb_mQMatrix;
+
+// void
+// Init_q_matrix(void)
+// {
+//   rb_mQMatrix = rb_define_module("QMatrix");
+// }

data/ext/qlang/qlang.h

@@ -0,0 +1,6 @@
+#ifndef QLANG_H
+#define QLANG_H 1
+
+#include "ruby.h"
+
+#endif /* QLANG_H */

data/lib/qlang.rb

@@ -1,42 +1,45 @@
-# Use Dydx -> https://github.com/gogotanaka/dydx
-require 'dydx'
-include Dydx
-
-require "qlang/version"
-require 'qlang/utils/ruby_ext'
-require 'qlang/lexer'
-require 'qlang/parser'
-
-require 'qlang/exec'
-
-require 'qlang/iq'
-
+# Ruby stlib
 require 'kconv'
 require 'matrix'
-require 'yaml'
 require 'singleton'
+require 'yaml'
+
+# Q core
+require 'qlang/lexer'
+require 'qlang/parser'
+require 'qlang/utils/ruby_ext'
+require "qlang/version"
 
 module Qlang
+  # $meta_info indicate what and how to do.
   class MetaInfo
     include Singleton
-    attr_accessor :lang, :opts
+    attr_accessor :lang, :opts, :mode
+
+    LANGS_HASH = YAML.load_file("./lib/qlang/utils/langs.yml")['langs']
 
     def _load
       # compiles into R as default.
       lang = :r
     end
+
+    def langs_hash
+      LANGS_HASH
+    end
+
+    def lang_str
+      LANGS_HASH[@lang.to_s]
+    end
   end
   $meta_info = MetaInfo.instance
 
-  LANGS_HASH = YAML.load_file("./lib/qlang/utils/langs.yml")['langs']
-
   class << self
     def compile(str)
       lexed = Lexer.execute(str)
       Kconv.tosjis(Parser.execute(lexed))
     end
 
-    LANGS_HASH.keys.each do |lang_name|
+    $meta_info.langs_hash.keys.each do |lang_name|
       define_method("to_#{lang_name}") do |*opts|
         $meta_info.lang = lang_name.to_sym
         $meta_info.opts = opts

data/lib/qlang/api/func_api.rb

@@ -8,7 +8,7 @@ module Qlang
         when :ruby
           "#{func_name}(#{ args.join(' ,') }) <= #{contents}"
         else
-          fail "Function is not implemented for #{LANGS_HASH[$meta_info.lang.to_s]}"
+          fail "Function is not implemented for #{$meta_info.lang_str}"
         end
 
       end

data/lib/qlang/api/integral_api.rb

@@ -7,7 +7,7 @@ module Qlang
         when :ruby
           "S(#{func}, #{delta})[#{a}, #{b}]"
         else
-          fail "Integral is not implemented for #{LANGS_HASH[$meta_info.lang.to_s]}"
+          fail "Integral is not implemented for #{$meta_info.lang_str}"
         end
 
       end

data/lib/qlang/api/list_api.rb

@@ -7,7 +7,7 @@ module Qlang
           combineds_by_equal = arys.map { |ary| "#{ary[0]}=#{ary[1]}" }.join(', ')
           "list(#{combineds_by_equal})"
         else
-          fail "List is not implemented for #{LANGS_HASH[$meta_info.lang.to_s]}"
+          fail "List is not implemented for #{$meta_info.lang_str}"
         end
 
       end

data/lib/qlang/api/matrix_api.rb

@@ -11,7 +11,7 @@ module Qlang
           arys_str = rows.map { |row| "[#{row.join(', ')}]" }.join(', ')
           "Matrix[#{arys_str}]"
         else
-          fail "Matrix is not implemented for #{LANGS_HASH[$meta_info.lang.to_s]}"
+          fail "Matrix is not implemented for #{$meta_info.lang_str}"
         end
       end
       module_function :execute

data/lib/qlang/api/vector_api.rb

@@ -10,7 +10,7 @@ module Qlang
         when :python
           "array([#{nums.join(', ')}])"
         else
-          fail "Vector is not implemented for #{LANGS_HASH[$meta_info.lang.to_s]}"
+          fail "Vector is not implemented for #{$meta_info.lang_str}"
         end
       end
       module_function :execute

data/lib/qlang/iq.rb

@@ -1,3 +1,6 @@
+require 'dydx'
+include Dydx
+
 module Qlang
   module Iq
     class Dydx::Algebra::Formula
@@ -9,10 +12,10 @@ module Qlang
     end
 
     def self.execute(code)
-      ruby_code = Q.to_ruby.compile(code)
+      ruby_code = Q.to_ruby.compile(code.encode('utf-8'))
       ruby_obj = eval(ruby_code)
 
-      optimize_output(ruby_obj)
+      optimize_output(ruby_obj).encode('utf-8')
     rescue SyntaxError
       # TODO: emergency
       case ruby_code

data/lib/qlang/lexer.rb

@@ -1,10 +1,10 @@
 require 'qlang/lexer/base'
-require 'qlang/lexer/wrap_lexer'
+require 'qlang/lexer/main_lexer'
 
 module Qlang
   module Lexer
     def execute(str)
-      WrapLexer.new(str)
+      MainLexer.new(str)
     end
     module_function :execute
   end

data/lib/qlang/lexer/base.rb

@@ -7,12 +7,12 @@ module Qlang
       attr_accessor :lexeds
       include Tokens
       class << self
-        attr_reader :token_hash
+        attr_reader :token_rule_hash
 
         def rule(pattern, &token)
           token ||= proc { :NULL }
-          @token_hash ||= {}
-          @token_hash[token.call] = pattern
+          @token_rule_hash ||= {}
+          @token_rule_hash[token.call] = pattern
         end
       end
 
@@ -20,26 +20,45 @@ module Qlang
         ss = StringScanner.new(str)
         @lexeds = []
         until ss.eos?
-          self.class.token_hash.each do |token, patter|
-            if ss.scan(patter)
-              (@lexeds << {token => ss[0]}) unless token == :NULL
-              break
-            end
+          scan_rslt, ss = scan(ss)
+          if scan_rslt
+            @lexeds << scan_rslt unless scan_rslt == :NULL
+          else
+            fail "I'm so sorry, something wrong. Please feel free to report this."
           end
         end
       end
 
+      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 }
+            break
+          end
+        end
+        [scan_rslt, ss]
+      end
+
       # Accessor
       ## GET(without side effect)
+      def [](index)
+        @lexeds[index.to_i]
+      end
+
       def get_value(num)
         num = num.to_i
-        @lexeds.map { |lexed| lexed.values.first }[num]
+        @lexeds[num].values.first
       end
 
       def token_str
         @lexeds.map.with_index { |lexed, i| ":#{lexed.keys.first}#{i}" }.join
       end
 
+      def token_rule_hash
+        self.class.token_rule_hash
+      end
+
       ## POST(with side effect, without idempotence.)
       def parsed!(parsed, target)
         case target
@@ -50,7 +69,9 @@ module Qlang
         end
       end
 
-      def squash!(range, token: :CONT)
+      #squash!(range, token: :CONT)
+      def squash!(range, opts={token: :CONT})
+        token = opts[:token]
         range = (range.first.to_i)..(range.last.to_i)
         value = values[range].join
         range.count.times { @lexeds.delete_at(range.first) }
@@ -62,10 +83,6 @@ module Qlang
         @lexeds.map { |lexed| lexed.values.first }
       end
 
-      def [](index)
-        @lexeds[index]
-      end
-
       private
         def parsed_at!(token_position, parsed)
           @lexeds.delete_at(token_position)

data/lib/qlang/lexer/formula_lexer.rb

@@ -0,0 +1,20 @@
+module Qlang
+  module Lexer
+    class FormulaLexer < Base
+      rule(/\^/) { :EXP }
+      rule(/#{EMBEDDED_FUNC}/) { :BFUNC }
+      rule(/(pi|[1-9a-z]){2,}/) { :MUL }
+      rule(/(pi|[1-9a-z])/) { :SNGL }
+      rule(/([^\^1-9a-z]|^pi)+/) { :OTHER }
+
+      # rule(/#{OPE}/) { :OPE }
+      # rule(/#{FUNCV}/) { :FUNCV }
+      # rule(/#{VAR}/) { :VAR }
+      # rule(/#{NUM}/) { :NUM }
+      # rule(/#{LPRN}/) { :LPRN }
+      # rule(/#{RPRN}/) { :RPRN }
+
+      # rule(/#{ANYSP}/) {  }
+    end
+  end
+end

data/lib/qlang/lexer/main_lexer.rb

@@ -0,0 +1,25 @@
+module Qlang
+  module Lexer
+    class MainLexer < Base
+      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(/#{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(/#{FUNCCN}/) { :FUNCCN }
+
+      rule(/#{LPRN}/) { :LPRN }
+      rule(/#{RPRN}/) { :RPRN }
+      rule(/#{LBRCS}/) { :LBRCS }
+      rule(/#{RBRCS}/) { :RBRCS }
+
+      rule(/[ \t\f]/)
+
+      rule(/(\r|\n)+/) { :NULL }
+
+      rule(/[^\(\)\{\}(\n\n)]+/) { :CONT }
+    end
+  end
+end