calc_jbusta16 0.2.0 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ce317c0b16e4304de90d57623d5655a80a38b8ef
-  data.tar.gz: 88a1cab8abaf364a99e956a9e8b6fa9078044f8f
+  metadata.gz: 2183149fb606227443cab2502cbb9d415b8add50
+  data.tar.gz: 2ba14b5a251ce3fcf377276374a24f6f817bada1
 SHA512:
-  metadata.gz: 9dd06df2b7894d2cc89c3bd9a34ad99baa0e62cd2722ea132039f9eaeeafa153081858a9a721109b731dfcc2c6c1151d22b4c3eb4bbbf833d9e47c1c0c4eba82
-  data.tar.gz: 39f244caddd2d2a9deb83103673399bad92a41c95adec2e55264393a36d6c59b25936c9f05f667a71f272f3f114e9281ba0f73d7a2432a29dadbf5f86cdd9d4e
+  metadata.gz: 090a08af6f50a975ee18b24d1a72194c603fae2b7b2da512f46e4b5993660297879e0c507c18d638c4a0a61744d3f8b4f50473dc6b749a910e54e288edbd33d4
+  data.tar.gz: 103f94ba16eaa4391c75b94c7d9bc92bf577142bf682b79de9849a05d637e9d02f252b48cc15324a0ec5606df1f2bafabb8d4ad92b017fe8f6a29e31af5befec

data/bin/calcex

@@ -0,0 +1,64 @@
+#!/usr/bin/env ruby
+
+require 'rubygems'
+require 'calculator'
+require 'calcex'
+
+$calc = Calculator.new()
+
+def makeInteractiveCalc
+  $stdout.print "> "
+  $stdout.flush
+  text = gets
+  makeCalc(text)
+  makeInteractiveCalc()
+end
+
+def makeCalc(text)
+  puts "=> " + $calc.eval(text).to_s + $calc.printVar()
+end
+
+def setEnvVars
+  $calc.changeSetEnvVars()
+  ENV.each do |key, value|
+    if key.start_with?("CALCVAR") == true then
+      var = key.slice(7, key.size)
+      text = var + "=" + value + "\n"
+      puts text
+      makeCalc(text)
+    end
+  end
+  $calc.changeSetEnvVars()
+end
+
+def main
+  args = ARGF.argv
+  setEnvVars()
+  i = 0
+  while i < args.size do
+    optionArg = args[i]
+    puts "args[#{i}]: #{args[i]}"
+    if optionArg == "-e" then
+      $calc.envConf()
+    elsif (optionArg == "-v") then
+      text = args[i+1] + "\n"
+      $calc.eval(text)
+      i += 1
+    else
+      lines = ARGF.readlines
+      lines.each do |line| makeCalc(line) end
+    end
+    i += 1
+  end
+  makeInteractiveCalc()
+end
+
+begin
+  main()
+rescue ParseError
+  puts "* Parse Error"
+rescue UnrecognizedTokenException
+  puts "* UnrecognizedTokenException"
+rescue
+  puts "* Unkown exception"
+end

data/lib/ast.rb

@@ -22,7 +22,7 @@ class AddNode < BinaryNode
     super(left,right)
   end
    
-  def evaluate() 
+  def evaluate
     return @left.evaluate() + @right.evaluate()
   end
 end
@@ -32,7 +32,7 @@ class SubNode < BinaryNode
     super(left,right)
   end
    
-  def evaluate() 
+  def evaluate
     return @left.evaluate() - @right.evaluate()
   end
 end
@@ -42,7 +42,7 @@ class TimesNode < BinaryNode
     super(left, right)
   end
 
-  def evaluate()
+  def evaluate
     left.evaluate * right.evaluate
   end
 end
@@ -52,33 +52,97 @@ class DivideNode < BinaryNode
     super(left, right)
   end
   
-  def evaluate()
+  def evaluate
     left.evaluate / right.evaluate
   end
 end
 
+class ModNode < BinaryNode
+  def initialize(left, right)
+    super(left, right)
+  end
+
+  def evaluate
+    left.evaluate % right.evaluate
+  end
+end
+
 class StoreNode < UnaryNode
   def initialize(sub)
     super(sub)
   end
 
-  def evaluate()
+  def evaluate
     $calc.memory = subTree.evaluate
   end
 end
 
 class RecallNode
-  def evaluate()
+  def evaluate
     $calc.memory
   end
 end
 
-class NumNode 
+class NumNode
   def initialize(num)
     @num = num
   end
    
-  def evaluate() 
+  def evaluate
     return @num
   end
 end
+
+class PlusNode < UnaryNode
+  def initialize(sub)
+    super(sub)
+  end
+
+  def evaluate
+    valc = $calc.memory + subTree.evaluate
+    $calc.memory = valc
+    return valc
+  end
+end
+
+class MinusNode < UnaryNode
+  def initialize(sub)
+    super(sub)
+  end
+
+  def evaluate
+    valc = $calc.memory - subTree.evaluate
+    $calc.memory = valc
+    return valc
+  end
+end
+
+class ClearNode
+  def evaluate
+    valc = 0
+    $calc.memory = valc
+    return valc
+  end
+end
+
+class SetNode < UnaryNode
+  def initialize(sub, key)
+    super(sub)
+    @key = key
+  end
+
+  def evaluate
+    val = subTree.evaluate
+    $calc.set(@key, val)
+  end
+end
+
+class GetNode
+  def initialize(key)
+    @key = key
+  end
+
+  def evaluate
+    return $calc.get(@key)
+  end
+end

data/lib/calculator.rb

@@ -7,6 +7,12 @@ class Calculator
   
   def initialize()
     @memory = 0
+    @useEnvVars = false
+    @setEnvVars = false
+    @createVar = false
+    @lastCreateKey = ''
+    @varsEnv = Hash.new()
+    @vars = Hash.new()
   end
   
   def eval(expr)
@@ -14,4 +20,48 @@ class Calculator
     ast = parser.parse()
     return ast.evaluate()
   end
+
+  def set(key, value)
+    if @setEnvVars == true then
+      @varsEnv.store(key, value)
+    else
+      @vars.store(key, value)
+    end
+    @createVar = true;
+    @lastCreateKey = key
+  end
+
+  def get(keyToGet)
+    if @useEnvVars == true && isEnvVar(key) == true then
+      @varsEnv.each {|key, val| if keyToGet == key then return val end }
+    else
+      @vars.each {|key, val| if keyToGet == key then return val end }
+    end
+    return 0
+  end
+  
+  def isEnvVar(key)
+    if @varsEnv.has_key?(key) == true then
+      return true
+    else
+      return false
+    end
+  end
+
+  def envConf
+    @useEnvVars = true
+  end
+
+  def changeSetEnvVars
+    if @setEnvVars == true then @setEnvVars = false else @setEnvVars = true end
+  end
+
+  def printVar
+    result = ''
+    if @createVar == true then
+      result = " [ #{@lastCreateKey} <- #{get(@lastCreateKey)} ]"
+      @createVar = false
+    end
+    return result
+  end
 end

data/lib/parser.rb

@@ -16,7 +16,6 @@ class Parser
   def Prog
     result = Expr()
     t = @scan.getToken
-    
     if t.type != :eof then
       print "Expected EOF. Found ", t.type, ".\n"
       raise ParseError.new
@@ -60,28 +59,43 @@ class Parser
       return RestTerm(DivideNode.new(e,Storable()))
     end
 
+    if t.type == :mod then
+      return RestTerm(ModNode.new(e,Storable()))
+    end
+
     @scan.putBackToken
 
     e
   end
-  
+
   def Storable
-    result = Factor()
-    
+    MemOperation(Factor())
+  end
+  
+  def MemOperation(e)
     t = @scan.getToken
 
     if t.type == :keyword
       if t.lex == "S"
-        return StoreNode.new(result)
+        return StoreNode.new(e)
       end
-      puts "We found an error on Storable #{t.lex}"
+
+      if t.lex == 'P'
+        return PlusNode.new(e)
+      end
+
+      if t.lex == 'M'
+        return MinusNode.new(e)
+      end
+      
+      puts "We found an error on MemOperation #{t.lex}"
       print " at line #{t.line} col: #{t.col}"
       raise ParseError.new
     end
 
     @scan.putBackToken
 
-    result
+    e
   end
   
   def Factor
@@ -92,13 +106,17 @@ class Parser
     end
 
     if t.type == :keyword
-      if t.lex == "R"
+      if t.lex == 'R'
         return RecallNode.new
       end
+
+      if t.lex == 'C'
+        return ClearNode.new
+      end
       puts "We found an error on Factor::keyword"
       raise ParseError.new
     end
-
+    
     if t.type == :lparen
       result = Expr()
       t = @scan.getToken
@@ -109,8 +127,24 @@ class Parser
       print " at line #{t.line} col: #{t.col}"
       raise ParseError.new
     end
-    puts "We found an error on Factor::lparen"
-    print " at line #{t.line} col: #{t.col}"
-    raise ParseError.new
+    
+    if t.type == :identifier
+      Assignable(t.lex)
+    end
+  end
+  
+  def Assignable(key)
+    t = @scan.getToken
+    if t.type == :assign
+      return Assign(key)
+    end
+
+    @scan.putBackToken
+
+    return GetNode.new(key)
+  end
+
+  def Assign(key)
+    return SetNode.new(Expr(), key)
   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 = :mod
+        foundOne = true
+      when 10
+        type = :assign
+        foundOne = true
       end
 
       if !foundOne then

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: calc_jbusta16
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.5
 platform: ruby
 authors:
 - Kent D. Lee - Juan Francisco Cardona Mc - Josue Daniel Bustamante
@@ -13,18 +13,18 @@ dependencies: []
 description: An calculator implementation on ruby
 email: j@coderise.org
 executables:
-- calc
+- calcex
 extensions: []
 extra_rdoc_files: []
 files:
-- bin/calc
+- bin/calcex
 - lib/ast.rb
 - lib/calcex.rb
 - lib/calculator.rb
 - lib/parser.rb
 - lib/scanner.rb
 - lib/token.rb
-homepage: http://github.com/JosueDanielBust/rubycal
+homepage: http://github.com/JosueDanielBust/rubycalc
 licenses:
 - ARTISTIC
 metadata: {}
@@ -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

data/bin/calc

@@ -1,22 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'rubygems'
-require 'calculator'
-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