kalculator 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3cb0411bb21bb99550cde9115cb53218b956d7fa107779b8e318446114fa6f3e
-  data.tar.gz: 1aad75a31f459f8a6b3c2390b073ff507c27d5ec56b5bf017d91c5f14ff41bce
+  metadata.gz: a4fd757c1bc075fe247ba612bf8e3670d6fc03711c332fa297d881513deda678
+  data.tar.gz: 1a6a5a2d27345d274d8559ea2b0c8a3cc3551db9012da35123f3ad0ce140c22d
 SHA512:
-  metadata.gz: b25b44e6d18de63b49db47effbf77661d1ae1556e5b61745be03bd3a813bda3afe7218815af54132ac59ffee4e32314d6bdb7ff993ca4255da7b713ac64633cd
-  data.tar.gz: dbede4204b904eb0f9969da284facdc0b91827878e87430dfa10d45bccc3e7a9fa373fa78cf26d63c7d6f96f38f604d074dbc622fb5fe01ca19b5bc08d881733
+  metadata.gz: 28573ad987c775b85a49c31cd74d2bd13b7344c66f8c7d937d1db80a286fd6d3c9ecbb149ef50d7ffc44ce0e4bf516b3f1f935c0edf0e7c4b1b773061a4e7dd1
+  data.tar.gz: d34ab516d686fcb3428e901625c07b00cd30bd9d67eb43d124b44358e04cc2a3de1abb0dd2adfd89eb9bfcec7f0870227fc5fe28717d07cdaca0b599fc7df36d

data/lib/kalculator/evaluator.rb

@@ -44,6 +44,14 @@ class Kalculator
       evaluate(left) == evaluate(right)
     end
 
+    def and(_, left, right)
+      evaluate(left) && evaluate(right)
+    end
+
+    def or(_, left, right)
+      evaluate(left) || evaluate(right)
+    end
+
     def boolean(_, boolean)
       boolean
     end

data/lib/kalculator/lexer.rb

@@ -13,6 +13,8 @@ class Kalculator
     rule(/</)        { :LT     }
     rule(/<=/)       { :LTE    }
     rule(/==/)       { :EQ     }
+    rule(/AND/)      { :AND    }
+    rule(/OR/)       { :OR     }
     rule(/\d+/)      { |t| [:NUMBER, t.to_i] }
     rule(/\.\d+/)    { |t| [:NUMBER, t.to_f] }
     rule(/\d+\.\d+/) { |t| [:NUMBER, t.to_f] }

data/lib/kalculator/parser.rb

@@ -1,6 +1,6 @@
 class Kalculator
   class Parser < RLTK::Parser
-    #Left     200 '&&' '||'.
+    left :AND, :OR
     left :GT, :GTE, :LT, :LTE, :EQ
     left :PLUS, :SUB
     left :MUL, :DIV
@@ -30,6 +30,9 @@ class Kalculator
       clause('expression LTE expression') { |e0, _, e1| [:<=, e0, e1] }
       clause('expression EQ expression') { |e0, _, e1| [:==, e0, e1] }
 
+      clause('expression AND expression') { |e0, _, e1| [:and, e0, e1] }
+      clause('expression OR expression') { |e0, _, e1| [:or, e0, e1] }
+
       clause('expression PLUS expression') { |e0, _, e1| [:+, e0, e1] }
       clause('expression SUB expression')  { |e0, _, e1| [:-, e0, e1] }
       clause('expression MUL expression')  { |e0, _, e1| [:*, e0, e1] }

data/lib/kalculator/version.rb

@@ -1,3 +1,3 @@
 class Kalculator
-  VERSION = "0.4.0"
+  VERSION = "0.4.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kalculator
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Michael Ries
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-05-14 00:00:00.000000000 Z
+date: 2018-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rltk