jmejiao5-rubycalc 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fce3c7e8c9fe4c83624d141d033ec857cf77eca6
-  data.tar.gz: a50f32969d787336172b098419d4f59aae0cb06a
+  metadata.gz: 4f725d9b06b4be7a783e6630192d41258de624c3
+  data.tar.gz: 470edb50f9000659d1d85f078b556ad3325e79b7
 SHA512:
-  metadata.gz: a9251c8d1ebf08f34b3bffea9d7dba2f808bdd1217fdaa62c5116f6ca608e26dea8cf2da8c1ab8240611a93ff518b18eed1e1e106efaa4f106cb29768066acc0
-  data.tar.gz: d3f3c4cd54ece36a174edf717e8c30c55d0a6bb052054de1f131d7322a07f3a1ea0cd744faf53c3e7fadacf9976349db864dcc0e3d0479ecf7642e719be58b09
+  metadata.gz: bf5f53c1270ec3163061f1b80b4489577b71c3e22688a35abd7197cf76b79e693a8ad4abad785945b9e4bb186e78632e0dd2f3565f690aecad2ed8247ca75920
+  data.tar.gz: 6c6daf29a06eb0dccbf32a9a278bb130ddee8bdff960123973dc2852d82ff519f245f7dbf21386732f1626a493f48e4bad5b70667650552fa920bbbca2197e9e

data/lib/parser.rb

@@ -46,11 +46,11 @@ class Parser
   end
   
   def Term()
-    ResTerm(Storable())
+    return ResTerm(Storable())
   end
    
   def RestTerm(e)
-    t = @scan.getToken
+    t = @scan.getToken()
 
     if t.type == :times then
       return RestTerm(TimesNode.new(e,Storable()))
@@ -58,10 +58,12 @@ class Parser
 
     if t.type == :divide then
       return RestTerm(DivideNode.new(e,Storable()))
+    end
 
-      @scan.putBackToken
+      @scan.putBackToken()
+
+      return e
 
-    end
   end
    
     def Storable()
@@ -78,8 +80,7 @@ class Parser
       end
 
       @scan.putBackToken
-
-      factor
+      return factor
   end
    
   def Factor() 
@@ -99,7 +100,7 @@ class Parser
 
     if t.ype == :lparen then
       expr = Expr()
-      t = @scan.getToken
+      t = @scan.getToken()
       if t.type == :rparen then
         return expr
       else

data/lib/scanner.rb

@@ -30,7 +30,7 @@ class Scanner
       return @lastToken
     end
     
-    while !foundOne
+    until foundOne do
       @colCount = @colCount + 1
       case state
       when 0
@@ -117,20 +117,20 @@ class Scanner
     if c.nil? then
       return false
     end
-    (?a <= c and c <= ?z) or (?A <= c and c <= ?Z)
+    return ((?a <= c and c <= ?z) or (?A <= c and c <= ?Z))
   end
   
   def isDigit(c)
     if c.nil? then
       return false
     end
-    ?0 <= c and c <= ?9
+    return (?0 <= c and c <= ?9)
   end
   
   def isWhiteSpace(c)
     if c.nil? then
       return false
     end
-    c == ?\  or c == ?\n or c == ?\t
+    return (c == ?\  or c == ?\n or c == ?\t)
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jmejiao5-rubycalc
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Kent D. Lee - Jose Alberto Mejia
@@ -17,13 +17,13 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- bin/rubycalc
+- lib/token.rb
+- lib/scanner.rb
 - lib/ast.rb
-- lib/calcex.rb
-- lib/calculator.rb
 - lib/parser.rb
-- lib/scanner.rb
-- lib/token.rb
+- lib/calculator.rb
+- lib/calcex.rb
+- bin/rubycalc
 homepage: http://www1.eafit.edu.co/fcardona/cursos/st0244/rubycal
 licenses:
 - ARTISTIC
@@ -34,17 +34,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.0.14.1
 signing_key: 
 specification_version: 4
 summary: Another calculator in ruby