maths 0.0.5 → 0.0.6

data/README.md

@@ -56,6 +56,16 @@ maths> x = y = z = 25
 = 25
 ```
 
+There's even a special variable, `$`, that is always set to the result of
+the last calculation:
+
+```
+maths> 5 + 5
+= 10
+maths> $
+= 10
+```
+
 And of course, sometimes you'll want to close the app:
 
 ```
@@ -88,6 +98,20 @@ maths> 2 ^ 4
 = 16
 ```
 
+Percentages!
+```
+maths> 2 as a % of 4
+= 50%
+```
+
+Maths also includes some constants:
+
+Pi!
+```
+maths> pi
+= 3.14159265358979323846264338327
+```
+
 Maths is still pretty new - I hacked the original version together on a flight, and it's still maturing. If you'd like to see something added, let me know in the [issue tracker](https://github.com/commondream/maths/issues).
 
 ## Contributing

data/bin/maths

@@ -16,7 +16,6 @@ Readline.completion_proc = Proc.new do |str|
   # TODO: Get this working
 end
 
-
 prompt = "maths> "
 while command = Readline.readline(prompt, true)
   break if /exit/i =~ command
@@ -33,6 +32,7 @@ while command = Readline.readline(prompt, true)
       result = parser.parse(command)
 
       puts "= #{Maths::Formatter.format(result)}"
+      Maths::Brain.assign("$", result)
     rescue ParseError
       puts $!
     end

data/lib/maths/calc.y

@@ -24,7 +24,6 @@ rule
      | '-' NUMBER  =UMINUS { result = -val[1] }
      | VARIABLE { result = Brain.lookup(val[0])}
      | NUMBER
-     | FLOAT
      | FUNC exp { result = Maths::Functions.exec(val[0], val[1]) }
      | exp PERCENTAGE_OF exp { result = Percentage.build(val[0], val[2]) }
 
@@ -42,7 +41,11 @@ module Maths
     @q = []
     until str.empty?
       case str
+      
+      # ignore whitespace
       when /\A\s+/
+        
+      # percentage handling
       when /\Aas a percentage of/
         @q.push [:PERCENTAGE_OF, $&]
       when /\Aas a % of/
@@ -52,16 +55,25 @@ module Maths
       when /\Aas % of/
         @q.push [:PERCENTAGE_OF, $&]
 
+      # special terms
+      when /\Api/
+        @q.push [:NUMBER, BigDecimal.new("3.14159265358979323846264338327")]
+
+      # variables and functions
       when /\A[A-Za-z]+[0-9]*/
         if Maths::Functions::FUNCTIONS.has_key?($&)
           @q.push [:FUNC, $&]
         else
           @q.push [:VARIABLE, $&]
         end
-      when /\A\d+\.\d+/
-        @q.push [:FLOAT, BigDecimal.new($&)]
-      when /\A\d+/
+      when /\A\$/
+        @q.push [:VARIABLE, $&]
+        
+      # numbers
+      when /\A\d+(\.\d+)?([Ee]\d+)?/
         @q.push [:NUMBER, BigDecimal.new($&)]
+      # when /\A\d+/
+      #   @q.push [:NUMBER, BigDecimal.new($&)]
       when /\A.|\n/o
         s = $&
         @q.push [s, s]

data/lib/maths/functions.rb

@@ -1,7 +1,27 @@
 module Maths
   class Functions
     FUNCTIONS = {
-      "sqrt" => Proc.new { |val| BigDecimal.new(Math.sqrt(val).to_s) }
+      "sqrt" => Proc.new { |val| BigDecimal.new(Math.sqrt(val).to_s) },
+      "cbrt" => Proc.new { |val| BigDecimal.new(Math.cbrt(val).to_s) },
+      "sin" => Proc.new { |val| BigDecimal.new(Math.sin(val).to_s) },
+      "asin" => Proc.new { |val| BigDecimal.new(Math.sin(val).to_s) },
+      "sinh" => Proc.new { |val| BigDecimal.new(Math.sinh(val).to_s) },
+      "asinh" => Proc.new { |val| BigDecimal.new(Math.asinh(val).to_s) },
+      "cos" => Proc.new { |val| BigDecimal.new(Math.cos(val).to_s) },
+      "acos" => Proc.new { |val| BigDecimal.new(Math.acos(val).to_s) },
+      "cosh" => Proc.new { |val| BigDecimal.new(Math.cosh(val).to_s) },
+      "acosh" => Proc.new { |val| BigDecimal.new(Math.acosh(val).to_s) },
+      "tan" => Proc.new { |val| BigDecimal.new(Math.tan(val).to_s) },
+      "atan" => Proc.new { |val| BigDecimal.new(Math.atan(val).to_s) },
+      "tanh" => Proc.new { |val| BigDecimal.new(Math.tanh(val).to_s) },
+      "atanh" => Proc.new { |val| BigDecimal.new(Math.atanh(val).to_s) },
+      "ln" => Proc.new { |val| BigDecimal.new(Math.log(val).to_s) },
+      "log" => Proc.new { |val| BigDecimal.new(Math.log10(val).to_s) },
+      "log2" => Proc.new { |val| BigDecimal.new(Math.log2(val).to_s) },
+      "floor" => Proc.new { |val| BigDecimal.new(val.floor.to_s) },
+      "ceil" => Proc.new { |val| BigDecimal.new(val.ceil.to_s) },
+      "ceiling" => Proc.new { |val| BigDecimal.new(val.ceil.to_s) },
+      "round" => Proc.new { |val| BigDecimal.new(val.round.to_s) }
     }
     
     def self.exec(function, value)

data/lib/maths/version.rb

@@ -1,3 +1,3 @@
 module Maths
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: maths
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors: