rrpn 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2dd193f6ca23427ec0dbdd608d5ca69f92275361
-  data.tar.gz: ef26048dd880fe03516eafe274b5cff16880bfdf
+  metadata.gz: dce10c5255e618e1569cee575178957017ecf427
+  data.tar.gz: 9ff65fd6fb376ad3f63ad042de8a299a88c997ab
 SHA512:
-  metadata.gz: f8a4f40475a9ab08c55eb29d6440405beeb80ce4cb45dc45d7d5c491f7d5e815476c37ae34f9a9cc5d1d2c1b6e1d553967361fcc419410fa8e4053edf7f3b237
-  data.tar.gz: 70fc6d5c5ec1c44cc11a8d8817bed7262cb419b2fdd3eec764fa196d04d5c035024e498efda3a30d27f4175e742af80fe7cd76e26b55bfdd07bace727816443d
+  metadata.gz: 06a0ec43dd9f0aae28d33e6376880e89808277b84a154e8e1164b485b4d446d397f715ad11c8435281dc8840bb06af4a876acabe4a2f910737aa963719bf0ffa
+  data.tar.gz: f27e055055fe4568703b033eb943e9ecd755990039c49f413998741cf31c9be18d9f7f86aa341328bb6cf8d0663c76bc21cb39f59fa0becffdb7af8514451f53

data/README.md

@@ -53,9 +53,9 @@ Complex
 
 ```ruby
 rpn = '(1+2i) + (3+3i)'.to_rpn
-p rpn.queue #=> [1, (0+2i), :+, 3, (0+3i), :+, :+]
+p rpn.queue #=> [1, "2i", :+, 3, "3i", :+, :+]
 p rpn.calc  #=> (4+5i)
-puts rpn    #=> 1 0+2i + 3 0+3i + +
+puts rpn    #=> 1 2i + 3 3i + +
 ```
 
 Other

data/lib/rrpn.rb

@@ -31,7 +31,7 @@ class RRPN
   def initialize(formula)
     @formula = formula
     stree = Ripper.sexp(@formula)
-    @queue = parse(stree[1..-1])
+    @queue = parse(stree[1..-1]).flatten
   end
 
   def parse(tree)
@@ -49,9 +49,9 @@ class RRPN
       when :@float
         return tree[1].to_f
       when :@rational
-        return tree[1].to_s
+        return tree[1]
       when :@imaginary
-        return tree[1].to_c
+        return tree[1]
       else
         if tree[0].instance_of?(Array)
           queue << parse(tree[0])
@@ -60,7 +60,7 @@ class RRPN
         end
     end
 
-    queue.flatten
+    queue
   end
 
   def calc
@@ -68,6 +68,6 @@ class RRPN
   end
 
   def to_s
-    @queue.join(' ')
+    queue.join(' ')
   end
 end

data/rrpn.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "rrpn"
-  spec.version       = "1.0.0"
+  spec.version       = "1.1.0"
   spec.authors       = ["siman-man"]
   spec.email         = ["k128585@ie.u-ryukyu.ac.jp"]
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rrpn
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - siman-man
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-02-21 00:00:00.000000000 Z
+date: 2017-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler