calc_jloaiz16 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2a80c94263eea25ca624b6dc06d02ff67caac571
-  data.tar.gz: 0e5fa948b17ea9c30369da048cd4c633a8b39642
+  metadata.gz: 7e1763c84f4f111060403fbe966b73d13e1a8eee
+  data.tar.gz: ae2a9593713a72541e56037e77a56eb99be79123
 SHA512:
-  metadata.gz: d14c2abaa3a60d9cdb5e921e77f0b31888a3c5b85a54bb9565cc5fcf6fc55c73204a01e776f055583af1c413217a058d3a2e0f05b03482d648785d471a263c63
-  data.tar.gz: 23601e8b70ed549a3bb96e7fb4b2ff7261593bf75aff243eb127aacaa266062e3972cc895915a7f135ba97a89283cdfe380ee4a8d1e7b255dba9e39e5d87b937
+  metadata.gz: 47d9baac765afccd480e400d4d06689c96564d6cc5d4df92ed494f273f2edaf0b823aaaea3ff1f8e60c45e343595c632ba29ff1ce652fdc16e1ddfd4038b14df
+  data.tar.gz: 90623321dbc1fa9ae638187b99580903cc17e50f4c260338b8c7984770f9626092beeb7aec82581d2d6da715eeab85a74070b6deaffa74422d172eeefa4a6a45

data/bin/calc

@@ -4,19 +4,22 @@ require 'rubygems'
 require 'calculator'
 require 'calcex'
 
+$calc = Calculator.new()
+
 $stdout.print "> "
 $stdout.flush
 
-text = gets
-
-$calc = Calculator.new()
-
-begin
-  puts "= " + $calc.eval(text).to_s
-rescue ParseError
-  puts "Parse Error"
-rescue UnrecognizedTokenException
-  puts "UnrecognizedTokenException"
-rescue
-  puts "Unkown exception"
+while text = gets do
+  
+  begin
+    puts "=> " + $calc.eval(text).to_s
+  rescue ParseError
+    puts "Parse Error"
+  rescue UnrecognizedTokenException
+    puts "UnrecognizedTokenException"
+  rescue
+    puts "Unkown exception"
+  end
+  $stdout.print "> "
+  
 end

data/lib/ast.rb

@@ -27,38 +27,66 @@ class AddNode < BinaryNode
   end
 end
 
-#Se agregaron TimesNode y DivideNode
-class TimesNode < BinaryNode
+
+class SubNode < BinaryNode
   def initialize(left, right)
     super(left,right)
   end
    
   def evaluate() 
-    @left.evaluate() * @right.evaluate()
+    @left.evaluate() - @right.evaluate()
   end
 end
 
-class DivideNode < BinaryNode
+class StoreNode < UnaryNode
+  def initialize(subT)
+    super(subT)
+  end
+  def evaluate
+    $calc.memory = subTree.evaluate()
+  end
+end
+
+class RecallNode
+  def evaluate
+    $calc.memory
+  end
+end
+
+class NumNode 
+  def initialize(num)
+    @num = num
+  end
+   
+  def evaluate 
+    @num
+  end
+end
+
+#Se agregaron TimesNode y DivideNode
+class TimesNode < BinaryNode
   def initialize(left, right)
     super(left,right)
   end
    
   def evaluate() 
-    @left.evaluate() / @right.evaluate()
+    @left.evaluate() * @right.evaluate()
   end
 end
 
-class SubNode < BinaryNode
+class DivideNode < BinaryNode
   def initialize(left, right)
     super(left,right)
   end
    
   def evaluate() 
-    @left.evaluate() - @right.evaluate()
+    @left.evaluate() / @right.evaluate()
   end
 end
 
-=begin
+# -- Modificaciones calculadora -- #
+
+#clase Modulo
 class MdNode < BinaryNode
   def initialize(left, right)
     super(left,right)
@@ -68,28 +96,53 @@ class MdNode < BinaryNode
     @left.evaluate() % @right.evaluate()
   end
 end
-=end
-class StoreNode < UnaryNode
+
+#Clase plus
+class PlusNode < UnaryNode
+  def initialize(subTree)
+    super(subTree)
+  end
+  def evaluate
+    $calc.memory = $calc.memory + subTree.evaluate()
+  end
+end
+
+#Clase Minus
+class MinusNode < UnaryNode
   def initialize(subT)
     super(subT)
   end
   def evaluate
-    $calc.memory = subTree.evaluate
+    $calc.memory = $calc.memory - subTree.evaluate()
   end
 end
 
-class RecallNode
+#Clase Clear
+class ClearNode
   def evaluate
-    $calc.memory
+    $calc.memory = 0
   end
 end
 
-class NumNode 
-  def initialize(num)
-    @num = num
+#Clase para asignar
+class AssigNode < UnaryNode
+  def initialize(subT, nom)
+    super(subT)
+    @nombre = nom
   end
-   
-  def evaluate 
-    @num
+  def evaluate
+    value = @subTree.evaluate()
+    $calc.storevar(@nombre, value)
+    return value
+  end
+end
+
+#Obtener valor de memoria
+class VarNode
+  def initialize(nom)
+    @nombre = nom
+  end
+  def evaluate
+    $calc.recallvar(@nombre)
   end
 end

data/lib/calculator.rb

@@ -6,6 +6,7 @@ class Calculator
   
   def initialize()
     @memory = 0
+    @h = Hash.new()
   end
   
   def eval(expr)
@@ -13,4 +14,17 @@ class Calculator
     ast = parser.parse()
     return ast.evaluate()
   end
+
+  def storevar(nombre,valor)
+   @h[nombre] = valor
+  end
+
+  def recallvar(nombre)
+    tem = @h[nombre]
+    if tem == nil then
+      return 0
+    else
+      return tem
+    end
+  end
 end

data/lib/parser.rb

@@ -18,8 +18,8 @@ class Parser
     t = @scan.getToken()
     
     if t.type != :eof then
-      print "Expected EOF. Found ", t.type, ".\n"
-      raise ParseError.new
+     #print "Expected EOF. Found ", t.type, ".\n"
+     #raise ParseError.new
     end
     
     return result
@@ -46,19 +46,6 @@ class Parser
   end
   
   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
   
@@ -71,53 +58,81 @@ class Parser
     if t.type == :divide then
       return RestTerm(DivideNode.new(e,Storable()))
     end
+    #Agregamos modulo
+    if t.type == :md then
+      return RestTerm(MdNode.new(e,Storable()))
+    end
 
     @scan.putBackToken
 
     return e
   end
-  
+
   def Storable()
-    result = Factor()
-    t = @scan.getToken()
-    if t.type == :keyword then
+    return MemOperation(Factor())
+  end
+  
+  def MemOperation(result)
+    t= @scan.getToken
+    if t.type== :keyword then
       if t.lex == "S" then
         return StoreNode.new(result)
+      elsif t.lex == "P" then
+        return PlusNode.new(result)
+      elsif t.lex == "M" then
+        return MinusNode.new(result)
       end
-      puts "Expected S found: " , t.lex
-      raise ParseError.new
+      puts "Expected S || P || M found: ",t.lex
+      raise  ParseError.new
     end
-
     @scan.putBackToken
     return result
   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
+      elsif t.lex == "C" then
+        return ClearNode.new
       end
-      puts "Expected R found: " , t.lex
+      puts "Expected R || C found: " + t.lex
       raise ParseError.new
     end
-
     if t.type == :lparen then
       result = Expr()
-      t = @scan.getToken()
+      t=@scan.getToken
       if t.type == :rparen then
         return result
       end
-      puts "Expected ) found: ", t.type.to_s
+      puts "Expected ) found: " + t.type.to_s
       raise ParseError.new
     end
-    
-    puts "Expected number, R, ( found: " , t.type.to_s
-    raise ParseError.new # "Parse Error"
-  end        
+    if t.type == :identifier
+      return Assignable(t)
+    end
+    puts "Expected number || R || ( found: " + t.type.to_s
+    raise ParseError
+  end
+
+  def Assignable(t)
+    return Assign(t)
+  end
+
+  def Assign(t)
+    t2=@scan.getToken
+    nombre = t.lex
+    if t2.type == :igual then
+      result = Expr()
+      val = result.evaluate
+      return AssigNode.new(NumNode.new(val), nombre)
+    else
+      @scan.putBackToken
+      return VarNode.new(nombre)
+    end
+  end
 end

data/lib/scanner.rb

@@ -4,7 +4,7 @@ require 'calcex'
 class Scanner
   def initialize(inStream)
     @istream = inStream
-    @keywords = Set.new(["S","R"])
+    @keywords = Set.new(["S","R", "P", "M", "C", "="])
     @lineCount = 1
     @colCount = -1
     @needToken = true
@@ -30,7 +30,7 @@ class Scanner
       return @lastToken
     end
     
-    while !foundOne
+    until foundOne
       @colCount = @colCount + 1
       case state
       when 0
@@ -45,6 +45,8 @@ class Scanner
         elsif c == ?/ then state = 6
         elsif c == ?( then state = 7
         elsif c == ?) then state = 8
+        elsif c == ?% then state = 9
+        elsif c == ?= then state = 10
         elsif c == ?\n then 
           @colCount = -1
           @lineCount = @lineCount+1
@@ -91,6 +93,12 @@ class Scanner
       when 8
         type = :rparen
         foundOne = true
+      when 9
+        type = :md
+        foundOne = true
+      when 10
+        type = :igual
+        foundOne = true
       end
 
       if !foundOne then
@@ -99,7 +107,7 @@ class Scanner
       end
 
     end
-   
+    
     @istream.ungetc(c)   
     @colCount = @colCount - 1
     if type == :number or type == :identifier or type == :keyword then
@@ -116,11 +124,11 @@ class Scanner
   def isLetter(c) 
     return ((?a <= c and c <= ?z) or (?A <= c and c <= ?Z))
   end
-  
+
   def isDigit(c)
     return (?0 <= c and c <= ?9)
   end
-  
+
   def isWhiteSpace(c)
     return (c == ?\  or c == ?\n or c == ?\t)
   end

metadata

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