s_calc 0.1.2 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 71e6238052352f288d04dd872eccba4f61fe316b2a350e9170f49068319ce534
-  data.tar.gz: 28d214b0aa8762938797b309cd2718065e0de072c9207b94f223e9a0c805c282
+  metadata.gz: 71bbe1e1641fd9021338663ad0132482fcb95420895e9188faafb9de9cf612b3
+  data.tar.gz: 506bd735892ca62beb09a554488318c2142f831d84fdce3013b5c3591a3d6dd8
 SHA512:
-  metadata.gz: f25daea5118727a36f0e5a12d1c73c54d882f15e613345d7dd669143de68e7dc2c226c369eb977ab98b93439d218460135719334af16f2268ebc6487c7e0e0e2
-  data.tar.gz: 21ee599c61b51656237c8056065460b67de6ccd546c9d68a584bda1b428656e43ca696ed2023a326fcf7a7b8bd88bfe003bcb358439afbe9128743fac02bec1c
+  metadata.gz: 2ebefdecfa7fd99ce1a3726ebe89dda31f1eadf27c72180fc182baad1f109029382d63faedcd422d630e8e7d8aff4714faea63451beae9d652822642f57e9f8e
+  data.tar.gz: 53bd32713d1c421847f28e47ae883ad650f6a301910c174b624a03017002a79f9fcffe45c7a9e33f8731b151d729c0dcc58fe9467d83a2ea5714264dc48bc39a

data/README.md

@@ -0,0 +1,259 @@
+日本語の解説が後半にあります。
+
+### What is this program?
+
+The program 'calc' is a scientific calculator written in Ruby programming language.
+It is run from the command line like this.
+
+```
+$ calc 2*3+4*5
+26
+$ calc
+calc > 0.1-0.2
+-0.1
+calc > sin(PI/6)
+0.49999999999999994 # Float always includes error.
+calc > quit
+$
+```
+
+### Prerequisites
+
+- Linux OS
+- Ruby 3.1.2 or later (maybe older version is also OK)
+
+### installation
+
+There are two ways.
+
+1. Click the 'Code' button, then click 'Download ZIP' in the small dialog.
+2. Unzip the downloaded Zip file, then a new directory 'calc' will be created.
+3. Type `gem build s_calc` under the directory 'calc', then the gem file `s_calc-X.X.X.gem` is created.
+The part `X.X.X` is a version number like `0.1.4`.
+4. Type `gem install s_calc-X.X.X.gem`.
+
+Another way is simpler.
+This gem is published to RubyGems.org.
+You can install it from RubyGems.
+Just type:
+
+```
+$ gem install s_calc
+```
+
+Be careful.
+The command name and GitHub repository name is `calc` but the gem name is `s_calc`.
+This is because the name `calc` has already existed in RubyGems.org.
+
+### How to use the program.
+
+1. Start the terminal and type `calc`.
+2. Then the prompt appears `calc > `
+3. Type an expression like `2+3` and push Enter key, then the answer `5` appears.
+4. Type `quit`, `q` or `exit`, then the program will finish.
+5. You can also use it as a one line calculator like `$ calc "10*20+30"`.
+
+### feature
+
+- Operatores: `+`, `-`, `*`, `/`, `**`(power), `-`(unary minus), `(` and `)`
+- Functions: `sqrt`, `sin`, `cos`, `tan`, `asin`, `acos`, `atan`, `exp`, `ln`, `log`, `abs`, `fact`, `floor`, `ceil` and `round`.
+- The special variable `v` keeps the result of the previous calculation.
+- Variable can be used.
+It is a string of alphabets without the keywords above.
+It can be used in any place in the expression.
+`variable_name = expression` is the syntax to define the variable.
+A defined variable can be used in an expression.
+
+### Functions
+
+- `sqrt`: Square root. `sqrt(4) => 2`
+- `sin`: `sin(PI) => 1.2246467991473532e-16` It is well known that sin(PI) is zero. But Float always includes error.
+- `cos`: `cos(PI) => -1`
+- `tan`: `tan(PI/4) => 0.9999999999999999` The answer includes error. The exact value is 1.
+- `asin`: Inverse of the sine function. `asin(1) => 1.5707963267948966` This is PI/2
+- `acos`: Inverse of the cosine function. `acos(1) => 0`
+- `atan`: Inverse of the tangent function. `atan(1) => 0.7853981633974483` This is PI/4
+- `exp`: Exponential function. `exp(n)` means `e` raised to the power of n. `exp(1) => 2.718281828459045` It is E.
+- `ln`: Natural logarithm. `ln(E) => 1`
+- `log`: Common logarithm or decimal logarithm. The base is 10. `log(10) => 1`
+- `abs`: Absolute value. `abs(-10) =>10`
+- `fact`: Factorial. `fact(10) => 3628800` The argument must be non-negative. If it isn't an integer, it will be rounded down to an integer. It must be less than 171 because of the limitation of Float.
+- `floor`: Floor function. `floor(3.45) => 3`
+- `ceil`: Ceiling function. `ceil(3.45) => 4`
+- `round`: Rounding function. `round(3.45,1) => 3.5, round(-3.45,1) => -3.5` The rounding is done away from zero if the argument is at the middle of two candidates.
+
+### Racc library
+
+Racc is a Ruby standard library.
+It is a parser generator like Yacc, which is a famous parser generator made for the Unix Operating system.
+Calc uses Racc.
+It makes the library file `lib/calc/calc.rb` with Racc.
+The source file is `racc/calc.y`.
+You can compile it by typing:
+
+```
+$ rake
+```
+
+See `racc/doc.md` for details.
+
+### Rakefile
+
+You can do the following
+
+- `rake`: Compile `racc/calc.y` and create/update `lib/calc/calc.rb`.
+- `rake rdoc`: Create documents under `docs` directory.
+- `rake test`: Run test programs under `test` directory.
+
+### Using Calc as a library
+
+You can use Calc as a library in your Ruby program.
+
+- First, require 'calc'.
+- Create an instance of the class `Calc`. Let the instance name be 'c'.
+- Call `c.run(s)` where `s` is a string of an expression. Then it returns the value of the expression.
+For example, `c.run("1+2")` returns 3.0.
+
+The following is a sample code.
+
+```ruby
+require 'calc'
+
+c = Calc.new
+s = "1+2"
+print "#{c.run(s)}\n" #=> 3.0
+```
+
+### License
+
+GPL ver 3 or later.
+See [License.md](License.md) for details.
+
+### これは何のプログラム？
+
+Rubyプログラム`calc.rb`は関数電卓です。
+コマンドラインから次のように起動できます。
+
+```
+$ calc 2*3+4*5
+26
+$ calc
+calc > 0.1-0.2
+-0.1
+calc > sin(PI/6)
+0.49999999999999994 # 実数計算では誤差が発生します
+calc > quit
+$
+```
+
+### 動作条件
+
+- Linux OS
+- Ruby バージョン3.1.2以降（おそらく不利バージョンでも動作します）
+
+### インストール
+
+2通りのインストール方法があります。
+
+1. 'Code'ボタンをクリックし、現れた小さなダイアログの'Download ZIP'をクリックする
+2. ダウンロードしたZipファイルを解凍する。これにより新しく「calc」ディレクトリが作られ、その中にすべてのファイルが収められる
+3. 「gem build s_calc」を実行することにより、gemファイル「s_calc-X.X.X.gem」が作られる。「X.X.X」の部分はバージョン番号で、例えば「0.1.4」のような数字である
+4. 「gem install s_calc-X.X.X.gem」とタイプし、gemをインストールする
+
+もっと簡単なインストール方法は、RubyGemsからインストールすることです。
+次のようにタイプするだけでgemをダウンロードしインストールします。
+
+```
+$ gem install s_calc
+```
+
+コマンド名とGitHubのレポジトリ名が`calc`であるのに対して、gem名は`s_calc`であることに注意してください。
+これは、RubyGemsには既に`calc`という名前のgemが存在しており、異なるgem名が必要だったためです。
+
+### 使い方
+
+1. 解凍したフォルダで端末（コマンドライン）を起動し、「calc」と入力する
+2. プロンプト「calc >」が現れる
+3. 式（例えば2+3）と入力し、エンターキーを押すと、答え「5」が表示される
+4. 「quit」または「q」または「exit」とタイプするとプログラムは終了する
+5. 引数を付けて一行計算アプリとしても使える。（例）`$ calc "10*20+30"`
+
+### 特長
+
+- 次の演算記号が使える。`+`, `-`, `*`, `/`, `**`(累乗), `-`(単項マイナス), `(`, `)`
+- 関数: `sqrt`, `sin`, `cos`, `tan`, `asin`, `acos`, `atan`, `exp`, `ln`, `log`, `abs`, `fact`, `floor`, `ceil` and `round`.
+- 変数が使える
+- calcは直前の計算結果を記憶しており、変数`v` でその値を参照できる
+- 変数はアルファベットからなる文字列で、上記のキーワードを除く。
+`変数名 = 式` により、変数に値を代入することができる。
+定義された変数は、式の中で使うことができる
+
+### 関数
+
+- `sqrt`: 平方根。 `sqrt(4) => 2`
+- `sin`: `sin(PI) => 1.2246467991473532e-16` sin(PI)はゼロですが、浮動小数点の計算は常に誤差が生じます
+- `cos`: `cos(PI) => -1`
+- `tan`: `tan(PI/4) => 0.9999999999999999` 答えは誤差を含んでいます。正確には1になります
+- `asin`: サインの逆三角関数。`asin(1) => 1.5707963267948966` これはPI/2です
+- `acos`: コサインの逆三角関数。`acos(1) => 0`
+- `atan`: タンジェントの逆三角関数。`atan(1) => 0.7853981633974483` これはPI/4です
+- `exp`: 指数関数。 `exp(n)`は`e`のn乗。`exp(1) => 2.718281828459045` これはEです
+- `ln`: 自然対数。底がeの対数。`ln(E) => 1`
+- `log`: 常用対数。底が10の対数。`log(10) => 1`
+- `abs`: 絶対値。`abs(-10) =>10`
+- `fact`: 階乗。`fact(10) => 3628800` 引数はゼロ以上。引数が整数でなければ、切り捨てて整数に直す。引数は171より小さくなければならない。答えがFloatの最大値を越えないように制限するため。
+- `floor`: フロアー関数。小数点以下を切り捨て。`floor(3.45) => 3`
+- `ceil`: シーリング関数。小数点以下を切り上げ。`ceil(3.45) => 4`
+- `round`: 四捨五入関数。`round(3.45,1) => 3.5, round(-3.45,1) => -3.5` 丸める桁が5である場合は、ゼロから遠い方に丸める。
+
+### Racc
+
+RaccはRubyの標準ライブラリーです。
+パーサー・ジェネレーターと呼ばれ、Unixオペレーティングシステム上の有名なYaccに似ています。
+CalcはRaccを使って`lib/calc/calc.rb`を生成しています。
+そのソース・ファイルは`racc/calc.y`です。
+コンパイルは次のようにタイプするだけでできます。
+
+```
+$ rake
+```
+
+ドキュメント `racc/doc.md`を参照してください。
+
+### Rakefile
+
+次のことができます。
+
+- `rake`: `racc/calc.y`をコンパイルして`lib/calc/calc.rb`を生成する
+- `rake rdoc`: `docs`ディレクトリ以下にドキュメントを生成する
+- `rake test`: `test`ディレクトリの下にあるテストプログラムを実行する
+
+### Calcをライブラリとして使う
+
+CalcをライブラリとしてRubyプログラムの中で使うことができます。
+
+- まず、'calc'をrequireする
+- `Calc`クラスのインスタンスを生成する。仮にその名前を`c`とする
+- 数式を表す文字列を`s`とすると、`c.run(s)`はその数式を計算した値を返す
+例えば、`c.run("1+2")`は3.0を返す。
+
+以下に簡単なサンプルコードを示します。
+
+```ruby
+require 'calc'
+
+c = Calc.new
+s = "1+2"
+print "#{c.run(s)}\n" #=> 3.0
+```
+
+### ライセンス
+
+Copyright (C) 2022,2023  ToshioCP (関谷 敏雄)
+
+このプログラムは、フリーソフトウェア財団によって発行された「GNU一般公衆利用許諾書」(バージョン3か、希望によってはそれ以降のバージョンのうちどれか)の定める条件の下で再頒布または改変することができる。
+
+このプログラムは有用であることを願って頒布されますが、*全くの無保証* です。商業可能性の保証や特定の目的への適合性は、言外に示されたものも含め全く存在しません。
+詳しくは[GNU 一般公衆利用許諾書(英語)](https://www.gnu.org/licenses/gpl-3.0.en.html)、またはその日本語訳[GNU 一般公衆利用許諾書の日本語訳](https://gpl.mhatta.org/gpl.ja.html)をご覧ください。
+
+なお、ライセンスを英語で記した[License.md](License.md)もあります。

data/bin/calc

@@ -11,8 +11,14 @@ end
 def usage_possible_calculation
   $stderr.print "Possible calculation:\n"
   $stderr.print "  Arithmetic such as +, -, *, /, (, ), - (unary minus) and ** (power).\n"
-  $stderr.print "  Functions such as sqrt, sin, cos, tan, asin, acos, atan, exp, log and log10.\n"
+  $stderr.print "  Functions such as sqrt, sin, cos, tan, asin, acos, atan, exp, ln, log,\n"
+  $stderr.print "                    abs, fact, floor, ceil and round\n"
   $stderr.print "  Variables (any alphabetical word) and the special variable 'v' that is the former result.\n"
+  $stderr.print "Example:\n"
+  $stderr.print "  sin(PI/2) #=> 1\n"
+  $stderr.print "  ln(E) #=> 1\n"
+  $stderr.print "  log(10) #=> 1\n"
+  $stderr.print "  round(1.25, 1) #=> 1.3, round(1.5,0) #=> 2, round(-1.5,0) #=> -2\n"
 end
 
 calc = Calc.new
@@ -20,9 +26,10 @@ if ARGV[0] =~ /--help|-h/
   usage
 elsif ARGV.size == 1
   begin
-    print "#{calc.run(ARGV[0])}\n"
+    a = calc.run(ARGV[0])
+    print "#{a == a.to_i ? a.to_i : a}\n"
   rescue StandardError => evar
-    print "#{evar.message[1..-1]}\n" # remove the newline at the beginning of the message
+    print "#{evar.message}\n"
   end
 else
   while buf = Readline.readline("calc > ", true)
@@ -32,9 +39,10 @@ else
       usage_possible_calculation
     else
       begin
-        print "#{calc.run(buf)}\n"
-      rescue => evar
-        print "#{evar.message[1..-1]}\n" # remove the newline at the beginning of the message
+        a = calc.run(buf)
+        print "#{a == a.to_i ? a.to_i : a}\n"
+      rescue StandardError =>evar
+        print "#{evar.message}\n"
       end
     end
   end

data/lib/calc/calc.rb

@@ -12,7 +12,7 @@ include Math
 
 class Calc < Racc::Parser
 
-module_eval(<<'...end calc.y/module_eval...', 'calc.y', 45)
+module_eval(<<'...end calc.y/module_eval...', 'calc.y', 50)
  
 def initialize
   @table = {}
@@ -27,7 +27,7 @@ end
 def lex(s)
   ss = StringScanner.new(s)
   until ss.eos?
-    if ss.scan(/sqrt|sin|cos|tan|asin|acos|atan|exp|log|sqrt|PI|E|v/)
+    if ss.scan(/sqrt|sin|cos|tan|asin|acos|atan|exp|ln|log|abs|fact|floor|ceil|round|PI|E|v/)
       @tokens << [ss[0].to_sym, ss[0]]
     elsif ss.scan(/[[:alpha:]]+/)
       @tokens << [:ID, ss[0]]
@@ -35,7 +35,7 @@ def lex(s)
       @tokens << [:NUM, ss[0].to_f]
     elsif ss.scan(/\*\*/)
       @tokens << [:POWER,ss[0]]
-    elsif ss.scan(/[+\-*\/()=;]/)
+    elsif ss.scan(/[+\-*\/()=;,]/)
       @tokens << [ss[0],ss[0]]
     elsif ss.scan(/\s+/)
       # ignore spaces
@@ -50,130 +50,213 @@ def next_token
   @tokens.shift
 end
 
+def fact(f)
+  n = f.to_i
+  raise ("No factorial for negative number.") if n < 0
+  raise ("The argument of fact must be less than 171.") if n >= 171
+  if n == 0 || n == 1
+    1.0
+  else
+    (1..n).inject{|result, item| result*item}.to_f
+  end
+end
+
 ...end calc.y/module_eval...
 ##### State transition tables begin ###
 
 racc_action_table = [
-    24,    25,    22,    23,    24,    25,    22,    23,    24,    25,
-    22,    23,    24,    25,    22,    23,    24,    25,    22,    23,
-    21,    48,    24,    25,    26,    59,    24,    25,    29,    60,
-    31,    32,    33,    61,    34,    35,    36,    62,    24,    25,
-    22,    23,    24,    25,    22,    23,    24,    25,    22,    23,
-    24,    25,    22,    23,    24,    25,    22,    23,    37,    63,
-    38,    39,    40,    64,    41,    29,    29,    65,   nil,   nil,
-   nil,    66,   nil,   nil,   nil,    67,    24,    25,    22,    23,
-   nil,     4,     3,     7,     8,     9,    10,    11,    12,    13,
-    14,    15,    16,    17,    18,    19,    20,    68,     6,     4,
-    28,     7,     8,     9,    10,    11,    12,    13,    14,    15,
-    16,    17,    18,    19,    20,   nil,     6,     4,    28,     7,
+    29,    30,    27,    28,    29,    30,    27,    28,    29,    30,
+    27,    28,    29,    30,    27,    28,    29,    30,    27,    28,
+    29,    30,    27,    28,    29,    30,    26,    88,    29,    30,
+    58,    31,    34,    36,    74,    37,    38,    39,    75,    40,
+    41,    42,    76,    43,    44,    45,    77,    29,    30,    27,
+    28,    29,    30,    27,    28,    29,    30,    27,    28,    29,
+    30,    27,    28,    29,    30,    27,    28,    29,    30,    27,
+    28,    46,    47,    78,    48,    49,    50,    79,    51,    34,
+    34,    80,   nil,   nil,   nil,    81,   nil,   nil,   nil,    82,
+   nil,   nil,   nil,    83,    29,    30,    27,    28,    29,    30,
+    27,    28,    29,    30,    27,    28,    29,    30,    27,    28,
+    29,    30,    27,    28,    29,    30,    27,    28,   nil,   nil,
+    84,   nil,   nil,   nil,    85,   nil,   nil,   nil,    86,   nil,
+   nil,   nil,    87,   nil,   nil,   nil,    90,     4,     3,     7,
      8,     9,    10,    11,    12,    13,    14,    15,    16,    17,
-    18,    19,    20,   nil,     6,     4,    28,     7,     8,     9,
+    18,    19,    20,    21,    22,    23,    24,    25,   nil,     6,
+     4,    33,     7,     8,     9,    10,    11,    12,    13,    14,
+    15,    16,    17,    18,    19,    20,    21,    22,    23,    24,
+    25,   nil,     6,     4,    33,     7,     8,     9,    10,    11,
+    12,    13,    14,    15,    16,    17,    18,    19,    20,    21,
+    22,    23,    24,    25,   nil,     6,     4,    33,     7,     8,
+     9,    10,    11,    12,    13,    14,    15,    16,    17,    18,
+    19,    20,    21,    22,    23,    24,    25,   nil,     6,     4,
+    33,     7,     8,     9,    10,    11,    12,    13,    14,    15,
+    16,    17,    18,    19,    20,    21,    22,    23,    24,    25,
+   nil,     6,     4,    33,     7,     8,     9,    10,    11,    12,
+    13,    14,    15,    16,    17,    18,    19,    20,    21,    22,
+    23,    24,    25,   nil,     6,     4,    33,     7,     8,     9,
     10,    11,    12,    13,    14,    15,    16,    17,    18,    19,
-    20,   nil,     6,     4,    28,     7,     8,     9,    10,    11,
-    12,    13,    14,    15,    16,    17,    18,    19,    20,   nil,
-     6,     4,    28,     7,     8,     9,    10,    11,    12,    13,
-    14,    15,    16,    17,    18,    19,    20,   nil,     6,     4,
-    28,     7,     8,     9,    10,    11,    12,    13,    14,    15,
-    16,    17,    18,    19,    20,   nil,     6,     4,    28,     7,
+    20,    21,    22,    23,    24,    25,   nil,     6,     4,    33,
+     7,     8,     9,    10,    11,    12,    13,    14,    15,    16,
+    17,    18,    19,    20,    21,    22,    23,    24,    25,   nil,
+     6,     4,    33,     7,     8,     9,    10,    11,    12,    13,
+    14,    15,    16,    17,    18,    19,    20,    21,    22,    23,
+    24,    25,   nil,     6,     4,    33,     7,     8,     9,    10,
+    11,    12,    13,    14,    15,    16,    17,    18,    19,    20,
+    21,    22,    23,    24,    25,   nil,     6,     4,    33,     7,
      8,     9,    10,    11,    12,    13,    14,    15,    16,    17,
-    18,    19,    20,   nil,     6,     4,    28,     7,     8,     9,
+    18,    19,    20,    21,    22,    23,    24,    25,   nil,     6,
+     4,    33,     7,     8,     9,    10,    11,    12,    13,    14,
+    15,    16,    17,    18,    19,    20,    21,    22,    23,    24,
+    25,   nil,     6,     4,    33,     7,     8,     9,    10,    11,
+    12,    13,    14,    15,    16,    17,    18,    19,    20,    21,
+    22,    23,    24,    25,   nil,     6,     4,    33,     7,     8,
+     9,    10,    11,    12,    13,    14,    15,    16,    17,    18,
+    19,    20,    21,    22,    23,    24,    25,   nil,     6,     4,
+    33,     7,     8,     9,    10,    11,    12,    13,    14,    15,
+    16,    17,    18,    19,    20,    21,    22,    23,    24,    25,
+   nil,     6,     4,    33,     7,     8,     9,    10,    11,    12,
+    13,    14,    15,    16,    17,    18,    19,    20,    21,    22,
+    23,    24,    25,   nil,     6,     4,    33,     7,     8,     9,
     10,    11,    12,    13,    14,    15,    16,    17,    18,    19,
-    20,   nil,     6,     4,    28,     7,     8,     9,    10,    11,
-    12,    13,    14,    15,    16,    17,    18,    19,    20,   nil,
-     6,     4,    28,     7,     8,     9,    10,    11,    12,    13,
-    14,    15,    16,    17,    18,    19,    20,   nil,     6,     4,
-    28,     7,     8,     9,    10,    11,    12,    13,    14,    15,
-    16,    17,    18,    19,    20,   nil,     6,     4,    28,     7,
+    20,    21,    22,    23,    24,    25,   nil,     6,     4,    33,
+     7,     8,     9,    10,    11,    12,    13,    14,    15,    16,
+    17,    18,    19,    20,    21,    22,    23,    24,    25,   nil,
+     6,     4,    33,     7,     8,     9,    10,    11,    12,    13,
+    14,    15,    16,    17,    18,    19,    20,    21,    22,    23,
+    24,    25,   nil,     6,     4,    33,     7,     8,     9,    10,
+    11,    12,    13,    14,    15,    16,    17,    18,    19,    20,
+    21,    22,    23,    24,    25,   nil,     6,     4,    33,     7,
      8,     9,    10,    11,    12,    13,    14,    15,    16,    17,
-    18,    19,    20,   nil,     6,     4,    28,     7,     8,     9,
+    18,    19,    20,    21,    22,    23,    24,    25,   nil,     6,
+     4,    33,     7,     8,     9,    10,    11,    12,    13,    14,
+    15,    16,    17,    18,    19,    20,    21,    22,    23,    24,
+    25,   nil,     6,     4,    33,     7,     8,     9,    10,    11,
+    12,    13,    14,    15,    16,    17,    18,    19,    20,    21,
+    22,    23,    24,    25,   nil,     6,    33,     7,     8,     9,
     10,    11,    12,    13,    14,    15,    16,    17,    18,    19,
-    20,   nil,     6,     4,    28,     7,     8,     9,    10,    11,
-    12,    13,    14,    15,    16,    17,    18,    19,    20,   nil,
-     6,     4,    28,     7,     8,     9,    10,    11,    12,    13,
-    14,    15,    16,    17,    18,    19,    20,   nil,     6,     4,
-    28,     7,     8,     9,    10,    11,    12,    13,    14,    15,
-    16,    17,    18,    19,    20,   nil,     6,    28,     7,     8,
-     9,    10,    11,    12,    13,    14,    15,    16,    17,    18,
-    19,    20,   nil,     6,    28,     7,     8,     9,    10,    11,
-    12,    13,    14,    15,    16,    17,    18,    19,    20,   nil,
-     6,    24,    25,    22,    23,    24,    25,    22,    23 ]
+    20,    21,    22,    23,    24,    25,   nil,     6,    33,     7,
+     8,     9,    10,    11,    12,    13,    14,    15,    16,    17,
+    18,    19,    20,    21,    22,    23,    24,    25,   nil,     6,
+    29,    30,    27,    28 ]
 
 racc_action_check = [
-    30,    30,    30,    30,    49,    49,    49,    49,    50,    50,
-    50,    50,    51,    51,    51,    51,    52,    52,    52,    52,
-     1,    30,    42,    42,     3,    49,    43,    43,     5,    50,
-    10,    11,    12,    51,    13,    14,    15,    52,    53,    53,
-    53,    53,    54,    54,    54,    54,    55,    55,    55,    55,
-    56,    56,    56,    56,    57,    57,    57,    57,    16,    53,
-    17,    18,    19,    54,    21,    27,    47,    55,   nil,   nil,
-   nil,    56,   nil,   nil,   nil,    57,    58,    58,    58,    58,
-   nil,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     0,     0,     0,     0,     0,     0,     0,    58,     0,     6,
+    73,    73,    73,    73,    35,    35,    35,    35,    59,    59,
+    59,    59,    60,    60,    60,    60,    61,    61,    61,    61,
+    62,    62,    62,    62,    52,    52,     1,    73,    53,    53,
+    35,     3,     5,    10,    59,    11,    12,    13,    60,    14,
+    15,    16,    61,    17,    18,    19,    62,    63,    63,    63,
+    63,    64,    64,    64,    64,    65,    65,    65,    65,    66,
+    66,    66,    66,    67,    67,    67,    67,    68,    68,    68,
+    68,    20,    21,    63,    22,    23,    24,    64,    26,    32,
+    57,    65,   nil,   nil,   nil,    66,   nil,   nil,   nil,    67,
+   nil,   nil,   nil,    68,    69,    69,    69,    69,    70,    70,
+    70,    70,    71,    71,    71,    71,    72,    72,    72,    72,
+    89,    89,    89,    89,     2,     2,     2,     2,   nil,   nil,
+    69,   nil,   nil,   nil,    70,   nil,   nil,   nil,    71,   nil,
+   nil,   nil,    72,   nil,   nil,   nil,    89,     0,     0,     0,
+     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+     0,     0,     0,     0,     0,     0,     0,     0,   nil,     0,
+     6,     6,     6,     6,     6,     6,     6,     6,     6,     6,
      6,     6,     6,     6,     6,     6,     6,     6,     6,     6,
-     6,     6,     6,     6,     6,   nil,     6,    22,    22,    22,
-    22,    22,    22,    22,    22,    22,    22,    22,    22,    22,
-    22,    22,    22,   nil,    22,    23,    23,    23,    23,    23,
-    23,    23,    23,    23,    23,    23,    23,    23,    23,    23,
-    23,   nil,    23,    24,    24,    24,    24,    24,    24,    24,
-    24,    24,    24,    24,    24,    24,    24,    24,    24,   nil,
-    24,    25,    25,    25,    25,    25,    25,    25,    25,    25,
-    25,    25,    25,    25,    25,    25,    25,   nil,    25,    26,
-    26,    26,    26,    26,    26,    26,    26,    26,    26,    26,
-    26,    26,    26,    26,    26,   nil,    26,    31,    31,    31,
+     6,   nil,     6,    27,    27,    27,    27,    27,    27,    27,
+    27,    27,    27,    27,    27,    27,    27,    27,    27,    27,
+    27,    27,    27,    27,   nil,    27,    28,    28,    28,    28,
+    28,    28,    28,    28,    28,    28,    28,    28,    28,    28,
+    28,    28,    28,    28,    28,    28,    28,   nil,    28,    29,
+    29,    29,    29,    29,    29,    29,    29,    29,    29,    29,
+    29,    29,    29,    29,    29,    29,    29,    29,    29,    29,
+   nil,    29,    30,    30,    30,    30,    30,    30,    30,    30,
+    30,    30,    30,    30,    30,    30,    30,    30,    30,    30,
+    30,    30,    30,   nil,    30,    31,    31,    31,    31,    31,
     31,    31,    31,    31,    31,    31,    31,    31,    31,    31,
-    31,    31,    31,   nil,    31,    32,    32,    32,    32,    32,
-    32,    32,    32,    32,    32,    32,    32,    32,    32,    32,
-    32,   nil,    32,    33,    33,    33,    33,    33,    33,    33,
-    33,    33,    33,    33,    33,    33,    33,    33,    33,   nil,
-    33,    34,    34,    34,    34,    34,    34,    34,    34,    34,
-    34,    34,    34,    34,    34,    34,    34,   nil,    34,    35,
-    35,    35,    35,    35,    35,    35,    35,    35,    35,    35,
-    35,    35,    35,    35,    35,   nil,    35,    36,    36,    36,
+    31,    31,    31,    31,    31,    31,   nil,    31,    36,    36,
     36,    36,    36,    36,    36,    36,    36,    36,    36,    36,
-    36,    36,    36,   nil,    36,    37,    37,    37,    37,    37,
+    36,    36,    36,    36,    36,    36,    36,    36,    36,   nil,
+    36,    37,    37,    37,    37,    37,    37,    37,    37,    37,
     37,    37,    37,    37,    37,    37,    37,    37,    37,    37,
-    37,   nil,    37,    38,    38,    38,    38,    38,    38,    38,
-    38,    38,    38,    38,    38,    38,    38,    38,    38,   nil,
-    38,    39,    39,    39,    39,    39,    39,    39,    39,    39,
-    39,    39,    39,    39,    39,    39,    39,   nil,    39,    40,
+    37,    37,   nil,    37,    38,    38,    38,    38,    38,    38,
+    38,    38,    38,    38,    38,    38,    38,    38,    38,    38,
+    38,    38,    38,    38,    38,   nil,    38,    39,    39,    39,
+    39,    39,    39,    39,    39,    39,    39,    39,    39,    39,
+    39,    39,    39,    39,    39,    39,    39,    39,   nil,    39,
     40,    40,    40,    40,    40,    40,    40,    40,    40,    40,
-    40,    40,    40,    40,    40,   nil,    40,     4,     4,     4,
+    40,    40,    40,    40,    40,    40,    40,    40,    40,    40,
+    40,   nil,    40,    41,    41,    41,    41,    41,    41,    41,
+    41,    41,    41,    41,    41,    41,    41,    41,    41,    41,
+    41,    41,    41,    41,   nil,    41,    42,    42,    42,    42,
+    42,    42,    42,    42,    42,    42,    42,    42,    42,    42,
+    42,    42,    42,    42,    42,    42,    42,   nil,    42,    43,
+    43,    43,    43,    43,    43,    43,    43,    43,    43,    43,
+    43,    43,    43,    43,    43,    43,    43,    43,    43,    43,
+   nil,    43,    44,    44,    44,    44,    44,    44,    44,    44,
+    44,    44,    44,    44,    44,    44,    44,    44,    44,    44,
+    44,    44,    44,   nil,    44,    45,    45,    45,    45,    45,
+    45,    45,    45,    45,    45,    45,    45,    45,    45,    45,
+    45,    45,    45,    45,    45,    45,   nil,    45,    46,    46,
+    46,    46,    46,    46,    46,    46,    46,    46,    46,    46,
+    46,    46,    46,    46,    46,    46,    46,    46,    46,   nil,
+    46,    47,    47,    47,    47,    47,    47,    47,    47,    47,
+    47,    47,    47,    47,    47,    47,    47,    47,    47,    47,
+    47,    47,   nil,    47,    48,    48,    48,    48,    48,    48,
+    48,    48,    48,    48,    48,    48,    48,    48,    48,    48,
+    48,    48,    48,    48,    48,   nil,    48,    49,    49,    49,
+    49,    49,    49,    49,    49,    49,    49,    49,    49,    49,
+    49,    49,    49,    49,    49,    49,    49,    49,   nil,    49,
+    50,    50,    50,    50,    50,    50,    50,    50,    50,    50,
+    50,    50,    50,    50,    50,    50,    50,    50,    50,    50,
+    50,   nil,    50,    88,    88,    88,    88,    88,    88,    88,
+    88,    88,    88,    88,    88,    88,    88,    88,    88,    88,
+    88,    88,    88,    88,   nil,    88,     4,     4,     4,     4,
      4,     4,     4,     4,     4,     4,     4,     4,     4,     4,
-     4,     4,   nil,     4,    29,    29,    29,    29,    29,    29,
-    29,    29,    29,    29,    29,    29,    29,    29,    29,   nil,
-    29,     2,     2,     2,     2,    46,    46,    46,    46 ]
+     4,     4,     4,     4,     4,     4,   nil,     4,    34,    34,
+    34,    34,    34,    34,    34,    34,    34,    34,    34,    34,
+    34,    34,    34,    34,    34,    34,    34,    34,   nil,    34,
+    56,    56,    56,    56 ]
 
 racc_action_pointer = [
-    74,    20,   417,     1,   379,    26,    92,   nil,   nil,   nil,
-     6,     7,     8,    10,    11,    12,    34,    36,    37,    38,
-   nil,    64,   110,   128,   146,   164,   182,    63,   nil,   396,
-    -4,   200,   218,   236,   254,   272,   290,   308,   326,   344,
-   362,   nil,    18,    22,   nil,   nil,   421,    64,   nil,     0,
-     4,     8,    12,    34,    38,    42,    46,    50,    72,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil ]
+   130,    26,   110,     3,   658,    30,   153,   nil,   nil,   nil,
+     4,     6,     7,     8,    10,    11,    12,    14,    15,    16,
+    42,    43,    45,    46,    47,   nil,    78,   176,   199,   222,
+   245,   268,    77,   nil,   680,     0,   291,   314,   337,   360,
+   383,   406,   429,   452,   475,   498,   521,   544,   567,   590,
+   613,   nil,    20,    24,   nil,   nil,   706,    78,   nil,     4,
+     8,    12,    16,    43,    47,    51,    55,    59,    63,    90,
+    94,    98,   102,    -4,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   636,   106,
+   nil ]
 
 racc_action_default = [
-   -26,   -26,    -1,   -11,   -26,    -8,   -26,   -12,   -13,   -14,
-   -26,   -26,   -26,   -26,   -26,   -26,   -26,   -26,   -26,   -26,
-   -25,   -26,   -26,   -26,   -26,   -26,   -26,    -7,   -11,   -26,
-   -26,   -26,   -26,   -26,   -26,   -26,   -26,   -26,   -26,   -26,
-   -26,    69,    -3,    -4,    -5,    -6,    -2,    -9,   -10,   -26,
-   -26,   -26,   -26,   -26,   -26,   -26,   -26,   -26,   -26,   -15,
-   -16,   -17,   -18,   -19,   -20,   -21,   -22,   -23,   -24 ]
+   -31,   -31,    -1,   -11,   -31,    -8,   -31,   -12,   -13,   -14,
+   -31,   -31,   -31,   -31,   -31,   -31,   -31,   -31,   -31,   -31,
+   -31,   -31,   -31,   -31,   -31,   -30,   -31,   -31,   -31,   -31,
+   -31,   -31,    -7,   -11,   -31,   -31,   -31,   -31,   -31,   -31,
+   -31,   -31,   -31,   -31,   -31,   -31,   -31,   -31,   -31,   -31,
+   -31,    91,    -3,    -4,    -5,    -6,    -2,    -9,   -10,   -31,
+   -31,   -31,   -31,   -31,   -31,   -31,   -31,   -31,   -31,   -31,
+   -31,   -31,   -31,   -31,   -15,   -16,   -17,   -18,   -19,   -20,
+   -21,   -22,   -23,   -24,   -25,   -26,   -27,   -28,   -31,   -31,
+   -29 ]
 
 racc_goto_table = [
-     2,     1,    27,   nil,   nil,   nil,    30,   nil,   nil,   nil,
+     2,     1,    32,   nil,   nil,   nil,    35,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,    52,    53,    54,
+    55,    56,    57,   nil,   nil,   nil,    59,    60,    61,    62,
+    63,    64,    65,    66,    67,    68,    69,    70,    71,    72,
+    73,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,    42,    43,    44,    45,    46,    47,   nil,   nil,
-   nil,    49,    50,    51,    52,    53,    54,    55,    56,    57,
-    58 ]
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    89 ]
 
 racc_goto_check = [
      2,     1,     3,   nil,   nil,   nil,     2,   nil,   nil,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,     2,     2,     2,     2,     2,     3,   nil,   nil,
-   nil,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2 ]
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,     2,     2,     2,
+     2,     2,     3,   nil,   nil,   nil,     2,     2,     2,     2,
+     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+     2,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,     2 ]
 
 racc_goto_pointer = [
    nil,     1,     0,    -2 ]
@@ -183,35 +266,40 @@ racc_goto_default = [
 
 racc_reduce_table = [
   0, 0, :racc_error,
-  1, 27, :_reduce_1,
-  3, 27, :_reduce_2,
-  3, 28, :_reduce_3,
-  3, 28, :_reduce_4,
-  3, 28, :_reduce_5,
-  3, 28, :_reduce_6,
-  2, 28, :_reduce_7,
-  1, 28, :_reduce_none,
-  3, 29, :_reduce_9,
-  3, 29, :_reduce_10,
-  1, 29, :_reduce_11,
-  1, 29, :_reduce_none,
-  1, 29, :_reduce_13,
-  1, 29, :_reduce_14,
-  4, 29, :_reduce_15,
-  4, 29, :_reduce_16,
-  4, 29, :_reduce_17,
-  4, 29, :_reduce_18,
-  4, 29, :_reduce_19,
-  4, 29, :_reduce_20,
-  4, 29, :_reduce_21,
-  4, 29, :_reduce_22,
-  4, 29, :_reduce_23,
-  4, 29, :_reduce_24,
-  1, 29, :_reduce_25 ]
-
-racc_reduce_n = 26
-
-racc_shift_n = 69
+  1, 33, :_reduce_1,
+  3, 33, :_reduce_2,
+  3, 34, :_reduce_3,
+  3, 34, :_reduce_4,
+  3, 34, :_reduce_5,
+  3, 34, :_reduce_6,
+  2, 34, :_reduce_7,
+  1, 34, :_reduce_none,
+  3, 35, :_reduce_9,
+  3, 35, :_reduce_10,
+  1, 35, :_reduce_11,
+  1, 35, :_reduce_none,
+  1, 35, :_reduce_13,
+  1, 35, :_reduce_14,
+  4, 35, :_reduce_15,
+  4, 35, :_reduce_16,
+  4, 35, :_reduce_17,
+  4, 35, :_reduce_18,
+  4, 35, :_reduce_19,
+  4, 35, :_reduce_20,
+  4, 35, :_reduce_21,
+  4, 35, :_reduce_22,
+  4, 35, :_reduce_23,
+  4, 35, :_reduce_24,
+  4, 35, :_reduce_25,
+  4, 35, :_reduce_26,
+  4, 35, :_reduce_27,
+  4, 35, :_reduce_28,
+  6, 35, :_reduce_29,
+  1, 35, :_reduce_30 ]
+
+racc_reduce_n = 31
+
+racc_shift_n = 91
 
 racc_token_table = {
   false => 0,
@@ -234,14 +322,20 @@ racc_token_table = {
   :acos => 17,
   :atan => 18,
   :exp => 19,
-  :log => 20,
-  :log10 => 21,
-  :v => 22,
-  "=" => 23,
-  "(" => 24,
-  ")" => 25 }
-
-racc_nt_base = 26
+  :ln => 20,
+  :log => 21,
+  :abs => 22,
+  :fact => 23,
+  :floor => 24,
+  :ceil => 25,
+  :round => 26,
+  :v => 27,
+  "=" => 28,
+  "(" => 29,
+  ")" => 30,
+  "," => 31 }
+
+racc_nt_base = 32
 
 racc_use_result_var = false
 
@@ -282,12 +376,18 @@ Racc_token_to_s_table = [
   "acos",
   "atan",
   "exp",
+  "ln",
   "log",
-  "log10",
+  "abs",
+  "fact",
+  "floor",
+  "ceil",
+  "round",
   "v",
   "\"=\"",
   "\"(\"",
   "\")\"",
+  "\",\"",
   "$start",
   "statement",
   "expression",
@@ -307,7 +407,7 @@ module_eval(<<'.,.,', 'calc.y', 11)
 
 module_eval(<<'.,.,', 'calc.y', 12)
   def _reduce_2(val, _values)
-     @v = @table[val[0]] = val[2]
+     @v = @table[val[0].to_sym] = val[2]
   end
 .,.,
 
@@ -357,7 +457,7 @@ module_eval(<<'.,.,', 'calc.y', 20)
 
 module_eval(<<'.,.,', 'calc.y', 21)
   def _reduce_11(val, _values)
-    if @table[val[0]] then @table[val[0]] else raise("#{val[0]} not found.") end
+    if @table[val[0].to_sym] then @table[val[0].to_sym] else raise("#{val[0]} not found.") end
   end
 .,.,
 
@@ -377,66 +477,96 @@ module_eval(<<'.,.,', 'calc.y', 24)
 
 module_eval(<<'.,.,', 'calc.y', 25)
   def _reduce_15(val, _values)
-     sqrt(val[2] )
+     sqrt(val[2])
   end
 .,.,
 
 module_eval(<<'.,.,', 'calc.y', 26)
   def _reduce_16(val, _values)
-     sin(val[2] )
+     sin(val[2])
   end
 .,.,
 
 module_eval(<<'.,.,', 'calc.y', 27)
   def _reduce_17(val, _values)
-     cos(val[2] )
+     cos(val[2])
   end
 .,.,
 
 module_eval(<<'.,.,', 'calc.y', 28)
   def _reduce_18(val, _values)
-     tan(val[2] )
+     tan(val[2])
   end
 .,.,
 
 module_eval(<<'.,.,', 'calc.y', 29)
   def _reduce_19(val, _values)
-     asin(val[2] )
+     asin(val[2])
   end
 .,.,
 
 module_eval(<<'.,.,', 'calc.y', 30)
   def _reduce_20(val, _values)
-     acos(val[2] )
+     acos(val[2])
   end
 .,.,
 
 module_eval(<<'.,.,', 'calc.y', 31)
   def _reduce_21(val, _values)
-     atan(val[2] )
+     atan(val[2])
   end
 .,.,
 
 module_eval(<<'.,.,', 'calc.y', 32)
   def _reduce_22(val, _values)
-     exp(val[2] )
+     exp(val[2])
   end
 .,.,
 
 module_eval(<<'.,.,', 'calc.y', 33)
   def _reduce_23(val, _values)
-     log(val[2] )
+     log(val[2])
   end
 .,.,
 
 module_eval(<<'.,.,', 'calc.y', 34)
   def _reduce_24(val, _values)
-     log10(val[2] )
+     log10(val[2])
   end
 .,.,
 
 module_eval(<<'.,.,', 'calc.y', 35)
   def _reduce_25(val, _values)
+     val[2].abs
+  end
+.,.,
+
+module_eval(<<'.,.,', 'calc.y', 36)
+  def _reduce_26(val, _values)
+     fact(val[2])
+  end
+.,.,
+
+module_eval(<<'.,.,', 'calc.y', 37)
+  def _reduce_27(val, _values)
+     val[2].floor.to_f
+  end
+.,.,
+
+module_eval(<<'.,.,', 'calc.y', 38)
+  def _reduce_28(val, _values)
+     val[2].ceil.to_f
+  end
+.,.,
+
+module_eval(<<'.,.,', 'calc.y', 39)
+  def _reduce_29(val, _values)
+     val[2].round(val[4]).to_f
+  end
+.,.,
+
+module_eval(<<'.,.,', 'calc.y', 40)
+  def _reduce_30(val, _values)
      @v
   end
 .,.,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: s_calc
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.4
 platform: ruby
 authors:
 - Toshio Sekiya
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-10-16 00:00:00.000000000 Z
+date: 2023-10-20 00:00:00.000000000 Z
 dependencies: []
 description: CUI Scientific calculator
 email: lxboyjp@gmail.com
@@ -17,13 +17,15 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- README.md
 - bin/calc
 - lib/calc.rb
 - lib/calc/calc.rb
 homepage: https://github.com/ToshioCP/calc
 licenses:
 - GPL-3.0
-metadata: {}
+metadata:
+  documentation_uri: https://toshiocp.github.io/calc/
 post_install_message:
 rdoc_options: []
 require_paths: