maths 0.0.3 → 0.0.4

data/bin/maths

@@ -31,17 +31,8 @@ while command = Readline.readline(prompt, true)
   else
     begin
       result = parser.parse(command)
-      
-      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")
-      end
-      puts "= #{output}"
+
+      puts "= #{Maths::Formatter.format(result)}"
     rescue ParseError
       puts $!
     end

data/lib/maths/calc.y

@@ -3,8 +3,9 @@ class Calculator
   prechigh
     nonassoc UMINUS
     nonassoc FUNC
-    left '^' '*' '/' '%'
-    left '+' '-'
+    left "^" "*" '/' '%'
+    left "+" "-"
+    right PERCENTAGE_OF
     right "="
   preclow
 rule
@@ -25,7 +26,8 @@ rule
      | NUMBER
      | FLOAT
      | FUNC exp { result = Maths::Functions.exec(val[0], val[1]) }
-     
+     | exp PERCENTAGE_OF exp { result = Percentage.build(val[0], val[2]) }
+
    assign: VARIABLE "=" exp { result = Brain.assign(val[0], val[2]) }
      | VARIABLE "=" assign { result = Brain.assign(val[0], val[2]) }
 
@@ -41,6 +43,15 @@ module Maths
     until str.empty?
       case str
       when /\A\s+/
+      when /\Aas a percentage of/
+        @q.push [:PERCENTAGE_OF, $&]
+      when /\Aas a % of/
+        @q.push [:PERCENTAGE_OF, $&]
+      when /\Aas % of/
+        @q.push [:PERCENTAGE_OF, $&]
+      when /\Aas % of/
+        @q.push [:PERCENTAGE_OF, $&]
+
       when /\A[A-Za-z]+[0-9]*/
         if Maths::Functions::FUNCTIONS.has_key?($&)
           @q.push [:FUNC, $&]

data/lib/maths/formatter.rb

@@ -0,0 +1,22 @@
+module Maths
+  class Formatter
+    # Public: Formats values for us to output.
+    def self.format(val)
+      if val.nil?
+        output = "Undefined"
+      elsif !val.is_a?(Numeric)
+        output = val.to_s
+      elsif val.frac == 0
+        output = val.to_i.to_s
+      else
+        output = val.to_s("F")
+      end
+      
+      if val.is_a?(Percentage)
+        output += "%"
+      end
+      
+      output
+    end
+  end
+end

data/lib/maths/percentage.rb

@@ -0,0 +1,14 @@
+module Maths
+  # Public: Represents a number that should be formatted as a percentage
+	class Percentage < BigDecimal
+    # Pretty much idential to a BigDecimal
+    
+    # Public: Builds out a fraction by the numerator and denominator
+    def self.build(numerator, denominator)
+      numerator = BigDecimal.new(numerator.to_s)
+      denominator = BigDecimal.new(denominator.to_s)
+      puts numerator, denominator
+      Percentage.new(((numerator / denominator) * 100).to_s)
+    end
+  end
+end

data/lib/maths/version.rb

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

data/lib/maths.rb

@@ -7,4 +7,6 @@ require "bigdecimal"
 require "maths/version"
 require "maths/calc"
 require "maths/brain"
-require "maths/functions"
+require "maths/functions"
+require "maths/formatter"
+require "maths/percentage"

metadata

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