jmejiao5-rubycalc 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4f725d9b06b4be7a783e6630192d41258de624c3
-  data.tar.gz: 470edb50f9000659d1d85f078b556ad3325e79b7
+  metadata.gz: e356e670b90165e3c10023ef55c575340033d3af
+  data.tar.gz: 926015f5092fcd22be8e1af04b73f1b6dba0c468
 SHA512:
-  metadata.gz: bf5f53c1270ec3163061f1b80b4489577b71c3e22688a35abd7197cf76b79e693a8ad4abad785945b9e4bb186e78632e0dd2f3565f690aecad2ed8247ca75920
-  data.tar.gz: 6c6daf29a06eb0dccbf32a9a278bb130ddee8bdff960123973dc2852d82ff519f245f7dbf21386732f1626a493f48e4bad5b70667650552fa920bbbca2197e9e
+  metadata.gz: bc6ea85157f7b0827958854d39a8469ebf58a74d477b1569f05f6974dbe020af76102ba6033a6cfcc0a6673409ae10b91cc561ca01bb49738b91ca826e49b52d
+  data.tar.gz: 91636ba4b25e86e9ca13ac596c81fb3cad75d0801c647e376716693ed29129b9d5bb2e3fdb105c4e935d94cd520638a5a6105252fe77d09df2ce171ea10de53f

data/bin/rubycalc

@@ -4,19 +4,151 @@ require 'rubygems'
 require 'calculator'
 require 'calcex'
 
-$stdout.print "> "
-$stdout.flush
+$calc = Calculator.new()
 
-text = gets
+if ARGV.size >= 1
+  	i=0
+	while i < ARGV.size do
+		#puts ARGV[i]
 
-$calc = Calculator.new()
+		if ARGV[i] == "-v" then
+			i=i+1
+			var = ARGV[i].split("=")
+			nomVar = var[0]
+
+			valVar = $calc.eval(var[1].to_s+"\n")
+
+			#puts $calc.public_methods
+
+			$calc.storeVar(nomVar, valVar)
+
+			puts nomVar+" <- #{$calc.recallVar(nomVar)}"
+
+		end
+
+		if ARGV[i].include? ".calc"
+			puts "Lectura de archivos"
+			archivo = "lib/#{ARGV[i]}"
+
+			File.open( archivo ) do |f|
+  				loop do
+    				break if not line = f.gets
+    				#puts "#{f.lineno}: #{line}"
+
+    				text = line
+
+				begin
+					if text.chomp == "" || text.chomp == "exit" then
+						exit
+					else
+						while text.include? "let" do
+							#puts text
+
+							var = text.split("=")
+
+							#puts var[0].to_s
+
+							expresion = var[1]
+
+							#puts expresion.to_s
+
+							aux = var[0].split(" ")
+
+							nomVar = aux[1]
+
+							#puts nomVar.to_s
+
+							valVar = $calc.eval(var[1].to_s)
+
+							$calc.storeVar(nomVar, valVar)
+
+							puts nomVar+" <- #{$calc.recallVar(nomVar)}"
+
+							$stdout.print "> "
+							$stdout.flush
+
+							text = $stdin.gets
+						end
+  						puts "= " + ($calc.eval(text).to_s)
+  					end
+				rescue ParseError => pe
+  					puts "Parse Error"
+				rescue UnrecognizedTokenException => ute
+  					puts "UnrecognizedTokenException"
+				rescue
+  					puts "Unkown exception"
+				end
+  				end
+			end
+			exit
+		end
+
+		if ARGV[i] == "-c"
+			puts "Crear .ewe"
+			archivo = File.open("lib/a.ewe","w")
+			$stdout.print "> "
+			$stdout.flush
+			text = $stdin.gets
+
+			archivo.puts $calc.comp(text).to_s
+
+  			archivo.close
+
+			exit
+		end
+
+		i=i+1
+	end
 
-begin
-  puts "= " #{$calc.eval(text)}
-rescue ParseError => pe
-  puts "Parse Error"
-rescue UnrecognizedTokenException => ute
-  puts "UnrecognizedTokenException"
-rescue
-  puts "Unkown exception"
 end
+
+while true do
+
+	$stdout.print "> "
+	$stdout.flush
+
+	text = $stdin.gets
+
+	begin
+		if text.chomp == "" || text.chomp == "exit" then
+			exit
+		else
+			while text.include? "let" do
+				#puts text
+
+				var = text.split("=")
+
+				#puts var[0].to_s
+
+				expresion = var[1]
+
+				#puts expresion.to_s
+
+				aux = var[0].split(" ")
+
+				nomVar = aux[1]
+
+				#puts nomVar.to_s
+
+				valVar = $calc.eval(var[1].to_s)
+
+				$calc.storeVar(nomVar, valVar)
+
+			puts nomVar+" <- #{$calc.recallVar(nomVar)}"
+
+				$stdout.print "> "
+				$stdout.flush
+
+				text = $stdin.gets
+			end
+  			puts "= " + ($calc.eval(text).to_s)
+  		end
+	rescue ParseError => pe
+  		puts "Parse Error"
+	rescue UnrecognizedTokenException => ute
+  		puts "UnrecognizedTokenException"
+	rescue
+  		puts "Unkown exception"
+	end
+
+end

data/lib/ast.rb

@@ -25,6 +25,18 @@ class AddNode < BinaryNode
   def evaluate() 
     return @left.evaluate() + @right.evaluate()
   end
+
+  def ewe()
+     iniciaAN = "       sp := sp + tres \n"
+     medioAN = "\n       sp := sp - tres \n      tmp := M[sp + 3] \n"
+     medioAN = medioAN + "      M[sp + 1] := tmp \n       sp := sp + tres \n"
+     finAN ="\n       sp := sp - tres \n       tmp := M[sp + 3] \n"
+     finAN = finAN + "       M[sp + 2] := tmp \n       tmp := M[sp + 1] \n"
+     finAN = finAN + "       tmp2 := M[sp + 2] \n       tmp := tmp + tmp2 \n"
+     finAN = finAN + "       M[sp + 0] := tmp  \n"
+     suma = iniciaAN + @left.ewe() + medioAN + @right.ewe() + finAN 
+     return suma
+   end
 end
 
 class SubNode < BinaryNode
@@ -35,6 +47,18 @@ class SubNode < BinaryNode
   def evaluate() 
     return @left.evaluate() - @right.evaluate()
   end
+
+  def ewe()
+     iniciaSubN = "       sp := sp + tres \n"
+     medioSubN = "\n       sp := sp - tres \n       tmp := M[sp + 3] \n"
+     medioSubN+="       M[sp + 1] := tmp \n       sp := sp + tres \n"
+     finSubN ="\n       sp := sp - tres \n       tmp := M[sp + 3] \n"
+     finSubN+="       M[sp + 2] := tmp \n       tmp := M[sp + 1] \n"
+     finSubN+="       tmp2 := M[sp + 2] \n       tmp := tmp - tmp2 \n"
+     finSubN+="       M[sp + 0] := tmp \n"
+     sub = iniciaSubN + @left.ewe() + medioSubN + @right.ewe() + finSubN 
+     return sub
+   end
 end
 
 class TimesNode < BinaryNode
@@ -44,15 +68,99 @@ class TimesNode < BinaryNode
   def evaluate()
     return @left.evaluate() * @right.evaluate()
   end
+
+  def ewe()
+     iniciaMN = "       sp := sp + tres \n"
+     medioMN = "\n       sp := sp - tres \n   tmp := M[sp + 3] \n"
+     medioMN+="       M[sp + 1] := tmp \n       sp := sp + tres \n"
+     finMN ="\n      sp := sp - tres \n       tmp := M[sp + 3] \n"
+     finMN+="       M[sp + 2] := tmp \n       tmp := M[sp + 1] \n"
+     finMN+="       tmp2 := M[sp + 2] \n    tmp := tmp * tmp2 \n"
+     finMN+="       M[sp + 0] := tmp  \n"
+     times = iniciaMN + @left.ewe() + medioMN + @right.ewe() + finMN 
+     return times
+   end
+
 end
 
-class DivideNode < BinaryNode
+class DivNode < BinaryNode
   def initialize(lef, right)
     super(left, right)
   end
   def evaluate()
     return @left.evaluate() / @right.evaluate()
   end
+
+  def ewe()
+     iniciaDN = "       sp := sp + tres \n"
+     medioDN = "\n       sp := sp - tres \n     tmp := M[sp + 3] \n"
+     medioDN+="       M[sp + 1] := tmp \n     sp := sp + tres \n"
+     finDN = "\n       sp := sp - tres \n     tmp := M[sp + 3] \n"
+     finDN+="       M[sp + 2] := tmp \n       tmp := M[sp + 1] \n"
+     finDN+="       tmp2 := M[sp + 2] \n     tmp := tmp / tmp2 \n"
+     finDN+="       M[sp + 0] := tmp \n"
+     div = iniciaDN + @left.ewe() +medioDN + @right.ewe() + finDN 
+     return div
+   end
+end
+
+class ModNode < BinaryNode
+  def initialize(lef, right)
+    super(left, right)
+  end
+  def evaluate()
+    return @left.evaluate() % @right.evaluate()
+  end
+
+  def ewe()
+    iniciaModN = "       sp := sp + tres \n"
+    medioModN = "\n       sp := sp - tres \n     tmp := M[sp + 3] \n"
+    medioModN+="       M[sp + 1] := tmp \n     sp := sp + tres \n";
+    finModN = "\n       sp := sp - tres \n     tmp := M[sp + 3] \n"
+    finModN+="       M[sp + 2] := tmp \n       tmp := M[sp + 1] \n"
+    finModN+="       tmp2 := M[sp + 2] \n     tmp := tmp % tmp2 \n"
+    finModN+="       M[sp + 0] := tmp \n"
+    mod = iniciaModN + @left.ewe() +medioModN + @right.ewe() + finModN 
+    return mod
+  end
+end
+
+class PNode < UnaryNode
+  def initialize(subtree)
+    super(subtree)
+  end
+  def evaluate()
+  	plus = @subTree.evaluate()
+  	memory = $calc.memory
+    $calc.memory = plus + memory
+  end
+
+  def ewe()
+    iniciaSN = "sp := sp + uno\n"
+    finSN = "\n      sp := sp - uno\n      tmp := M[sp + 1]\n"
+    finSN += "      M[sp + 0] := tmp\n      mem := tmp\n"
+    store = iniciaNN + @subTree.ewe().to_s + finSN 
+    return store
+  end
+end
+
+class MNode < UnaryNode
+  def initialize(subtree)
+    super(subtree)
+  end
+  def evaluate()
+  	minus = @subTree.evaluate()
+  	memory = $calc.memory
+    $calc.memory = memory - minus
+  end
+
+  def ewe()
+    iniciaSN = "sp := sp + uno\n"
+    finSN = "\n      sp := sp - uno\n      tmp := M[sp + 1]\n"
+    finSN += "      M[sp + 0] := tmp\n      mem := tmp\n"
+    store = iniciaNN + @subTree.ewe().to_s + finSN 
+    return store
+  end
 end
 
 class StoreNode < UnaryNode
@@ -62,6 +170,14 @@ class StoreNode < UnaryNode
   def evaluate()
     $calc.memory = @subTree.evaluate()
   end
+
+  def ewe()
+    iniciaSN = "sp := sp + uno\n"
+    finSN = "\n      sp := sp - uno\n      tmp := M[sp + 1]\n"
+    finSN += "      M[sp + 0] := tmp\n      mem := tmp\n"
+    store = iniciaNN + @subTree.ewe().to_s + finSN 
+    return store
+  end
 end
 
 class NumNode 
@@ -72,10 +188,41 @@ class NumNode
   def evaluate() 
     return @num
   end
+
+  def ewe()
+     aux = "     tmp := " + @num.to_s()
+     num = aux + "\n       M[sp + 0 ] := tmp"
+     return num
+   end
+end
+
+class IdentifierNod 
+  def initialize(var, val)
+    @var = var
+    @val = val
+  end
+   
+  def evaluate() 
+    return @val
+  end
+  
+  def ewe()
+     return ""
+   end
 end
 
+
+
 class RecallNode
   def evaluate()
     $calc.memory
   end
+  def ewe()
+    recall = "M[sp + 0] := mem \n"
+    return recall
+  end
 end
+
+
+
+

data/lib/calculator.rb

@@ -3,9 +3,22 @@ require 'ast'
 
 class Calculator
   attr_accessor :memory
-  
+  attr_accessor :nomVar
+  attr_accessor :valVar
+
   def initialize()
     @memory = 0
+    @nomVar = []
+    @valVar = []
+  end
+
+  def storeVar(key, val)
+    @nomVar << key
+    @valVar << val
+  end
+
+  def store (val)
+  	@memory = val
   end
   
   def eval(expr)
@@ -13,4 +26,28 @@ class Calculator
     ast = parser.parse()
     return ast.evaluate()
   end
-end
+
+  def recallVar(key)
+    i = 0
+    value = 0
+    while i < @nomVar.size do
+      if @nomVar[i] == key then
+        value = @valVar[i]
+      end
+      i=i+1
+    end
+    return value
+  end
+
+  def comp(expr)
+     parser = Parser.new(StringIO.new(expr))
+     inicioConst = "main: sp := 6 \n  cero := 0 \n uno  := 1 \n tres := 3 \n 
+sp := sp + uno \n"
+     finalConst = "  writeInt(tmp) \n halt \n equ tmp M[0] \n 
+equ tmp2  M[1] \n equ uno M[2] \n equ tres M[3] \n equ mem
+     M[4] \n equ sp  M[5] \n equ stack M[6] equ cero M[7]"
+     ast = parser.parse()
+     ret = inicioConst + ast.ewe() + finalConst
+     return ret
+   end
+end

data/lib/parser.rb

@@ -2,10 +2,12 @@ require 'ast'
 require 'scanner'
 require 'token'
 require 'calcex'
+require 'calculator'
 
 class Parser
   def initialize(istream)
     @scan = Scanner.new(istream)
+    @todo = true
   end
    
   def parse()
@@ -46,24 +48,26 @@ class Parser
   end
   
   def Term()
-    return ResTerm(Storable())
+    return 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,Term()))
     end
 
     if t.type == :divide then
-      return RestTerm(DivideNode.new(e,Storable()))
+      return RestTerm(DivNode.new(e,Term()))
     end
 
-      @scan.putBackToken()
-
-      return e
+    if t.type == :mod then
+      return RestTerm(ModNode.new(e,Term()))
+    end
 
+    @scan.putBackToken
+    return e
   end
    
     def Storable()
@@ -74,13 +78,18 @@ class Parser
       if t.type == :keyword then
         if t.lex == "S" then
           return StoreNode.new(factor)
-        else
-          raise ParseError.new
+        end
+        if t.lex == "M" then
+          return MNode.new(factor)
+        end
+        if t.lex == "P" then
+          return PNode.new(factor)
         end
       end
 
       @scan.putBackToken
-      return factor
+
+      factor
   end
    
   def Factor() 
@@ -90,23 +99,49 @@ class Parser
       return NumNode.new(t.lex.to_i)
     end
 
+    if t.type == :identifier then
+
+      var = t.lex.to_s
+      value = $calc.recallVar(t.lex.to_s)
+
+      return IdentifierNod.new(var, value.to_i)
+    end
+
     if t.type == :keyword then
       if t.lex == "R" then
         return RecallNode.new
-      else
-        raise ParseError.new
+      end
+      if t.lex == "C" then
+        $calc.store(0)
+        return RecallNode.new
       end
     end
-
-    if t.ype == :lparen then
+    if t.type == :lparen then
+      
       expr = Expr()
-      t = @scan.getToken()
+      t = @scan.getToken
+
       if t.type == :rparen then
         return expr
       else
         raise ParseError.new
       end
     end
+
     raise ParseError.new
-  end         
+  end
+
+  def ExprEWE()
+  	result = Term()
+  	result = RestExpr(result)
+  	return result
+  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","C","M","P"])
     @lineCount = 1
     @colCount = -1
     @needToken = true
@@ -30,7 +30,7 @@ class Scanner
       return @lastToken
     end
     
-    until foundOne do
+    while !foundOne
       @colCount = @colCount + 1
       case state
       when 0
@@ -43,8 +43,9 @@ class Scanner
         elsif c == ?- then state = 4
         elsif c == ?* then state = 5
         elsif c == ?/ then state = 6
-        elsif c == ?( then state = 7
-        elsif c == ?) then state = 8
+        elsif c == ?% then state = 7
+        elsif c == ?( then state = 8
+        elsif c == ?) then state = 9
         elsif c == ?\n then 
           @colCount = -1
           @lineCount = @lineCount+1
@@ -86,9 +87,12 @@ class Scanner
         type = :divide
         foundOne = true
       when 7
-        type = :lparen
+        type = :mod
         foundOne = true
       when 8
+        type = :lparen
+        foundOne = true
+      when 9
         type = :rparen
         foundOne = true
       end
@@ -117,20 +121,20 @@ class Scanner
     if c.nil? then
       return false
     end
-    return ((?a <= c and c <= ?z) or (?A <= c and c <= ?Z))
+    (?a <= c and c <= ?z) or (?A <= c and c <= ?Z)
   end
   
   def isDigit(c)
     if c.nil? then
       return false
     end
-    return (?0 <= c and c <= ?9)
+    return(?0 <= c and c <= ?9)
   end
   
   def isWhiteSpace(c)
     if c.nil? then
       return false
     end
-    return (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.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Kent D. Lee - Jose Alberto Mejia