calc_rgotthei 0.0.2 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c13e1fd62d9a671c3119468d789cd48c08f121c5
-  data.tar.gz: d251f4a19dc186c1c7176c1f5b1cc39575c53c0e
+  metadata.gz: 2d4df24cc58e891784c299bab0e6c8cb7e63ac98
+  data.tar.gz: 356b6b67931241b0edb63310b2a990efaa5a7470
 SHA512:
-  metadata.gz: 21e3f046e7f1a581ab836fad9138c6d7bfe3703485b2161a4bf8e56cd25434d7eceb6bb6fee3e4b62504fb4a8f238686c91cd3222f90d1fa6f9fef7fb5d3238c
-  data.tar.gz: 164b26c49f626c099144cd04250b009d412d49c119fa69e9bf85d9092cf121709538b0ea83f3d5a01133e98bebebdb32e84a33842e3b0724d768f10b95cb5d53
+  metadata.gz: 797f4d2cc3d70ef8945aa16a8c5ff467f6e65d7b124fff54332301e9fbf1da1f76deeb3f0d39246db266812067c6b5e98a4e91a9806b28909a6f88da31231b95
+  data.tar.gz: 345cd4c742a8cb667312ac09d42a722970fb6b6dec37202172a716a7a4e4000be0589c1e7b2649b794ba860c7dec1bdfae4c9ce5b3f2e50e2d2d7fb16224a55f

data/bin/calc

@@ -7,16 +7,26 @@ require 'calcex'
 $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"
-end
+while(text = gets)
+
+  @res = $calc.eval(text) 
+
+  begin
+  	if $calc.getChange == 1 then 
+      puts "=> " + @res.to_s + $calc.getVars().to_s
+    else
+  	  puts "=> " + @res.to_s
+  	end
+  	$calc.setChange
+  	$calc.cleanVariables
+  rescue ParseError
+    puts "Parse Error"
+  rescue UnrecognizedTokenException
+    puts "UnrecognizedTokenException"
+  rescue
+    puts "Unkown exception"
+  end
+  $stdout.print "> "
+end

data/lib/ast.rb

@@ -83,3 +83,67 @@ class DivideNode < BinaryNode
     @left.evaluate / @right.evaluate
   end
 end
+
+class ModuleNode < BinaryNode
+  def initialize(left, right)
+    super(left,right)
+  end
+   
+  def evaluate 
+    @left.evaluate % @right.evaluate
+  end
+end
+
+class PlusNode < UnaryNode
+  def initialize(sub)
+    super(sub)
+  end
+
+  def evaluate
+    $calc.memory += subTree.evaluate
+  end
+end
+
+class MinusNode < UnaryNode
+  def initialize(sub)
+    super(sub)
+  end
+  
+  def evaluate  
+    $calc.memory -= subTree.evaluate
+  end
+end
+
+class CleanNode 
+  def evaluate
+    $calc.memory = 0
+  end
+end
+
+class IgualNode < BinaryNode
+  def initialize(left,right)
+    super(left,right)
+  end
+end 
+
+class ConfigurarNode < UnaryNode
+  def initialize(sub, nombre)
+    super sub
+    @nombre = nombre
+  end
+
+  def evaluate
+    @val = subTree.evaluate
+    $calc.set(@val,@nombre)
+  end
+end
+
+class ObtenerNode
+  def initialize(key)
+    @key = key
+  end
+
+  def evaluate
+    $calc.get(@key)
+  end
+end

data/lib/calculator.rb

@@ -1,11 +1,16 @@
 require 'parser'
 require 'ast'
+require 'stringio'
 
 class Calculator
   attr_accessor :memory
   
-  def initialize()
+  def initialize
     @memory = 0
+    @variables = Hash.new
+    @cadena = ""
+    @count = 0
+    @change = 0
   end
   
   def eval(expr)
@@ -13,4 +18,42 @@ class Calculator
     ast = parser.parse()
     return ast.evaluate()
   end
+
+  def set(val,nom)
+    @change = 1
+    if @count == 0 then
+      @cadena += " #{nom} <- #{val}"
+    else
+      @cadena += ", #{nom} <- #{val}"
+    end
+    @count += 1
+    @variables[nom]=val
+  end
+
+  def get(v)
+    tem = @variables[v]
+    if tem != nil then
+      return tem.to_i
+    else
+      return 0
+    end
+
+  end
+
+  def cleanVariables
+    @count = 0
+    @caracter = ""
+  end
+
+  def getVars
+    return a = " ["+ @cadena + "]"
+  end
+
+  def setChange
+    @change = 0
+  end
+  
+  def getChange
+    return @change
+  end
 end

data/lib/parser.rb

@@ -74,30 +74,49 @@ class Parser
       return RestTerm(DivideNode.new(e,Storable()))
     end
 
+    if t.type == :module then
+      return RestTerm(ModuleNode.new(e,Term()))
+    end
+
+    if t.type == :igual then
+      return RestTerm(IgualNode.new(e,Term()))
+    end
+
     @scan.putBackToken
 
     e
-    
-    # puts "RestTerm not implemented"
-    # raise ParseError.new # "Parse Error"
   end
    
   def Storable()
 
     result = Factor()
 
-    t = @scan.getToken
+    # t = @scan.getToken
 
-    if t.type == :keyword then
-      if t.lex == "S" then
-        return StoreNode.new(result)
-      end
-      puts "Expected S found: ", t.lex
-      raise ParseError.new
-    end
+    # if t.type == :keyword then
+    #   if t.lex == "S" then
+    #     return StoreNode.new(result)
+    #   end
+    #   puts "Expected S found: ", t.lex
+    #   raise ParseError.new
 
-    @scan.putBackToken
-    result
+    #   if t.lex == "P" then
+    #     return PlusNode.new(result)        
+    #   end
+    #   puts "Expected P found: ", t.lex
+    #   raise ParseError.new
+
+    #   if t.lex == "M" then
+    #     return MinusNode.new(result)
+    #   end
+    #   puts "Expected M found: ", t.lex
+    #   raise ParseError.new
+
+    # end
+
+    # @scan.putBackToken
+    
+    MemOperation(result)
     
   end
    
@@ -114,6 +133,10 @@ class Parser
         return RecallNode.new
       end
 
+      if t.lex == "C" then
+        return CleanNode.new
+      end
+
       puts "Expected R found: "+ t.lex
       raise ParseError.new
     end
@@ -131,8 +154,58 @@ class Parser
       raise ParseError.new
     end
 
+    if t.type == :identifier then
+      return Assignable(t.lex)
+    end
+
     puts "Expected number, R, ( found: " + t.type.to_s
     raise ParseError.new
       
-  end         
+  end 
+
+  def MemOperation(e)
+    t = @scan.getToken
+
+    if t.type == :keyword then
+      if t.lex == "S" then
+        return StoreNode.new(e)
+      end
+
+      if t.lex == "P" then
+        return PlusNode.new(e)        
+      end
+      
+      if t.lex == "M" then
+        return MinusNode.new(e)
+      end
+      
+      puts "Syntax error: ", t.lex
+      raise ParseError.new 
+      
+
+    end
+
+    @scan.putBackToken
+    e
+  end  
+
+  def Assignable(a)
+    t = @scan.getToken
+
+    if t.type == :igual then
+      return Assign(a)
+    end
+
+    @scan.putBackToken
+
+    return ObtenerNode.new(a)
+  end
+
+  def Assign(nombre)
+    result = Expr()
+
+    return ConfigurarNode.new(result, nombre)
+
+    @scan.putBackToken
+  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
@@ -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 = :module
+        foundOne = true
+      when 10
+        type = :igual
+        foundOne = true
       end
 
       if !foundOne then

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: calc_rgotthei
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.1.0
 platform: ruby
 authors:
 - Kent D. Lee - Juan Francisco Cardona Mc