qlang 0.0.141 → 0.0.1414

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 717677209dfcc71bdf36cce50db8ec22692dd7f8
-  data.tar.gz: 46f9c75f916b1975e03075db0410b64769078ff3
+  metadata.gz: 1518e06566b7c7e245e13554112a8181d38bdb1c
+  data.tar.gz: eef905e36510038a6f5124264449e485841248df
 SHA512:
-  metadata.gz: 22d87e8c71f5e87481488d58fe6fcda5269e983437fb4cdb830b954f4b25942eee41e1be4efdcdbd50d2668f84d0e9c6d49648fb75a4707c946a2e7888949017
-  data.tar.gz: 675be6320a08b8c72a0950aead7c353cfdebe92b37b08111957e7dee88ecc4c2b22f160bef7bd44b29a1d03547faa191433d19cafc9f5594abc78e2b1cfc4425
+  metadata.gz: 7f91e2946d82df754a9bc496f18c494a7014bd4b24c7a14e311d73d7ceb7dc2af9598752d890eb409eea564bcbe75b59d81df727504115b33f9083d6a289e511
+  data.tar.gz: f27a4aedfe46515869ec152ad7e0ab9bd64d30b33d95eaa01aaa4201b518405d0b3945ddc9e343dc5a76934058bcaca443ff2d36e4bf0bb3ddb9767a642ab8c7

data/.coveralls.yml

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

data/Gemfile

@@ -4,6 +4,7 @@ ruby '2.1.2'
 gem 'dydx', '0.1.412'
 
 gem 'rubocop'
+gem 'coveralls', require: false
 gem 'pry'
 
 gemspec

data/README.md

@@ -1,42 +1,53 @@
 # 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
 
 ```
-# Differentiate
+d/dx(cos(x))
+=> ( - sin( x ) )
 
-Q:-> d/dx(cos(x))
-( - sin( x ) )
+d/dx(log(x))
+=> ( 1 / x )
 
-Q:-> d/dx(log(x))
-( 1 / x )
+d/dy(y ** 2)                        
+=> ( 2 * y )
+```
 
-Q:-> d/dy(y ** 2)                        
-( 2 * y )
 
+### Integrate
 
-# Integrate
+```
+S(log(x)dx)[0..1]
+=> - oo
 
-Q:-> S(log(x)dx)[0..1]
-( - sin( x ) )
+S(sin(x)dx)[0..pi]
+=> 2.0
 
-Q:-> d/dx(log(x))
-( 1 / x )
+S(cos(x)dx)[0..pi]                       
+=> 0.0
+```
 
-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)
 
-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; 4 5 6)
+=> (2 4 6; 8 10 12)
 
-Q:-> (1 2 3; 4 5 6) * (1 2 3)
-(14 32)
+(1 2 3; 4 5 6) * (1 2 3)
+=> (14 32)
+```
 
+### Function
+```
+f(x, y) = x + y
 ```
 
 

data/lib/qlang/lexer/wrap_lexer.rb

@@ -1,7 +1,8 @@
 module Qlang
   module Lexer
     class WrapLexer < Base
-      rule(/\w\(\w( ?, ?\w)*\) ?= ?[^\r\n]+/) { :FUNC }
+      rule(/[fgh]\(\w( ?, ?\w)*\) ?= ?[^\r\n]+/) { :FUNC }
+      rule(/[fgh]\( ?\d( *, *\d)* *\)/) { :EFUNC }
       rule(/S *\(.+\)\[.+\]/) { :ITGL }
       rule(/\(/) { :LPRN }
       rule(/\)/) { :RPRN }

data/lib/qlang/parser.rb

@@ -61,6 +61,10 @@ module Qlang
           lexed.ch_value(cont_token_with_num, cont)
           lexed.ch_token(cont_token_with_num, :R)
 
+        when /:EFUNC\d/
+          cont_token_with_num = $&
+          cont = lexed.get_value(cont_token_with_num)
+          lexed.squash_with_prn(cont_token_with_num, cont)
         when /:CONT\d/
           lexed.ch_token($&, :R)
         end

data/lib/qlang/version.rb

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

data/spec/iq_spec.rb

@@ -48,7 +48,9 @@ describe Qlang do
     describe 'Function' do
       it do
         expect(Iq.execute('f(x, y) = x + y')).to eq(f(x, y) <= x + y)
+        expect(Iq.execute('f( 4, 5 )')).to eq(9)
         expect(Iq.execute('g(x) = x ** 2')).to eq(g(x) <= x ** 2)
+        expect(Iq.execute('g(2)')).to eq(4)
       end
     end
   end

data/spec/spec_helper.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: qlang
 version: !ruby/object:Gem::Version
-  version: 0.0.141
+  version: 0.0.1414
 platform: ruby
 authors:
 - gogotanaka
@@ -74,6 +74,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".coveralls.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
@@ -114,7 +115,6 @@ files:
 - spec/q_lang_spec.rb
 - spec/spec_helper.rb
 - spec/vector_spec.rb
-- tanaka.rb
 homepage: http://q-language.org/
 licenses:
 - MIT

data/tanaka.rb

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