calc_fcardona 0.0.3 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: be7f6147202a8755c23962b0891e9780691df069
-  data.tar.gz: b08aa8393390a33b9912998f717e69906c557879
+  metadata.gz: b58be65020fec2385269041f11aa7df98b79aae1
+  data.tar.gz: 3234dc68ec5d71647472a0cb622224b2b1134d0f
 SHA512:
-  metadata.gz: 4a2b2c96ee286b81eb30bb58988a4b56b104d9b4ab03ed19f5810e6b13c0720167e9a785cb7b221b5a13bba01b4bbad47b553f355c6c534fed99e85efd82f4f8
-  data.tar.gz: 8b1f5bfd52727f1c6ad4c2569673699ac664d6d545ad511c77187e00df00c80924f91b063d900374a2f942251b45c69103cd75a761e07870904de6f73597d0c3
+  metadata.gz: 9308eb98ecde6506f5e12d5dd804e9216c23f3dd1504c66d7260a52cc982f31c29ecfb3ed124e0a8b245bb14a1e20f75ad73047355a4472e149d9e62ab939dea
+  data.tar.gz: d259a8ec214ae0262045981e6cf21fc2c5070fec6c5be0cdfb5141c43e6fb15a199f9bc4655839dc718e529a7a47d76842d8ae025f772cb9d015831d851e2731

data/lib/ast.rb

@@ -23,7 +23,7 @@ class AddNode < BinaryNode
   end
    
   def evaluate 
-    @left.evaluate + @right.evaluate
+    left.evaluate + right.evaluate
   end
 end
 
@@ -32,7 +32,7 @@ class SubNode < BinaryNode
     super(left,right)
   end
    
-  def evaluate 
+  def evaluate
     left.evaluate - right.evaluate
   end
 end
@@ -42,7 +42,7 @@ class TimesNode < BinaryNode
     super(left,right)
   end
    
-  def evaluate 
+  def evaluate
     left.evaluate * right.evaluate
   end
 end
@@ -61,7 +61,6 @@ class StoreNode < UnaryNode
   def initialize(sub)
     super(sub)
   end
-
   def evaluate
     $calc.memory = subTree.evaluate
   end

data/lib/calculator.rb

@@ -4,7 +4,7 @@ require 'ast'
 class Calculator
   attr_accessor :memory
   
-  def initialize()
+  def initialize
     @memory = 0
   end
   

data/lib/parser.rb

@@ -8,35 +8,35 @@ class Parser
     @scan = Scanner.new(istream)
   end
    
-  def parse()
-    return Prog()
+  def parse
+    Prog()
   end
   
   private
-  def Prog()
+  def Prog
     result = Expr()
-    t = @scan.getToken()
+    t = @scan.getToken
     
     if t.type != :eof then
       print "Expected EOF. Found ", t.type, ".\n"
       raise ParseError.new
     end
     
-    return result
+    result
   end
   
-  def Expr() 
+  def Expr
     RestExpr(Term())
   end
    
   def RestExpr(e) 
-    t = @scan.getToken()
+    t = @scan.getToken
     
-    if t.type == :add
+    if t.type == :add then
       return RestExpr(AddNode.new(e,Term()))
     end
     
-    if t.type == :sub
+    if t.type == :sub then
       return RestExpr(SubNode.new(e,Term()))
     end
       
@@ -45,12 +45,12 @@ class Parser
     e
   end
   
-  def Term
-
+  def Term()
     RestTerm(Storable())
   end
    
   def RestTerm(e)
+
     t = @scan.getToken
 
     if t.type == :times then
@@ -66,8 +66,7 @@ class Parser
     e
   end
    
-  def Storable()
-   
+  def Storable
     result = Factor()
 
     t = @scan.getToken
@@ -76,16 +75,18 @@ class Parser
       if t.lex == "S" then
         return StoreNode.new(result)
       end
-      puts "Expected S found: ",t.lex
+      print "Expected S found #{t.lex}"
+      puts " at line: #{t.line} col: #{t.col}"
       raise ParseError.new
     end
+    
 
     @scan.putBackToken
+
     result
   end
    
-  def Factor() 
-
+  def Factor
     t = @scan.getToken
 
     if t.type == :number then
@@ -97,24 +98,22 @@ class Parser
         return RecallNode.new
       end
 
-      puts "Expected R found: " + t.lex
+      puts "Error"
       raise ParseError.new
     end
 
     if t.type == :lparen then
       result = Expr()
-      
       t = @scan.getToken
-
       if t.type == :rparen then
         return result
       end
-
-      puts "Expected ) found: " + t.type.to_s
+      puts "Error"
       raise ParseError.new
     end
 
-    puts "Expected number, R, ( found: " + t.type.to_s
-    raise ParseError.new # "Parse Error"
+    puts "Error"
+    raise ParseError.new
+  
   end         
 end

data/lib/scanner.rb

@@ -11,12 +11,12 @@ class Scanner
     @lastToken = nil
   end
   
-  def putBackToken
+  def putBackToken()
     @needToken = false
   end
 
-  def getToken
-    unless @needToken
+  def getToken()
+    if !@needToken
       @needToken = true
       return @lastToken
     end
@@ -30,7 +30,7 @@ class Scanner
       return @lastToken
     end
     
-    until foundOne
+    while !foundOne
       @colCount = @colCount + 1
       case state
       when 0

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: calc_fcardona
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.2.0
 platform: ruby
 authors:
 - Kent D. Lee - Juan Francisco Cardona Mc
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-12 00:00:00.000000000 Z
+date: 2015-11-13 00:00:00.000000000 Z
 dependencies: []
 description: An calculator implementation on ruby
 email: fcardona@eafit.edu.co