maths 0.0.2 → 0.0.3

data/README.md

@@ -35,7 +35,7 @@ maths> 20 * 3
 maths> 8 - 4
 = 4
 maths> 4.4 + 3.2
-= 7.6000000000000005
+= 7.6
 ```
 
 Maths also supports assigning variables:
@@ -64,6 +64,30 @@ maths> exit
 
 Variables persist in maths between runs of the command, so feel free to exit and reopen maths all you want - those variables will stick around between executions.
 
+## Tell Us More, Bob
+
+Maths can do all sorts of great math!
+
+Absolute Values!
+
+```
+maths> |-5|
+= 5
+```
+
+Square Roots!
+
+```
+maths> sqrt 25
+= 5
+```
+
+Exponents!
+```
+maths> 2 ^ 4
+= 16
+```
+
 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

@@ -32,7 +32,11 @@ while command = Readline.readline(prompt, true)
     begin
       result = parser.parse(command)
       
-      if result.frac == 0
+      if result.nil?
+        output = "Undefined"
+      elsif !result.is_a?(Numeric)
+        output = result.to_s
+      elsif result.frac == 0
         output = result.to_i.to_s
       else
         output = result.to_s("F")

data/lib/maths/brain.rb

@@ -12,7 +12,13 @@ module Maths
     
     # Public: Looks up data
     def self.lookup(variable)
-      BigDecimal.new(read[variable])
+      value = read[variable]
+      
+      if value.nil?
+        nil
+      else
+        BigDecimal.new(read[variable])
+      end
     end
     
     # Public: The file we're using to store our memories

data/lib/maths/calc.y

@@ -2,7 +2,8 @@
 class Calculator
   prechigh
     nonassoc UMINUS
-    left '*' '/' '%'
+    nonassoc FUNC
+    left '^' '*' '/' '%'
     left '+' '-'
     right "="
   preclow
@@ -16,12 +17,14 @@ rule
      | exp '*' exp { result *= val[2] }
      | exp '/' exp { result /= val[2] }
      | exp '%' exp { result %= val[2] }
+     | exp '^' exp { result = result.power(val[2])}
      | '(' exp ')' { result = val[1] }
      | '|' exp '|' { result = val[1].abs }
      | '-' NUMBER  =UMINUS { result = -val[1] }
      | VARIABLE { result = Brain.lookup(val[0])}
      | NUMBER
      | FLOAT
+     | FUNC exp { result = Maths::Functions.exec(val[0], val[1]) }
      
    assign: VARIABLE "=" exp { result = Brain.assign(val[0], val[2]) }
      | VARIABLE "=" assign { result = Brain.assign(val[0], val[2]) }
@@ -39,7 +42,11 @@ module Maths
       case str
       when /\A\s+/
       when /\A[A-Za-z]+[0-9]*/
-        @q.push [:VARIABLE, $&]
+        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+/

data/lib/maths/functions.rb

@@ -0,0 +1,11 @@
+module Maths
+  class Functions
+    FUNCTIONS = {
+      "sqrt" => Proc.new { |val| BigDecimal.new(Math.sqrt(val).to_s) }
+    }
+    
+    def self.exec(function, value)
+      FUNCTIONS[function].call(value)
+    end
+  end
+end

data/lib/maths/version.rb

@@ -1,3 +1,3 @@
 module Maths
-  VERSION = "0.0.2"
-end
+  VERSION = "0.0.3"
+end

data/lib/maths.rb

@@ -6,4 +6,5 @@ require "bigdecimal"
 
 require "maths/version"
 require "maths/calc"
-require "maths/brain"
+require "maths/brain"
+require "maths/functions"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: maths
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -44,6 +44,7 @@ files:
 - lib/maths.rb
 - lib/maths/brain.rb
 - lib/maths/calc.y
+- lib/maths/functions.rb
 - lib/maths/version.rb
 - maths.gemspec
 homepage: http://github.com/commondream/maths