calc_mlopez12 0.0.2 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 22ad6be10bdb6633c895ac5b7c9529339a92cb4a
-  data.tar.gz: b7ff821f32b189938facc694f280c1b129c3221f
+  metadata.gz: b3971fbee53f7f69d11557ffd1631574a1a5bc5c
+  data.tar.gz: 35fcf2b7a203fef9f7a9013094c2dd6bc6f95528
 SHA512:
-  metadata.gz: 68d9f07f95c724f8b4816357d0e11fba8fcbd17b9752fad9d4f3de8229e15c425c896493039703675b2bfa5c63ca2a1fd61178202ea686a3eb2efbda466ca748
-  data.tar.gz: f9de523a0915919d7e0de52af79e2fc4fe6203492fdf441678456add5d25ab1b8f2c3f95219b3c9fbf83a3e41fdaf11f6b139837ba87abc30f50171b3fe9b2cf
+  metadata.gz: 94eecb78945a447b6c8aea10c0bd7b8265e07452f53cec57f213f6b79995d7be7db44b9553ffe7bd99d1e1606206620c4555fda4fbe35bf7b11129db5d1132e1
+  data.tar.gz: 1417bde73ec921023d4aa1c01eea01110b39a7a3c682c4a796084d786c51f250efbd062e93b1e0a497d9207b423bdd9a5f6203485bcd2d1ab0d5d4221e31745a

data/lib/ast.rb

@@ -22,63 +22,62 @@ class AddNode < BinaryNode
     super(left,right)
   end
    
-  def evaluate() 
-    return @left.evaluate() + @right.evaluate()
+  def evaluate 
+    @left.evaluate() + @right.evaluate()
   end
 end
 
-class TimesNode < BinaryNode
-  def initialize(left,right)
+class SubNode < BinaryNode
+  def initialize(left, right)
     super(left,right)
   end
-
-  def evaluate()
-    return @left.evaluate() * @right.evaluate()
+   
+  def evaluate 
+    @left.evaluate() - @right.evaluate()
   end
 end
 
-class DivideNode < BinaryNode
-  def initialize(left,right)
+class TimesNode < BinaryNode
+  def initialize(left, right)
     super(left,right)
   end
-
-  def evaluate()
-    return @left.evaluate() / @right.evaluate()
+   
+  def evaluate 
+    @left.evaluate() * @right.evaluate()
   end
 end
 
-class SubNode < BinaryNode
+class DivideNode < BinaryNode
   def initialize(left, right)
     super(left,right)
   end
    
-  def evaluate() 
-    return @left.evaluate() - @right.evaluate()
+  def evaluate 
+    @left.evaluate() / @right.evaluate()
   end
 end
 
 class StoreNode < UnaryNode
-  def initialize(subTree)
-    super(subTree)
+  def initialize(sub)
+    super(sub)
   end
+  def evaluate
+    $calc.memory = @subTree.evaluate()
+  end 
+end
 
-  def evaluate()
-    $calc.memory = subTree.evaluate()
+class RecallNode
+  def evaluate
+    $calc.memory
   end
 end
 
 class NumNode 
-  def initialize(num)
+  def initialize num
     @num = num
   end
    
-  def evaluate() 
-    return @num
-  end
-end
-
-class RecallNode
-  def evaluate()
-    $calc.memory
+  def evaluate 
+    @num
   end
 end

data/lib/calculator.rb

@@ -2,7 +2,8 @@ require 'parser'
 require 'ast'
 
 class Calculator
-  attr_accessor :memory
+  attr_reader :memory
+  attr_writer :memory
   
   def initialize()
     @memory = 0

data/lib/parser.rb

@@ -1,5 +1,4 @@
 require 'ast'
-require 'stringio'
 require 'scanner'
 require 'token'
 require 'calcex'
@@ -9,8 +8,8 @@ class Parser
     @scan = Scanner.new(istream)
   end
    
-  def parse()
-    return Prog()
+  def parse
+    return Prog() 
   end
   
   private
@@ -23,18 +22,18 @@ class Parser
       raise ParseError.new
     end
     
-    return result
+    result
   end
   
   def Expr() 
-    return RestExpr(Term())
+    RestExpr(Term())
   end
    
   def RestExpr(e) 
-    t = @scan.getToken()
+    t = @scan.getToken
     
     if t.type == :add then
-         return RestExpr(AddNode.new(e,Term()))
+      return RestExpr(AddNode.new(e,Term()))
     end
     
     if t.type == :sub then
@@ -43,79 +42,95 @@ class Parser
       
     @scan.putBackToken()
     
-    return e
+    e
   end
-
-  def Term
-    return RestTerm(Storable())
+  
+  def Term()
+    # # Write your Term() code here. This code is just temporary
+    # # so you can try the calculator out before finishing it.
+    
+    # t = @scan.getToken()
+    
+    # if t.type == :number then
+    #   val = t.lex.to_i
+    #   return NumNode.new(val)
+    # end
+    
+    # puts "Term not implemented\n"
+    
+    # raise ParseError.new
+    RestTerm(Storable())
   end
-
+   
   def RestTerm(e)
-    t = @scan.getToken()
-
+    
+    t = @scan.getToken
     if t.type == :times then
-      return RestTerm(TimesNode.new(e, Storable))
+      return RestTerm(TimesNode.new(e,Storable()))
     end
-
+    
     if t.type == :divide then
-      return Resterm(DivideNode.new(e, Storable))
+      return RestTerm(DivideNode.new(e,Storable()))
     end
-
-    if t.type == :mod then
-      return Resterm(ModNode.new(e, Storable))
-    end
-
+      
     @scan.putBackToken()
-
+    
     e
 
   end
-
-  def Storable
-
-    result=Factor()
-
+   
+  def Storable()
+    result = Factor()
     t = @scan.getToken
 
     if t.type == :keyword then
-      if t.lex == "S" then
+      if t.lex == "S" then 
         return StoreNode.new(result)
-      else  
-      puts "*Expected s found: #{t.lex} at line: #{t.line} col: #{t.col}"
-      raise ParserError.new # "Parse Error"
       end
+      puts "Expected S found: #{t.lex} at line: #{t.line} col: #{t.col}"
+      raise ParseErro.new
     end
-    @scan.putBackToken
-
+    @scan.putBackToken()
+    
     result
-
+    
+    
+    # puts "Storable not implemented"
+    # raise ParseError.new # "Parse Error"
   end
-  
-  def Factor
-    t = @scan.getToken
+   
+  def Factor() 
+
+    t = @scan.getToken()
+
     if t.type == :number then
       return NumNode.new(t.lex.to_i)
     end
+    
     if t.type == :keyword then
-      if t.lex == "R" then
-        return RecallNode.new
+      if t.lex == "R" then 
+        return RecallNode.new()
       end
-    else
-      puts "*Expected s found: #{t.lex} at line: #{t.line} col: #{t.col}"
-      raise ParserError.new # "Parse Error"
+      puts "Expected R found: #{t.lex} at line: " + t.line.to_s + " col: " + t.col.to_s
+      raise ParseError.new
     end
+
     if t.type == :lparen then
-      result = Expr()
+      expresion = Expr()
       t = @scan.getToken
+
       if t.type == :rparen then
-        return result
+        expresion
       end
-      puts "Parser Error: expected ) found: #{t.lex}"
-      puts "at line: #{t.line} col: #{t.col}"
+      puts "Syntax error expected ) at line: #{t.line}"
       raise ParseError.new
     end
 
-    puts "Factor not implemented"
-    raise ParserError.new # "Parse Error"
-  end
+    print "Parser Error: expected number, R, ( found: #{t.lext}"
+    puts "at line #{t.line} col: #{t.col}"
+    raise ParseError.new
+
+    # puts "Factor not implemented"
+    # raise ParserError.new # "Parse Error"
+  end         
 end

data/lib/scanner.rb

@@ -4,35 +4,34 @@ require 'calcex'
 class Scanner
   def initialize(inStream)
     @istream = inStream
-    @keywords = Set.new(%w{S R})
-    #@keywords = Set.new(["S","R"])
+    @keywords = Set.new(%W{S R})
     @lineCount = 1
     @colCount = -1
     @needToken = true
     @lastToken = nil
   end
   
-  def putBackToken()
+  def putBackToken
     @needToken = false
   end
 
-  def getToken()
-    if !@needToken # = unless @neddToken
+  def getToken
+    unless !@needToken
       @needToken = true
       return @lastToken
     end
     
     state = 0
     foundOne = false
-    c = @istream.getc()
+    c = @istream.getc
     
     if @istream.eof? then
       @lastToken = Token.new(:eof,@lineCount,@colCount)
       return @lastToken
     end
     
-    while !foundOne
-      @colCount = @colCount + 1
+    until foundOne
+      @colCount += 1
       case state
       when 0
         lex = ""

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: calc_mlopez12
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.1.0
 platform: ruby
 authors:
 - Kent D. Lee - Juan Francisco Cardona Mc - Mayerli López
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-17 00:00:00.000000000 Z
+date: 2015-11-12 00:00:00.000000000 Z
 dependencies: []
 description: An calculator implementation on ruby
 email: mlopez12@eafit.edu.co
@@ -44,7 +44,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.4.7
 signing_key: 
 specification_version: 4
 summary: Another calculator in ruby