calc_dsalaz26 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ac46daeb4898891060f235bfc94e7a844ea7e3dc
-  data.tar.gz: 8d3be5804700679b7002e7ca3ed2a72885e1669f
+  metadata.gz: 1c24d48dc0ab7733702f0c1468332146150ad405
+  data.tar.gz: dec3877c75106826c36bdf81c97c9ec178e66af1
 SHA512:
-  metadata.gz: d33ef502efc60c49b39fc3b0231662fc2239b04f40312911f940fec9015428e96784d97b800bd6980da4d356c218f1092100c505036f45e12dab05f0a8395d6a
-  data.tar.gz: 05f7847748a297fe55cf4b94d886bda041e62b2c6a32aba7290f7dc1537c84461e1e0a51a32ef5b505f0972080ef1711d39029b26216e0f4d10c59852d95104e
+  metadata.gz: 4c2348ed89ecf116d335ee176f87a2c75cdf864ca779af98c29504bd78419069888aff45aef5ec79cfcefac9e174c8a2665d3082016ff7b3775bbd7a8076580a
+  data.tar.gz: 16b5f1145be09892b6c9a5e58b6524a68c2cf766b5e1d6269abee2fde6503d02dc9169bde55433f24e1b7efc410ea8c7a711f7361223d4a0915ed904d024d7dc

data/bin/calc

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

data/lib/ast.rb

@@ -1,4 +1,6 @@
+# coding: utf-8
 require 'set'
+##require 'hash'
 
 class BinaryNode
   attr_reader :left, :right
@@ -38,8 +40,8 @@ class TimesNode < BinaryNode
 end
 
 class DivideNode < BinaryNode
-  def initialize(left,right)
-    super(left,right)
+  def initialize(left, right)
+    super(left, right)
   end
 
   def evaluate()
@@ -57,6 +59,15 @@ class SubNode < BinaryNode
   end
 end
 
+class ModuleNode < BinaryNode
+  def initialize(left,right)
+    super(left,right)
+  end
+  def evaluate()
+    return @left.evaluate % @right.evaluate()
+  end
+end
+
 class StoreNode < UnaryNode
   def initialize(subTree)
     super(subTree)
@@ -82,3 +93,57 @@ class RecallNode
     $calc.memory
   end
 end
+
+class CleanNode
+  def evaluate()
+    $calc.memory = 0
+  end
+end
+
+class MinusNode < UnaryNode
+  def initialize(subTree)
+    super(subTree)
+  end
+
+  def evaluate()
+    $calc.memory = $calc.memory - subTree.evaluate()
+  end
+end
+
+class PlusNode < UnaryNode
+  def initialize(subTree)
+    super(subTree)
+  end
+  def evaluate()
+    valor = $calc.memory
+    $calc.memory = valor + subTree.evaluate()
+  end
+end
+
+class VariableNode < UnaryNode
+  def initialize(variable, subTree)
+    super(subTree)
+    @variable=variable
+  end
+  def evaluate()
+    puts "Va a entrar"
+    $calc.memory2[@variable]= subTree.evaluate()
+    puts "Entró #{@variable}"
+    
+    return subTree.evaluate()
+  end
+end
+
+class BuscarNode
+  def initialize(variable)
+    @variable = variable
+  end
+  def evaluate()
+    var = @variable
+    if $calc.memory2[var] != nil then
+      return $calc.memory2[var]
+    else
+      return 0
+    end
+  end
+end

data/lib/calculator.rb

@@ -1,11 +1,15 @@
 require 'parser'
 require 'ast'
 
+
 class Calculator
   attr_accessor :memory
+  attr_accessor :memory2
   
   def initialize()
     @memory = 0
+    @memory2 = Hash.new()
+    ##@memory2.clear
   end
   
   def eval(expr)

data/lib/parser.rb

@@ -1,3 +1,4 @@
+# coding: utf-8
 require 'ast'
 require 'stringio'
 require 'scanner'
@@ -54,15 +55,15 @@ class Parser
     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))
+    if t.type == :module then
+      return RestTerm(ModuleNode.new(e, Storable()))
     end
 
     @scan.putBackToken()
@@ -78,18 +79,28 @@ class Parser
     t = @scan.getToken
 
     if t.type == :keyword 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
+      return MemOperation(result,t)
     end
+    
     @scan.putBackToken
 
     result
 
   end
+
+  def MemOperation (result,t)
+    if t.lex == "S" then
+      return StoreNode.new(result)
+    elsif t.lex == "M" then
+      return MinusNode.new(result)
+    elsif t.lex == "P" then
+      return PlusNode.new(result)
+    else
+      puts "Syntax Error: found other keyword "
+      puts "at line: #{t.line} col: #{t.col}"
+      raise ParseError.new
+    end
+  end
   
   def Factor
     t = @scan.getToken
@@ -99,10 +110,12 @@ class Parser
     if t.type == :keyword then
       if t.lex == "R" then
         return RecallNode.new
+      elsif t.lex == "C" then
+        return CleanNode.new
+      else
+        puts "*Expected R or C found: #{t.lex} at line: #{t.line} col: #{t.col}"
+        raise ParserError.new # "Parse Error"
       end
-    else
-      puts "*Expected s found: #{t.lex} at line: #{t.line} col: #{t.col}"
-      raise ParserError.new # "Parse Error"
     end
     if t.type == :lparen then
       result = Expr()
@@ -115,7 +128,38 @@ class Parser
       raise ParseError.new
     end
 
+    @scan.putBackToken
+    return Assignable()
+    
     puts "Factor not implemented"
     raise ParserError.new # "Parse Error"
   end
+
+  def Assignable
+    t = @scan.getToken
+    puts "Va a pasar"
+    if t.type == :identifier then
+      puts "Pasó"
+      return Assign(t.lex)
+    else
+      puts "Expected identifier, found: #{t.type}"
+      raise PerseError.new
+    end
+  end
+
+  def Assign (name)
+ 
+    ##return name
+    puts "Hola"
+    t=@scan.getToken
+    if t.type == :igual then
+      puts "Hola2"
+      return VariableNode.new(name,Expr())
+    end
+
+    @scan.putBackToken
+    puts "Hola 3"
+    return BuscarNode.new(name)
+  end
+
 end

data/lib/scanner.rb

@@ -4,8 +4,7 @@ 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 C M P})
     @lineCount = 1
     @colCount = -1
     @needToken = true
@@ -17,7 +16,7 @@ class Scanner
   end
 
   def getToken()
-    if !@needToken # = unless @neddToken
+    unless @needToken
       @needToken = true
       return @lastToken
     end
@@ -31,8 +30,8 @@ class Scanner
       return @lastToken
     end
     
-    while !foundOne
-      @colCount = @colCount + 1
+    until foundOne
+      @colCount += 1
       case state
       when 0
         lex = ""
@@ -46,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
@@ -92,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,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: calc_dsalaz26
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Kent D. Lee - Juan Francisco Cardona Mc - Diego Salazar Noreña
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-12 00:00:00.000000000 Z
+date: 2015-11-23 00:00:00.000000000 Z
 dependencies: []
 description: An calculator implementation on ruby
 email: dsalaz26@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