calculator7 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 40211eb9c733da716a3293644f7f37e2eb0359e8
-  data.tar.gz: 872356cfed078745997a82ffb418481df99c9fa2
+  metadata.gz: 8f59e3a0f339618c747adb971291fc0e1b9b9eda
+  data.tar.gz: 729569bbf4a649108746428a8a218fca14cac235
 SHA512:
-  metadata.gz: 07d5e9632568fdda114290d5656eefe6ec2afabe2774390c0e3589ebdd48bd1f10abf68be4652f68d9ce42d1779ceeb896efa2cb270f720e4238d70e9936ff02
-  data.tar.gz: fd3d2c5c2489157322055b1daaab184fd7c963ae5b50c19c65ad066d495ddab6c4899d489b955d28b0c0ea27e68f7f2b0fe7559edebd27084a0e727e2a2dafc6
+  metadata.gz: 8383742eabff7d1d4d74d9cc8281878d92d8a6535e9efe8985e7e15df43728bc5c5780f08581e3695e9acb422c28b94aa5709f8b24b650575521e7ce4e76344b
+  data.tar.gz: 2f074299180a8ff35b81105b6a65afe170dccd78a09c9b0f5a70108d2caaef5f638bbd4a1f3c6772607cff81bff93225640b4ec9bb9ce9ad9cac2fe2e6e828e1

data/lib/calculator7.rb

@@ -1,28 +1,95 @@
 class Calculator7
-  def self.hi
-    puts "Hello world!"
-  end
 
-  def self.compute(str)
+  def self.compute(expression)
     enable = true
-    str.chars.each do |c|
-      if !"+-*/0123456789 ".include?(c)
+    expression.chars.each do |c|
+      if !"+-*/0123456789(). ".include?(c)
         enable = false
         break
       end
     end
 
-    ret = nil
-    if enable
-      begin
-        ret = eval(str).to_s
-      rescue SyntaxError
-        # do nothing
+    return nil if !enable
+    expression = expression.chars.select { |c| "+-*/0123456789().".include?(c) }.join('')
+
+    compute_sub(expression)
+  end
+
+  def self.compute_sub(expression)
+    return compute_sub(expression[1..-2]) if expression[0] == '(' and expression[-1] == ')'
+
+    number = check_number(expression) 
+    return number if number != nil
+
+    offset = 0
+    value = 0
+
+    last_index = -1
+    expression.chars.each_with_index do |c, index|
+      offset = offset + 1 if c == '('
+      offset = offset - 1 if c == ')'
+
+      if offset == 0 and index > 0 and '+-'.include?(c)
+        last_index = index
+     end
+    end
+    return nil if offset != 0
+
+    if last_index > 0
+      left = compute_sub(expression[0..last_index-1]) 
+      right = compute_sub(expression[(last_index+1)..-1])
+      c = expression[last_index]
+
+      if c == '+' 
+        return left + right
+      elsif c == '-' 
+        return left - right
       end
     end
 
-    return ret
+    expression.chars.each_with_index do |c, index|
+      offset = offset + 1 if c == '('
+      offset = offset - 1 if c == ')'
+
+      if offset == 0 and index > 0 and '*/'.include?(c)
+        last_index = index
+      end
+    end
+    if last_index > 0
+      left = compute_sub(expression[0..last_index-1]) 
+      right = compute_sub(expression[(last_index+1)..-1])
+      c = expression[last_index]
+      return nil if right.to_f == 0
+
+      if c == '*' 
+        return left * right
+      elsif c == '/' 
+        if (left / right).to_f == (left.to_f / right.to_f)
+          return left / right
+        else
+          return left.to_f / right.to_f
+        end
+      end
+    end
+
+    nil
   end
 
+  def self.check_number(expression)
+    count = expression.chars.select { |c| !"0123456789-+.".include?(c) }.count
+    return nil if count > 0
+
+    count = expression.chars.select { |c| c == '+' or c == '-' }.count
+    return nil if count == 2 or (count == 1 and "0123456789".include?(expression[0]))
+
+    count = expression.chars.select { |c| c == '.' }.count
+    return nil if count > 1
+
+    if count == 1
+      expression.to_f
+    else
+      expression.to_i
+    end
+  end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: calculator7
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Jianfeng
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-22 00:00:00.000000000 Z
+date: 2015-04-24 00:00:00.000000000 Z
 dependencies: []
 description: A simple calculator
 email: tujf.cn@gmail.com
@@ -29,7 +29,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - '>='
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - '>='