calc_jquinon1 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5ad7b5f2eecfff7897f77a9d377a120ba413db28
-  data.tar.gz: 511faa2b680aa465df0e80f639a07ea590fd2351
+  metadata.gz: 76c7ac93939d677abd36237d64c0b3c44f5f3cf9
+  data.tar.gz: f274eb75a3b6c430411364ce677cce3386611ec9
 SHA512:
-  metadata.gz: a66da9781fb92b92796e6ee57501922a7054418129cb81d622043696297cc478e7e2f2d51c2d3f17ae0c8d661335923f0606c318184a11cbb4863bea5aa10a41
-  data.tar.gz: 617a94f44a410d34b8adf572c1d54c883b22de85ba2eacd5ea767139ebbffdc3fa912e294a543061821a833c7c723c5272403483bf9ff2855b12eff686fa8705
+  metadata.gz: ad12adb567014fd10d6a61d23a2debae55f24ee0f3581e4bb2649d654cd41243f958d44571d651572f07639617063cac61e3884bb46e48eacb4c2658b0fdc578
+  data.tar.gz: 46eb36af5f1d41b950f7ca8f3385a8af61a39c4987754f0ceb6c99bd958cbdf111b7454cb92cb29cb1e15429e4d58f1447aae8a848beb7b82973b4022d2cedfa

data/lib/ast.rb

@@ -57,6 +57,16 @@ class DivideNode < BinaryNode
   end
 end
 
+class ModuleNode < BinaryNode
+  def initialize(left,right)
+    super(left,right)
+  end
+
+  def evaluate
+    @left.evaluate % @right.evaluate
+  end
+end
+
 class StoreNode < UnaryNode
   def initialize(subTree)
     super(subTree)
@@ -67,18 +77,49 @@ class StoreNode < UnaryNode
   end
 end 
 
+class PlusNode < UnaryNode
+  def initialize(subTree)
+    super(subTree)
+  end
+
+  def evaluate
+    result1 = @subTree.evaluate
+    result2 = $calc.memory
+    result1+result2
+  end
+end
+
+class MinusNode < UnaryNode
+  def initialize(subTree)
+    super(subTree)
+  end
+
+  def evaluate
+    result1 = @subTree.evaluate
+    result2 = $calc.memory
+    result1-result2
+  end
+end
+
 class RecallNode
   def evaluate
     $calc.memory
   end
 end
 
+class ClearNode
+  
+  def evaluate
+    $calc.memory = 0
+  end
+end
+
 class NumNode 
   def initialize(num)
     @num = num
   end
    
-  def evaluate() 
+  def evaluate 
     return @num
   end
 end

data/lib/parser.rb

@@ -72,6 +72,11 @@ class Parser
     if t.type==:divide
       return RestTerm(DivideNode.new(e,Storable()))
     end
+
+    if t.type == :module
+      return RestTerm(ModuleNode.new(e,Storable()))
+    end
+
     @scan.putBackToken
     return e
   end
@@ -82,9 +87,18 @@ class Parser
     t=@scan.getToken
     if t.type == :keyword
       if t.lex == "S"
-        return StorableNode.new(result)
+        return StoreNode.new(result)
+      end
+
+      if t.lex == "P"
+        return PlusNode.new(result)
       end
-      puts "Expected S found: ", t.lex
+
+      if t.lex == "M"
+        return MinusNode.new(result)
+      end
+
+      puts "Expected S, P or M found: ", t.lex
       raise ParseError.new
     end
 
@@ -102,10 +116,14 @@ class Parser
 
     if t.type == :keyword
       if t.lex == "R"
-        return RecallNode
+        return RecallNode.new
+      end
+
+      if t.lex == "C"
+        return ClearNode.new
       end
 
-      puts "Expected R found: " + t.lex
+      puts "Expected R or C found: " + t.lex
       raise ParseError.new
     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
@@ -45,6 +45,7 @@ class Scanner
         elsif c == ?/ then state = 6
         elsif c == ?( then state = 7
         elsif c == ?) then state = 8
+        elsif c == ?% then state = 9            
         elsif c == ?\n then 
           @colCount = -1
           @lineCount = @lineCount+1
@@ -91,6 +92,9 @@ class Scanner
       when 8
         type = :rparen
         foundOne = true
+      when 9
+        type = :module
+        foundOne = true
       end
 
       if !foundOne then

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification
 name: calc_jquinon1
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
-- Kent D. Lee - Juan Francisco Cardona Mc
+- Kent D. Lee - Juan Francisco Cardona Mc - Jhonatan Quiñonez
 autorequire: 
 bindir: bin
 cert_chain: []
@@ -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.5.1
 signing_key: 
 specification_version: 4
 summary: Another calculator in ruby